fix: depends-on ordering

nalgeon · Apr 17, 2024 · 29a4e74 · 29a4e74
1 parent 3a747c9
commit 29a4e74
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 2 deletions.
diff --git a/src/snippet.js b/src/snippet.js
@@ -319,14 +319,17 @@ function gatherCode(curSnip) {
     let ids = curSnip.dependsOn ? curSnip.dependsOn.split(" ") : [];
     // print separators between snippets to tail output later
     const sep = curSnip.hasAttribute("output-tail") ? codegen.hr(curSnip.syntax) : "";
-    for (const id of ids) {
+    // first dependency should be the last one to be prepended
+    for (const id of ids.reverse()) {
         const snip = document.getElementById(id);
         if (!snip) {
             throw new Error(`#${id} dependency not found`);
         }
         code = snip.code + `\n${sep}\n` + code;
         if (snip.dependsOn) {
-            ids.push(...snip.dependsOn.split(" ").filter((i) => !ids.includes(i)));
+            const moreIDs = snip.dependsOn.split(" ").filter((i) => !ids.includes(i));
+            // first dependency should be the last one to be prepended
+            ids.push(...moreIDs.reverse());
         }
     }
     return code;

diff --git a/tests/snippet.js b/tests/snippet.js
@@ -70,6 +70,8 @@ async function runTests() {
     await testFilesTargetPath();
 
     await testDependsOn();
+    await testDependsOrder1();
+    await testDependsOrder2();
 
     t.summary();
     return t.errorCount;
@@ -1017,6 +1019,67 @@ async function testDependsOn() {
     });
 }
 
+async function testDependsOrder1() {
+    return new Promise((resolve, reject) => {
+        t.log("testDependsOrder1...");
+        const html = `
+            <pre><code>console.log("step-1")</code></pre>
+            <codapi-snippet id="step-1" engine="browser" sandbox="javascript">
+            </codapi-snippet>
+            <pre><code>console.log("step-2")</code></pre>
+            <codapi-snippet id="step-2" engine="browser" sandbox="javascript">
+            </codapi-snippet>
+            <pre><code>console.log("step-3")</code></pre>
+            <codapi-snippet id="step-3" engine="browser" sandbox="javascript" depends-on="step-1 step-2">
+            </codapi-snippet>
+        `;
+        const ui = createSnippet(html);
+        ui.snip.addEventListener("result", (event) => {
+            const result = event.detail;
+            t.assert("result.ok", result.ok);
+            t.assert("result.stdout", result.stdout.trim() == "step-1\nstep-2\nstep-3");
+            t.assert("result.stderr", result.stderr == "");
+            t.assert("status done", ui.status.innerHTML.includes("Done"));
+            t.assert("output", ui.output.out.innerText.trim() == "step-1\nstep-2\nstep-3");
+            resolve();
+        });
+        ui.toolbar.run.click();
+        t.assert("status running", ui.status.innerHTML.includes("Running"));
+    });
+}
+
+async function testDependsOrder2() {
+    return new Promise((resolve, reject) => {
+        t.log("testDependsOrder2...");
+        const html = `
+            <pre><code>console.log("step-1")</code></pre>
+            <codapi-snippet id="step-1" engine="browser" sandbox="javascript">
+            </codapi-snippet>
+            <pre><code>console.log("step-2")</code></pre>
+            <codapi-snippet id="step-2" engine="browser" sandbox="javascript" depends-on="step-1">
+            </codapi-snippet>
+            <pre><code>console.log("step-3")</code></pre>
+            <codapi-snippet id="step-3" engine="browser" sandbox="javascript" depends-on="step-1">
+            </codapi-snippet>
+            <pre><code>console.log("step-4")</code></pre>
+            <codapi-snippet id="step-4" engine="browser" sandbox="javascript" depends-on="step-2 step-3">
+            </codapi-snippet>
+        `;
+        const ui = createSnippet(html);
+        ui.snip.addEventListener("result", (event) => {
+            const result = event.detail;
+            t.assert("result.ok", result.ok);
+            t.assert("result.stdout", result.stdout.trim() == "step-1\nstep-2\nstep-3\nstep-4");
+            t.assert("result.stderr", result.stderr == "");
+            t.assert("status done", ui.status.innerHTML.includes("Done"));
+            t.assert("output", ui.output.out.innerText.trim() == "step-1\nstep-2\nstep-3\nstep-4");
+            resolve();
+        });
+        ui.toolbar.run.click();
+        t.assert("status running", ui.status.innerHTML.includes("Running"));
+    });
+}
+
 function createSnippet(html) {
     document.querySelector("#app").innerHTML = html;
     const editor = document.querySelector("#app pre:last-of-type code");