Fix #2360 - Better shared env/setup handling

WebReflection · WebReflection · commit dd369d4cfb9f · 2025-07-10T09:26:47.000-04:00
diff --git a/core/package-lock.json b/core/package-lock.json
diff --git a/core/package.json b/core/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@pyscript/core",
-    "version": "0.6.64",
+    "version": "0.6.65",
     "type": "module",
     "description": "PyScript",
     "module": "./index.js",
@@ -70,7 +70,7 @@
         "@webreflection/utils": "^0.1.1",
         "add-promise-listener": "^0.1.3",
         "basic-devtools": "^0.1.6",
-        "polyscript": "^0.18.1",
+        "polyscript": "^0.18.2",
         "sticky-module": "^0.1.1",
         "to-json-callback": "^0.1.1",
         "type-checked-collections": "^0.1.7"
@@ -81,7 +81,7 @@
         "@codemirror/language": "^6.11.2",
         "@codemirror/state": "^6.5.2",
         "@codemirror/view": "^6.38.0",
-        "@playwright/test": "^1.53.2",
+        "@playwright/test": "^1.54.0",
         "@rollup/plugin-commonjs": "^28.0.6",
         "@rollup/plugin-node-resolve": "^16.0.1",
         "@rollup/plugin-terser": "^0.4.4",
diff --git a/core/src/plugins/py-editor.js b/core/src/plugins/py-editor.js
@@ -38,7 +38,7 @@ const getRelatedScript = (target, type) => {
     return editor?.parentNode?.previousElementSibling;
 };
 
-async function execute({ currentTarget }) {
+async function execute({ currentTarget, script }) {
     const { env, pySrc, outDiv } = this;
     const hasRunButton = !!currentTarget;
 
@@ -91,14 +91,13 @@ async function execute({ currentTarget }) {
         // creation and destruction of editors on the fly
         if (hasRunButton) {
             for (const type of TYPES.keys()) {
-                const script = getRelatedScript(currentTarget, type);
-                if (script) {
-                    defineProperties(script, { xworker: { value: xworker } });
-                    break;
-                }
+                script = getRelatedScript(currentTarget, type);
+                if (script) break;
             }
         }
 
+        defineProperties(script, { xworker: { value: xworker } });
+
         const { sync } = xworker;
         const { promise, resolve } = withResolvers();
         envs.set(env, promise);
@@ -157,6 +156,20 @@ async function execute({ currentTarget }) {
     });
 }
 
+const replaceScript = (script, type) => {
+    script.xworker?.terminate();
+    const clone = script.cloneNode(true);
+    clone.type = `${type}-editor`;
+    const editor = editors.get(script);
+    if (editor) {
+        const content = editor.state.doc.toString();
+        clone.textContent = content;
+        editors.delete(script);
+        script.nextElementSibling.remove();
+    }
+    script.replaceWith(clone);
+};
+
 const makeRunButton = (handler, type) => {
     const runButton = document.createElement("button");
     runButton.className = `absolute ${type}-editor-run-button`;
@@ -169,15 +182,25 @@ const makeRunButton = (handler, type) => {
         ) {
             const script = getRelatedScript(runButton, type);
             if (script) {
-                const editor = editors.get(script);
-                const content = editor.state.doc.toString();
-                const clone = script.cloneNode(true);
-                clone.type = `${type}-editor`;
-                clone.textContent = content;
-                script.xworker.terminate();
-                script.nextElementSibling.remove();
-                script.replaceWith(clone);
-                editors.delete(script);
+                const env = script.getAttribute("env");
+                // remove the bootstrapped env which could be one or shared
+                if (env) {
+                    for (const [key, value] of TYPES) {
+                        if (key === type) {
+                            configs.delete(`${value}-${env}`);
+                            envs.delete(`${value}-${env}`);
+                            break;
+                        }
+                    }
+                }
+                // lonley script without setup node should be replaced
+                if (script.xworker) replaceScript(script, type);
+                // all scripts sharing the same env should be replaced
+                else {
+                    const sel = `script[type^="${type}-editor"][env="${env}"]`;
+                    for (const script of document.querySelectorAll(sel))
+                        replaceScript(script, type);
+                }
             }
             return;
         }
@@ -365,7 +388,7 @@ const init = async (script, type, interpreter) => {
     };
 
     if (isSetup) {
-        await context.handleEvent({ currentTarget: null });
+        await context.handleEvent({ currentTarget: null, script });
         notifyEditor();
         return;
     }
