@pyscript/core 0.6.4 → 0.6.5

package/src/plugins/donkey.js

@@ -1,64 +1,108 @@
+import addPromiseListener from "add-promise-listener";
 import { assign, dedent } from "polyscript/exports";
 
+const { stringify } = JSON;
+
 const invoke = (name, args) => `${name}(code, ${args.join(", ")})`;
 
-export default (options = {}) => {
-    const type = options.type || "py";
-    const args = options.persistent
-        ? ["globals()", "__locals__"]
-        : ["{}", "{}"];
+const donkey = ({ type = "py", persistent, terminal, config }) => {
+    const args = persistent ? ["globals()", "__locals__"] : ["{}", "{}"];
+
     const src = URL.createObjectURL(
         new Blob([
-            dedent(`
-                from pyscript import sync, config
-                __message__ = lambda e,v: f"\x1b[31m\x1b[1m{e.__name__}\x1b[0m: {v}"
-                __locals__ = {}
-                if config["type"] == "py":
-                    import sys
-                    def __error__(_):
-                        info = sys.exc_info()
-                        return __message__(info[0], info[1])
-                else:
-                    __error__ = lambda e: __message__(e.__class__, e.value)
-                def execute(code):
-                    try: return ${invoke("exec", args)};
-                    except Exception as e: print(__error__(e));
-                def evaluate(code):
-                    try: return ${invoke("eval", args)};
-                    except Exception as e: print(__error__(e));
-                sync.execute = execute
-                sync.evaluate = evaluate
-            `),
+            [
+                // this array is to better minify this code once in production
+                "from pyscript import sync, config",
+                '__message__ = lambda e,v: f"\x1b[31m\x1b[1m{e.__name__}\x1b[0m: {v}"',
+                "__locals__ = {}",
+                'if config["type"] == "py":',
+                "	import sys",
+                "	def __error__(_):",
+                "		info = sys.exc_info()",
+                "		return __message__(info[0], info[1])",
+                "else:",
+                "	__error__ = lambda e: __message__(e.__class__, e.value)",
+                "def execute(code):",
+                `	try: return ${invoke("exec", args)};`,
+                "	except Exception as e: print(__error__(e));",
+                "def evaluate(code):",
+                `	try: return ${invoke("eval", args)};`,
+                "	except Exception as e: print(__error__(e));",
+                "sync.execute = execute",
+                "sync.evaluate = evaluate",
+            ].join("\n"),
         ]),
     );
 
+    // create the script that exposes the code to execute or evaluate
     const script = assign(document.createElement("script"), { type, src });
-
     script.toggleAttribute("worker", true);
     script.toggleAttribute("terminal", true);
-    if (options.terminal) script.setAttribute("target", options.terminal);
-    if (options.config)
-        script.setAttribute("config", JSON.stringify(options.config));
+    if (terminal) script.setAttribute("target", terminal);
+    if (config) {
+        script.setAttribute(
+            "config",
+            typeof config === "string" ? config : stringify(config),
+        );
+    }
 
-    return new Promise((resolve) => {
-        script.addEventListener(`${type}:done`, (event) => {
-            event.stopPropagation();
-            URL.revokeObjectURL(src);
-            const { xworker, process, terminal } = script;
-            const { execute, evaluate } = xworker.sync;
-            script.remove();
-            resolve({
-                process,
-                execute: (code) => execute(dedent(code)),
-                evaluate: (code) => evaluate(dedent(code)),
-                clear: () => terminal.clear(),
-                reset: () => terminal.reset(),
-                kill: () => {
-                    xworker.terminate();
-                    terminal.dispose();
-                },
-            });
-        });
-        document.body.append(script);
+    return addPromiseListener(
+        document.body.appendChild(script),
+        `${type}:done`,
+        { stopPropagation: true },
+    ).then(() => {
+        URL.revokeObjectURL(src);
+        return script;
     });
 };
+
+const utils = async (options) => {
+    const script = await donkey(options);
+    const { xworker, process, terminal } = script;
+    const { execute, evaluate } = xworker.sync;
+    script.remove();
+    return {
+        xworker,
+        process,
+        terminal,
+        execute,
+        evaluate,
+    };
+};
+
+export default async (options = {}) => {
+    let farmer = await utils(options);
+    let working = false;
+    const asyncTask = (method) => async (code) => {
+        // race condition ... a new task has been
+        // assigned while the previous one didn't finish
+        if (working) {
+            kill();
+            farmer = await utils(options);
+        }
+        working = true;
+        try {
+            return await farmer[method](dedent(code));
+        } catch (e) {
+            console.error(e);
+        } finally {
+            working = false;
+        }
+    };
+    const kill = () => {
+        if (farmer) {
+            farmer.xworker.terminate();
+            farmer.terminal.dispose();
+            farmer = null;
+            working = false;
+        }
+    };
+    return {
+        process: asyncTask("process"),
+        execute: asyncTask("execute"),
+        evaluate: asyncTask("evaluate"),
+        clear: () => farmer?.terminal.clear(),
+        reset: () => farmer?.terminal.reset(),
+        kill,
+    };
+};

package/types/core.d.ts

@@ -1,4 +1,11 @@
-export function donkey(options: any): Promise<any>;
+export function donkey(options: any): Promise<{
+    process: (code: any) => Promise<any>;
+    execute: (code: any) => Promise<any>;
+    evaluate: (code: any) => Promise<any>;
+    clear: () => any;
+    reset: () => any;
+    kill: () => void;
+}>;
 export function offline_interpreter(config: any): string;
 import { stdlib } from "./stdlib.js";
 import { optional } from "./stdlib.js";

package/types/plugins/donkey.d.ts

@@ -1,2 +1,9 @@
-declare function _default(options?: {}): Promise<any>;
+declare function _default(options?: {}): Promise<{
+    process: (code: any) => Promise<any>;
+    execute: (code: any) => Promise<any>;
+    evaluate: (code: any) => Promise<any>;
+    clear: () => any;
+    reset: () => any;
+    kill: () => void;
+}>;
 export default _default;

package/dist/donkey-4afK0Hep.js

@@ -1,2 +0,0 @@
-import{d as e,a as t}from"./core-C6pIgnlT.js";const r=(e,t)=>`${e}(code, ${t.join(", ")})`;var n=(n={})=>{const o=n.type||"py",s=n.persistent?["globals()","__locals__"]:["{}","{}"],a=URL.createObjectURL(new Blob([e(`\n                from pyscript import sync, config\n                __message__ = lambda e,v: f"{e.__name__}: {v}"\n                __locals__ = {}\n                if config["type"] == "py":\n                    import sys\n                    def __error__(_):\n                        info = sys.exc_info()\n                        return __message__(info[0], info[1])\n                else:\n                    __error__ = lambda e: __message__(e.__class__, e.value)\n                def execute(code):\n                    try: return ${r("exec",s)};\n                    except Exception as e: print(__error__(e));\n                def evaluate(code):\n                    try: return ${r("eval",s)};\n                    except Exception as e: print(__error__(e));\n                sync.execute = execute\n                sync.evaluate = evaluate\n            `)])),_=t(document.createElement("script"),{type:o,src:a});return _.toggleAttribute("worker",!0),_.toggleAttribute("terminal",!0),n.terminal&&_.setAttribute("target",n.terminal),n.config&&_.setAttribute("config",JSON.stringify(n.config)),new Promise((t=>{_.addEventListener(`${o}:done`,(r=>{r.stopPropagation(),URL.revokeObjectURL(a);const{xworker:n,process:o,terminal:s}=_,{execute:c,evaluate:i}=n.sync;_.remove(),t({process:o,execute:t=>c(e(t)),evaluate:t=>i(e(t)),clear:()=>s.clear(),reset:()=>s.reset(),kill:()=>{n.terminate(),s.dispose()}})})),document.body.append(_)}))};export{n as default};
-//# sourceMappingURL=donkey-4afK0Hep.js.map

package/dist/donkey-4afK0Hep.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"donkey-4afK0Hep.js","sources":["../src/plugins/donkey.js"],"sourcesContent":["import { assign, dedent } from \"polyscript/exports\";\n\nconst invoke = (name, args) => `${name}(code, ${args.join(\", \")})`;\n\nexport default (options = {}) => {\n    const type = options.type || \"py\";\n    const args = options.persistent\n        ? [\"globals()\", \"__locals__\"]\n        : [\"{}\", \"{}\"];\n    const src = URL.createObjectURL(\n        new Blob([\n            dedent(`\n                from pyscript import sync, config\n                __message__ = lambda e,v: f\"\\x1b[31m\\x1b[1m{e.__name__}\\x1b[0m: {v}\"\n                __locals__ = {}\n                if config[\"type\"] == \"py\":\n                    import sys\n                    def __error__(_):\n                        info = sys.exc_info()\n                        return __message__(info[0], info[1])\n                else:\n                    __error__ = lambda e: __message__(e.__class__, e.value)\n                def execute(code):\n                    try: return ${invoke(\"exec\", args)};\n                    except Exception as e: print(__error__(e));\n                def evaluate(code):\n                    try: return ${invoke(\"eval\", args)};\n                    except Exception as e: print(__error__(e));\n                sync.execute = execute\n                sync.evaluate = evaluate\n            `),\n        ]),\n    );\n\n    const script = assign(document.createElement(\"script\"), { type, src });\n\n    script.toggleAttribute(\"worker\", true);\n    script.toggleAttribute(\"terminal\", true);\n    if (options.terminal) script.setAttribute(\"target\", options.terminal);\n    if (options.config)\n        script.setAttribute(\"config\", JSON.stringify(options.config));\n\n    return new Promise((resolve) => {\n        script.addEventListener(`${type}:done`, (event) => {\n            event.stopPropagation();\n            URL.revokeObjectURL(src);\n            const { xworker, process, terminal } = script;\n            const { execute, evaluate } = xworker.sync;\n            script.remove();\n            resolve({\n                process,\n                execute: (code) => execute(dedent(code)),\n                evaluate: (code) => evaluate(dedent(code)),\n                clear: () => terminal.clear(),\n                reset: () => terminal.reset(),\n                kill: () => {\n                    xworker.terminate();\n                    terminal.dispose();\n                },\n            });\n        });\n        document.body.append(script);\n    });\n};\n"],"names":["invoke","name","args","join","donkey","options","type","persistent","src","URL","createObjectURL","Blob","dedent","script","assign","document","createElement","toggleAttribute","terminal","setAttribute","config","JSON","stringify","Promise","resolve","addEventListener","event","stopPropagation","revokeObjectURL","xworker","process","execute","evaluate","sync","remove","code","clear","reset","kill","terminate","dispose","body","append"],"mappings":"8CAEA,MAAMA,EAAS,CAACC,EAAMC,IAAS,GAAGD,WAAcC,EAAKC,KAAK,SAE1D,IAAAC,EAAe,CAACC,EAAU,CAAA,KACtB,MAAMC,EAAOD,EAAQC,MAAQ,KACvBJ,EAAOG,EAAQE,WACf,CAAC,YAAa,cACd,CAAC,KAAM,MACPC,EAAMC,IAAIC,gBACZ,IAAIC,KAAK,CACLC,EAAO,8iBAYeZ,EAAO,OAAQE,8IAGfF,EAAO,OAAQE,2KAQvCW,EAASC,EAAOC,SAASC,cAAc,UAAW,CAAEV,OAAME,QAQhE,OANAK,EAAOI,gBAAgB,UAAU,GACjCJ,EAAOI,gBAAgB,YAAY,GAC/BZ,EAAQa,UAAUL,EAAOM,aAAa,SAAUd,EAAQa,UACxDb,EAAQe,QACRP,EAAOM,aAAa,SAAUE,KAAKC,UAAUjB,EAAQe,SAElD,IAAIG,SAASC,IAChBX,EAAOY,iBAAiB,GAAGnB,UAAcoB,IACrCA,EAAMC,kBACNlB,IAAImB,gBAAgBpB,GACpB,MAAMqB,QAAEA,EAAOC,QAAEA,EAAOZ,SAAEA,GAAaL,GACjCkB,QAAEA,EAAOC,SAAEA,GAAaH,EAAQI,KACtCpB,EAAOqB,SACPV,EAAQ,CACJM,UACAC,QAAUI,GAASJ,EAAQnB,EAAOuB,IAClCH,SAAWG,GAASH,EAASpB,EAAOuB,IACpCC,MAAO,IAAMlB,EAASkB,QACtBC,MAAO,IAAMnB,EAASmB,QACtBC,KAAM,KACFT,EAAQU,YACRrB,EAASsB,SAAS,GAExB,IAENzB,SAAS0B,KAAKC,OAAO7B,EAAO,GAC9B"}