Fix #1899 - Expose pyscript.js_modules as module (#1902 )

* Fix #1899 - Expose pyscript.js_modules as module * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix #1899 - Make import as smooth as in polyscript --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
PyTerminal - expose the reference through the element (#1921 )
2025-12-23 12:12:59 -05:00 · 2024-01-03 17:16:51 +01:00 · 2024-01-03 16:24:38 +01:00 · 2023-12-19 14:18:27 +01:00 · 2023-12-19 13:52:45 +01:00 · 2023-12-14 18:32:46 +01:00
12 changed files with 230 additions and 116 deletions
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ ci:
 default_stages: [commit]
 repos:
    - repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.4.0
+      rev: v4.5.0
      hooks:
          - id: check-builtin-literals
          - id: check-case-conflict
@@ -25,13 +25,13 @@ repos:
          - id: trailing-whitespace

    - repo: https://github.com/psf/black
-      rev: 23.1.0
+      rev: 23.11.0
      hooks:
          - id: black
            exclude: pyscript\.core/src/stdlib/pyscript/__init__\.py

    - repo: https://github.com/codespell-project/codespell
-      rev: v2.2.4
+      rev: v2.2.6
      hooks:
          - id: codespell # See 'pyproject.toml' for args
            exclude: \.js\.map$
--- a/pyscript.core/package-lock.json
+++ b/pyscript.core/package-lock.json
@@ -1,17 +1,17 @@
 {
    "name": "@pyscript/core",
-    "version": "0.3.9",
+    "version": "0.3.14",
    "lockfileVersion": 3,
    "requires": true,
    "packages": {
        "": {
            "name": "@pyscript/core",
-            "version": "0.3.9",
+            "version": "0.3.14",
            "license": "APACHE-2.0",
            "dependencies": {
                "@ungap/with-resolvers": "^0.1.0",
                "basic-devtools": "^0.1.6",
-                "polyscript": "^0.6.2",
+                "polyscript": "^0.6.8",
                "sticky-module": "^0.1.1",
                "to-json-callback": "^0.1.1",
                "type-checked-collections": "^0.1.7"
@@ -21,7 +21,7 @@
                "@codemirror/lang-python": "^6.1.3",
                "@codemirror/language": "^6.9.3",
                "@codemirror/state": "^6.3.3",
-                "@codemirror/view": "^6.22.1",
+                "@codemirror/view": "^6.22.3",
                "@playwright/test": "^1.40.1",
                "@rollup/plugin-commonjs": "^25.0.7",
                "@rollup/plugin-node-resolve": "^15.2.3",
@@ -30,8 +30,8 @@
                "@xterm/addon-fit": "^0.9.0-beta.1",
                "chokidar": "^3.5.3",
                "codemirror": "^6.0.1",
-                "eslint": "^8.55.0",
-                "rollup": "^4.6.1",
+                "eslint": "^8.56.0",
+                "rollup": "^4.9.1",
                "rollup-plugin-postcss": "^4.0.2",
                "rollup-plugin-string": "^3.0.0",
                "static-handler": "^0.4.3",
@@ -133,9 +133,9 @@
            "dev": true
        },
        "node_modules/@codemirror/view": {
-            "version": "6.22.1",
-            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.1.tgz",
-            "integrity": "sha512-38BRn1nPqZqiHbmWfI8zri23IbRVbmSpSmh1E/Ysvc+lIGGdBC17K8zlK7ZU6fhfy9x4De9Zyj5JQqScPq5DkA==",
+            "version": "6.22.3",
+            "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.22.3.tgz",
+            "integrity": "sha512-rqnq+Zospwoi3x1vZ8BGV1MlRsaGljX+6qiGYmIpJ++M+LCC+wjfDaPklhwpWSgv7pr/qx29KiAKQBH5+DOn4w==",
            "dev": true,
            "dependencies": {
                "@codemirror/state": "^6.1.4",
@@ -191,9 +191,9 @@
            }
        },
        "node_modules/@eslint/js": {
-            "version": "8.55.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
-            "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+            "version": "8.56.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
+            "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
            "dev": true,
            "engines": {
                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -509,9 +509,9 @@
            }
        },
        "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.1.tgz",
-            "integrity": "sha512-0WQ0ouLejaUCRsL93GD4uft3rOmB8qoQMU05Kb8CmMtMBe7XUDLAltxVZI1q6byNqEtU7N1ZX1Vw5lIpgulLQA==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.1.tgz",
+            "integrity": "sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==",
            "cpu": [
                "arm"
            ],
@@ -522,9 +522,9 @@
            ]
        },
        "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.6.1.tgz",
-            "integrity": "sha512-1TKm25Rn20vr5aTGGZqo6E4mzPicCUD79k17EgTLAsXc1zysyi4xXKACfUbwyANEPAEIxkzwue6JZ+stYzWUTA==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.1.tgz",
+            "integrity": "sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==",
            "cpu": [
                "arm64"
            ],
@@ -535,9 +535,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.6.1.tgz",
-            "integrity": "sha512-cEXJQY/ZqMACb+nxzDeX9IPLAg7S94xouJJCNVE5BJM8JUEP4HeTF+ti3cmxWeSJo+5D+o8Tc0UAWUkfENdeyw==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.1.tgz",
+            "integrity": "sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==",
            "cpu": [
                "arm64"
            ],
@@ -548,9 +548,9 @@
            ]
        },
        "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.6.1.tgz",
