From f6dfc5361e0e611e588a66944d60ea73b3297055 Mon Sep 17 00:00:00 2001
From: Andrea Giammarchi <andrea.giammarchi@gmail.com>
Date: Thu, 22 Jun 2023 17:29:07 +0200
Subject: [PATCH] Implement PyScript custom <script type> (#1548)

  * updated MicroPython to latest in order to have `globals` API available
  * reduced code around helpers for both MicroPython and Pyodide as now these are more aligned
  * updated all dependencies and brought in latest [coincident/window](https://github.com/WebReflection/coincident#coincidentwindow) goodness to any `xworker`, preserving the `sync` previous behavior
  * using [@ungap/structured-clone/json](https://github.com/ungap/structured-clone#tojson) as *coincident* default `parse` and `stringify` utility to allow recursive and more complex data to travel back from the *Worker* (forward data is still fully [structured clone algorithm compatible](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm))
  * renamed all *plugin/s* references to *custom/s* as plugin as a word was too misleading
  * changed *custom types* helpers logic to allow any single node to have its own version of the interpreter wrapper, and all the extra fields it carries with it, including a way to augment every interpreter execution, among as every worker code execution
  * created a `custom` folder where I've landed the very first `pyscript.js` custom type
  * created an exhaustive test page to demonstrate the current abilities of *PyScript Next* among its ability to expose utilities that can be used to create *PyScript* plugins
---
 .prettierignore                               |   1 +
 pyscript.core/.gitignore                      |   2 +-
 pyscript.core/README.md                       |   2 +-
 .../esm/{custom-types.js => custom.js}        | 143 ++++++-------
 pyscript.core/esm/custom/pyscript.js          | 195 ++++++++++++++++++
 .../esm/custom/pyscript/exceptions.js         |  80 +++++++
 pyscript.core/esm/custom/pyscript/fetch.js    |  63 ++++++
 pyscript.core/esm/index.js                    |   4 +-
 pyscript.core/esm/interpreter/_python.js      |   6 +
 pyscript.core/esm/interpreter/micropython.js  |  22 +-
 pyscript.core/esm/interpreter/pyodide.js      |  16 +-
 pyscript.core/esm/script-handler.js           |   2 +-
 pyscript.core/esm/worker/_template.js         |  11 +-
 pyscript.core/esm/worker/class.js             |   8 +-
 pyscript.core/esm/worker/hooks.js             |   1 -
 pyscript.core/node.importmap                  |   2 +-
 pyscript.core/package-lock.json               |  87 ++++----
 pyscript.core/package.json                    |  20 +-
 pyscript.core/pyscript.js                     |   2 +
 .../rollup/{min.config.js => core.config.js}  |   4 +-
 pyscript.core/rollup/pyscript.config.js       |  18 ++
 pyscript.core/rollup/xworker.config.js        |   2 +-
 pyscript.core/test/async.html                 |   2 +-
 pyscript.core/test/env.html                   |   2 +-
 pyscript.core/test/fetch.html                 |   2 +-
 pyscript.core/test/index.html                 |   2 +-
 pyscript.core/test/isolated.html              |   2 +-
 pyscript.core/test/many.html                  |   2 +-
 pyscript.core/test/matplot.html               |   2 +-
 pyscript.core/test/matplot.json.html          |   2 +-
 pyscript.core/test/matplot.py                 |  26 ++-
 pyscript.core/test/matplot.worker.html        |  22 +-
 pyscript.core/test/micropython.html           |   2 +-
 pyscript.core/test/mocked/micropython.mjs     |   8 +
 pyscript.core/test/no-sw.html                 |   2 +-
 pyscript.core/test/order.html                 |   5 +-
 pyscript.core/test/plugins/index.html         |   2 +-
 pyscript.core/test/plugins/lua.html           |   2 +-
 pyscript.core/test/plugins/py-script.html     |  40 +++-
 pyscript.core/test/plugins/py-script.js       |  72 -------
 pyscript.core/test/py-events.html             |   2 +-
 pyscript.core/test/remote.html                |   2 +-
 pyscript.core/test/ruby.html                  |   5 +-
 pyscript.core/test/shadow-dom.html            |   2 +-
 pyscript.core/test/table.html                 |   2 +-
 pyscript.core/test/test.html                  |   5 +-
 pyscript.core/test/wasmoon.html               |   5 +-
 pyscript.core/test/worker/index.html          |   3 +-
 pyscript.core/test/worker/input.html          |   3 +-
 49 files changed, 634 insertions(+), 283 deletions(-)
 rename pyscript.core/esm/{custom-types.js => custom.js} (51%)
 create mode 100644 pyscript.core/esm/custom/pyscript.js
 create mode 100644 pyscript.core/esm/custom/pyscript/exceptions.js
 create mode 100644 pyscript.core/esm/custom/pyscript/fetch.js
 delete mode 100644 pyscript.core/esm/worker/hooks.js
 create mode 100644 pyscript.core/pyscript.js
 rename pyscript.core/rollup/{min.config.js => core.config.js} (80%)
 create mode 100644 pyscript.core/rollup/pyscript.config.js
 delete mode 100644 pyscript.core/test/plugins/py-script.js

diff --git a/.prettierignore b/.prettierignore
index 2797bf5c..24675894 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,3 +9,4 @@ pyscript.core/types/
 pyscript.core/esm/worker/xworker.js
 pyscript.core/cjs/package.json
 pyscript.core/min.js
+pyscript.core/pyscript.js
diff --git a/pyscript.core/.gitignore b/pyscript.core/.gitignore
index a970cd0d..3150ddba 100644
--- a/pyscript.core/.gitignore
+++ b/pyscript.core/.gitignore
@@ -3,6 +3,6 @@ coverage/
 node_modules/
 cjs/
 !cjs/package.json
-min.js
+core.js
 esm/worker/xworker.js
 types/
diff --git a/pyscript.core/README.md b/pyscript.core/README.md
index 2698ae08..b67f31ef 100644
--- a/pyscript.core/README.md
+++ b/pyscript.core/README.md
@@ -19,7 +19,7 @@ This project requires some automatic artifact creation to:
 
     * create a _Worker_ as a _Blob_ based on the same code used by this repo
     * create automatically the list of runtimes available via the module
-    * create the `min.js` file used by most integration tests
+    * create the `core.js` file used by most integration tests
     * create a sha256 version of the Blob content for CSP cases
 
 Accordingly, to build latest project:
diff --git a/pyscript.core/esm/custom-types.js b/pyscript.core/esm/custom.js
similarity index 51%
rename from pyscript.core/esm/custom-types.js
rename to pyscript.core/esm/custom.js
index 517efd0f..883527d8 100644
--- a/pyscript.core/esm/custom-types.js
+++ b/pyscript.core/esm/custom.js
@@ -12,8 +12,6 @@ import { getRuntimeID } from "./loader.js";
 import { io } from "./interpreter/_utils.js";
 import { addAllListeners } from "./listeners.js";
 
-import workerHooks from "./worker/hooks.js";
-
 export const CUSTOM_SELECTORS = [];
 
 /**
@@ -26,7 +24,6 @@ export const CUSTOM_SELECTORS = [];
  * @prop {(path:string, data:ArrayBuffer) => void} writeFile an utility to write a file in the virtual FS, if available
  */
 
-const patched = new Map();
 const types = new Map();
 const waitList = new Map();
 
@@ -52,7 +49,7 @@ export const handleCustomType = (node) => {
                 } = options;
                 const name = getRuntimeID(runtime, version);
                 const id = env || `${name}${config ? `|${config}` : ""}`;
-                const { interpreter: engine, XWorker } = getDetails(
+                const { interpreter: engine, XWorker: Worker } = getDetails(
                     runtime,
                     id,
                     name,
@@ -60,87 +57,79 @@ export const handleCustomType = (node) => {
                     config,
                 );
                 engine.then((interpreter) => {
-                    if (!patched.has(id)) {
-                        const module = create(defaultRegistry.get(runtime));
-                        const {
-                            onBeforeRun,
-                            onBeforeRunAsync,
-                            onAfterRun,
-                            onAfterRunAsync,
-                            codeBeforeRunWorker,
-                            codeBeforeRunWorkerAsync,
-                            codeAfterRunWorker,
-                            codeAfterRunWorkerAsync,
-                        } = options;
+                    const module = create(defaultRegistry.get(runtime));
 
-                        // These two loops mimic a `new Map(arrayContent)` without needing
-                        // the new Map overhead so that [name, [before, after]] can be easily destructured
-                        // and new sync or async patches become easy to add (when the logic is the same).
+                    const {
+                        onBeforeRun,
+                        onBeforeRunAsync,
+                        onAfterRun,
+                        onAfterRunAsync,
+                        codeBeforeRunWorker,
+                        codeBeforeRunWorkerAsync,
+                        codeAfterRunWorker,
+                        codeAfterRunWorkerAsync,
+                    } = options;
 
-                        // patch sync
-                        for (const [name, [before, after]] of [
-                            ["run", [onBeforeRun, onAfterRun]],
-                        ]) {
-                            const method = module[name];
-                            module[name] = function (interpreter, code) {
-                                if (before) before.call(this, resolved, node);
-                                const result = method.call(
-                                    this,
-                                    interpreter,
-                                    code,
-                                );
-                                if (after) after.call(this, resolved, node);
-                                return result;
-                            };
-                        }
+                    const hooks = {
+                        beforeRun: codeBeforeRunWorker?.(),
+                        beforeRunAsync: codeBeforeRunWorkerAsync?.(),
+                        afterRun: codeAfterRunWorker?.(),
+                        afterRunAsync: codeAfterRunWorkerAsync?.(),
+                    };
 
-                        // patch async
-                        for (const [name, [before, after]] of [
-                            ["runAsync", [onBeforeRunAsync, onAfterRunAsync]],
-                        ]) {
-                            const method = module[name];
-                            module[name] = async function (interpreter, code) {
-                                if (before)
-                                    await before.call(this, resolved, node);
-                                const result = await method.call(
-                                    this,
-                                    interpreter,
-                                    code,
-                                );
-                                if (after)
-                                    await after.call(this, resolved, node);
-                                return result;
-                            };
-                        }
+                    const XWorker = function XWorker(...args) {
+                        return Worker.apply(hooks, args);
+                    };
 
-                        // setup XWorker hooks, allowing strings to be forwarded to the worker
-                        // whenever it's created, as functions can't possibly be serialized
-                        // unless these are pure with no outer scope access (or globals vars)
-                        // so that making it strings disambiguate about their running context.
-                        workerHooks.set(XWorker, {
-                            beforeRun: codeBeforeRunWorker,
-                            beforeRunAsync: codeBeforeRunWorkerAsync,
-                            afterRun: codeAfterRunWorker,
-                            afterRunAsync: codeAfterRunWorkerAsync,
-                        });
+                    // These two loops mimic a `new Map(arrayContent)` without needing
+                    // the new Map overhead so that [name, [before, after]] can be easily destructured
+                    // and new sync or async patches become easy to add (when the logic is the same).
 
-                        module.setGlobal(interpreter, "XWorker", XWorker);
-
-                        const resolved = {
-                            type,
-                            interpreter,
-                            XWorker,
-                            io: io.get(interpreter),
-                            config: structuredClone(configs.get(name)),
-                            run: module.run.bind(module, interpreter),
-                            runAsync: module.runAsync.bind(module, interpreter),
+                    // patch sync
+                    for (const [name, [before, after]] of [
+                        ["run", [onBeforeRun, onAfterRun]],
+                    ]) {
+                        const method = module[name];
+                        module[name] = function (interpreter, code) {
+                            if (before) before.call(this, resolved, node);
+                            const result = method.call(this, interpreter, code);
+                            if (after) after.call(this, resolved, node);
+                            return result;
                         };
-
-                        patched.set(id, resolved);
-                        resolve(resolved);
                     }
 
-                    onRuntimeReady?.(patched.get(id), node);
+                    // patch async
+                    for (const [name, [before, after]] of [
+                        ["runAsync", [onBeforeRunAsync, onAfterRunAsync]],
+                    ]) {
+                        const method = module[name];
+                        module[name] = async function (interpreter, code) {
+                            if (before) await before.call(this, resolved, node);
+                            const result = await method.call(
+                                this,
+                                interpreter,
+                                code,
+                            );
+                            if (after) await after.call(this, resolved, node);
+                            return result;
+                        };
+                    }
+
+                    module.setGlobal(interpreter, "XWorker", XWorker);
+
+                    const resolved = {
+                        type,
+                        interpreter,
+                        XWorker,
+                        io: io.get(interpreter),
+                        config: structuredClone(configs.get(name)),
+                        run: module.run.bind(module, interpreter),
+                        runAsync: module.runAsync.bind(module, interpreter),
+                    };
+
+                    resolve(resolved);
+
+                    onRuntimeReady?.(resolved, node);
                 });
             }
         }
diff --git a/pyscript.core/esm/custom/pyscript.js b/pyscript.core/esm/custom/pyscript.js
new file mode 100644
index 00000000..6da58df5
--- /dev/null
+++ b/pyscript.core/esm/custom/pyscript.js
@@ -0,0 +1,195 @@
+import "@ungap/with-resolvers";
+import { $ } from "basic-devtools";
+
+import { define } from "../index.js";
+import { queryTarget } from "../script-handler.js";
+import { defineProperty } from "../utils.js";
+import { getText } from "../fetch-utils.js";
+
+// TODO: should this utility be in core instead?
+import { robustFetch as fetch } from "./pyscript/fetch.js";
+
+// append ASAP CSS to avoid showing content
+document.head.appendChild(document.createElement("style")).textContent = `
+  py-script, py-config {
+    display: none;
+  }
+`;
+
+(async () => {
+    // create a unique identifier when/if needed
+    let id = 0;
+    const getID = (prefix = "py") => `${prefix}-${id++}`;
+
+    // find the shared config for all py-script elements
+    let config;
+    let pyConfig = $("py-config");
+    if (pyConfig) config = pyConfig.getAttribute("src") || pyConfig.textContent;
+    else {
+        pyConfig = $('script[type="py"]');
+        config = pyConfig?.getAttribute("config");
+    }
+
+    if (/^https?:\/\//.test(config)) config = await fetch(config).then(getText);
+
+    // generic helper to disambiguate between custom element and script
+    const isScript = (element) => element.tagName === "SCRIPT";
+
+    // helper for all script[type="py"] out there
+    const before = (script) => {
+        defineProperty(document, "currentScript", {
+            configurable: true,
+            get: () => script,
+        });
+    };
+
+    const after = () => {
+        delete document.currentScript;
+    };
+
+    /**
+     * Given a generic DOM Element, tries to fetch the 'src' attribute, if present.
+     * It either throws an error if the 'src' can't be fetched or it returns a fallback
+     * content as source.
+     */
+    const fetchSource = async (tag) => {
+        if (tag.hasAttribute("src")) {
+            try {
+                const response = await fetch(tag.getAttribute("src"));
+                return response.then(getText);
+            } catch (error) {
+                // TODO _createAlertBanner(err) instead ?
+                alert(error.message);
+                throw error;
+            }
+        }
+        return tag.textContent;
+    };
+
+    // common life-cycle handlers for any node
+    const bootstrapNodeAndPlugins = (pyodide, element, callback, hook) => {
+        if (isScript(element)) callback(element);
+        for (const fn of hooks[hook]) fn(pyodide, element);
+    };
+
+    const addDisplay = (element) => {
+        const id = isScript(element) ? element.target.id : element.id;
+        return `
+            # this code is just for demo purpose but the basics work
+            def _display(what, target="${id}", append=True):
+                from js import document
+                element = document.getElementById(target)
+                element.textContent = what
+            display = _display
+        `;
+    };
+
+    // define the module as both `<script type="py">` and `<py-script>`
+    define("py", {
+        config,
+        env: "py-script",
+        interpreter: "pyodide",
+        codeBeforeRunWorker() {
+            const { codeBeforeRunWorker: set } = hooks;
+            const prefix = 'print("codeBeforeRunWorker")';
+            return [prefix].concat(...set).join("\n");
+        },
+        codeAfterRunWorker() {
+            const { codeAfterRunWorker: set } = hooks;
+            const prefix = 'print("codeAfterRunWorker")';
+            return [prefix].concat(...set).join("\n");
+        },
+        onBeforeRun(pyodide, element) {
+            bootstrapNodeAndPlugins(pyodide, element, before, "onBeforeRun");
+            pyodide.interpreter.runPython(addDisplay(element));
+        },
+        onBeforeRunAync(pyodide, element) {
+            pyodide.interpreter.runPython(addDisplay(element));
+            bootstrapNodeAndPlugins(
+                pyodide,
+                element,
+                before,
+                "onBeforeRunAync",
+            );
+        },
+        onAfterRun(pyodide, element) {
+            bootstrapNodeAndPlugins(pyodide, element, after, "onAfterRun");
+        },
+        onAfterRunAsync(pyodide, element) {
+            bootstrapNodeAndPlugins(pyodide, element, after, "onAfterRunAsync");
+        },
+        async onRuntimeReady(pyodide, element) {
+            // allows plugins to do whatever they want with the element
+            // before regular stuff happens in here
+            for (const callback of hooks.onRuntimeReady)
+                callback(pyodide, element);
+            if (isScript(element)) {
+                const {
+                    attributes: { async: isAsync, target },
+                } = element;
+                const hasTarget = !!target?.value;
+                const show = hasTarget
+                    ? queryTarget(target.value)
+                    : document.createElement("script-py");
+
+                if (!hasTarget) element.after(show);
+                if (!show.id) show.id = getID();
+
+                // allows the code to retrieve the target element via
+                // document.currentScript.target if needed
+                defineProperty(element, "target", { value: show });
+
+                pyodide[`run${isAsync ? "Async" : ""}`](
+                    await fetchSource(element),
+                );
+            } else {
+                // resolve PyScriptElement to allow connectedCallback
+                element._pyodide.resolve(pyodide);
+            }
+        },
+    });
+
+    class PyScriptElement extends HTMLElement {
+        constructor() {
+            if (!super().id) this.id = getID();
+            this._pyodide = Promise.withResolvers();
+            this.srcCode = "";
+            this.executed = false;
+        }
+        async connectedCallback() {
+            if (!this.executed) {
+                this.executed = true;
+                const { run } = await this._pyodide.promise;
+                this.srcCode = await fetchSource(this);
+                this.textContent = "";
+                const result = run(this.srcCode);
+                if (!this.textContent && result) this.textContent = result;
+                this.style.display = "block";
+            }
+        }
+    }
+
+    customElements.define("py-script", PyScriptElement);
+})();
+
+export const hooks = {
+    /** @type {Set<function>} */
+    onBeforeRun: new Set(),
+    /** @type {Set<function>} */
+    onBeforeRunAync: new Set(),
+    /** @type {Set<function>} */
+    onAfterRun: new Set(),
+    /** @type {Set<function>} */
+    onAfterRunAsync: new Set(),
+    /** @type {Set<function>} */
+    onRuntimeReady: new Set(),
+
+    /** @type {Set<string>} */
+    codeBeforeRunWorker: new Set(),
+    /** @type {Set<string>} */
+    codeBeforeRunWorkerAsync: new Set(),
+    /** @type {Set<string>} */
+    codeAfterRunWorker: new Set(),
+    /** @type {Set<string>} */
+    codeAfterRunWorkerAsync: new Set(),
+};
diff --git a/pyscript.core/esm/custom/pyscript/exceptions.js b/pyscript.core/esm/custom/pyscript/exceptions.js
new file mode 100644
index 00000000..b5bdc56e
--- /dev/null
+++ b/pyscript.core/esm/custom/pyscript/exceptions.js
@@ -0,0 +1,80 @@
+const CLOSEBUTTON = `<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill="currentColor" width="12px"><path d='M.293.293a1 1 0 011.414 0L8 6.586 14.293.293a1 1 0 111.414 1.414L9.414 8l6.293 6.293a1 1 0 01-1.414 1.414L8 9.414l-6.293 6.293a1 1 0 01-1.414-1.414L6.586 8 .293 1.707a1 1 0 010-1.414z'/></svg>`;
+
+/**
+ * These error codes are used to identify the type of error that occurred.
+ * @see https://docs.pyscript.net/latest/reference/exceptions.html?highlight=errors
+ */
+export const ErrorCode = {
+    GENERIC: "PY0000", // Use this only for development then change to a more specific error code
+    FETCH_ERROR: "PY0001",
+    FETCH_NAME_ERROR: "PY0002",
+    // Currently these are created depending on error code received from fetching
+    FETCH_UNAUTHORIZED_ERROR: "PY0401",
+    FETCH_FORBIDDEN_ERROR: "PY0403",
+    FETCH_NOT_FOUND_ERROR: "PY0404",
+    FETCH_SERVER_ERROR: "PY0500",
+    FETCH_UNAVAILABLE_ERROR: "PY0503",
+    BAD_CONFIG: "PY1000",
+    MICROPIP_INSTALL_ERROR: "PY1001",
+    BAD_PLUGIN_FILE_EXTENSION: "PY2000",
+    NO_DEFAULT_EXPORT: "PY2001",
+    TOP_LEVEL_AWAIT: "PY9000",
+};
+
+export class UserError extends Error {
+    constructor(errorCode, message = "", messageType = "text") {
+        super(`(${errorCode}): ${message}`);
+        this.errorCode = errorCode;
+        this.messageType = messageType;
+        this.name = "UserError";
+    }
+}
+
+export class FetchError extends UserError {
+    constructor(errorCode, message) {
+        super(errorCode, message);
+        this.name = "FetchError";
+    }
+}
+
+export class InstallError extends UserError {
+    constructor(errorCode, message) {
+        super(errorCode, message);
+        this.name = "InstallError";
+    }
+}
+
+export function _createAlertBanner(
+    message,
+    level,
+    messageType = "text",
+    logMessage = true,
+) {
+    switch (`log-${level}-${logMessage}`) {
+        case "log-error-true":
+            console.error(message);
+            break;
+        case "log-warning-true":
+            console.warn(message);
+            break;
+    }
+
+    const content = messageType === "html" ? "innerHTML" : "textContent";
+    const banner = Object.assign(document.createElement("div"), {
+        className: `alert-banner py-${level}`,
+        [content]: message,
+    });
+
+    if (level === "warning") {
+        const closeButton = Object.assign(document.createElement("button"), {
+            id: "alert-close-button",
+            innerHTML: CLOSEBUTTON,
+        });
+
+        banner.appendChild(closeButton).addEventListener("click", () => {
+            banner.remove();
+        });
+    }
+
+    document.body.prepend(banner);
+}
diff --git a/pyscript.core/esm/custom/pyscript/fetch.js b/pyscript.core/esm/custom/pyscript/fetch.js
new file mode 100644
index 00000000..e240bb64
--- /dev/null
+++ b/pyscript.core/esm/custom/pyscript/fetch.js
@@ -0,0 +1,63 @@
+import { FetchError, ErrorCode } from "./exceptions";
+
+/**
+ * This is a fetch wrapper that handles any non 200 responses and throws a
+ * FetchError with the right ErrorCode. This is useful because our FetchError
+ * will automatically create an alert banner.
+ *
+ * @param {string} url - URL to fetch
+ * @param {Request} [options] - options to pass to fetch
+ * @returns {Promise<Response>}
+ */
+export async function robustFetch(url, options) {
+    let response;
+
+    // Note: We need to wrap fetch into a try/catch block because fetch
+    // throws a TypeError if the URL is invalid such as http://blah.blah
+    try {
+        response = await fetch(url, options);
+    } catch (err) {
+        const error = err;
+        let errMsg;
+        if (url.startsWith("http")) {
+            errMsg =
+                `Fetching from URL ${url} failed with error ` +
+                `'${error.message}'. Are your filename and path correct?`;
+        } else {
+            errMsg = `PyScript: Access to local files
+        (using [[fetch]] configurations in &lt;py-config&gt;)
+        is not available when directly opening a HTML file;
+        you must use a webserver to serve the additional files.
+        See <a style="text-decoration: underline;" href="https://github.com/pyscript/pyscript/issues/257#issuecomment-1119595062">this reference</a>
+        on starting a simple webserver with Python.
+            `;
+        }
+        throw new FetchError(ErrorCode.FETCH_ERROR, errMsg);
+    }
+
+    // Note that response.ok is true for 200-299 responses
+    if (!response.ok) {
+        const errorMsg = `Fetching from URL ${url} failed with error ${response.status} (${response.statusText}). Are your filename and path correct?`;
+        switch (response.status) {
+            case 404:
+                throw new FetchError(ErrorCode.FETCH_NOT_FOUND_ERROR, errorMsg);
+            case 401:
+                throw new FetchError(
+                    ErrorCode.FETCH_UNAUTHORIZED_ERROR,
+                    errorMsg,
+                );
+            case 403:
+                throw new FetchError(ErrorCode.FETCH_FORBIDDEN_ERROR, errorMsg);
+            case 500:
+                throw new FetchError(ErrorCode.FETCH_SERVER_ERROR, errorMsg);
+            case 503:
+                throw new FetchError(
+                    ErrorCode.FETCH_UNAVAILABLE_ERROR,
+                    errorMsg,
+                );
+            default:
+                throw new FetchError(ErrorCode.FETCH_ERROR, errorMsg);
+        }
+    }
+    return response;
+}
diff --git a/pyscript.core/esm/index.js b/pyscript.core/esm/index.js
index 9951d636..0ab624db 100644
--- a/pyscript.core/esm/index.js
+++ b/pyscript.core/esm/index.js
@@ -4,10 +4,10 @@ import xworker from "./worker/class.js";
 import { handle } from "./script-handler.js";
 import { assign } from "./utils.js";
 import { selectors, prefixes } from "./interpreters.js";
-import { CUSTOM_SELECTORS, handleCustomType } from "./custom-types.js";
+import { CUSTOM_SELECTORS, handleCustomType } from "./custom.js";
 import { listener, addAllListeners } from "./listeners.js";
 
-export { define, whenDefined } from "./custom-types.js";
+export { define, whenDefined } from "./custom.js";
 export const XWorker = xworker();
 
 const INTERPRETER_SELECTORS = selectors.join(",");
diff --git a/pyscript.core/esm/interpreter/_python.js b/pyscript.core/esm/interpreter/_python.js
index 28593e36..38d91cbb 100644
--- a/pyscript.core/esm/interpreter/_python.js
+++ b/pyscript.core/esm/interpreter/_python.js
@@ -7,6 +7,12 @@ export const run = (interpreter, code) => interpreter.runPython(clean(code));
 export const runAsync = (interpreter, code) =>
     interpreter.runPythonAsync(clean(code));
 
+export const setGlobal = (interpreter, name, value) =>
+    interpreter.globals.set(name, value);
+
+export const deleteGlobal = (interpreter, name) =>
+    interpreter.globals.delete(name);
+
 export const writeFile = ({ FS }, path, buffer) =>
     writeFileUtil(FS, path, buffer);
 /* c8 ignore stop */
diff --git a/pyscript.core/esm/interpreter/micropython.js b/pyscript.core/esm/interpreter/micropython.js
index 641b2607..846b6e8f 100644
--- a/pyscript.core/esm/interpreter/micropython.js
+++ b/pyscript.core/esm/interpreter/micropython.js
@@ -1,5 +1,11 @@
 import { fetchPaths, stdio } from "./_utils.js";
-import { run, runAsync, writeFile } from "./_python.js";
+import {
+    run,
+    runAsync,
+    setGlobal,
+    deleteGlobal,
+    writeFile,
+} from "./_python.js";
 
 const type = "micropython";
 
@@ -7,7 +13,7 @@ const type = "micropython";
 /* c8 ignore start */
 export default {
     type,
-    module: (version = "1.20.0-239") =>
+    module: (version = "1.20.0-253") =>
         `https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@${version}/micropython.mjs`,
     async engine({ loadMicroPython }, config, url) {
         const { stderr, stdout, get } = stdio();
@@ -16,16 +22,8 @@ export default {
         if (config.fetch) await fetchPaths(this, runtime, config.fetch);
         return runtime;
     },
-    setGlobal(interpreter, name, value) {
-        const id = `__pyscript_${this.type}_${name}`;
-        globalThis[id] = value;
-        this.run(interpreter, `from js import ${id};${name}=${id};`);
-    },
-    deleteGlobal(interpreter, name) {
-        const id = `__pyscript_${this.type}_${name}`;
-        this.run(interpreter, `del ${id};del ${name}`);
-        delete globalThis[id];
-    },
+    setGlobal,
+    deleteGlobal,
     run,
     runAsync,
     writeFile,
diff --git a/pyscript.core/esm/interpreter/pyodide.js b/pyscript.core/esm/interpreter/pyodide.js
index 2566be77..d987c22e 100644
--- a/pyscript.core/esm/interpreter/pyodide.js
+++ b/pyscript.core/esm/interpreter/pyodide.js
@@ -1,5 +1,11 @@
 import { fetchPaths, stdio } from "./_utils.js";
-import { run, runAsync, writeFile } from "./_python.js";
+import {
+    run,
+    runAsync,
+    setGlobal,
+    deleteGlobal,
+    writeFile,
+} from "./_python.js";
 
 const type = "pyodide";
 
@@ -24,12 +30,8 @@ export default {
         }
         return interpreter;
     },
-    setGlobal(interpreter, name, value) {
-        interpreter.globals.set(name, value);
-    },
-    deleteGlobal(interpreter, name) {
-        interpreter.globals.delete(name);
-    },
+    setGlobal,
+    deleteGlobal,
     run,
     runAsync,
     writeFile,
diff --git a/pyscript.core/esm/script-handler.js b/pyscript.core/esm/script-handler.js
index 8feb6d16..952844ec 100644
--- a/pyscript.core/esm/script-handler.js
+++ b/pyscript.core/esm/script-handler.js
@@ -12,7 +12,7 @@ const getRoot = (script) => {
     return parent;
 };
 
-const queryTarget = (script, idOrSelector) => {
+export const queryTarget = (script, idOrSelector) => {
     const root = getRoot(script);
     return root.getElementById(idOrSelector) || $(idOrSelector, root);
 };
diff --git a/pyscript.core/esm/worker/_template.js b/pyscript.core/esm/worker/_template.js
index 7dd1c54e..a8d6bb90 100644
--- a/pyscript.core/esm/worker/_template.js
+++ b/pyscript.core/esm/worker/_template.js
@@ -4,7 +4,8 @@
 //    Please check via `npm run size` that worker code is not much
 //    bigger than it used to be before any changes is applied to this file.
 
-import coincident from "coincident/structured";
+import * as JSON from "@ungap/structured-clone/json";
+import coincident from "coincident/window";
 
 import { create } from "../utils.js";
 import { registry } from "../interpreters.js";
@@ -37,9 +38,15 @@ const add = (type, fn) => {
     );
 };
 
+const { proxy: sync, window, isWindowProxy } = coincident(self, JSON);
+
 const xworker = {
     // allows synchronous utilities between this worker and the main thread
-    sync: coincident(self),
+    sync,
+    // allow access to the main thread world
+    window,
+    // allow introspection for foreign (main thread) refrences
+    isWindowProxy,
     // standard worker related events / features
     onerror() {},
     onmessage() {},
diff --git a/pyscript.core/esm/worker/class.js b/pyscript.core/esm/worker/class.js
index 742dccef..c4a36474 100644
--- a/pyscript.core/esm/worker/class.js
+++ b/pyscript.core/esm/worker/class.js
@@ -1,8 +1,8 @@
-import coincident from "coincident/structured";
+import * as JSON from "@ungap/structured-clone/json";
+import coincident from "coincident/window";
 import xworker from "./xworker.js";
 import { assign, defineProperties, absoluteURL } from "../utils.js";
 import { getText } from "../fetch-utils.js";
-import workerHooks from "./hooks.js";
 
 /**
  * @typedef {Object} WorkerOptions custom configuration
@@ -19,9 +19,9 @@ export default (...args) =>
      * @returns {Worker}
      */
     function XWorker(url, options) {
-        const hooks = workerHooks.get(XWorker);
         const worker = xworker();
         const { postMessage } = worker;
+        const hooks = this instanceof XWorker ? void 0 : this;
         if (args.length) {
             const [type, version] = args;
             options = assign({}, options || { type, version });
@@ -39,7 +39,7 @@ export default (...args) =>
                     ),
             },
             sync: {
-                value: coincident(worker),
+                value: coincident(worker, JSON).proxy,
             },
         });
     };
diff --git a/pyscript.core/esm/worker/hooks.js b/pyscript.core/esm/worker/hooks.js
deleted file mode 100644
index 5ff4a41e..00000000
--- a/pyscript.core/esm/worker/hooks.js
+++ /dev/null
@@ -1 +0,0 @@
-export default new WeakMap();
diff --git a/pyscript.core/node.importmap b/pyscript.core/node.importmap
index 09b8c2fa..a81572e9 100644
--- a/pyscript.core/node.importmap
+++ b/pyscript.core/node.importmap
@@ -2,7 +2,7 @@
     "imports": {
         "http://pyodide": "./test/mocked/pyodide.mjs",
         "https://cdn.jsdelivr.net/pyodide/v0.23.2/full/pyodide.mjs": "./test/mocked/pyodide.mjs",
-        "https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@1.20.0-239/micropython.mjs": "./test/mocked/micropython.mjs",
+        "https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@1.20.0-253/micropython.mjs": "./test/mocked/micropython.mjs",
         "https://cdn.jsdelivr.net/npm/basic-toml@0.3.1/es.js": "./test/mocked/toml.mjs"
     }
 }
diff --git a/pyscript.core/package-lock.json b/pyscript.core/package-lock.json
index 1d999696..755f5226 100644
--- a/pyscript.core/package-lock.json
+++ b/pyscript.core/package-lock.json
@@ -9,9 +9,10 @@
             "version": "0.0.0",
             "license": "ISC",
             "dependencies": {
+                "@ungap/structured-clone": "^1.2.0",
                 "@ungap/with-resolvers": "^0.1.0",
                 "basic-devtools": "^0.1.6",
-                "coincident": "^0.4.1"
+                "coincident": "^0.7.2"
             },
             "devDependencies": {
                 "@node-loader/import-maps": "^1.1.0",
@@ -19,10 +20,10 @@
                 "@rollup/plugin-terser": "^0.4.3",
                 "ascjs": "^5.0.1",
                 "c8": "^8.0.0",
-                "eslint": "^8.42.0",
+                "eslint": "^8.43.0",
                 "linkedom": "^0.14.26",
                 "rollup": "^3.25.1",
-                "static-handler": "^0.4.1",
+                "static-handler": "^0.4.2",
                 "typescript": "^5.1.3"
             }
         },
@@ -92,9 +93,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
-            "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+            "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
             "dev": true,
             "engines": {
                 "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -348,9 +349,9 @@
             "integrity": "sha512-g7f0IkJdPW2xhY7H4iE72DAsIyfuwEFc6JWc2tYFwKDMWWAF699vGjrM348cwQuOXgHpe1gWFe+Eiyjx/ewvvw=="
         },
         "node_modules/acorn": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+            "version": "8.9.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+            "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
             "dev": true,
             "bin": {
                 "acorn": "bin/acorn"
@@ -534,9 +535,9 @@
             }
         },
         "node_modules/coincident": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/coincident/-/coincident-0.4.1.tgz",
-            "integrity": "sha512-CiHZVx/eUano0G+sSc0S0pXTBH51q0W7pMw1ScRa57BgfBw8l19pMW2Z6sVDHjOih5c9NYrP0budO8SslJv2sA==",
+            "version": "0.7.2",
+            "resolved": "https://registry.npmjs.org/coincident/-/coincident-0.7.2.tgz",
+            "integrity": "sha512-/hNcCDfousAW04kxOeuwzrM+gIQZpFDCYKXvDex/DJxvIcDL57WM32zGO9t8xT34cpBJUl0GNEclpaOx7/rk4A==",
             "dependencies": {
                 "@ungap/structured-clone": "^1.2.0"
             }
@@ -764,15 +765,15 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
-            "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+            "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
             "dev": true,
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.4.0",
                 "@eslint/eslintrc": "^2.0.3",
-                "@eslint/js": "8.42.0",
+                "@eslint/js": "8.43.0",
                 "@humanwhocodes/config-array": "^0.11.10",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
@@ -1796,12 +1797,12 @@
             }
         },
         "node_modules/static-handler": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/static-handler/-/static-handler-0.4.1.tgz",
