@pyscript/core 0.7.14 → 0.7.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pyscript/core",
-    "version": "0.7.14",
+    "version": "0.7.15",
     "type": "module",
     "description": "PyScript",
     "module": "./index.js",
@@ -71,7 +71,7 @@
         "@webreflection/utils": "^0.1.1",
         "add-promise-listener": "^0.1.3",
         "basic-devtools": "^0.1.6",
-        "polyscript": "^0.20.5",
+        "polyscript": "^0.20.6",
         "sticky-module": "^0.1.1",
         "to-json-callback": "^0.1.1",
         "type-checked-collections": "^0.1.7"
@@ -96,7 +96,7 @@
         "codemirror": "^6.0.2",
         "eslint": "^9.39.2",
         "flatted": "^3.3.3",
-        "rollup": "^4.55.3",
+        "rollup": "^4.56.0",
         "rollup-plugin-postcss": "^4.0.2",
         "rollup-plugin-string": "^3.0.0",
         "static-handler": "^0.5.3",

package/src/core.js

@@ -180,201 +180,189 @@ for (const [TYPE, interpreter] of TYPES) {
         });
     };
 
-    // define the module as both `<script type="py">` and `<py-script>`
-    // but only if the config didn't throw an error
-    if (!error) {
-        // ensure plugins are bootstrapped already before custom type definition
-        // NOTE: we cannot top-level await in here as plugins import other utilities
-        //       from core.js itself so that custom definition should not be blocking.
-        plugins().then(() => {
-            // possible early errors sent by polyscript
-            const errors = new Map();
-
-            // specific main and worker hooks
-            const hooks = {
-                main: {
-                    ...codeFor(main, TYPE),
-                    async onReady(wrap, element) {
-                        registerModule(wrap);
-
-                        // allows plugins to do whatever they want with the element
-                        // before regular stuff happens in here
-                        for (const callback of main("onReady"))
-                            await callback(wrap, element);
-
-                        // now that all possible plugins are configured,
-                        // bail out if polyscript encountered an error
-                        if (errors.has(element)) {
-                            let { message } = errors.get(element);
-                            errors.delete(element);
-                            const clone = message === INVALID_CONTENT;
-                            message = `(${ErrorCode.CONFLICTING_CODE}) ${message} for `;
-                            message += element.cloneNode(clone).outerHTML;
-                            wrap.io.stderr(message);
-                            return;
-                        }
+    // ensure plugins are bootstrapped already before custom type definition
+    // NOTE: we cannot top-level await in here as plugins import other utilities
+    //       from core.js itself so that custom definition should not be blocking.
+    plugins().then(() => {
+        // let plugins logic decide how to show the error but stop here if any
+        if (error) return;
+
+        // possible early errors sent by polyscript
+        const errors = new Map();
+
+        // specific main and worker hooks
+        const hooks = {
+            main: {
+                ...codeFor(main, TYPE),
+                async onReady(wrap, element) {
+                    registerModule(wrap);
+
+                    // allows plugins to do whatever they want with the element
+                    // before regular stuff happens in here
+                    for (const callback of main("onReady"))
+                        await callback(wrap, element);
+
+                    // now that all possible plugins are configured,
+                    // bail out if polyscript encountered an error
+                    if (errors.has(element)) {
+                        let { message } = errors.get(element);
+                        errors.delete(element);
+                        const clone = message === INVALID_CONTENT;
+                        message = `(${ErrorCode.CONFLICTING_CODE}) ${message} for `;
+                        message += element.cloneNode(clone).outerHTML;
+                        wrap.io.stderr(message);
+                        return;
+                    }
 
-                        if (isScript(element)) {
-                            const isAsync = !isSync(element);
-                            const target = element.getAttribute("target");
-                            const show = target
-                                ? queryTarget(element, target)
-                                : document.createElement("script-py");
-
-                            if (!target) {
-                                const { head, body } = document;
-                                if (head.contains(element)) body.append(show);
-                                else 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 });
-
-                            // notify before the code runs
-                            dispatch(element, TYPE, "ready");
-                            dispatchDone(
-                                element,
-                                isAsync,
-                                wrap[`run${isAsync ? "Async" : ""}`](
-                                    await fetchSource(element, wrap.io, true),
-                                ),
-                            );
-                        } else {
-                            // resolve PyScriptElement to allow connectedCallback
-                            element._wrap.resolve(wrap);
+                    if (isScript(element)) {
+                        const isAsync = !isSync(element);
+                        const target = element.getAttribute("target");
+                        const show = target
+                            ? queryTarget(element, target)
+                            : document.createElement("script-py");
+
+                        if (!target) {
+                            const { head, body } = document;
+                            if (head.contains(element)) body.append(show);
+                            else element.after(show);
                         }
-                        console.debug("[pyscript/main] PyScript Ready");
-                    },
-                    onWorker(_, xworker) {
-                        assign(xworker.sync, sync);
-                        for (const callback of main("onWorker"))
-                            callback(_, xworker);
-                    },
-                    onBeforeRun(wrap, element) {
-                        currentElement = element;
-                        bootstrapNodeAndPlugins(
-                            main,
-                            wrap,
-                            element,
-                            "onBeforeRun",
-                        );
-                    },
-                    onBeforeRunAsync(wrap, element) {
-                        currentElement = element;
-                        return bootstrapNodeAndPlugins(
-                            main,
-                            wrap,
-                            element,
-                            "onBeforeRunAsync",
-                        );
-                    },
-                    onAfterRun(wrap, element) {
-                        bootstrapNodeAndPlugins(
-                            main,
-                            wrap,
-                            element,
-                            "onAfterRun",
-                        );
-                    },
-                    onAfterRunAsync(wrap, element) {
-                        return bootstrapNodeAndPlugins(
-                            main,
-                            wrap,
+                        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 });
+
+                        // notify before the code runs
+                        dispatch(element, TYPE, "ready");
+                        dispatchDone(
                             element,
-                            "onAfterRunAsync",
+                            isAsync,
+                            wrap[`run${isAsync ? "Async" : ""}`](
+                                await fetchSource(element, wrap.io, true),
+                            ),
                         );
-                    },
+                    } else {
+                        // resolve PyScriptElement to allow connectedCallback
+                        element._wrap.resolve(wrap);
+                    }
+                    console.debug("[pyscript/main] PyScript Ready");
                 },
-                worker: {
-                    ...codeFor(worker, TYPE),
-                    // these are lazy getters that returns a composition
-                    // of the current hooks or undefined, if no hook is present
-                    get onReady() {
-                        return createFunction(this, "onReady", true);
-                    },
-                    get onBeforeRun() {
-                        return createFunction(this, "onBeforeRun", false);
-                    },
-                    get onBeforeRunAsync() {
-                        return createFunction(this, "onBeforeRunAsync", true);
-                    },
-                    get onAfterRun() {
-                        return createFunction(this, "onAfterRun", false);
-                    },
-                    get onAfterRunAsync() {
-                        return createFunction(this, "onAfterRunAsync", true);
-                    },
+                onWorker(_, xworker) {
+                    assign(xworker.sync, sync);
+                    for (const callback of main("onWorker"))
+                        callback(_, xworker);
                 },
-            };
-
-            hooked.set(TYPE, hooks);
-
-            // allow offline interpreter detection via [offline] attribute
-            let version = offline_interpreter(config);
-            if (!version) {
-                const css = "script[type='module'][offline]";
-                const s = document.querySelector(css)?.src;
-                if (s && import.meta.url.startsWith(s.replace(/\.js$/, ""))) {
-                    version = `./pyscript/${interpreter}/${interpreter}.mjs`;
-                    version = offline_interpreter({ interpreter: version });
-                }
-            }
-
-            define(TYPE, {
-                config,
-                configURL,
-                interpreter,
-                hooks,
-                version,
-                env: `${TYPE}-script`,
-                onerror(error, element) {
-                    errors.set(element, error);
+                onBeforeRun(wrap, element) {
+                    currentElement = element;
+                    bootstrapNodeAndPlugins(main, wrap, element, "onBeforeRun");
                 },
-            });
-
-            customElements.define(
-                `${TYPE}-script`,
-                class extends HTMLElement {
-                    constructor() {
-                        assign(super(), {
-                            _wrap: withResolvers(),
-                            srcCode: "",
-                            executed: false,
-                        });
-                    }
-                    get id() {
-                        return super.id || (super.id = getID());
-                    }
-                    set id(value) {
-                        super.id = value;
-                    }
-                    async connectedCallback() {
-                        if (!this.executed) {
-                            this.executed = true;
-                            const isAsync = !isSync(this);
-                            const { io, run, runAsync } = await this._wrap
-                                .promise;
-                            this.srcCode = await fetchSource(
-                                this,
-                                io,
-                                !this.childElementCount,
-                            );
-                            this.replaceChildren();
-                            this.style.display = "block";
-                            dispatch(this, TYPE, "ready");
-                            dispatchDone(
-                                this,
-                                isAsync,
-                                (isAsync ? runAsync : run)(this.srcCode),
-                            );
-                        }
-                    }
+                onBeforeRunAsync(wrap, element) {
+                    currentElement = element;
+                    return bootstrapNodeAndPlugins(
+                        main,
+                        wrap,
+                        element,
+                        "onBeforeRunAsync",
+                    );
                 },
-            );
+                onAfterRun(wrap, element) {
+                    bootstrapNodeAndPlugins(main, wrap, element, "onAfterRun");
+                },
+                onAfterRunAsync(wrap, element) {
+                    return bootstrapNodeAndPlugins(
+                        main,
+                        wrap,
+                        element,
+                        "onAfterRunAsync",
+                    );
+                },
+            },
+            worker: {
+                ...codeFor(worker, TYPE),
+                // these are lazy getters that returns a composition
+                // of the current hooks or undefined, if no hook is present
+                get onReady() {
+                    return createFunction(this, "onReady", true);
+                },
+                get onBeforeRun() {
+                    return createFunction(this, "onBeforeRun", false);
+                },
+                get onBeforeRunAsync() {
+                    return createFunction(this, "onBeforeRunAsync", true);
+                },
+                get onAfterRun() {
+                    return createFunction(this, "onAfterRun", false);
+                },
+                get onAfterRunAsync() {
+                    return createFunction(this, "onAfterRunAsync", true);
+                },
+            },
+        };
+
+        hooked.set(TYPE, hooks);
+
+        // allow offline interpreter detection via [offline] attribute
+        let version = offline_interpreter(config);
+        if (!version) {
+            const css = "script[type='module'][offline]";
+            const s = document.querySelector(css)?.src;
+            if (s && import.meta.url.startsWith(s.replace(/\.js$/, ""))) {
+                version = `./pyscript/${interpreter}/${interpreter}.mjs`;
+                version = offline_interpreter({ interpreter: version });
+            }
+        }
+
+        define(TYPE, {
+            config,
+            configURL,
+            interpreter,
+            hooks,
+            version,
+            env: `${TYPE}-script`,
+            onerror(error, element) {
+                errors.set(element, error);
+            },
         });
-    }
+
+        customElements.define(
+            `${TYPE}-script`,
+            class extends HTMLElement {
+                constructor() {
+                    assign(super(), {
+                        _wrap: withResolvers(),
+                        srcCode: "",
+                        executed: false,
+                    });
+                }
+                get id() {
+                    return super.id || (super.id = getID());
+                }
+                set id(value) {
+                    super.id = value;
+                }
+                async connectedCallback() {
+                    if (!this.executed) {
+                        this.executed = true;
+                        const isAsync = !isSync(this);
+                        const { io, run, runAsync } = await this._wrap.promise;
+                        this.srcCode = await fetchSource(
+                            this,
+                            io,
+                            !this.childElementCount,
+                        );
+                        this.replaceChildren();
+                        this.style.display = "block";
+                        dispatch(this, TYPE, "ready");
+                        dispatchDone(
+                            this,
+                            isAsync,
+                            (isAsync ? runAsync : run)(this.srcCode),
+                        );
+                    }
+                }
+            },
+        );
+    });
 
     // export the used config without allowing leaks through it
     exportedConfig[TYPE] = structuredClone(config);

package/dist/toml-BK2RWy-G.js

@@ -1,3 +0,0 @@
-/*! (c) Andrea Giammarchi - ISC */
-const{isArray:e}=Array,{parse:r}=JSON,s=(e,{s:r})=>e.replace(/"s(\d+)"/g,(e,s)=>r[s]),t=(e,s)=>r(e.replace(/(\S+?)\s*=/g,'"$1":'),(e,r)=>"string"==typeof r?s[r[0]][r.slice(1)]:r),p=(r,t,p,l)=>{for(let n=0,{length:a}=r,c=a-1;n<a;n++){const a=s(r[n],t);p=p[a]||(p[a]=l&&n===c?[]:{}),e(p)&&(n!==c&&p.length||p.push({}),p=p.at(-1))}return p},l=e=>{const[r,l]=((e,r,s)=>[e.replace(/(["'])(?:(?=(\\?))\2.)*?\1/g,e=>`"s${r.push(e.slice(1,-1))-1}"`).replace(/\d{2,}([:-]\d{2}){2}([ T:-][\dZ:-]+)?/g,e=>`"d${s.push(new Date(e))-1}"`).replace(/,\s*[\r\n]+/g,", ").replace(/\[\s*[\r\n]+/g,"[").replace(/[\r\n]+\s*]/g,"]"),{s:r,d:s}])(e,[],[]),n={};let a=n;for(let e of r.split(/[\r\n]+/))if((e=e.trim())&&!e.startsWith("#"))if(/^(\[+)(.*?)\]+/.test(e))a=p(RegExp.$2.trim().split("."),l,n,"["!==RegExp.$1);else if(/^(\S+?)\s*=([^#]+)/.test(e)){const{$1:e,$2:r}=RegExp;a[s(e,l)]=t(r.trim(),l)}return n};export{l as parse};
-//# sourceMappingURL=toml-BK2RWy-G.js.map

package/dist/toml-BK2RWy-G.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"toml-BK2RWy-G.js","sources":["../node_modules/polyscript/esm/3rd-party/toml.js"],"sourcesContent":["/* c8 ignore start */\n/*! (c) Andrea Giammarchi - ISC */\n\nconst {isArray} = Array;\nconst {parse: jsonParse} = JSON;\n\n/** @typedef {{s: string[], d: Date[]}} Foreign foreign strings and dates */\n\n/**\n * Transform quoted keys into regular keys.\n * @param {string} str the key to eventually normalize\n * @param {Foreign} foreign foreign strings and dates\n * @returns \n */\nconst getKey = (str, {s}) => str.replace(/\"s(\\d+)\"/g, (_, $1) => s[$1]);\n\n/**\n * Given a `'string'` or a `\"string\"` returns a JSON compatible string.\n * @param {string} str a TOML entry to parse\n * @param {Foreign} foreign foreign strings and dates\n * @returns {string}\n */\nconst getValue = (str, foreign) => jsonParse(\n  str.replace(/(\\S+?)\\s*=/g, '\"$1\":'),\n  (_, value) => typeof value === 'string' ?\n    foreign[value[0]][value.slice(1)] :\n    value\n);\n\n/**\n * Crawl the `json` object via the given array of keys and handle array entries.\n * @param {string[]} keys a path with all keys to reach the entry\n * @param {Foreign} foreign foreign strings and dates\n * @param {object} entry the root entry of the TOML\n * @param {boolean} asArray handle array entries\n * @returns {object} the current entry to handle\n */\nconst getPath = (keys, foreign, entry, asArray) => {\n  for (let i = 0, {length} = keys, last = length - 1; i < length; i++) {\n    const key = getKey(keys[i], foreign);\n    entry = entry[key] || (entry[key] = (asArray && (i === last) ? [] : {}));\n    if (isArray(entry)) {\n      if ((i === last) || !entry.length)\n        entry.push({});\n      entry = entry.at(-1);\n    }\n  }\n  return entry;\n};\n\n/**\n * Given a TOML text, removes stirngs and dates for easier parsing +\n * remove multi-line arrays to not need evaluation.\n * @param {string} toml the TOML text to map\n * @param {string[]} strings mapped strings\n * @param {Date[]} dates mapped Dates\n * @returns {[string, Foreign]}\n */\nconst mapForeign = (toml, strings, dates) => [\n  toml\n    // map strings in the TOML\n    .replace(\n      /([\"'])(?:(?=(\\\\?))\\2.)*?\\1/g,\n      value => `\"s${strings.push(value.slice(1, -1)) - 1}\"`\n    )\n    // map dates in the TOML\n    .replace(\n      /\\d{2,}([:-]\\d{2}){2}([ T:-][\\dZ:-]+)?/g,\n      value => `\"d${dates.push(new Date(value)) - 1}\"`\n    )\n    // avoid multi-line array entries\n    .replace(/,\\s*[\\r\\n]+/g, ', ')\n    .replace(/\\[\\s*[\\r\\n]+/g, '[')\n    .replace(/[\\r\\n]+\\s*]/g, ']'),\n  {s: strings, d: dates}\n];\n\n/**\n * Given a simple subset of a TOML file, returns its JS equivalent.\n * @param {string} toml the TOML text to parse\n * @returns {object} the TOML equivalent as JSON serializable\n */\nconst parse = toml => {\n  const [text, foreign] = mapForeign(toml, [], []);\n  const json = {};\n  let entry = json;\n  for (let line of text.split(/[\\r\\n]+/)) {\n    if ((line = line.trim()) && !line.startsWith('#')) {\n      if (/^(\\[+)(.*?)\\]+/.test(line))\n        entry = getPath(RegExp.$2.trim().split('.'), foreign, json, RegExp.$1 !== '[');\n      else if (/^(\\S+?)\\s*=([^#]+)/.test(line)) {\n        const {$1: key, $2: value} = RegExp;\n        entry[getKey(key, foreign)] = getValue(value.trim(), foreign);\n      }\n    }\n  }\n  return json;\n};\n\nexport { parse };\n\n/* c8 ignore stop */\n"],"names":["isArray","Array","parse","jsonParse","JSON","getKey","str","s","replace","_","$1","getValue","foreign","value","slice","getPath","keys","entry","asArray","i","length","last","key","push","at","toml","text","strings","dates","Date","d","mapForeign","json","line","split","trim","startsWith","test","RegExp","$2"],"mappings":";AAGA,MAAMA,QAACA,GAAWC,OACXC,MAAOC,GAAaC,KAUrBC,EAAS,CAACC,GAAMC,OAAOD,EAAIE,QAAQ,YAAa,CAACC,EAAGC,IAAOH,EAAEG,IAQ7DC,EAAW,CAACL,EAAKM,IAAYT,EACjCG,EAAIE,QAAQ,cAAe,SAC3B,CAACC,EAAGI,IAA2B,iBAAVA,EACnBD,EAAQC,EAAM,IAAIA,EAAMC,MAAM,IAC9BD,GAWEE,EAAU,CAACC,EAAMJ,EAASK,EAAOC,KACrC,IAAK,IAAIC,EAAI,GAAGC,OAACA,GAAUJ,EAAMK,EAAOD,EAAS,EAAGD,EAAIC,EAAQD,IAAK,CACnE,MAAMG,EAAMjB,EAAOW,EAAKG,GAAIP,GAC5BK,EAAQA,EAAMK,KAASL,EAAMK,GAAQJ,GAAYC,IAAME,EAAQ,GAAK,CAAA,GAChErB,EAAQiB,KACLE,IAAME,GAAUJ,EAAMG,QACzBH,EAAMM,KAAK,IACbN,EAAQA,EAAMO,OAElB,CACA,OAAOP,GAmCHf,EAAQuB,IACZ,MAAOC,EAAMd,GAzBI,EAACa,EAAME,EAASC,IAAU,CAC3CH,EAEGjB,QACC,8BACAK,GAAS,KAAKc,EAAQJ,KAAKV,EAAMC,MAAM,GAAG,IAAO,MAGlDN,QACC,yCACAK,GAAS,KAAKe,EAAML,KAAK,IAAIM,KAAKhB,IAAU,MAG7CL,QAAQ,eAAgB,MACxBA,QAAQ,gBAAiB,KACzBA,QAAQ,eAAgB,KAC3B,CAACD,EAAGoB,EAASG,EAAGF,IASQG,CAAWN,EAAM,GAAI,IACvCO,EAAO,CAAA,EACb,IAAIf,EAAQe,EACZ,IAAK,IAAIC,KAAQP,EAAKQ,MAAM,WAC1B,IAAKD,EAAOA,EAAKE,UAAYF,EAAKG,WAAW,KAC3C,GAAI,iBAAiBC,KAAKJ,GACxBhB,EAAQF,EAAQuB,OAAOC,GAAGJ,OAAOD,MAAM,KAAMtB,EAASoB,EAAoB,MAAdM,OAAO5B,SAChE,GAAI,qBAAqB2B,KAAKJ,GAAO,CACxC,MAAOvB,GAAIY,EAAKiB,GAAI1B,GAASyB,OAC7BrB,EAAMZ,EAAOiB,EAAKV,IAAYD,EAASE,EAAMsB,OAAQvB,EACvD,CAGJ,OAAOoB","x_google_ignoreList":[0]}