Merge pull request #64 from pyscript/issue-1804

WebReflection · web-flow · commit 4b3587e42189 · 2023-10-20T11:25:05.000+02:00
Ensure custom types run queued like it is for non custom types
diff --git a/docs/core.js b/docs/core.js
diff --git a/docs/core.js.map b/docs/core.js.map
diff --git a/esm/custom.js b/esm/custom.js
@@ -34,8 +34,9 @@ export const handleCustomType = (node) => {
     for (const selector of CUSTOM_SELECTORS) {
         if (node.matches(selector)) {
             const type = types.get(selector);
+            const details = registry.get(type);
             const { resolve } = waitList.get(type);
-            const { options, known } = registry.get(type);
+            const { options, known } = details;
             if (!known.has(node)) {
                 known.add(node);
                 const {
@@ -143,11 +144,11 @@ export const handleCustomType = (node) => {
                         runEvent: module.runEvent.bind(module, interpreter),
                     };
 
-                    resolve(resolved);
-
-                    if (error) onerror?.(error, node);
-
-                    onInterpreterReady?.(resolved, node);
+                    details.queue = details.queue.then(() => {
+                        resolve(resolved);
+                        if (error) onerror?.(error, node);
+                        return onInterpreterReady?.(resolved, node);
+                    });
                 });
             }
         }
@@ -225,6 +226,7 @@ export const define = (type, options) => {
     registry.set(type, {
         options: assign({ env: type }, options),
         known: new WeakSet(),
+        queue: Promise.resolve(),
     });
 
     if (!dontBother) addAllListeners(document);
diff --git a/test/queue/index.html b/test/queue/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Polyscript queue</title>
+  <script type="module">
+    import { define } from "../../core.js";
+    define("mpy", {
+      interpreter: "micropython",
+      async onInterpreterReady({ run }, element) {
+        let code = element.textContent;
+        if (element.src)
+          code = await fetch(element.src).then(b => b.text());
+        run(code);
+      }
+    });
+  </script>
+</head>
+<body>
+  <script type="mpy" src="one.py"></script>
+  <script type="mpy">print('inline one')</script>
+  <script type="mpy" src="two.py"></script>
+  <script type="mpy">print('inline two')</script>
+  <script type="mpy" src="three.py"></script>
+  <script type="mpy">print('inline three')</script>
+</body>
+</html>
diff --git a/test/queue/one.py b/test/queue/one.py
@@ -0,0 +1 @@
+print('src one')
diff --git a/test/queue/three.py b/test/queue/three.py
@@ -0,0 +1 @@
+print('src three')
diff --git a/test/queue/two.py b/test/queue/two.py
@@ -0,0 +1 @@
+print('src two')
