Revert "[RC] Ensure dedicated configs per interpreter (#1743)" (#1747)

This reverts commit b4c686f411.

pyscript.core/src/config.js

@@ -5,7 +5,6 @@
  */
 import { $ } from "basic-devtools";
 
-import TYPES from "./types.js";
 import allPlugins from "./plugins.js";
 import { robustFetch as fetch, getText } from "./fetch.js";
 import { ErrorCode } from "./exceptions.js";
@@ -46,72 +45,66 @@ const syntaxError = (type, url, { message }) => {
     return new SyntaxError(`${str}\n${message}`);
 };
 
-const configs = new Map();
-
-for (const [TYPE] of TYPES) {
-    // find the shared config for all py-script elements
-    let config, plugins, parsed, error, type;
-    let pyConfig = $(`${TYPE}-config`);
-    if (pyConfig) {
-        config = pyConfig.getAttribute("src") || pyConfig.textContent;
-        type = pyConfig.getAttribute("type");
-    } else {
-        pyConfig = $(
-            [
-                `script[type="${TYPE}"][config]:not([worker])`,
-                `${TYPE}-script[config]:not([worker])`,
-            ].join(","),
-        );
-        if (pyConfig) config = pyConfig.getAttribute("config");
-    }
-
-    // catch possible fetch errors
-    if (config) {
-        try {
-            const { json, toml, text, url } = await configDetails(config);
-            config = text;
-            if (json || type === "json") {
-                try {
-                    parsed = JSON.parse(text);
-                } catch (e) {
-                    error = syntaxError("JSON", url, e);
-                }
-            } else if (toml || type === "toml") {
-                try {
-                    const { parse } = await import(
-                        /* webpackIgnore: true */
-                        "https://cdn.jsdelivr.net/npm/@webreflection/toml-j0.4/toml.js"
-                    );
-                    parsed = parse(text);
-                } catch (e) {
-                    error = syntaxError("TOML", url, e);
-                }
-            }
-        } catch (e) {
-            error = e;
-        }
-    }
-
-    // parse all plugins and optionally ignore only
-    // those flagged as "undesired" via `!` prefix
-    const toBeAwaited = [];
-    for (const [key, value] of Object.entries(allPlugins)) {
-        if (error) {
-            if (key === "error") {
-                // show on page the config is broken, meaning that
-                // it was not possible to disable error plugin neither
-                // as that part wasn't correctly parsed anyway
-                value().then(({ notify }) => notify(error.message));
-            }
-        } else if (!parsed?.plugins?.includes(`!${key}`)) {
-            toBeAwaited.push(value());
-        }
-    }
-
-    // assign plugins as Promise.all only if needed
-    if (toBeAwaited.length) plugins = Promise.all(toBeAwaited);
-
-    configs.set(TYPE, { config: parsed, plugins, error });
+// find the shared config for all py-script elements
+let config, plugins, parsed, error, type;
+let pyConfig = $("py-config");
+if (pyConfig) {
+    config = pyConfig.getAttribute("src") || pyConfig.textContent;
+    type = pyConfig.getAttribute("type");
+} else {
+    pyConfig = $(
+        [
+            'script[type="py"][config]:not([worker])',
+            "py-script[config]:not([worker])",
+        ].join(","),
+    );
+    if (pyConfig) config = pyConfig.getAttribute("config");
 }
 
-export default configs;
+// catch possible fetch errors
+if (config) {
+    try {
+        const { json, toml, text, url } = await configDetails(config);
+        config = text;
+        if (json || type === "json") {
+            try {
+                parsed = JSON.parse(text);
+            } catch (e) {
+                error = syntaxError("JSON", url, e);
+            }
+        } else if (toml || type === "toml") {
+            try {
+                const { parse } = await import(
+                    /* webpackIgnore: true */
+                    "https://cdn.jsdelivr.net/npm/@webreflection/toml-j0.4/toml.js"
+                );
+                parsed = parse(text);
+            } catch (e) {
+                error = syntaxError("TOML", url, e);
+            }
+        }
+    } catch (e) {
+        error = e;
+    }
+}
+
+// parse all plugins and optionally ignore only
+// those flagged as "undesired" via `!` prefix
+const toBeAwaited = [];
+for (const [key, value] of Object.entries(allPlugins)) {
+    if (error) {
+        if (key === "error") {
+            // show on page the config is broken, meaning that
+            // it was not possible to disable error plugin neither
+            // as that part wasn't correctly parsed anyway
+            value().then(({ notify }) => notify(error.message));
+        }
+    } else if (!parsed?.plugins?.includes(`!${key}`)) {
+        toBeAwaited.push(value());
+    }
+}
+
+// assign plugins as Promise.all only if needed
+if (toBeAwaited.length) plugins = Promise.all(toBeAwaited);
+
+export { parsed as config, plugins, error };

pyscript.core/src/core.js

@@ -9,11 +9,10 @@ import { queryTarget } from "../node_modules/polyscript/esm/script-handler.js";
 import { dedent, dispatch } from "../node_modules/polyscript/esm/utils.js";
 import { Hook } from "../node_modules/polyscript/esm/worker/hooks.js";
 
-import TYPES from "./types.js";
-import configs from "./config.js";
+import { ErrorCode } from "./exceptions.js";
 import sync from "./sync.js";
 import stdlib from "./stdlib.js";
-import { ErrorCode } from "./exceptions.js";
+import { config, plugins, error } from "./config.js";
 import { robustFetch as fetch, getText } from "./fetch.js";
 
 const { assign, defineProperty } = Object;
@@ -21,6 +20,11 @@ const { assign, defineProperty } = Object;
 // allows lazy element features on code evaluation
 let currentElement;
 
+const TYPES = new Map([
+    ["py", "pyodide"],
+    ["mpy", "micropython"],
+]);
+
 // generic helper to disambiguate between custom element and script
 const isScript = ({ tagName }) => tagName === "SCRIPT";
 
@@ -99,12 +103,7 @@ const workerHooks = {
         [...hooks.codeAfterRunWorkerAsync].map(dedent).join("\n"),
 };
 
-const exportedConfig = {};
-export { exportedConfig as config };
-
 for (const [TYPE, interpreter] of TYPES) {
-    const { config, plugins, error } = configs.get(TYPE);
-
     // create a unique identifier when/if needed
     let id = 0;
     const getID = (prefix = TYPE) => `${prefix}-${id++}`;
@@ -274,9 +273,6 @@ for (const [TYPE, interpreter] of TYPES) {
 
     // define py-script only if the config didn't throw an error
     if (!error) customElements.define(`${TYPE}-script`, PyScriptElement);
-
-    // export the used config without allowing leaks through it
-    exportedConfig[TYPE] = structuredClone(config);
 }
 
 // TBD: I think manual worker cases are interesting in pyodide only

pyscript.core/src/types.js

@@ -1,4 +0,0 @@
-export default new Map([
-    ["py", "pyodide"],
-    ["mpy", "micropython"],
-]);