-            "integrity": "sha512-atl+UofbqCECS4Ag1ZZIjC606I1I40CuDsdq4YQ5Vq3vTsUbvqVaNG4evFsKktlnPcEm217vBUSEFKyi9lsJ8Q==",
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/static-handler/-/static-handler-0.4.2.tgz",
+            "integrity": "sha512-Szbk521mneb5npxg3SEyoufsHr2osAzxMy71W2zFCzLB8wLhHYvKUDCMkLY6imi+fIqkpfas3rzXGBQf99aeEA==",
             "dev": true,
             "dependencies": {
-                "mime-types": "^2.1.34"
+                "mime-types": "^2.1.35"
             },
             "bin": {
                 "static-handler": "static-handler.cjs"
@@ -1873,9 +1874,9 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz",
-            "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==",
+            "version": "5.18.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.1.tgz",
+            "integrity": "sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==",
             "dev": true,
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
@@ -2118,9 +2119,9 @@
             }
         },
         "@eslint/js": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.42.0.tgz",
-            "integrity": "sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.43.0.tgz",
+            "integrity": "sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==",
             "dev": true
         },
         "@humanwhocodes/config-array": {
@@ -2306,9 +2307,9 @@
             "integrity": "sha512-g7f0IkJdPW2xhY7H4iE72DAsIyfuwEFc6JWc2tYFwKDMWWAF699vGjrM348cwQuOXgHpe1gWFe+Eiyjx/ewvvw=="
         },
         "acorn": {
-            "version": "8.8.2",
-            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz",
-            "integrity": "sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==",
+            "version": "8.9.0",
+            "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.9.0.tgz",
+            "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
             "dev": true
         },
         "acorn-jsx": {
@@ -2447,9 +2448,9 @@
             }
         },
         "coincident": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/coincident/-/coincident-0.4.1.tgz",
