Merge pull request #114 from pyscript/worker-version

Fix worker interpreter version

Author: WebReflection

docs/index.js

@@ -4,7 +4,7 @@ import { $$ } from 'basic-devtools';
 import { JSModules, isSync, assign, create, createOverload, createResolved, dedent, defineProperty, nodeInfo, registerJSModules } from './utils.js';
 import { getDetails } from './script-handler.js';
 import { registry as defaultRegistry, prefixes, configs } from './interpreters.js';
-import { getRuntimeID } from './loader.js';
+import { getRuntimeID, resolveConfig } from './loader.js';
 import { addAllListeners } from './listeners.js';
 import { Hook, XWorker as XW } from './xworker.js';
 import { workers, workersHandler } from './workers.js';
@@ -62,13 +62,20 @@ export const handleCustomType = async (node) => {
             try {
                 const worker = workerURL(node);
                 if (worker) {
+                    let v = version;
+                    const cfg = node.getAttribute('config') || config || {};
+                    if (!v) {
+                        const [o] = resolveConfig(cfg, configURL);
+                        const details = await o;
+                        v = details.version || details.interpreter;
+                    }
                     const xworker = XW.call(new Hook(null, hooks), worker, {
                         ...nodeInfo(node, type),
-                        version,
                         configURL,
+                        version: v,
                         type: runtime,
                         custom: type,
-                        config: node.getAttribute('config') || config || {},
+                        config: cfg,
                         async: !isSync(node),
                         serviceWorker: node.getAttribute('service-worker'),
                     });

docs/index.js.map

@@ -17,6 +17,23 @@ export const getConfigURLAndType = (config, configURL = './config.txt') => {
     return [absoluteURL(config), type];
 };
 
+export const resolveConfig = (config, configURL, options = {}) => {
+    const [absolute, type] = getConfigURLAndType(config, configURL);
+    if (type === 'json') {
+        options = fetch(absolute).json();
+    } else if (type === 'toml') {
+        options = fetch(absolute).text().then(toml);
+    } else if (type === 'string') {
+        options = parseString(config);
+    } else if (type === 'object' && config) {
+        options = config;
+    } else if (type === 'txt' && typeof options === 'string') {
+        options = parseString(options);
+    }
+    config = absolute;
+    return [options, config];
+};
+
 const parseString = config => {
     try {
         return parse(config);
@@ -43,19 +60,7 @@ export const getRuntime = (id, config, configURL, options = {}) => {
     if (config) {
         // REQUIRES INTEGRATION TEST
         /* c8 ignore start */
-        const [absolute, type] = getConfigURLAndType(config, configURL);
-        if (type === 'json') {
-            options = fetch(absolute).json();
-        } else if (type === 'toml') {
-            options = fetch(absolute).text().then(toml);
-        } else if (type === 'string') {
-            options = parseString(config);
-        } else if (type === 'object' && config) {
-            options = config;
-        } else if (type === 'txt' && typeof options === 'string') {
-            options = parseString(options);
-        }
-        config = absolute;
+        [options, config] = resolveConfig(config, configURL, options);
         /* c8 ignore stop */
     }
     return resolve(options).then(options => interpreter[id](options, config));

docs/zip-BIfA-Q-T.js

@@ -150,6 +150,7 @@ export const handle = async (script) => {
             const XWorker = $xworker(type, versionValue);
             const xworker = new XWorker(url, {
                 ...nodeInfo(script, type),
+                version: versionValue,
                 async: isAsync,
                 config: configValue,
                 serviceWorker: sw?.value,