-            "integrity": "sha512-LoSU9Xu56isrkV2jLldcKspJ7sSXmZWkAxg7sW/RfF7GS4F5/v4EiqKSMCFbZtDu2Nc1gxxFdQdKwkKS4rwxNg==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.1.tgz",
+            "integrity": "sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==",
            "cpu": [
                "x64"
            ],
@@ -561,9 +561,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.6.1.tgz",
-            "integrity": "sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.1.tgz",
+            "integrity": "sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==",
            "cpu": [
                "arm"
            ],
@@ -574,9 +574,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.6.1.tgz",
-            "integrity": "sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.1.tgz",
+            "integrity": "sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==",
            "cpu": [
                "arm64"
            ],
@@ -587,9 +587,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.6.1.tgz",
-            "integrity": "sha512-FfoOK1yP5ksX3wwZ4Zk1NgyGHZyuRhf99j64I5oEmirV8EFT7+OhUZEnP+x17lcP/QHJNWGsoJwrz4PJ9fBEXw==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.1.tgz",
+            "integrity": "sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==",
            "cpu": [
                "arm64"
            ],
@@ -599,10 +599,23 @@
                "linux"
            ]
        },
+        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.1.tgz",
+            "integrity": "sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
        "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.6.1.tgz",
-            "integrity": "sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.1.tgz",
+            "integrity": "sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==",
            "cpu": [
                "x64"
            ],
@@ -613,9 +626,9 @@
            ]
        },
        "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.6.1.tgz",
-            "integrity": "sha512-RkJVNVRM+piYy87HrKmhbexCHg3A6Z6MU0W9GHnJwBQNBeyhCJG9KDce4SAMdicQnpURggSvtbGo9xAWOfSvIQ==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.1.tgz",
+            "integrity": "sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==",
            "cpu": [
                "x64"
            ],
@@ -626,9 +639,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.6.1.tgz",
-            "integrity": "sha512-v2FVT6xfnnmTe3W9bJXl6r5KwJglMK/iRlkKiIFfO6ysKs0rDgz7Cwwf3tjldxQUrHL9INT/1r4VA0n9L/F1vQ==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.1.tgz",
+            "integrity": "sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==",
            "cpu": [
                "arm64"
            ],
@@ -639,9 +652,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.6.1.tgz",
-            "integrity": "sha512-YEeOjxRyEjqcWphH9dyLbzgkF8wZSKAKUkldRY6dgNR5oKs2LZazqGB41cWJ4Iqqcy9/zqYgmzBkRoVz3Q9MLw==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.1.tgz",
+            "integrity": "sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==",
            "cpu": [
                "ia32"
            ],