-            "integrity": "sha512-CiHZVx/eUano0G+sSc0S0pXTBH51q0W7pMw1ScRa57BgfBw8l19pMW2Z6sVDHjOih5c9NYrP0budO8SslJv2sA==",
+            "version": "0.7.2",
+            "resolved": "https://registry.npmjs.org/coincident/-/coincident-0.7.2.tgz",
+            "integrity": "sha512-/hNcCDfousAW04kxOeuwzrM+gIQZpFDCYKXvDex/DJxvIcDL57WM32zGO9t8xT34cpBJUl0GNEclpaOx7/rk4A==",
             "requires": {
                 "@ungap/structured-clone": "^1.2.0"
             }
@@ -2615,15 +2616,15 @@
             "dev": true
         },
         "eslint": {
-            "version": "8.42.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.42.0.tgz",
-            "integrity": "sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==",
+            "version": "8.43.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.43.0.tgz",
+            "integrity": "sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==",
             "dev": true,
             "requires": {
                 "@eslint-community/eslint-utils": "^4.2.0",
                 "@eslint-community/regexpp": "^4.4.0",
                 "@eslint/eslintrc": "^2.0.3",
-                "@eslint/js": "8.42.0",
+                "@eslint/js": "8.43.0",
                 "@humanwhocodes/config-array": "^0.11.10",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@nodelib/fs.walk": "^1.2.8",
@@ -3363,12 +3364,12 @@
             }
         },
         "static-handler": {
-            "version": "0.4.1",
-            "resolved": "https://registry.npmjs.org/static-handler/-/static-handler-0.4.1.tgz",
-            "integrity": "sha512-atl+UofbqCECS4Ag1ZZIjC606I1I40CuDsdq4YQ5Vq3vTsUbvqVaNG4evFsKktlnPcEm217vBUSEFKyi9lsJ8Q==",
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/static-handler/-/static-handler-0.4.2.tgz",
+            "integrity": "sha512-Szbk521mneb5npxg3SEyoufsHr2osAzxMy71W2zFCzLB8wLhHYvKUDCMkLY6imi+fIqkpfas3rzXGBQf99aeEA==",
             "dev": true,
             "requires": {
-                "mime-types": "^2.1.34"
+                "mime-types": "^2.1.35"
             }
         },
         "string-width": {
@@ -3413,9 +3414,9 @@
             "dev": true
         },
         "terser": {
-            "version": "5.18.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.0.tgz",
-            "integrity": "sha512-pdL757Ig5a0I+owA42l6tIuEycRuM7FPY4n62h44mRLRfnOxJkkOHd6i89dOpwZlpF6JXBwaAHF6yWzFrt+QyA==",
+            "version": "5.18.1",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.18.1.tgz",
+            "integrity": "sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==",
             "dev": true,
             "requires": {
                 "@jridgewell/source-map": "^0.3.3",
diff --git a/pyscript.core/package.json b/pyscript.core/package.json
index 7b4592d8..97c635f1 100644
--- a/pyscript.core/package.json
+++ b/pyscript.core/package.json
@@ -1,20 +1,21 @@
 {
     "name": "@pyscript/core",
-    "version": "0.0.0",
+    "version": "0.0.1",
     "description": "",
     "main": "./cjs/index.js",
     "types": "./types/index.d.ts",
     "scripts": {
         "server": "npx static-handler --cors --coep --coop --corp .",
-        "build": "npm run rollup:xworker && npm run rollup:min && eslint esm/ && npm run ts && npm run cjs && npm run test",
+        "build": "npm run rollup:xworker && npm run rollup:core && npm run rollup:pyscript && eslint esm/ && npm run ts && npm run cjs && npm run test",
         "cjs": "ascjs --no-default esm cjs",
-        "rollup:min": "rollup --config rollup/min.config.js",
+        "rollup:core": "rollup --config rollup/core.config.js",
+        "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 ",
         "test:html": "npm run test && c8 report -r html",
         "coverage": "mkdir -p ./coverage; c8 report --reporter=text-lcov > ./coverage/lcov.info",
         "size": "npm run size:module && npm run size:worker",
-        "size:module": "echo module is $(cat min.js | brotli | wc -c) bytes once compressed",
+        "size:module": "echo module is $(cat core.js | brotli | wc -c) bytes once compressed",
         "size:worker": "echo worker is $(cat esm/worker/xworker.js | brotli | wc -c) bytes once compressed",
         "ts": "tsc -p ."
     },
@@ -27,10 +28,10 @@
         "@rollup/plugin-terser": "^0.4.3",
         "ascjs": "^5.0.1",
         "c8": "^8.0.0",
-        "eslint": "^8.42.0",
+        "eslint": "^8.43.0",
         "linkedom": "^0.14.26",
         "rollup": "^3.25.1",
-        "static-handler": "^0.4.1",
+        "static-handler": "^0.4.2",
         "typescript": "^5.1.3"
     },
     "module": "./esm/index.js",
@@ -43,13 +44,14 @@
         },
         "./package.json": "./package.json"
     },
