Added a worker attribute to simplify interpreters in workers

dev.cjs

@@ -9,7 +9,7 @@ const build = (fileName) => {
         () =>
             new Promise((resolve, reject) => {
                 exec(
-                    "npm run rollup:xworker && npm run rollup:core && npm run rollup:pyscript",
+                    "npm run rollup:xworker && npm run rollup:core",
                     { cwd: __dirname, env: { ...process.env, NO_MIN: true } },
                     (error) => {
                         if (error) reject(error);

esm/custom.js

@@ -1,13 +1,14 @@
 import '@ungap/with-resolvers';
 import { $$ } from 'basic-devtools';
 
-import { assign, create } from './utils.js';
+import { assign, create, defineProperty } from './utils.js';
 import { getDetails } from './script-handler.js';
 import { registry as defaultRegistry, prefixes, configs } from './interpreters.js';
 import { getRuntimeID } from './loader.js';
 import { io } from './interpreter/_utils.js';
 import { addAllListeners } from './listeners.js';
 import { Hook } from './worker/hooks.js';
+import { XWorker } from './index.js';
 
 export const CUSTOM_SELECTORS = [];
 
@@ -44,6 +45,20 @@ export const handleCustomType = (node) => {
                     env,
                     onInterpreterReady,
                 } = options;
+
+                const worker = node.attributes.worker?.value || '';
+                if (worker) {
+                    const xworker = XWorker.call(new Hook(null, options), worker, {
+                        config,
+                        version,
+                        type: runtime,
+                        async: node.hasAttribute('async')
+                    });
+                    defineProperty(node, 'xworker', { value: xworker });
+                    resolve({ type, xworker });
+                    return;
+                }
+
                 const name = getRuntimeID(runtime, version);
                 const id = env || `${name}${config ? `|${config}` : ''}`;
                 const { interpreter: engine, XWorker: Worker } = getDetails(

esm/script-handler.js

@@ -1,6 +1,6 @@
 import { $ } from 'basic-devtools';
 
-import xworker from './worker/class.js';
+import $xworker from './worker/class.js';
 import { getRuntime, getRuntimeID } from './loader.js';
 import { registry } from './interpreters.js';
 import { all, resolve, defineProperty } from './utils.js';
@@ -76,7 +76,7 @@ export const getDetails = (type, id, name, version, config) => {
         const details = {
             interpreter: getRuntime(name, config),
             queue: resolve(),
-            XWorker: xworker(type, version),
+            XWorker: $xworker(type, version),
         };
         interpreters.set(id, details);
         // enable sane defaults when single interpreter *of kind* is used in the page
@@ -107,16 +107,32 @@ export const handle = async (script) => {
         // allow a shared config among scripts, beside interpreter,
         // and/or source code with different config or interpreter
         const {
-            attributes: { async: isAsync, config, env, target, version },
+            attributes: { async: isAsync, config, env, target, version, worker },
             src,
             type,
         } = script;
+
         const versionValue = version?.value;
         const name = getRuntimeID(type, versionValue);
-        const targetValue = getValue(target, '');
         let configValue = getValue(config, '|');
         const id = getValue(env, '') || `${name}${configValue}`;
         configValue = configValue.slice(1);
+
+        const workerValue = worker?.value;
+        if (workerValue) {
+            const XWorker = $xworker(type, versionValue);
+            const xworker = new XWorker(workerValue, {
+                async: !!isAsync,
+                config: configValue
+            });
+            handled.set(
+                defineProperty(script, 'xworker', { value: xworker }),
+                { xworker }
+            );
+            return;
+        }
+
+        const targetValue = getValue(target, '');
         const details = getDetails(type, id, name, versionValue, configValue);
 
         handled.set(

package.json

@@ -11,7 +11,6 @@
         "dev": "node dev.cjs",
         "rollup:core": "rollup --config rollup/core.config.js",
         "rollup:integrations": "node rollup/build_integrations.cjs",
-        "rollup:pyscript": "rollup --config rollup/pyscript.config.js",
         "rollup:xworker": "rollup --config rollup/xworker.config.js",
         "test": "c8 --100 node --experimental-loader @node-loader/import-maps test/index.js && npm run test:integration",
         "test:html": "npm run test && c8 report -r html",

test/plugins/index.html

@@ -17,6 +17,7 @@
             whenDefined("mpy").then(console.log);
             define("mpy", {
                 interpreter: "micropython",
+                config: "../fetch.toml",
                 async onInterpreterReady(micropython, element) {
                     console.log(micropython);
                     // Somehow this doesn't work in MicroPython
@@ -36,6 +37,7 @@
         </script>
     </head>
     <body>
+        <!-- <mpy-script worker="./worker.py"></mpy-script> -->
         <mpy-script mpy-click="test_click">
             def test_click(event):
                 print(event.type)

test/plugins/worker.html

@@ -0,0 +1,11 @@
+<!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="../../core.js"></script>
+    </head>
+    <body>
+        <script type="micropython" worker="./worker.py" config="../fetch.toml"></script>
+    </body>
+</html>

test/plugins/worker.py

@@ -0,0 +1,6 @@
+from polyscript import xworker
+
+print('hello from worker')
+xworker.window.document.body.textContent = 'hello from worker'
+
+import a