@@ -652,9 +665,9 @@
            ]
        },
        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.6.1.tgz",
-            "integrity": "sha512-0zfTlFAIhgz8V2G8STq8toAjsYYA6eci1hnXuyOTUFnymrtJwnS6uGKiv3v5UrPZkBlamLvrLV2iiaeqCKzb0A==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.1.tgz",
+            "integrity": "sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==",
            "cpu": [
                "x64"
            ],
@@ -1390,15 +1403,15 @@
            }
        },
        "node_modules/eslint": {
-            "version": "8.55.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
-            "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+            "version": "8.56.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
+            "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
            "dev": true,
            "dependencies": {
                "@eslint-community/eslint-utils": "^4.2.0",
                "@eslint-community/regexpp": "^4.6.1",
                "@eslint/eslintrc": "^2.1.4",
-                "@eslint/js": "8.55.0",
+                "@eslint/js": "8.56.0",
                "@humanwhocodes/config-array": "^0.11.13",
                "@humanwhocodes/module-importer": "^1.0.1",
                "@nodelib/fs.walk": "^1.2.8",
@@ -2397,9 +2410,9 @@
            }
        },
        "node_modules/polyscript": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/polyscript/-/polyscript-0.6.2.tgz",
-            "integrity": "sha512-JL3aIodfdXVQy65iPqjPxbSHzSGJdyf5Z9CuESZVJobcOcOvymjFgsZeoktz0e6PHqM4YSggtKQ9bN9HzlgMBg==",
+            "version": "0.6.8",
+            "resolved": "https://registry.npmjs.org/polyscript/-/polyscript-0.6.8.tgz",
+            "integrity": "sha512-7HXhkWnVP4Qph2hYL85qQ+omIKA7yHTZJwphlMVLhZwvqpAKZEyPojrZMTg5j1sLLyyKsWSHSzZuklzS5qWgmA==",
            "dependencies": {
                "@ungap/structured-clone": "^1.2.0",
                "@ungap/with-resolvers": "^0.1.0",
@@ -3096,9 +3109,9 @@
            }
        },
        "node_modules/rollup": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.6.1.tgz",
-            "integrity": "sha512-jZHaZotEHQaHLgKr8JnQiDT1rmatjgKlMekyksz+yk9jt/8z9quNjnKNRoaM0wd9DC2QKXjmWWuDYtM3jfF8pQ==",
+            "version": "4.9.1",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.1.tgz",
+            "integrity": "sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==",
            "dev": true,
            "bin": {
                "rollup": "dist/bin/rollup"
@@ -3108,18 +3121,19 @@
                "npm": ">=8.0.0"
            },
            "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.6.1",
-                "@rollup/rollup-android-arm64": "4.6.1",
-                "@rollup/rollup-darwin-arm64": "4.6.1",
-                "@rollup/rollup-darwin-x64": "4.6.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.6.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.6.1",
-                "@rollup/rollup-linux-arm64-musl": "4.6.1",
-                "@rollup/rollup-linux-x64-gnu": "4.6.1",
-                "@rollup/rollup-linux-x64-musl": "4.6.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.6.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.6.1",
-                "@rollup/rollup-win32-x64-msvc": "4.6.1",
+                "@rollup/rollup-android-arm-eabi": "4.9.1",
+                "@rollup/rollup-android-arm64": "4.9.1",
+                "@rollup/rollup-darwin-arm64": "4.9.1",
+                "@rollup/rollup-darwin-x64": "4.9.1",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.9.1",
+                "@rollup/rollup-linux-arm64-gnu": "4.9.1",
+                "@rollup/rollup-linux-arm64-musl": "4.9.1",
+                "@rollup/rollup-linux-riscv64-gnu": "4.9.1",
+                "@rollup/rollup-linux-x64-gnu": "4.9.1",
+                "@rollup/rollup-linux-x64-musl": "4.9.1",
+                "@rollup/rollup-win32-arm64-msvc": "4.9.1",
+                "@rollup/rollup-win32-ia32-msvc": "4.9.1",
+                "@rollup/rollup-win32-x64-msvc": "4.9.1",
                "fsevents": "~2.3.2"
            }
        },