-    "unpkg": "min.js",
+    "unpkg": "core.js",
     "dependencies": {
+        "@ungap/structured-clone": "^1.2.0",
         "@ungap/with-resolvers": "^0.1.0",
         "basic-devtools": "^0.1.6",
-        "coincident": "^0.4.1"
+        "coincident": "^0.7.2"
     },
     "worker": {
-        "blob": "sha256-obDch1OaxOZKhaCpSW9vEAHJk01N+9kYvSiGkNmeJRU="
+        "blob": "sha256-llcU6BJSNpU+9XN3CXzTrR1Js0KQaXygnnKiD039CTQ="
     }
 }
diff --git a/pyscript.core/pyscript.js b/pyscript.core/pyscript.js
new file mode 100644
index 00000000..b8538acb
--- /dev/null
+++ b/pyscript.core/pyscript.js
@@ -0,0 +1,2 @@
+Promise.withResolvers||(Promise.withResolvers=function(){var e,t,r=new this((function(r,n){e=r,t=n}));return{resolve:e,reject:t,promise:r}});const e=(e,t=document)=>t.querySelector(e),t=(e,t=document)=>[...t.querySelectorAll(e)],r=(e,t=document)=>{const r=(new XPathEvaluator).createExpression(e).evaluate(t,XPathResult.ORDERED_NODE_SNAPSHOT_TYPE),n=[];for(let e=0,{snapshotLength:t}=r;e<t;e++)n.push(r.snapshotItem(e));return n},n="object"==typeof self?self:globalThis,s=e=>((e,t)=>{const r=(t,r)=>(e.set(r,t),t),s=o=>{if(e.has(o))return e.get(o);const[a,i]=t[o];switch(a){case 0:case-1:return r(i,o);case 1:{const e=r([],o);for(const t of i)e.push(s(t));return e}case 2:{const e=r({},o);for(const[t,r]of i)e[s(t)]=s(r);return e}case 3:return r(new Date(i),o);case 4:{const{source:e,flags:t}=i;return r(new RegExp(e,t),o)}case 5:{const e=r(new Map,o);for(const[t,r]of i)e.set(s(t),s(r));return e}case 6:{const e=r(new Set,o);for(const t of i)e.add(s(t));return e}case 7:{const{name:e,message:t}=i;return r(new n[e](t),o)}case 8:return r(BigInt(i),o);case"BigInt":return r(Object(BigInt(i)),o)}return r(new n[a](i),o)};return s})(new Map,e)(0),o="",{toString:a}={},{keys:i}=Object,c=e=>{const t=typeof e;if("object"!==t||!e)return[0,t];const r=a.call(e).slice(8,-1);switch(r){case"Array":return[1,o];case"Object":return[2,o];case"Date":return[3,o];case"RegExp":return[4,o];case"Map":return[5,o];case"Set":return[6,o]}return r.includes("Array")?[1,r]:r.includes("Error")?[7,r]:[2,r]},l=([e,t])=>0===e&&("function"===t||"symbol"===t),u=(e,{json:t,lossy:r}={})=>{const n=[];return((e,t,r,n)=>{const s=(e,t)=>{const s=n.push(e)-1;return r.set(t,s),s},o=n=>{if(r.has(n))return r.get(n);let[a,u]=c(n);switch(a){case 0:{let t=n;switch(u){case"bigint":a=8,t=n.toString();break;case"function":case"symbol":if(e)throw new TypeError("unable to serialize "+u);t=null;break;case"undefined":return s([-1],n)}return s([a,t],n)}case 1:{if(u)return s([u,[...n]],n);const e=[],t=s([a,e],n);for(const t of n)e.push(o(t));return t}case 2:{if(u)switch(u){case"BigInt":return s([u,n.toString()],n);case"Boolean":case"Number":case"String":return s([u,n.valueOf()],n)}if(t&&"toJSON"in n)return o(n.toJSON());const r=[],f=s([a,r],n);for(const t of i(n))!e&&l(c(n[t]))||r.push([o(t),o(n[t])]);return f}case 3:return s([a,n.toISOString()],n);case 4:{const{source:e,flags:t}=n;return s([a,{source:e,flags:t}],n)}case 5:{const t=[],r=s([a,t],n);for(const[r,s]of n)(e||!l(c(r))&&!l(c(s)))&&t.push([o(r),o(s)]);return r}case 6:{const t=[],r=s([a,t],n);for(const r of n)!e&&l(c(r))||t.push(o(r));return r}}const{message:f}=n;return s([a,{name:u,message:f}],n)};return o})(!(t||r),!!t,new Map,n)(e),n},{parse:f,stringify:p}=JSON,d={json:!0,lossy:!0};var h=Object.freeze({__proto__:null,parse:e=>s(f(e)),stringify:e=>p(u(e,d))}),y="dba0d233-ff77-488c-8f92-ef0e9cb3e008",w=e=>({value:new Promise((t=>{let r=new Worker("data:application/javascript,"+encodeURIComponent("onmessage=({data:b})=>(Atomics.wait(b,0),postMessage(0))"));r.onmessage=t,r.postMessage(e)}))})
+/*! (c) Andrea Giammarchi - ISC */;const{Int32Array:g,Map:m,SharedArrayBuffer:b,Uint16Array:v}=globalThis,{BYTES_PER_ELEMENT:A}=g,{BYTES_PER_ELEMENT:k}=v,{isArray:E}=Array,{notify:R,wait:P,waitAsync:S}=Atomics,{fromCharCode:$}=String,x=(e,t)=>e?(S||w)(t,0):(P(t,0),{value:{then:e=>e()}}),j=new WeakSet,M=new WeakMap;let W=0;const _=(e,{parse:t,stringify:r}=JSON)=>{if(!M.has(e)){const n=(t,...r)=>e.postMessage({[y]:r},{transfer:t});M.set(e,new Proxy(new m,{get:(r,s)=>"then"===s?null:(...r)=>{const o=W++;let a=new g(new b(A)),i=[];j.has(r.at(-1)||i)&&j.delete(i=r.pop()),n(i,o,a,s,r);const c=e instanceof Worker;return x(c,a).value.then((()=>{const e=a[0];if(!e)return;const r=k*e;return a=new g(new b(r+r%A)),n([],o,a),x(c,a).value.then((()=>t($(...new v(a.buffer).slice(0,e)))))}))},set(t,n,s){if(!t.size){const n=new m;e.addEventListener("message",(async e=>{const s=e.data?.[y];if(E(s)){e.stopImmediatePropagation();const[o,a,...i]=s;if(i.length){const[e,s]=i;if(!t.has(e))throw new Error(`Unsupported action: ${e}`);{const i=r(await t.get(e)(...s));i&&(n.set(o,i),a[0]=i.length)}}else{const e=n.get(o);n.delete(o);for(let t=new v(a.buffer),r=0;r<e.length;r++)t[r]=e.charCodeAt(r)}R(a,0)}}))}return!!t.set(n,s)}}))}return M.get(e)};_.transfer=(...e)=>(j.add(e),e);const O="object",T="function",B="number",C="string",F="undefined",I="symbol",{defineProperty:L,getOwnPropertyDescriptor:U,getPrototypeOf:G,isExtensible:N,ownKeys:D,preventExtensions:J,set:z,setPrototypeOf:q}=Reflect,Y=(e,t)=>{const{get:r,set:n,value:s}=e;return r&&(e.get=t(r)),n&&(e.set=t(n)),s&&(e.value=t(s)),e},X=(e,t)=>[e,t],V=e=>t=>{const r=typeof t;switch(r){case O:if(null==t)return X("null",t);case T:return e(r,t);case"boolean":case B:case C:case F:case"bigint":return X(r,t);case I:if(H.has(t))return X(r,H.get(t))}throw new Error(`Unable to handle this ${r} type`)},H=new Map(D(Symbol).filter((e=>typeof Symbol[e]===I)).map((e=>[Symbol[e],e]))),K=e=>{for(const[t,r]of H)if(r===e)return t},Q="apply",Z="construct",ee="defineProperty",te="deleteProperty",re="get",ne="getOwnPropertyDescriptor",se="getPrototypeOf",oe="has",ae="isExtensible",ie="ownKeys",ce="preventExtensions",le="set",ue="setPrototypeOf",fe="delete";let pe=0;const de=new Map,he=new Map,ye=new WeakMap;if(globalThis.window===globalThis){const{addEventListener:e}=EventTarget.prototype;L(EventTarget.prototype,"addEventListener",{value(t,r,...n){return n.at(0)?.invoke&&(ye.has(this)||ye.set(this,new Map),ye.get(this).set(t,[].concat(n[0].invoke)),delete n[0].invoke),e.call(this,t,r,...n)}})}const we=V(((e,t)=>{if(!de.has(t)){let e;for(;he.has(e=pe++););de.set(t,e),he.set(e,t)}return X(e,de.get(t))}));var ge=(e,t,r)=>{const{[r]:n}=e,s=new FinalizationRegistry((e=>{n(fe,X(C,e))})),o=([e,t])=>{switch(e){case O:return null==t?globalThis:typeof t===B?he.get(t):t;case T:if(typeof t===C){if(!he.has(t)){const e=function(...e){return e.at(0)instanceof Event&&(e=>{const{currentTarget:t,target:r,type:n}=e;for(const s of ye.get(t||r)?.get(n)||[])e[s]()})(...e),n(Q,X(T,t),we(this),e.map(we))},r=new WeakRef(e);he.set(t,r),s.register(e,t,r)}return he.get(t).deref()}return he.get(t);case I:return K(t)}return t},a={[Q]:(e,t,r)=>we(e.apply(t,r)),[Z]:(e,t)=>we(new e(...t)),[ee]:(e,t,r)=>we(L(e,t,r)),[te]:(e,t)=>we(delete e[t]),[se]:e=>we(G(e)),[re]:(e,t)=>we(e[t]),[ne]:(e,t)=>{const r=U(e,t);return r?X(O,Y(r,we)):X(F,r)},[oe]:(e,t)=>we(t in e),[ae]:e=>we(N(e)),[ie]:e=>X(O,D(e).map(we)),[ce]:e=>we(J(e)),[le]:(e,t,r)=>we(z(e,t,r)),[ue]:(e,t)=>we(q(e,t)),[fe](e){de.delete(he.get(e)),he.delete(e)}};return e[t]=(e,t,...r)=>{switch(e){case Q:r[0]=o(r[0]),r[1]=r[1].map(o);break;case Z:r[0]=r[0].map(o);break;case ee:{const[e,t]=r;r[0]=o(e);const{get:n,set:s,value:a}=t;n&&(t.get=o(n)),s&&(t.set=o(s)),a&&(t.value=o(a));break}default:r=r.map(o)}return a[e](o(t),...r)},{proxy:e,window:globalThis,isWindowProxy:()=>!1}};const me=e=>typeof e===T?e():e,be=V(((e,t)=>{if(ve in t)return me(t[ve]);if(e===T){if(!Ee.has(t)){let e;for(;Ee.has(e=String(Ae++)););ke.set(t,e),Ee.set(e,t)}return X(e,ke.get(t))}return X(e,t)})),ve=Symbol();let Ae=0;const ke=new Map,Ee=new Map;var Re=(e,t,r)=>{const{[t]:n}=e,s=new Map,o=new FinalizationRegistry((e=>{s.delete(e),n(fe,be(e))})),a=e=>{const[t,r]=e;if(!s.has(r)){const n=t===T?Pe.bind(e):e,a=new Proxy(n,l),i=new WeakRef(a);s.set(r,i),o.register(a,r,i)}return s.get(r).deref()},i=e=>{const[t,r]=e;switch(t){case O:return typeof r===B?a(e):r;case T:return typeof r===C?Ee.get(r):a(e);case I:return K(r)}return r},c=(e,t,...r)=>i(n(e,me(t),...r)),l={[Q]:(e,t,r)=>c(Q,e,be(t),r.map(be)),[Z]:(e,t)=>c(Z,e,t.map(be)),[ee]:(e,t,r)=>{const{get:n,set:s,value:o}=r;return typeof n===T&&(r.get=be(n)),typeof s===T&&(r.set=be(s)),typeof o===T&&(r.value=be(o)),c(ee,e,be(t),r)},[te]:(e,t)=>c(te,e,be(t)),[se]:e=>c(se,e),[re]:(e,t)=>t===ve?e:c(re,e,be(t)),[ne]:(e,t)=>{const r=c(ne,e,be(t));return r&&Y(r,i)},[oe]:(e,t)=>t===ve||c(oe,e,be(t)),[ae]:e=>c(ae,e),[ie]:e=>c(ie,e).map(i),[ce]:e=>c(ce,e),[le]:(e,t,r)=>c(le,e,be(t),be(r)),[ue]:(e,t)=>c(ue,e,be(t))};return e[r]=(e,t,r,n)=>{switch(e){case Q:return i(t).apply(i(r),n.map(i));case fe:{const e=i(t);ke.delete(Ee.get(e)),Ee.delete(e)}}},{proxy:e,window:new Proxy([O,null],l),isWindowProxy:e=>typeof e===O&&!!e&&ve in e,get global(){return console.warn("Deprecated: please access `window` field instead"),this.window},get isGlobal(){return function(e){return console.warn("Deprecated: please access `isWindowProxy` field instead"),this.isWindowProxy(e)}.bind(this)}}};function Pe(){return this}const Se=y+"M",$e=y+"T",xe=new WeakMap,je=(e,...t)=>{const r=_(e,...t);if(!xe.has(r)){const t=e instanceof Worker?ge:Re;xe.set(r,t(r,Se,$e))}return xe.get(r)};je.transfer=_.transfer;const{isArray:Me}=Array,{assign:We,create:_e,defineProperties:Oe,defineProperty:Te}=Object,{all:Be,resolve:Ce}=new Proxy(Promise,{get:(e,t)=>e[t].bind(e)}),Fe=(e,t=location.href)=>new URL(e,t).href,Ie=e=>e.arrayBuffer(),Le=e=>e.json(),Ue=e=>e.text();var Ge=(...e)=>function t(r,n){const s=new Worker(URL.createObjectURL(new Blob(['const e="object"==typeof self?self:globalThis,t=t=>((t,r)=>{const n=(e,r)=>(t.set(r,e),e),s=o=>{if(t.has(o))return t.get(o);const[a,i]=r[o];switch(a){case 0:case-1:return n(i,o);case 1:{const e=n([],o);for(const t of i)e.push(s(t));return e}case 2:{const e=n({},o);for(const[t,r]of i)e[s(t)]=s(r);return e}case 3:return n(new Date(i),o);case 4:{const{source:e,flags:t}=i;return n(new RegExp(e,t),o)}case 5:{const e=n(new Map,o);for(const[t,r]of i)e.set(s(t),s(r));return e}case 6:{const e=n(new Set,o);for(const t of i)e.add(s(t));return e}case 7:{const{name:t,message:r}=i;return n(new e[t](r),o)}case 8:return n(BigInt(i),o);case"BigInt":return n(Object(BigInt(i)),o)}return n(new e[a](i),o)};return s})(new Map,t)(0),r="",{toString:n}={},{keys:s}=Object,o=e=>{const t=typeof e;if("object"!==t||!e)return[0,t];const s=n.call(e).slice(8,-1);switch(s){case"Array":return[1,r];case"Object":return[2,r];case"Date":return[3,r];case"RegExp":return[4,r];case"Map":return[5,r];case"Set":return[6,r]}return s.includes("Array")?[1,s]:s.includes("Error")?[7,s]:[2,s]},a=([e,t])=>0===e&&("function"===t||"symbol"===t),i=(e,{json:t,lossy:r}={})=>{const n=[];return((e,t,r,n)=>{const i=(e,t)=>{const s=n.push(e)-1;return r.set(t,s),s},c=n=>{if(r.has(n))return r.get(n);let[l,u]=o(n);switch(l){case 0:{let t=n;switch(u){case"bigint":l=8,t=n.toString();break;case"function":case"symbol":if(e)throw new TypeError("unable to serialize "+u);t=null;break;case"undefined":return i([-1],n)}return i([l,t],n)}case 1:{if(u)return i([u,[...n]],n);const e=[],t=i([l,e],n);for(const t of n)e.push(c(t));return t}case 2:{if(u)switch(u){case"BigInt":return i([u,n.toString()],n);case"Boolean":case"Number":case"String":return i([u,n.valueOf()],n)}if(t&&"toJSON"in n)return c(n.toJSON());const r=[],f=i([l,r],n);for(const t of s(n))!e&&a(o(n[t]))||r.push([c(t),c(n[t])]);return f}case 3:return i([l,n.toISOString()],n);case 4:{const{source:e,flags:t}=n;return i([l,{source:e,flags:t}],n)}case 5:{const t=[],r=i([l,t],n);for(const[r,s]of n)(e||!a(o(r))&&!a(o(s)))&&t.push([c(r),c(s)]);return r}case 6:{const t=[],r=i([l,t],n);for(const r of n)!e&&a(o(r))||t.push(c(r));return r}}const{message:f}=n;return i([l,{name:u,message:f}],n)};return c})(!(t||r),!!t,new Map,n)(e),n},{parse:c,stringify:l}=JSON,u={json:!0,lossy:!0};var f=Object.freeze({__proto__:null,parse:e=>t(c(e)),stringify:e=>l(i(e,u))}),p="dba0d233-ff77-488c-8f92-ef0e9cb3e008",d=e=>({value:new Promise((t=>{let r=new Worker("data:application/javascript,"+encodeURIComponent("onmessage=({data:b})=>(Atomics.wait(b,0),postMessage(0))"));r.onmessage=t,r.postMessage(e)}))})\n/*! (c) Andrea Giammarchi - ISC */;const{Int32Array:w,Map:h,SharedArrayBuffer:y,Uint16Array:g}=globalThis,{BYTES_PER_ELEMENT:m}=w,{BYTES_PER_ELEMENT:b}=g,{isArray:v}=Array,{notify:P,wait:E,waitAsync:S}=Atomics,{fromCharCode:j}=String,M=(e,t)=>e?(S||d)(t,0):(E(t,0),{value:{then:e=>e()}}),k=new WeakSet,x=new WeakMap;let A=0;const $=(e,{parse:t,stringify:r}=JSON)=>{if(!x.has(e)){const n=(t,...r)=>e.postMessage({[p]:r},{transfer:t});x.set(e,new Proxy(new h,{get:(r,s)=>"then"===s?null:(...r)=>{const o=A++;let a=new w(new y(m)),i=[];k.has(r.at(-1)||i)&&k.delete(i=r.pop()),n(i,o,a,s,r);const c=e instanceof Worker;return M(c,a).value.then((()=>{const e=a[0];if(!e)return;const r=b*e;return a=new w(new y(r+r%m)),n([],o,a),M(c,a).value.then((()=>t(j(...new g(a.buffer).slice(0,e)))))}))},set(t,n,s){if(!t.size){const n=new h;e.addEventListener("message",(async e=>{const s=e.data?.[p];if(v(s)){e.stopImmediatePropagation();const[o,a,...i]=s;if(i.length){const[e,s]=i;if(!t.has(e))throw new Error(`Unsupported action: ${e}`);{const i=r(await t.get(e)(...s));i&&(n.set(o,i),a[0]=i.length)}}else{const e=n.get(o);n.delete(o);for(let t=new g(a.buffer),r=0;r<e.length;r++)t[r]=e.charCodeAt(r)}P(a,0)}}))}return!!t.set(n,s)}}))}return x.get(e)};$.transfer=(...e)=>(k.add(e),e);const _="object",O="function",W="number",R="string",T="undefined",F="symbol",{defineProperty:B,getOwnPropertyDescriptor:G,getPrototypeOf:I,isExtensible:L,ownKeys:U,preventExtensions:N,set:z,setPrototypeOf:D}=Reflect,J=(e,t)=>{const{get:r,set:n,value:s}=e;return r&&(e.get=t(r)),n&&(e.set=t(n)),s&&(e.value=t(s)),e},C=(e,t)=>[e,t],q=e=>t=>{const r=typeof t;switch(r){case _:if(null==t)return C("null",t);case O:return e(r,t);case"boolean":case W:case R:case T:case"bigint":return C(r,t);case F:if(K.has(t))return C(r,K.get(t))}throw new Error(`Unable to handle this ${r} type`)},K=new Map(U(Symbol).filter((e=>typeof Symbol[e]===F)).map((e=>[Symbol[e],e]))),Y=e=>{for(const[t,r]of K)if(r===e)return t},V="apply",H="construct",Q="defineProperty",X="deleteProperty",Z="get",ee="getOwnPropertyDescriptor",te="getPrototypeOf",re="has",ne="isExtensible",se="ownKeys",oe="preventExtensions",ae="set",ie="setPrototypeOf",ce="delete";let le=0;const ue=new Map,fe=new Map,pe=new WeakMap;if(globalThis.window===globalThis){const{addEventListener:e}=EventTarget.prototype;B(EventTarget.prototype,"addEventListener",{value(t,r,...n){return n.at(0)?.invoke&&(pe.has(this)||pe.set(this,new Map),pe.get(this).set(t,[].concat(n[0].invoke)),delete n[0].invoke),e.call(this,t,r,...n)}})}const de=q(((e,t)=>{if(!ue.has(t)){let e;for(;fe.has(e=le++););ue.set(t,e),fe.set(e,t)}return C(e,ue.get(t))}));var we=(e,t,r)=>{const{[r]:n}=e,s=new FinalizationRegistry((e=>{n(ce,C(R,e))})),o=([e,t])=>{switch(e){case _:return null==t?globalThis:typeof t===W?fe.get(t):t;case O:if(typeof t===R){if(!fe.has(t)){const e=function(...e){return e.at(0)instanceof Event&&(e=>{const{currentTarget:t,target:r,type:n}=e;for(const s of pe.get(t||r)?.get(n)||[])e[s]()})(...e),n(V,C(O,t),de(this),e.map(de))},r=new WeakRef(e);fe.set(t,r),s.register(e,t,r)}return fe.get(t).deref()}return fe.get(t);case F:return Y(t)}return t},a={[V]:(e,t,r)=>de(e.apply(t,r)),[H]:(e,t)=>de(new e(...t)),[Q]:(e,t,r)=>de(B(e,t,r)),[X]:(e,t)=>de(delete e[t]),[te]:e=>de(I(e)),[Z]:(e,t)=>de(e[t]),[ee]:(e,t)=>{const r=G(e,t);return r?C(_,J(r,de)):C(T,r)},[re]:(e,t)=>de(t in e),[ne]:e=>de(L(e)),[se]:e=>C(_,U(e).map(de)),[oe]:e=>de(N(e)),[ae]:(e,t,r)=>de(z(e,t,r)),[ie]:(e,t)=>de(D(e,t)),[ce](e){ue.delete(fe.get(e)),fe.delete(e)}};return e[t]=(e,t,...r)=>{switch(e){case V:r[0]=o(r[0]),r[1]=r[1].map(o);break;case H:r[0]=r[0].map(o);break;case Q:{const[e,t]=r;r[0]=o(e);const{get:n,set:s,value:a}=t;n&&(t.get=o(n)),s&&(t.set=o(s)),a&&(t.value=o(a));break}default:r=r.map(o)}return a[e](o(t),...r)},{proxy:e,window:globalThis,isWindowProxy:()=>!1}};const he=e=>typeof e===O?e():e,ye=q(((e,t)=>{if(ge in t)return he(t[ge]);if(e===O){if(!ve.has(t)){let e;for(;ve.has(e=String(me++)););be.set(t,e),ve.set(e,t)}return C(e,be.get(t))}return C(e,t)})),ge=Symbol();let me=0;const be=new Map,ve=new Map;var Pe=(e,t,r)=>{const{[t]:n}=e,s=new Map,o=new FinalizationRegistry((e=>{s.delete(e),n(ce,ye(e))})),a=e=>{const[t,r]=e;if(!s.has(r)){const n=t===O?Ee.bind(e):e,a=new Proxy(n,l),i=new WeakRef(a);s.set(r,i),o.register(a,r,i)}return s.get(r).deref()},i=e=>{const[t,r]=e;switch(t){case _:return typeof r===W?a(e):r;case O:return typeof r===R?ve.get(r):a(e);case F:return Y(r)}return r},c=(e,t,...r)=>i(n(e,he(t),...r)),l={[V]:(e,t,r)=>c(V,e,ye(t),r.map(ye)),[H]:(e,t)=>c(H,e,t.map(ye)),[Q]:(e,t,r)=>{const{get:n,set:s,value:o}=r;return typeof n===O&&(r.get=ye(n)),typeof s===O&&(r.set=ye(s)),typeof o===O&&(r.value=ye(o)),c(Q,e,ye(t),r)},[X]:(e,t)=>c(X,e,ye(t)),[te]:e=>c(te,e),[Z]:(e,t)=>t===ge?e:c(Z,e,ye(t)),[ee]:(e,t)=>{const r=c(ee,e,ye(t));return r&&J(r,i)},[re]:(e,t)=>t===ge||c(re,e,ye(t)),[ne]:e=>c(ne,e),[se]:e=>c(se,e).map(i),[oe]:e=>c(oe,e),[ae]:(e,t,r)=>c(ae,e,ye(t),ye(r)),[ie]:(e,t)=>c(ie,e,ye(t))};return e[r]=(e,t,r,n)=>{switch(e){case V:return i(t).apply(i(r),n.map(i));case ce:{const e=i(t);be.delete(ve.get(e)),ve.delete(e)}}},{proxy:e,window:new Proxy([_,null],l),isWindowProxy:e=>typeof e===_&&!!e&&ge in e,get global(){return console.warn("Deprecated: please access `window` field instead"),this.window},get isGlobal(){return function(e){return console.warn("Deprecated: please access `isWindowProxy` field instead"),this.isWindowProxy(e)}.bind(this)}}};function Ee(){return this}const Se=p+"M",je=p+"T",Me=new WeakMap,ke=(e,...t)=>{const r=$(e,...t);if(!Me.has(r)){const t=e instanceof Worker?we:Pe;Me.set(r,t(r,Se,je))}return Me.get(r)};ke.transfer=$.transfer;const{isArray:xe}=Array,{assign:Ae,create:$e,defineProperties:_e,defineProperty:Oe}=Object,{all:We,resolve:Re}=new Proxy(Promise,{get:(e,t)=>e[t].bind(e)}),Te=(e,t=location.href)=>new URL(e,t).href;Promise.withResolvers||(Promise.withResolvers=function(){var e,t,r=new this((function(r,n){e=r,t=n}));return{resolve:e,reject:t,promise:r}});const Fe=e=>e.arrayBuffer(),Be=e=>e.json(),Ge=e=>e.text(),Ie=e=>e.replace(/^[^\\r\\n]+$/,(e=>e.trim())),Le=new WeakMap,Ue=e=>{const t=e||console,r={stderr:(t.stderr||console.error).bind(t),stdout:(t.stdout||console.log).bind(t)};return{stderr:(...e)=>r.stderr(...e),stdout:(...e)=>r.stdout(...e),async get(e){const t=await e;return Le.set(t,r),t}}},Ne=e=>{const t=e.split("/");return t.pop(),t.join("/")},ze=(e,t)=>{const r=[];for(const n of t.split("/"))r.push(n),n&&e.mkdir(r.join("/"))},De=(e,t)=>{const r=[];for(const e of t.split("/"))switch(e){case"":case".":break;case"..":r.pop();break;default:r.push(e)}return[e.cwd()].concat(r).join("/").replace(/^\\/+/,"/")},Je=e=>{const t=e.map((e=>e.trim().replace(/(^[/]*|[/]*$)/g,""))).filter((e=>""!==e&&"."!==e)).join("/");return e[0].startsWith("/")?`/${t}`:t},Ce=new WeakMap,qe=(e,t,r)=>We((e=>{for(const{files:t,to_file:r,from:n=""}of e){if(void 0!==t&&void 0!==r)throw new Error("Cannot use \'to_file\' and \'files\' parameters together!");if(void 0===t&&void 0===r&&n.endsWith("/"))throw new Error(`Couldn\'t determine the filename from the path ${n}, please supply \'to_file\' parameter.`)}return e.flatMap((({from:e="",to_folder:t=".",to_file:r,files:n})=>{if(xe(n))return n.map((r=>({url:Je([e,r]),path:Je([t,r])})));const s=r||e.slice(1+e.lastIndexOf("/"));return[{url:e,path:Je([t,s])}]}))})(r).map((({url:n,path:s})=>((e,t)=>fetch(Te(t,Ce.get(e))))(r,n).then(Fe).then((r=>e.writeFile(t,s,r)))))),Ke=(e,t)=>e.runPython(Ie(t)),Ye=(e,t)=>e.runPythonAsync(Ie(t)),Ve=(e,t,r)=>e.globals.set(t,r),He=(e,t)=>e.globals.delete(t),Qe=({FS:e},t,r)=>((e,t,r)=>{const{parentPath:n,name:s}=e.analyzePath(t,!0);return e.mkdirTree(n),e.writeFile([n,s].join("/"),new Uint8Array(r),{canOwn:!0})})(e,t,r);var Xe={type:"micropython",module:(e="1.20.0-253")=>`https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@${e}/micropython.mjs`,async engine({loadMicroPython:e},t,r){const{stderr:n,stdout:s,get:o}=Ue();r=r.replace(/\\.m?js$/,".wasm");const a=await o(e({stderr:n,stdout:s,url:r}));return t.fetch&&await qe(this,a,t.fetch),a},setGlobal:Ve,deleteGlobal:He,run:Ke,runAsync:Ye,writeFile:Qe};var Ze={type:"pyodide",module:(e="0.23.2")=>`https://cdn.jsdelivr.net/pyodide/v${e}/full/pyodide.mjs`,async engine({loadPyodide:e},t,r){const{stderr:n,stdout:s,get:o}=Ue(),a=r.slice(0,r.lastIndexOf("/")),i=await o(e({stderr:n,stdout:s,indexURL:a}));if(t.fetch&&await qe(this,i,t.fetch),t.packages){await i.loadPackage("micropip");const e=await i.pyimport("micropip");await e.install(t.packages),e.destroy()}return i},setGlobal:Ve,deleteGlobal:He,run:Ke,runAsync:Ye,writeFile:Qe};const et="ruby-wasm-wasi";var tt={type:et,experimental:!0,module:(e="2.0.0")=>`https://cdn.jsdelivr.net/npm/ruby-3_2-wasm-wasi@${e}/dist/browser.esm.js`,async engine({DefaultRubyVM:e},t,r){const n=await fetch(`${r.slice(0,r.lastIndexOf("/"))}/ruby.wasm`),s=await WebAssembly.compile(await n.arrayBuffer()),{vm:o}=await e(s);return t.fetch&&await qe(this,o,t.fetch),o},setGlobal(e,t,r){const n=`__pyscript_ruby_wasm_wasi_${t}`;globalThis[n]=r,this.run(e,`require "js";$${t}=JS::eval("return ${n}")`)},deleteGlobal(e,t){const r=`__pyscript_ruby_wasm_wasi_${t}`;this.run(e,`$${t}=nil`),delete globalThis[r]},run:(e,t)=>e.eval(Ie(t)),runAsync:(e,t)=>e.evalAsync(Ie(t)),writeFile:()=>{throw new Error(`writeFile is not supported in ${et}`)}};var rt={type:"wasmoon",module:(e="1.15.0")=>`https://cdn.jsdelivr.net/npm/wasmoon@${e}/+esm`,async engine({LuaFactory:e,LuaLibraries:t},r){const{stderr:n,stdout:s,get:o}=Ue(),a=await o((new e).createEngine());return a.global.getTable(t.Base,(e=>{a.global.setField(e,"print",s),a.global.setField(e,"printErr",n)})),r.fetch&&await qe(this,a,r.fetch),a},setGlobal(e,t,r){e.global.set(t,r)},deleteGlobal(e,t){e.global.set(t,void 0)},run:(e,t)=>e.doStringSync(Ie(t)),runAsync:(e,t)=>e.doString(Ie(t)),writeFile:({cmodule:{module:{FS:e}}},t,r)=>((e,t,r)=>(t=De(e,t),ze(e,Ne(t)),e.writeFile(t,new Uint8Array(r),{canOwn:!0})))(e,t,r)};const nt=new Map,st=new Map,ot=new Proxy(new Map,{get(e,t){if(!e.has(t)){const[r,...n]=t.split("@"),s=nt.get(r),o=/^https?:\\/\\//i.test(n)?n.join("@"):s.module(...n);e.set(t,{url:o,module:import(o),engine:s.engine.bind(s)})}const{url:r,module:n,engine:s}=e.get(t);return(e,o)=>n.then((n=>{st.set(t,e);const a=e?.fetch;return a&&Ce.set(a,o),s(n,e,r)}))}}),at=e=>{for(const t of[].concat(e.type))nt.set(t,e)};for(const e of[Xe,Ze,tt,rt])at(e);const it=async e=>(await import("https://cdn.jsdelivr.net/npm/basic-toml@0.3.1/es.js")).parse(e);try{new SharedArrayBuffer(4)}catch(e){throw new Error(["Unable to use SharedArrayBuffer due insecure environment.","Please read requirements in MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer#security_requirements"].join("\\n"))}let ct,lt,ut;const ft=(e,t)=>{addEventListener(e,t||(async t=>{await ct,ut=t,lt(`xworker.on${e}(xworker.event);`,ht)}),!!t&&{once:!0})},{proxy:pt,window:dt,isWindowProxy:wt}=ke(self,f),ht={sync:pt,window:dt,isWindowProxy:wt,onerror(){},onmessage(){},onmessageerror(){},postMessage:postMessage.bind(self),get event(){const e=ut;if(!e)throw new Error("Unauthorized event access");return ut=void 0,e}};ft("message",(({data:{options:e,code:t,hooks:r}})=>{ct=(async()=>{const{type:n,version:s,config:o,async:a}=e,i=await((e,t)=>{let r={};if(t)if(t.endsWith(".json"))r=fetch(t).then(Be);else if(t.endsWith(".toml"))r=fetch(t).then(Ge).then(it);else{try{r=JSON.parse(t)}catch(e){r=it(t)}t=Te("./config.txt")}return Re(r).then((r=>ot[e](r,t)))})(((e,t="")=>`${e}@${t}`.replace(/@$/,""))(n,s),o),c=$e(nt.get(n)),l="run"+(a?"Async":"");if(r){const{beforeRun:e,beforeRunAsync:t,afterRun:n,afterRunAsync:s}=r,o=n||s,a=e||t;if(o){const e=c[l].bind(c);c[l]=(t,r)=>e(t,`${r}\\n${o}`)}if(a){const e=c[l].bind(c);c[l]=(t,r)=>e(t,`${a}\\n${r}`)}}return c.setGlobal(i,"xworker",ht),lt=c[l].bind(c,i),lt(t),i})(),ft("error"),ft("message"),ft("messageerror")}));\n'],{type:"application/javascript"})),{type:"module"}),{postMessage:o}=s,a=this instanceof t?void 0:this;if(e.length){const[t,r]=e;(n=We({},n||{type:t,version:r})).type||(n.type=t)}n?.config&&(n.config=Fe(n.config));const i=fetch(r).then(Ue).then((e=>o.call(s,{options:n,code:e,hooks:a})));return Oe(s,{postMessage:{value:(e,...t)=>i.then((()=>o.call(s,e,...t)))},sync:{value:je(s,h).proxy}})};const Ne=e=>e.replace(/^[^\r\n]+$/,(e=>e.trim())),De=new WeakMap,Je=e=>{const t=e||console,r={stderr:(t.stderr||console.error).bind(t),stdout:(t.stdout||console.log).bind(t)};return{stderr:(...e)=>r.stderr(...e),stdout:(...e)=>r.stdout(...e),async get(e){const t=await e;return De.set(t,r),t}}},ze=e=>{const t=e.split("/");return t.pop(),t.join("/")},qe=(e,t)=>{const r=[];for(const n of t.split("/"))r.push(n),n&&e.mkdir(r.join("/"))},Ye=(e,t)=>{const r=[];for(const e of t.split("/"))switch(e){case"":case".":break;case"..":r.pop();break;default:r.push(e)}return[e.cwd()].concat(r).join("/").replace(/^\/+/,"/")},Xe=e=>{const t=e.map((e=>e.trim().replace(/(^[/]*|[/]*$)/g,""))).filter((e=>""!==e&&"."!==e)).join("/");return e[0].startsWith("/")?`/${t}`:t},Ve=new WeakMap,He=(e,t,r)=>Be((e=>{for(const{files:t,to_file:r,from:n=""}of e){if(void 0!==t&&void 0!==r)throw new Error("Cannot use 'to_file' and 'files' parameters together!");if(void 0===t&&void 0===r&&n.endsWith("/"))throw new Error(`Couldn't determine the filename from the path ${n}, please supply 'to_file' parameter.`)}return e.flatMap((({from:e="",to_folder:t=".",to_file:r,files:n})=>{if(Me(n))return n.map((r=>({url:Xe([e,r]),path:Xe([t,r])})));const s=r||e.slice(1+e.lastIndexOf("/"));return[{url:e,path:Xe([t,s])}]}))})(r).map((({url:n,path:s})=>((e,t)=>fetch(Fe(t,Ve.get(e))))(r,n).then(Ie).then((r=>e.writeFile(t,s,r)))))),Ke=(e,t)=>e.runPython(Ne(t)),Qe=(e,t)=>e.runPythonAsync(Ne(t)),Ze=(e,t,r)=>e.globals.set(t,r),et=(e,t)=>e.globals.delete(t),tt=({FS:e},t,r)=>((e,t,r)=>{const{parentPath:n,name:s}=e.analyzePath(t,!0);return e.mkdirTree(n),e.writeFile([n,s].join("/"),new Uint8Array(r),{canOwn:!0})})(e,t,r);var rt={type:"micropython",module:(e="1.20.0-253")=>`https://cdn.jsdelivr.net/npm/@micropython/micropython-webassembly-pyscript@${e}/micropython.mjs`,async engine({loadMicroPython:e},t,r){const{stderr:n,stdout:s,get:o}=Je();r=r.replace(/\.m?js$/,".wasm");const a=await o(e({stderr:n,stdout:s,url:r}));return t.fetch&&await He(this,a,t.fetch),a},setGlobal:Ze,deleteGlobal:et,run:Ke,runAsync:Qe,writeFile:tt};var nt={type:"pyodide",module:(e="0.23.2")=>`https://cdn.jsdelivr.net/pyodide/v${e}/full/pyodide.mjs`,async engine({loadPyodide:e},t,r){const{stderr:n,stdout:s,get:o}=Je(),a=r.slice(0,r.lastIndexOf("/")),i=await o(e({stderr:n,stdout:s,indexURL:a}));if(t.fetch&&await He(this,i,t.fetch),t.packages){await i.loadPackage("micropip");const e=await i.pyimport("micropip");await e.install(t.packages),e.destroy()}return i},setGlobal:Ze,deleteGlobal:et,run:Ke,runAsync:Qe,writeFile:tt};const st="ruby-wasm-wasi";var ot={type:st,experimental:!0,module:(e="2.0.0")=>`https://cdn.jsdelivr.net/npm/ruby-3_2-wasm-wasi@${e}/dist/browser.esm.js`,async engine({DefaultRubyVM:e},t,r){const n=await fetch(`${r.slice(0,r.lastIndexOf("/"))}/ruby.wasm`),s=await WebAssembly.compile(await n.arrayBuffer()),{vm:o}=await e(s);return t.fetch&&await He(this,o,t.fetch),o},setGlobal(e,t,r){const n=`__pyscript_ruby_wasm_wasi_${t}`;globalThis[n]=r,this.run(e,`require "js";$${t}=JS::eval("return ${n}")`)},deleteGlobal(e,t){const r=`__pyscript_ruby_wasm_wasi_${t}`;this.run(e,`$${t}=nil`),delete globalThis[r]},run:(e,t)=>e.eval(Ne(t)),runAsync:(e,t)=>e.evalAsync(Ne(t)),writeFile:()=>{throw new Error(`writeFile is not supported in ${st}`)}};var at={type:"wasmoon",module:(e="1.15.0")=>`https://cdn.jsdelivr.net/npm/wasmoon@${e}/+esm`,async engine({LuaFactory:e,LuaLibraries:t},r){const{stderr:n,stdout:s,get:o}=Je(),a=await o((new e).createEngine());return a.global.getTable(t.Base,(e=>{a.global.setField(e,"print",s),a.global.setField(e,"printErr",n)})),r.fetch&&await He(this,a,r.fetch),a},setGlobal(e,t,r){e.global.set(t,r)},deleteGlobal(e,t){e.global.set(t,void 0)},run:(e,t)=>e.doStringSync(Ne(t)),runAsync:(e,t)=>e.doString(Ne(t)),writeFile:({cmodule:{module:{FS:e}}},t,r)=>((e,t,r)=>(t=Ye(e,t),qe(e,ze(t)),e.writeFile(t,new Uint8Array(r),{canOwn:!0})))(e,t,r)};const it=new Map,ct=new Map,lt=[],ut=[],ft=new Proxy(new Map,{get(e,t){if(!e.has(t)){const[r,...n]=t.split("@"),s=it.get(r),o=/^https?:\/\//i.test(n)?n.join("@"):s.module(...n);e.set(t,{url:o,module:import(o),engine:s.engine.bind(s)})}const{url:r,module:n,engine:s}=e.get(t);return(e,o)=>n.then((n=>{ct.set(t,e);const a=e?.fetch;return a&&Ve.set(a,o),s(n,e,r)}))}}),pt=e=>{for(const t of[].concat(e.type))it.set(t,e),lt.push(`script[type="${t}"]`),ut.push(`${t}-`)};for(const e of[rt,nt,ot,at])pt(e);const dt=async e=>(await import("https://cdn.jsdelivr.net/npm/basic-toml@0.3.1/es.js")).parse(e),ht=(e,t)=>{let r={};if(t)if(t.endsWith(".json"))r=fetch(t).then(Le);else if(t.endsWith(".toml"))r=fetch(t).then(Ue).then(dt);else{try{r=JSON.parse(t)}catch(e){r=dt(t)}t=Fe("./config.txt")}return Ce(r).then((r=>ft[e](r,t)))},yt=(e,t="")=>`${e}@${t}`.replace(/@$/,""),wt=(t,r)=>{const n=(e=>{let t=e;for(;t.parentNode;)t=t.parentNode;return t})(t);return n.getElementById(r)||e(r,n)},gt=new WeakMap,mt={get(){let e=gt.get(this);return e||(e=document.createElement(`${this.type}-script`),gt.set(this,e),Et(this)),e},set(e){"string"==typeof e?gt.set(this,wt(this,e)):(gt.set(this,e),Et(this))}},bt=new WeakMap,vt=new Map,At=(e,t)=>{const r=e?.value;return r?t+r:""},kt=(e,t,r,n,s)=>{if(!vt.has(t)){const o={interpreter:ht(r,s),queue:Ce(),XWorker:Ge(e,n)};vt.set(t,o),vt.has(e)||vt.set(e,o)}return vt.get(t)},Et=async e=>{if(bt.has(e)){const{target:t}=e;t&&(e.closest("head")?document.body.append(t):e.after(t))}else{const{attributes:{async:t,config:r,env:n,target:s,version:o},src:a,type:i}=e,c=o?.value,l=yt(i,c),u=At(s,"");let f=At(r,"|");const p=At(n,"")||`${l}${f}`;f=f.slice(1),f&&(f=Fe(f));const d=kt(i,p,l,c,f);bt.set(Te(e,"target",mt),d),u&&gt.set(e,wt(e,u));const h=a?fetch(a).then(Ue):e.textContent;d.queue=d.queue.then((()=>(async(e,t,r,n)=>{const s=it.get(e.type);s.experimental&&console.warn(`The ${e.type} interpreter is experimental`);const[o,a]=await Be([bt.get(e).interpreter,t]);try{return Te(document,"currentScript",{configurable:!0,get:()=>e}),s.setGlobal(o,"XWorker",r),s[n?"runAsync":"run"](o,a)}finally{delete document.currentScript,s.deleteGlobal(o,"XWorker")}})(e,h,d.XWorker,!!t)))}};Te(globalThis,"pyscript",{value:{env:new Proxy(_e(null),{get:(e,t)=>Rt(t)})}});const Rt=async e=>{if(vt.has(e)){const{interpreter:t,queue:r}=vt.get(e);return(await Be([t,r]))[0]}const t=vt.size?`Available interpreters are: ${[...vt.keys()].map((e=>`"${e}"`)).join(", ")}.`:"There are no interpreters in this page.";throw new Error(`The interpreter "${e}" was not found. ${t}`)},Pt=async e=>{const{type:t,currentTarget:n}=e;for(let{name:s,value:o,ownerElement:a}of r(`./@*[${ut.map((e=>`name()="${e}${t}"`)).join(" or ")}]`,n)){s=s.slice(0,-(t.length+1));const r=await Rt(a.getAttribute(`${s}-env`)||s),n=it.get(s);try{n.setGlobal(r,"event",e),n.run(r,o)}finally{n.deleteGlobal(r,"event")}}},St=e=>{for(let{name:t,ownerElement:n}of r(`.//@*[${ut.map((e=>`starts-with(name(),"${e}")`)).join(" or ")}]`,e))t=t.slice(t.lastIndexOf("-")+1),"env"!==t&&n.addEventListener(t,Pt)},$t=[],xt=new Map,jt=new Map,Mt=e=>{for(const t of $t)if(e.matches(t)){const r=xt.get(t),{resolve:n}=jt.get(r),{options:s,known:o}=Wt.get(r);if(!o.has(e)){o.add(e);const{interpreter:t,version:a,config:i,env:c,onRuntimeReady:l}=s,u=yt(t,a),f=c||`${u}${i?`|${i}`:""}`,{interpreter:p,XWorker:d}=kt(t,f,u,a,i);p.then((o=>{const a=_e(it.get(t)),{onBeforeRun:i,onBeforeRunAsync:c,onAfterRun:f,onAfterRunAsync:p,codeBeforeRunWorker:h,codeBeforeRunWorkerAsync:y,codeAfterRunWorker:w,codeAfterRunWorkerAsync:g}=s,m={beforeRun:h?.(),beforeRunAsync:y?.(),afterRun:w?.(),afterRunAsync:g?.()},b=function(...e){return d.apply(m,e)};for(const[t,[r,n]]of[["run",[i,f]]]){const s=a[t];a[t]=function(t,o){r&&r.call(this,v,e);const a=s.call(this,t,o);return n&&n.call(this,v,e),a}}for(const[t,[r,n]]of[["runAsync",[c,p]]]){const s=a[t];a[t]=async function(t,o){r&&await r.call(this,v,e);const a=await s.call(this,t,o);return n&&await n.call(this,v,e),a}}a.setGlobal(o,"XWorker",b);const v={type:r,interpreter:o,XWorker:b,io:De.get(o),config:structuredClone(ct.get(u)),run:a.run.bind(a,o),runAsync:a.runAsync.bind(a,o)};n(v),l?.(v,e)}))}}},Wt=new Map,_t=e=>(jt.has(e)||jt.set(e,Promise.withResolvers()),jt.get(e).promise),Ot=lt.join(","),Tt=new MutationObserver((e=>{for(const{type:r,target:n,attributeName:s,addedNodes:o}of e)if("attributes"!==r){for(const e of o)if(1===e.nodeType)if(St(e),e.matches(Ot))Et(e);else{if(t(Ot,e).forEach(Et),!$t.length)continue;Mt(e),t($t.join(","),e).forEach(Mt)}}else{const e=s.lastIndexOf("-")+1;if(e){const t=s.slice(0,e);for(const r of ut)if(t===r){const t=s.slice(e);if("env"!==t){const e=n.hasAttribute(s)?"add":"remove";n[`${e}EventListener`](t,Pt)}break}}}})),Bt=e=>(Tt.observe(e,{childList:!0,subtree:!0,attributes:!0}),e),{attachShadow:Ct}=Element.prototype;We(Element.prototype,{attachShadow(e){return Bt(Ct.call(this,e))}}),St(Bt(document)),t(Ot,document).forEach(Et);const Ft="PY0001",It="PY0401",Lt="PY0403",Ut="PY0404",Gt="PY0500",Nt="PY0503";class Dt extends Error{constructor(e,t="",r="text"){super(`(${e}): ${t}`),this.errorCode=e,this.messageType=r,this.name="UserError"}}class Jt extends Dt{constructor(e,t){super(e,t),this.name="FetchError"}}async function zt(e,t){let r;try{r=await fetch(e,t)}catch(t){const r=t;let n;throw n=e.startsWith("http")?`Fetching from URL ${e} failed with error '${r.message}'. Are your filename and path correct?`:'PyScript: Access to local files\n        (using [[fetch]] configurations in &lt;py-config&gt;)\n        is not available when directly opening a HTML file;\n        you must use a webserver to serve the additional files.\n        See <a style="text-decoration: underline;" href="https://github.com/pyscript/pyscript/issues/257#issuecomment-1119595062">this reference</a>\n        on starting a simple webserver with Python.\n            ',new Jt(Ft,n)}if(!r.ok){const t=`Fetching from URL ${e} failed with error ${r.status} (${r.statusText}). Are your filename and path correct?`;switch(r.status){case 404:throw new Jt(Ut,t);case 401:throw new Jt(It,t);case 403:throw new Jt(Lt,t);case 500:throw new Jt(Gt,t);case 503:throw new Jt(Nt,t);default:throw new Jt(Ft,t)}}return r}document.head.appendChild(document.createElement("style")).textContent="\n  py-script, py-config {\n    display: none;\n  }\n",(async()=>{let r=0;const n=(e="py")=>`${e}-${r++}`;let s,o=e("py-config");o?s=o.getAttribute("src")||o.textContent:(o=e('script[type="py"]'),s=o?.getAttribute("config")),/^https?:\/\//.test(s)&&(s=await zt(s).then(Ue));const a=e=>"SCRIPT"===e.tagName,i=e=>{Te(document,"currentScript",{configurable:!0,get:()=>e})},c=()=>{delete document.currentScript},l=async e=>{if(e.hasAttribute("src"))try{return(await zt(e.getAttribute("src"))).then(Ue)}catch(e){throw alert(e.message),e}return e.textContent},u=(e,t,r,n)=>{a(t)&&r(t);for(const r of qt[n])r(e,t)},f=e=>`\n            # this code is just for demo purpose but the basics work\n            def _display(what, target="${a(e)?e.target.id:e.id}", append=True):\n                from js import document\n                element = document.getElementById(target)\n                element.textContent = what\n            display = _display\n        `;((e,r)=>{if(it.has(e)||Wt.has(e))throw new Error(`<script type="${e}"> already registered`);if(!it.has(r?.interpreter))throw new Error("Unspecified interpreter");it.set(e,it.get(r?.interpreter)),_t(e);const n=[`script[type="${e}"]`,`${e}-script`];for(const t of n)xt.set(t,e);$t.push(...n),ut.push(`${e}-`),Wt.set(e,{options:We({env:e},r),known:new WeakSet}),St(document),t(n.join(",")).forEach(Mt)})("py",{config:s,env:"py-script",interpreter:"pyodide",codeBeforeRunWorker(){const{codeBeforeRunWorker:e}=qt;return['print("codeBeforeRunWorker")'].concat(...e).join("\n")},codeAfterRunWorker(){const{codeAfterRunWorker:e}=qt;return['print("codeAfterRunWorker")'].concat(...e).join("\n")},onBeforeRun(e,t){u(e,t,i,"onBeforeRun"),e.interpreter.runPython(f(t))},onBeforeRunAync(e,t){e.interpreter.runPython(f(t)),u(e,t,i,"onBeforeRunAync")},onAfterRun(e,t){u(e,t,c,"onAfterRun")},onAfterRunAsync(e,t){u(e,t,c,"onAfterRunAsync")},async onRuntimeReady(e,t){for(const r of qt.onRuntimeReady)r(e,t);if(a(t)){const{attributes:{async:r,target:s}}=t,o=!!s?.value,a=o?wt(s.value):document.createElement("script-py");o||t.after(a),a.id||(a.id=n()),Te(t,"target",{value:a}),e["run"+(r?"Async":"")](await l(t))}else t._pyodide.resolve(e)}});class p extends HTMLElement{constructor(){super().id||(this.id=n()),this._pyodide=Promise.withResolvers(),this.srcCode="",this.executed=!1}async connectedCallback(){if(!this.executed){this.executed=!0;const{run:e}=await this._pyodide.promise;this.srcCode=await l(this),this.textContent="";const t=e(this.srcCode);!this.textContent&&t&&(this.textContent=t),this.style.display="block"}}}customElements.define("py-script",p)})();const qt={onBeforeRun:new Set,onBeforeRunAync:new Set,onAfterRun:new Set,onAfterRunAsync:new Set,onRuntimeReady:new Set,codeBeforeRunWorker:new Set,codeBeforeRunWorkerAsync:new Set,codeAfterRunWorker:new Set,codeAfterRunWorkerAsync:new Set};export{qt as hooks};
diff --git a/pyscript.core/rollup/min.config.js b/pyscript.core/rollup/core.config.js
similarity index 80%
rename from pyscript.core/rollup/min.config.js
rename to pyscript.core/rollup/core.config.js
index 3ab77e97..f4153c27 100644
--- a/pyscript.core/rollup/min.config.js
+++ b/pyscript.core/rollup/core.config.js
@@ -1,4 +1,4 @@
-// This file generates /min.js minified version of the module, which is
+// This file generates /core.js minified version of the module, which is
 // the default exported as npm entry.
 
 import { nodeResolve } from "@rollup/plugin-node-resolve";
@@ -13,6 +13,6 @@ export default {
     plugins: process.env.NO_MIN ? [nodeResolve()] : [nodeResolve(), terser()],
     output: {
         esModule: true,
-        file: "./min.js",
+        file: "./core.js",
     },
 };
diff --git a/pyscript.core/rollup/pyscript.config.js b/pyscript.core/rollup/pyscript.config.js
new file mode 100644
index 00000000..35c5eb93
--- /dev/null
+++ b/pyscript.core/rollup/pyscript.config.js
@@ -0,0 +1,18 @@
+// This file generates /core.js minified version of the module, which is
+// the default exported as npm entry.
+
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import terser from "@rollup/plugin-terser";
+
+import { createRequire } from "node:module";
+
+createRequire(import.meta.url)("./build_xworker.cjs");
+
+export default {
+    input: "./esm/custom/pyscript.js",
+    plugins: process.env.NO_MIN ? [nodeResolve()] : [nodeResolve(), terser()],
+    output: {
+        esModule: true,
+        file: "./pyscript.js",
+    },
+};
diff --git a/pyscript.core/rollup/xworker.config.js b/pyscript.core/rollup/xworker.config.js
index d990bd2f..a0876826 100644
--- a/pyscript.core/rollup/xworker.config.js
+++ b/pyscript.core/rollup/xworker.config.js
@@ -1,4 +1,4 @@
-// This file generates /min.js minified version of the module, which is
+// This file generates /core.js minified version of the module, which is
 // the default exported as npm entry.
 
 import { nodeResolve } from "@rollup/plugin-node-resolve";
diff --git a/pyscript.core/test/async.html b/pyscript.core/test/async.html
index 6135e16a..8cf19535 100644
--- a/pyscript.core/test/async.html
+++ b/pyscript.core/test/async.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide" async>
diff --git a/pyscript.core/test/env.html b/pyscript.core/test/env.html
index b3d6f2e4..ac941c51 100644
--- a/pyscript.core/test/env.html
+++ b/pyscript.core/test/env.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="micropython">
diff --git a/pyscript.core/test/fetch.html b/pyscript.core/test/fetch.html
index 348864c1..bb9623dd 100644
--- a/pyscript.core/test/fetch.html
+++ b/pyscript.core/test/fetch.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <title>python</title>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="micropython" config="./fetch.toml">
diff --git a/pyscript.core/test/index.html b/pyscript.core/test/index.html
index e19331df..9ef45e5d 100644
--- a/pyscript.core/test/index.html
+++ b/pyscript.core/test/index.html
@@ -5,7 +5,7 @@
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide">
diff --git a/pyscript.core/test/isolated.html b/pyscript.core/test/isolated.html
index cca1aa32..f52b9e2d 100644
--- a/pyscript.core/test/isolated.html
+++ b/pyscript.core/test/isolated.html
@@ -4,7 +4,7 @@
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
         <title>python</title>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide">
diff --git a/pyscript.core/test/many.html b/pyscript.core/test/many.html
index c0e24bd3..103a49e7 100644
--- a/pyscript.core/test/many.html
+++ b/pyscript.core/test/many.html
@@ -6,7 +6,7 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide" version="0.23.2">
diff --git a/pyscript.core/test/matplot.html b/pyscript.core/test/matplot.html
index 4ae35011..4c6a87bd 100644
--- a/pyscript.core/test/matplot.html
+++ b/pyscript.core/test/matplot.html
@@ -6,7 +6,7 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide" config="./config.toml">
diff --git a/pyscript.core/test/matplot.json.html b/pyscript.core/test/matplot.json.html
index bac4c5de..500e54f7 100644
--- a/pyscript.core/test/matplot.json.html
+++ b/pyscript.core/test/matplot.json.html
@@ -6,7 +6,7 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide" config="./config.json">
diff --git a/pyscript.core/test/matplot.py b/pyscript.core/test/matplot.py
index 94a142db..131cdf17 100644
--- a/pyscript.core/test/matplot.py
+++ b/pyscript.core/test/matplot.py
@@ -46,6 +46,26 @@ buf = io.BytesIO()
 plt.savefig(buf, format="png")
 buf.seek(0)
 
-js.xworker.postMessage(
-    "data:image/png;base64," + base64.b64encode(buf.read()).decode("UTF-8")
-)
+# how it was (including main thread counter part)
+# js.xworker.postMessage(
+#     "data:image/png;base64," + base64.b64encode(buf.read()).decode("UTF-8")
+# )
+
+# how it is now via structured coincident/window
+document = xworker.window.document
+img = document.createElement("img")
+img.style.transform = "scale(.5)"
+img.src = "data:image/png;base64," + base64.b64encode(buf.read()).decode("UTF-8")
+
+# document.body.append(img) fails for some reason I don't understand
+# same would be for document.querySelector("#image").append(img)
+# those would work in any JS counterpart though ... but for demo sake:
+document.querySelector("#image").innerHTML = img.outerHTML
+
+# about pyodide issue
+print(xworker.window.Array(1, 2))  # this works
+xworker.window.console.log(1, 2)  # this works too
+# xworker.window.console.log(xworker.window.Array(1, 2)) # this doesn't
+# xworker.window.console.log([1, 2]) # also this doesn't
+
+# xworker.window.console.log(to_js({})) # this doesn't neither
diff --git a/pyscript.core/test/matplot.worker.html b/pyscript.core/test/matplot.worker.html
index 9bf1256a..006afb96 100644
--- a/pyscript.core/test/matplot.worker.html
+++ b/pyscript.core/test/matplot.worker.html
@@ -6,19 +6,23 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="micropython">
-            def show_image(event):
-              from js import document
-              img = document.createElement("img")
-              img.style.transform = "scale(.5)"
-              img.src = event.data
-              document.body.appendChild(img)
-
             w = XWorker('./matplot.py', **{'type': 'pyodide', 'config': './config.toml'})
-            w.onmessage = show_image
+
+            # xworker.window made the following completely unnecessary
+
+            # def show_image(event):
+            #   from js import document
+            #   img = document.createElement("img")
+            #   img.style.transform = "scale(.5)"
+            #   img.src = event.data
+            #   document.querySelector("#image").append(img)
+
+            # w.onmessage = show_image
         </script>
+        <div id="image"></div>
     </body>
 </html>
diff --git a/pyscript.core/test/micropython.html b/pyscript.core/test/micropython.html
index e94794b7..205001f3 100644
--- a/pyscript.core/test/micropython.html
+++ b/pyscript.core/test/micropython.html
@@ -6,7 +6,7 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="micropython">
diff --git a/pyscript.core/test/mocked/micropython.mjs b/pyscript.core/test/mocked/micropython.mjs
index 9941feac..763d5e29 100644
--- a/pyscript.core/test/mocked/micropython.mjs
+++ b/pyscript.core/test/mocked/micropython.mjs
@@ -6,4 +6,12 @@ export const loadMicroPython = () => ({
             python.target = document.currentScript.target;
         }
     },
+    globals: {
+        set(name, value) {
+            globalThis[name] = value;
+        },
+        delete(name) {
+            delete globalThis[name];
+        },
+    },
 });
diff --git a/pyscript.core/test/no-sw.html b/pyscript.core/test/no-sw.html
index 22a133ce..74693731 100644
--- a/pyscript.core/test/no-sw.html
+++ b/pyscript.core/test/no-sw.html
@@ -6,7 +6,7 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide">
diff --git a/pyscript.core/test/order.html b/pyscript.core/test/order.html
index fb7cbcae..d482b90e 100644
--- a/pyscript.core/test/order.html
+++ b/pyscript.core/test/order.html
@@ -9,8 +9,9 @@
             {
                 "imports": {
                     "basic-devtools": "../node_modules/basic-devtools/esm/index.js",
-                    "coincident/structured": "../node_modules/coincident/structured.js",
-                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js"
+                    "coincident/window": "../node_modules/coincident/window.js",
+                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js",
+                    "@ungap/structured-clone/json": "../node_modules/@ungap/structured-clone/esm/json.js"
                 }
             }
         </script>
diff --git a/pyscript.core/test/plugins/index.html b/pyscript.core/test/plugins/index.html
index 4a23d509..99e24815 100644
--- a/pyscript.core/test/plugins/index.html
+++ b/pyscript.core/test/plugins/index.html
@@ -10,7 +10,7 @@
             }
         </style>
         <script type="importmap">
-            { "imports": { "@pyscript/core": "../../min.js" } }
+            { "imports": { "@pyscript/core": "../../core.js" } }
         </script>
         <script type="module">
             import { define, whenDefined } from "@pyscript/core";
diff --git a/pyscript.core/test/plugins/lua.html b/pyscript.core/test/plugins/lua.html
index 921dc3f5..1dbd92d1 100644
--- a/pyscript.core/test/plugins/lua.html
+++ b/pyscript.core/test/plugins/lua.html
@@ -10,7 +10,7 @@
             }
         </style>
         <script type="importmap">
