Merge branch 'main' into better-donkey

for more information, see https://pre-commit.ci

core/src/plugins/donkey.js

@@ -2,7 +2,7 @@ import { assign, dedent } from "polyscript/exports";
 
 const invoke = (name, args) => `${name}(code, ${args.join(", ")})`;
 
-export default (options = {}) => {
+const donkey = (options = {}) => {
     const type = options.type || "py";
     const args = options.persistent
         ? ["globals()", "__locals__"]
@@ -44,21 +44,55 @@ export default (options = {}) => {
         script.addEventListener(`${type}:done`, (event) => {
             event.stopPropagation();
             URL.revokeObjectURL(src);
+            let executed = true;
+            let evaluated = true;
             const { xworker, process, terminal } = script;
             const { execute, evaluate } = xworker.sync;
-            script.remove();
+            const kill = () => {
-            resolve({
+                xworker.terminate();
+                terminal.dispose();
+            };
+            const farmer = {
                 process,
-                execute: (code) => execute(dedent(code)),
+                execute: async (code) => {
-                evaluate: (code) => evaluate(dedent(code)),
+                    if (!executed) {
+                        kill();
+                        assign(farmer, await donkey(options));
+                        return farmer.execute(code);
+                    }
+                    executed = false;
+                    try {
+                        const result = await execute(dedent(code));
+                        executed = true;
+                        return result;
+                    } catch (e) {
+                        console.error(e);
+                    }
+                },
+                evaluate: async (code) => {
+                    if (!evaluated) {
+                        kill();
+                        assign(farmer, await donkey(options));
+                        return farmer.evaluate(code);
+                    }
+                    evaluated = false;
+                    try {
+                        const result = await evaluate(dedent(code));
+                        evaluated = true;
+                        return result;
+                    } catch (e) {
+                        console.error(e);
+                    }
+                },
                 clear: () => terminal.clear(),
                 reset: () => terminal.reset(),
-                kill: () => {
+                kill,
-                    xworker.terminate();
+            };
-                    terminal.dispose();
+            resolve(farmer);
-                },
+            script.remove();
-            });
         });
         document.body.append(script);
     });
 };
+
+export default donkey;

core/types/plugins/donkey.d.ts

@@ -1,2 +1,2 @@
-declare function _default(options?: {}): Promise<any>;
+export default donkey;
-export default _default;
+declare function donkey(options?: {}): Promise<any>;