--- a/pyscript.core/package.json
+++ b/pyscript.core/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@pyscript/core",
-    "version": "0.3.9",
+    "version": "0.3.14",
    "type": "module",
    "description": "PyScript",
    "module": "./index.js",
@@ -42,7 +42,7 @@
    "dependencies": {
        "@ungap/with-resolvers": "^0.1.0",
        "basic-devtools": "^0.1.6",
-        "polyscript": "^0.6.2",
+        "polyscript": "^0.6.8",
        "sticky-module": "^0.1.1",
        "to-json-callback": "^0.1.1",
        "type-checked-collections": "^0.1.7"
@@ -52,7 +52,7 @@
        "@codemirror/lang-python": "^6.1.3",
        "@codemirror/language": "^6.9.3",
        "@codemirror/state": "^6.3.3",
-        "@codemirror/view": "^6.22.1",
+        "@codemirror/view": "^6.22.3",
        "@playwright/test": "^1.40.1",
        "@rollup/plugin-commonjs": "^25.0.7",
        "@rollup/plugin-node-resolve": "^15.2.3",
@@ -61,8 +61,8 @@
        "@xterm/addon-fit": "^0.9.0-beta.1",
        "chokidar": "^3.5.3",
        "codemirror": "^6.0.1",
-        "eslint": "^8.55.0",
-        "rollup": "^4.6.1",
+        "eslint": "^8.56.0",
+        "rollup": "^4.9.1",
        "rollup-plugin-postcss": "^4.0.2",
        "rollup-plugin-string": "^3.0.0",
        "static-handler": "^0.4.3",
--- a/pyscript.core/src/core.js
+++ b/pyscript.core/src/core.js
@@ -26,33 +26,9 @@ import { ErrorCode } from "./exceptions.js";
 import { robustFetch as fetch, getText } from "./fetch.js";
 import { hooks, main, worker, codeFor, createFunction } from "./hooks.js";

-// allows lazy element features on code evaluation
-let currentElement;
-
 // generic helper to disambiguate between custom element and script
 const isScript = ({ tagName }) => tagName === "SCRIPT";

-let shouldRegister = true;
-const registerModule = ({ XWorker: $XWorker, interpreter, io }) => {
-    // automatically use the pyscript stderr (when/if defined)
-    // this defaults to console.error
-    function PyWorker(...args) {
-        const worker = $XWorker(...args);
-        worker.onerror = ({ error }) => io.stderr(error);
-        return worker;
-    }
-
-    // enrich the Python env with some JS utility for main
-    interpreter.registerJsModule("_pyscript", {
-        PyWorker,
-        get target() {
-            return isScript(currentElement)
-                ? currentElement.target.id
-                : currentElement.id;
-        },
-    });
-};
-
 // avoid multiple initialization of the same library
 const [
    {
@@ -118,6 +94,36 @@ for (const [TYPE, interpreter] of TYPES) {
        return code;
    };

+    // register once any interpreter
+    let alreadyRegistered = false;
+
+    // allows lazy element features on code evaluation
+    let currentElement;
+
+    const registerModule = ({ XWorker, interpreter, io }) => {
+        // avoid multiple registration of the same interpreter
+        if (alreadyRegistered) return;
+        alreadyRegistered = true;
+
+        // automatically use the pyscript stderr (when/if defined)
+        // this defaults to console.error
+        function PyWorker(...args) {
+            const worker = XWorker(...args);
+            worker.onerror = ({ error }) => io.stderr(error);
+            return worker;
+        }
+
+        // enrich the Python env with some JS utility for main
+        interpreter.registerJsModule("_pyscript", {
+            PyWorker,
+            get target() {
+                return isScript(currentElement)
+                    ? currentElement.target.id
+                    : currentElement.id;
+            },
+        });
+    };
+
    // define the module as both `<script type="py">` and `<py-script>`
    // but only if the config didn't throw an error
    if (!error) {
@@ -133,10 +139,7 @@ for (const [TYPE, interpreter] of TYPES) {
                main: {
                    ...codeFor(main),
                    async onReady(wrap, element) {
-                        if (shouldRegister) {
-                            shouldRegister = false;
-                            registerModule(wrap);
-                        }
+                        registerModule(wrap);

                        // allows plugins to do whatever they want with the element
                        // before regular stuff happens in here
@@ -320,7 +323,7 @@ for (const [TYPE, interpreter] of TYPES) {
 function PyWorker(file, options) {
    const hooks = hooked.get("py");
    // this propagates pyscript worker hooks without needing a pyscript
-    // bootstrap + it passes arguments and enforces `pyodide`
+    // bootstrap + it passes arguments and it defaults to `pyodide`
    // as the interpreter to use in the worker, as all hooks assume that
    // and as `pyodide` is the only default interpreter that can deal with
    // all the features we need to deliver pyscript out there.
--- a/pyscript.core/src/plugins/py-terminal.js
+++ b/pyscript.core/src/plugins/py-terminal.js
@@ -1,6 +1,7 @@
 // PyScript py-terminal plugin
 import { TYPES, hooks } from "../core.js";
 import { notify } from "./error.js";
+import { defineProperty } from "polyscript/exports";

 const SELECTOR = [...TYPES.keys()]
    .map((type) => `script[type="${type}"][terminal],${type}-script[terminal]`)
@@ -76,6 +77,7 @@ const pyTerminal = async () => {
        terminal.open(target);
        fitAddon.fit();
        terminal.focus();
+        defineProperty(element, "terminal", { value: terminal });
    };

    // branch logic for the worker
--- a/pyscript.core/src/stdlib/pyscript/magic_js.py
+++ b/pyscript.core/src/stdlib/pyscript/magic_js.py
@@ -1,9 +1,28 @@
+import sys
+
 import js as globalThis
 from polyscript import js_modules
 from pyscript.util import NotSupported

 RUNNING_IN_WORKER = not hasattr(globalThis, "document")

+
+# allow `from pyscript.js_modules.xxx import yyy`
+class JSModule(object):
+    def __init__(self, name):
+        self.name = name
+
+    def __getattr__(self, field):
+        # avoid pyodide looking for non existent fields
+        if not field.startswith("_"):
+            return getattr(getattr(js_modules, self.name), field)
+
+
+# generate N modules in the system that will proxy the real value
+for name in globalThis.Reflect.ownKeys(js_modules):
+    sys.modules[f"pyscript.js_modules.{name}"] = JSModule(name)
+sys.modules["pyscript.js_modules"] = js_modules
+
 if RUNNING_IN_WORKER:
    import js
    import polyscript
--- a/pyscript.core/test/js_modules.html
+++ b/pyscript.core/test/js_modules.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link rel="stylesheet" href="../dist/core.css">
+    <script type="module" src="../dist/core.js"></script>
+</head>
+<body>
+    <mpy-config>
+        [js_modules.main]
+        "./js_modules.js" = "random_js"
+    </mpy-config>
+    <mpy-script>
+        from pyscript.js_modules.random_js import default as value
+        from pyscript.js_modules import random_js
+        from pyscript import js_modules
+
+        print("mpy", value)
+        print("mpy", random_js.default)
+        print("mpy", js_modules.random_js.default)
+    </mpy-script>
+    <py-config>
+        [js_modules.main]
+        "./js_modules.js" = "random_js"
+    </py-config>
+    <py-script>
+        from pyscript.js_modules.random_js import default as value
+        from pyscript.js_modules import random_js
+        from pyscript import js_modules, document
+
+        print("py", value)
+        print("py", random_js.default)
+        print("py", js_modules.random_js.default)
+
+        document.documentElement.classList.add('done')
+    </py-script>
+</body>
+</html>
--- a/pyscript.core/test/js_modules.js
+++ b/pyscript.core/test/js_modules.js
@@ -0,0 +1 @@
+export default Math.random();
--- a/pyscript.core/test/mpy.spec.js
+++ b/pyscript.core/test/mpy.spec.js
@@ -35,3 +35,19 @@ test('MicroPython hooks', async ({ page }) => {
    'worker onAfterRun',
  ].join('\n'));
 });
+
+test('MicroPython + Pyodide js_modules', async ({ page }) => {
+  const logs = [];
+  page.on('console', msg => {
+    const text = msg.text();
+    if (!text.startsWith('['))
+      logs.push(text);
+  });
+  await page.goto('http://localhost:8080/test/js_modules.html');
+  await page.waitForSelector('html.done');
+  await expect(logs.length).toBe(6);
+  await expect(logs[0]).toBe(logs[1]);
+  await expect(logs[1]).toBe(logs[2]);
+  await expect(logs[3]).toBe(logs[4]);
+  await expect(logs[4]).toBe(logs[5]);
+});
--- a/pyscript.core/test/multi.html
+++ b/pyscript.core/test/multi.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <script type="module" src="../dist/core.js"></script>
+  </head>
+  <body>
+    <script type="mpy">
+      from pyscript import document
+      import sys
+      document.body.append(sys.version)
+    </script>
+    <script type="py">
+      from pyscript import document
+      import sys
+      document.body.append(sys.version)
+    </script>
+  </body>
+</html>
--- a/pyscript.core/tests/integration/test_py_terminal.py
+++ b/pyscript.core/tests/integration/test_py_terminal.py
@@ -112,7 +112,7 @@ class TestPyTerminal(PyScriptTest):
        This test isn't meant to capture all of the behaviors of an xtermjs terminal;
        rather, it confirms with a few basic formatting sequences that (1) the xtermjs
        terminal is functioning/loaded correctly and (2) that output toward that terminal
-        isn't being escaped in a way that prevents it reacting to escape seqeunces. The
+        isn't being escaped in a way that prevents it reacting to escape sequences. The
        main goal is preventing regressions.
        """
        self.pyscript_run(
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,13 +1,13 @@
-black
-isort
+black==23.11.0
+isort==5.12.0
 pytest==7.1.2
-pre-commit
+pre-commit==3.5.0
 playwright==1.33.0
 pytest-playwright==0.3.3
 pytest-xdist==3.3.0
-pexpect
+pexpect==4.9.0
 pyodide_py==0.24.1
-micropip
-toml
-numpy
-pillow
+micropip==0.5.0
+toml==0.10.2
+numpy==1.26.2
+pillow==10.1.0
Author	SHA1	Message	Date
Andrea Giammarchi	0f788fa284	Fix #1899 - Expose pyscript.js_modules as module (#1902 ) * Fix #1899 - Expose pyscript.js_modules as module * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fix #1899 - Make import as smooth as in polyscript --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2024-01-03 17:16:51 +01:00
Andrea Giammarchi	355866a1f1	PyTerminal - expose the reference through the element (#1921 ) * PyTerminal - expose the reference through the element * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2024-01-03 16:24:38 +01:00
pre-commit-ci[bot]	6eca06ac0b	[pre-commit.ci] pre-commit autoupdate (#1844 ) * [pre-commit.ci] pre-commit autoupdate updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v4.5.0) - [github.com/psf/black: 23.1.0 → 23.11.0](https://github.com/psf/black/compare/23.1.0...23.11.0) - [github.com/codespell-project/codespell: v2.2.4 → v2.2.6](https://github.com/codespell-project/codespell/compare/v2.2.4...v2.2.6) * fixed typo in comment --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Andrea Giammarchi <andrea.giammarchi@gmail.com>	2023-12-19 14:18:27 +01:00
Andrea Giammarchi	a4aef0b530	Fix CI VS local env inconsistencies (#1892 ) * Fix make fmt changing Python files * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>	2023-12-19 13:52:45 +01:00
Andrea Giammarchi	136e95498f	Reduce conflicts on multiple custom scripts (#1897 )	2023-12-14 18:32:46 +01:00