-            { "imports": { "@pyscript/core": "../../min.js" } }
+            { "imports": { "@pyscript/core": "../../core.js" } }
         </script>
         <script type="module">
             import { define } from "@pyscript/core";
diff --git a/pyscript.core/test/plugins/py-script.html b/pyscript.core/test/plugins/py-script.html
index 0c57d4b5..b4e7e0d3 100644
--- a/pyscript.core/test/plugins/py-script.html
+++ b/pyscript.core/test/plugins/py-script.html
@@ -3,24 +3,30 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-        <title>PyScript</title>
-        <style>
-            py-script {
-                display: none;
-            }
-        </style>
-        <script type="importmap">
-            { "imports": { "@pyscript/core": "../../min.js" } }
+        <title>PyScript Next</title>
+        <script type="importmap">{ "imports": { "@pyscript/element": "../../pyscript.js" } }</script>
+        <script type="module">
+            // how would PyScript plugins add their own behavior?
+            import { hooks } from "@pyscript/element";
+            let counter = 0;
+            hooks.onBeforeRun.add((pyodide, { localName }) => {
+                // console.log(++counter, 'elements so far', localName, pyodide);
+            });
         </script>
-        <script type="module" src="py-script.js"></script>
     </head>
     <body>
+        <fieldset>
+            <legend id="dary"></legend>
+            Something something about something ...
+        </fieldset>
         <py-config>
             [[fetch]]
             from = "../"
             to_folder = "./"
             files = ["a.py", "b.py"]
         </py-config>
