Adding site-packages changes waiting for Pyodide to solve dependencies

esm/interpreter/pyodide.js

@@ -75,7 +75,19 @@ export default {
         `https://cdn.jsdelivr.net/pyodide/v${version}/full/pyodide.mjs`,
     async engine({ loadPyodide, version }, config, url, baseURL) {
         progress('Loading Pyodide');
-        let { packages, index_urls } = config;
+        let fsInit, { ['site-packages']: sitePackages, packages, index_urls } = config;
+        if (sitePackages) {
+            const paths = Object.values(sitePackages);
+            const sources = await Promise.all(
+                Object.keys(sitePackages)
+                    .map(fixedRelative, baseURL)
+                    .map(url => fetch(url).then(response => response.arrayBuffer()))
+            );
+            fsInit = (FS, { sitePackages }) => {
+                for (let i = 0; i < sources.length; i++)
+                    FS.writeFile(`${sitePackages}${paths[i]}`, new Uint8Array(sources[i]));
+            };
+        }
         if (packages) {
             packages = packages.map(fixedRelative, baseURL);
             if (!index_urls) {
@@ -153,7 +165,7 @@ export default {
         const { stderr, stdout, get } = stdio();
         progress('Loading interpreter');
         const interpreter = await get(
-            loadPyodide({ stderr, stdout, ...options }),
+            loadPyodide({ stderr, stdout, fsInit, ...options }),
         );
         progress('Loaded interpreter');
         globalThis[js_modules].set('-T-', this.transform.bind(this, interpreter));

package.json

@@ -1,6 +1,6 @@
 {
     "name": "polyscript",
-    "version": "0.19.7",
+    "version": "0.19.8",
     "description": "PyScript single core to rule them all",
     "main": "./esm/index.js",
     "types": "./types/polyscript/esm/index.d.ts",
@@ -95,6 +95,6 @@
         "to-json-callback": "^0.1.1"
     },
     "worker": {
-        "blob": "sha256-KAjqLKnATwMGpCYHIqvKU0qTsPMg89Hg6gH2nz5FBys="
+        "blob": "sha256-0wxB87WWkfSkhmwEFt/uoha3/utDN4kljZS2ft4qG8Y="
     }
 }

test/pyodide/example.pth

@@ -0,0 +1,3 @@
+import bitarray
+
+print(bitarray.__version__)

test/pyodide/index.html

@@ -4,9 +4,8 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <script type="module" src="../../dist/index.js"></script>
-    <script type="pyodide" async worker>
-      from polyscript import xworker
-      print(xworker.window.Function('return 1')())
+    <script type="pyodide" config='{"packages_cache":"passthrough","packages":["bitarray"],"site-packages":{"./example.pth":"/example.pth"}}'>
+      print('Hello, world!')
     </script>
   </head>
 </html>