Enabled experimental files config field

Author: WebReflection

docs/core.js

@@ -124,4 +124,47 @@ export const fetchPaths = (module, interpreter, config_fetch) =>
                 .then((buffer) => module.writeFile(interpreter, path, buffer)),
         ),
     );
+
+    const fillName = (source, dest) => dest.endsWith('/') ?
+                        `${dest}${source.split('/').pop()}` : dest;
+
+const parseTemplate = (src, map) => src.replace(
+  /\{.+?\}/g,
+  k => {
+    if (!map.has(k))
+      throw new SyntaxError(`Invalid template: ${k}`);
+    return map.get(k);
+  }
+);
+
+const calculateFilesPaths = files => {
+  const map = new Map;
+  const targets = new Set;
+  const sourceDest = [];
+  for (const [source, dest] of Object.entries(files)) {
+    if (/^\{.+\}$/.test(source)) {
+      if (map.has(source))
+        throw new SyntaxError(`Duplicated template: ${source}`);
+      map.set(source, parseTemplate(dest, map));
+    }
+    else {
+      const url = parseTemplate(source, map);
+      const path = fillName(url, parseTemplate(dest, map));
+      if (targets.has(path))
+        throw new SyntaxError(`Duplicated destination: ${path}`);
+      targets.add(path);
+      sourceDest.push({ url, path });
+    }
+  }
+  return sourceDest;
+};
+
+export const fetchFiles = (module, interpreter, config_files) =>
+    all(
+        calculateFilesPaths(config_files).map(({ url, path }) =>
+            fetchResolved(config_files, url)
+                .then(getBuffer)
+                .then((buffer) => module.writeFile(interpreter, path, buffer)),
+        ),
+    );
 /* c8 ignore stop */

docs/core.js.map

@@ -1,4 +1,4 @@
-import { fetchPaths, stdio, writeFile } from './_utils.js';
+import { fetchFiles, fetchPaths, stdio, writeFile } from './_utils.js';
 import { registerJSModule, run, runAsync, runEvent } from './_python.js';
 
 const type = 'micropython';
@@ -13,6 +13,7 @@ export default {
         const { stderr, stdout, get } = stdio();
         url = url.replace(/\.m?js$/, '.wasm');
         const interpreter = await get(loadMicroPython({ stderr, stdout, url }));
+        if (config.files) await fetchFiles(this, interpreter, config.files);
         if (config.fetch) await fetchPaths(this, interpreter, config.fetch);
         return interpreter;
     },

esm/interpreter/_utils.js

@@ -1,4 +1,4 @@
-import { fetchPaths, stdio, writeFile } from './_utils.js';
+import { fetchFiles, fetchPaths, stdio, writeFile } from './_utils.js';
 import { registerJSModule, run, runAsync, runEvent } from './_python.js';
 
 const type = 'pyodide';
@@ -16,6 +16,7 @@ export default {
         const interpreter = await get(
             loadPyodide({ stderr, stdout, indexURL }),
         );
+        if (config.files) await fetchFiles(this, interpreter, config.files);
         if (config.fetch) await fetchPaths(this, interpreter, config.fetch);
         if (config.packages) {
             await interpreter.loadPackage('micropip');

esm/interpreter/micropython.js

@@ -1,5 +1,5 @@
 import { dedent } from '../utils.js';
-import { fetchPaths } from './_utils.js';
+import { fetchFiles, fetchPaths } from './_utils.js';
 
 const type = 'ruby-wasm-wasi';
 const jsType = type.replace(/\W+/g, '_');
@@ -22,6 +22,7 @@ export default {
         );
         const module = await WebAssembly.compile(await response.arrayBuffer());
         const { vm: interpreter } = await DefaultRubyVM(module);
+        if (config.files) await fetchFiles(this, interpreter, config.files);
         if (config.fetch) await fetchPaths(this, interpreter, config.fetch);
         return interpreter;
     },

esm/interpreter/pyodide.js

@@ -1,5 +1,5 @@
 import { dedent } from '../utils.js';
-import { fetchPaths, io, stdio, writeFileShim } from './_utils.js';
+import { fetchFiles, fetchPaths, io, stdio, writeFileShim } from './_utils.js';
 
 const type = 'wasmoon';
 
@@ -19,6 +19,7 @@ export default {
             interpreter.global.setField(index, 'print', stdout);
             interpreter.global.setField(index, 'printErr', stderr);
         });
+        if (config.files) await fetchFiles(this, interpreter, config.files);
         if (config.fetch) await fetchPaths(this, interpreter, config.fetch);
         return interpreter;
     },

esm/interpreter/ruby-wasm-wasi.js

@@ -34,8 +34,10 @@ export const interpreter = new Proxy(new Map(), {
         return (config, baseURL) =>
             module.then((module) => {
                 configs.set(id, config);
-                const fetch = config?.fetch;
-                if (fetch) base.set(fetch, baseURL);
+                for (const entry of ['files', 'fetch']) {
+                    const value = config?.[entry];
+                    if (value) base.set(value, baseURL);
+                }
                 return engine(module, config, url);
             });
     },

esm/interpreter/wasmoon.js

@@ -71,6 +71,6 @@
         "html-escaper": "^3.0.3"
     },
     "worker": {
-        "blob": "sha256-wpW1JDUswE7n7bkoJJYLv66C9OuoZbVItbc+oW3ttD8="
+        "blob": "sha256-OHYVqYaMc7x/7emaT0QXD2uRDdZ3gulKX60rGVxOh7g="
     }
 }

esm/interpreters.js

@@ -0,0 +1,17 @@
+<!doctype html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8" />
+        <meta name="viewport" content="width=device-width,initial-scale=1.0" />
+        <title>python</title>
+        <script type="module" src="../core.js"></script>
+    </head>
+    <body>
+        <script type="micropython" config="./files.toml">
+            import js
+            import a, b
+            js.console.log(a.x)
+            js.console.log(b.x)
+        </script>
+    </body>
+</html>

package.json

@@ -0,0 +1,3 @@
+[files]
+"./a.py" = "./"
+"./b.py" = "./"