+
+        <!-- <py-script next> -->
         <py-script>
             import js
             import a, b
@@ -29,8 +35,24 @@
             'Hello Web!'
         </py-script>
         <py-script>
+            # note the target is this element itself
+            display('second &lt;py-script&gt;')
+        </py-script>
+        <py-script>
+            # note this is late to the party simply because
+            # pyodide needs to be bootstrapped in the Worker too
             XWorker('../a.py')
             'OK'
         </py-script>
+
+        <!-- <script type="py"> -->
+        <script type="py">
+            # not the target is inferred as companion element
+            display('first <script type="py">')
+        </script>
+        <script type="py">
+            # note the target here is different
+            display('second <script type="py">', target="dary")
+        </script>
     </body>
 </html>
diff --git a/pyscript.core/test/plugins/py-script.js b/pyscript.core/test/plugins/py-script.js
deleted file mode 100644
index 8b05d7b2..00000000
--- a/pyscript.core/test/plugins/py-script.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { define } from "@pyscript/core";
-
-// append ASAP CSS to avoid showing content
-document.head.appendChild(document.createElement("style")).textContent = `
-  py-script, py-config {
-    display: none;
-  }
-`;
-
-// create a unique identifier when/if needed
-let id = 0;
-const getID = (prefix = "py-script") => `${prefix}-${id++}`;
-
-let bootstrap = true,
-    XWorker,
-    sharedRuntime;
-const sharedPyodide = new Promise((resolve) => {
-    const pyConfig = document.querySelector("py-config");
-    const config = pyConfig?.getAttribute("src") || pyConfig?.textContent;
-    define("py", {
-        config,
-        interpreter: "pyodide",
-        codeBeforeRunWorker: `print('codeBeforeRunWorker')`,
-        codeAfterRunWorker: `print('codeAfterRunWorker')`,
-        onBeforeRun(pyodide, node) {
-            pyodide.interpreter.globals.set("XWorker", XWorker);
-            console.log("onBeforeRun", sharedRuntime === pyodide, node);
-        },
-        onAfterRun(pyodide, node) {
-            console.log("onAfterRun", sharedRuntime === pyodide, node);
-        },
-        async onRuntimeReady(pyodide) {
-            // bootstrap the shared runtime once
-            // as each node as plugin gets onRuntimeReady called once
-            // because no custom-element is strictly needed
-            if (bootstrap) {
-                bootstrap = false;
-                sharedRuntime = pyodide;
-                XWorker = pyodide.XWorker;
-                pyodide.io.stdout = (message) => {
-                    console.log("🐍", pyodide.type, message);
-                };
-                // do any module / JS injection in here such as
-                // Element, display, and friends ... then:
-                resolve(pyodide);
-            }
-        },
-    });
-});
-
-/** @type {WeakSet<PyScriptElement>} */
-const known = new WeakSet();
-
-class PyScriptElement extends HTMLElement {
-    constructor() {
-        if (!super().id) this.id = getID();
-    }
-    async connectedCallback() {
-        if (!known.has(this)) {
-            known.add(this);
-            // sharedPyodide contains various helpers including run and runAsync
-            const { run } = await sharedPyodide;
-            // do any stuff needed to finalize this element bootstrap
-            // (i.e. check src attribute and so on)
-            this.replaceChildren(run(this.textContent) || "");
-            // reveal the node on the page
-            this.style.display = "block";
-        }
-    }
-}
-
-customElements.define("py-script", PyScriptElement);
diff --git a/pyscript.core/test/py-events.html b/pyscript.core/test/py-events.html
index 836c2086..89474441 100644
--- a/pyscript.core/test/py-events.html
+++ b/pyscript.core/test/py-events.html
@@ -6,7 +6,7 @@
         <title>python events</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script type="pyodide">
diff --git a/pyscript.core/test/remote.html b/pyscript.core/test/remote.html
index 162cb275..6938f01b 100644
--- a/pyscript.core/test/remote.html
+++ b/pyscript.core/test/remote.html
@@ -6,7 +6,7 @@
         <title>python</title>
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <script
diff --git a/pyscript.core/test/ruby.html b/pyscript.core/test/ruby.html
index 30d24fc9..14a6bdcc 100644
--- a/pyscript.core/test/ruby.html
+++ b/pyscript.core/test/ruby.html
@@ -9,8 +9,9 @@
             {
                 "imports": {
                     "basic-devtools": "../node_modules/basic-devtools/esm/index.js",
-                    "coincident/structured": "../node_modules/coincident/structured.js",
-                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js"
+                    "coincident/window": "../node_modules/coincident/window.js",
+                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js",
+                    "@ungap/structured-clone/json": "../node_modules/@ungap/structured-clone/esm/json.js"
                 }
             }
         </script>
diff --git a/pyscript.core/test/shadow-dom.html b/pyscript.core/test/shadow-dom.html
index a975d352..0c351203 100644
--- a/pyscript.core/test/shadow-dom.html
+++ b/pyscript.core/test/shadow-dom.html
@@ -10,7 +10,7 @@
         <link rel="manifest" href="manifest.json" />
         <link rel="stylesheet" href="style.css" />
         <script defer src="./counter.js"></script>
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
         <script type="module">
             customElements.define(
                 "shadow-dom",
diff --git a/pyscript.core/test/table.html b/pyscript.core/test/table.html
index 9582cf00..5479c6e1 100644
--- a/pyscript.core/test/table.html
+++ b/pyscript.core/test/table.html
@@ -14,7 +14,7 @@
             }
         </style>
         <link rel="stylesheet" href="style.css" />
-        <script type="module" src="../min.js"></script>
+        <script type="module" src="../core.js"></script>
     </head>
     <body>
         <table cellspacing="2" cellpadding="2">
diff --git a/pyscript.core/test/test.html b/pyscript.core/test/test.html
index e74fefef..e9e0b2e6 100644
--- a/pyscript.core/test/test.html
+++ b/pyscript.core/test/test.html
@@ -9,8 +9,9 @@
             {
                 "imports": {
                     "basic-devtools": "../node_modules/basic-devtools/esm/index.js",
-                    "coincident/structured": "../node_modules/coincident/structured.js",
-                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js"
+                    "coincident/window": "../node_modules/coincident/window.js",
+                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js",
+                    "@ungap/structured-clone/json": "../node_modules/@ungap/structured-clone/esm/json.js"
                 }
             }
         </script>
diff --git a/pyscript.core/test/wasmoon.html b/pyscript.core/test/wasmoon.html
index 3da2551e..a2ea615d 100644
--- a/pyscript.core/test/wasmoon.html
+++ b/pyscript.core/test/wasmoon.html
@@ -9,8 +9,9 @@
             {
                 "imports": {
                     "basic-devtools": "../node_modules/basic-devtools/esm/index.js",
-                    "coincident/structured": "../node_modules/coincident/structured.js",
-                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js"
+                    "coincident/window": "../node_modules/coincident/window.js",
+                    "@ungap/with-resolvers": "../node_modules/@ungap/with-resolvers/index.js",
+                    "@ungap/structured-clone/json": "../node_modules/@ungap/structured-clone/esm/json.js"
                 }
             }
         </script>
diff --git a/pyscript.core/test/worker/index.html b/pyscript.core/test/worker/index.html
index 6bd8d3b1..eb5d882d 100644
--- a/pyscript.core/test/worker/index.html
+++ b/pyscript.core/test/worker/index.html
@@ -8,8 +8,9 @@
             {
                 "imports": {
                     "basic-devtools": "../../node_modules/basic-devtools/esm/index.js",
-                    "coincident/structured": "../../node_modules/coincident/structured.js",
+                    "coincident/window": "../../node_modules/coincident/window.js",
                     "@ungap/with-resolvers": "../../node_modules/@ungap/with-resolvers/index.js",
+                    "@ungap/structured-clone/json": "../../node_modules/@ungap/structured-clone/esm/json.js",
                     "@pyscript/core": "../../esm/index.js"
                 }
             }
diff --git a/pyscript.core/test/worker/input.html b/pyscript.core/test/worker/input.html
index a0282e42..53af9dc0 100644
--- a/pyscript.core/test/worker/input.html
+++ b/pyscript.core/test/worker/input.html
@@ -8,8 +8,9 @@
             {
                 "imports": {
                     "basic-devtools": "../../node_modules/basic-devtools/esm/index.js",
-                    "coincident/structured": "../../node_modules/coincident/structured.js",
+                    "coincident/window": "../../node_modules/coincident/window.js",
                     "@ungap/with-resolvers": "../../node_modules/@ungap/with-resolvers/index.js",
+                    "@ungap/structured-clone/json": "../../node_modules/@ungap/structured-clone/esm/json.js",
                     "@pyscript/core": "../../esm/index.js"
                 }
             }