squiffy-runtime 6.0.0-beta.0 → 6.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squiffy-runtime",
-  "version": "6.0.0-beta.0",
+  "version": "6.0.0-beta.2",
   "type": "module",
   "main": "dist/squiffy.runtime.js",
   "types": "dist/squiffy.runtime.d.ts",
@@ -36,7 +36,7 @@
     "css.escape": "^1.5.1",
     "global-jsdom": "^25.0.0",
     "jsdom": "^25.0.0",
-    "squiffy-compiler": "^6.0.0-beta.0",
+    "squiffy-compiler": "^6.0.0-beta.2",
     "typescript": "^5.6.2",
     "vite": "^7.1.3",
     "vite-plugin-dts": "^4.5.4"
@@ -46,5 +46,5 @@
     "handlebars": "^4.7.8",
     "marked": "^16.2.0"
   },
-  "gitHead": "dadcab6940e5e7ffdd600e8821c9297fdbf93160"
+  "gitHead": "d8f215aafa4534ddff8ecee0f8eaa4dd3eb9a46a"
 }

package/src/squiffy.runtime.test.ts

@@ -100,6 +100,27 @@ test('"Hello world" script should run', async () => {
     expect(element.innerHTML).toMatchSnapshot();
 });
 
+test("squiffy.story.go() in section JS navigates without showing original section content", async () => {
+    // Regression test for https://github.com/textadventures/squiffy/issues/179
+    // Note: the 4-space indent on the next line is the squiffy JS syntax - don't trim it!
+    const script = `    squiffy.story.go('destination');
+Default section text that should not appear.
+
+[[destination]]:
+Destination section text.`;
+
+    const { element } = await initScript(script);
+
+    // Only the destination section content should be visible
+    const html = element.innerHTML;
+    expect(html).toContain("Destination section text.");
+    expect(html).not.toContain("Default section text that should not appear.");
+
+    // The destination section should be the only section element (no empty default section)
+    expect(element.querySelectorAll(".squiffy-output-section").length).toBe(1);
+    expect(element.querySelector(".squiffy-output-section")?.getAttribute("data-section")).toBe("destination");
+});
+
 test("Click a section link", async () => {
     const script = await fs.readFile("../examples/test/example.squiffy", "utf-8");
     const { squiffyApi, element } = await initScript(script);

package/src/squiffy.runtime.ts

@@ -180,20 +180,30 @@ export const init = async (options: SquiffyInitOptions): Promise<SquiffyApi> =>
             clearScreen();
         }
         newSection(sectionName);
+        const sectionElement = currentSectionElement;
         if (master) {
             await run(master, "[[]]");
+            if (get("_section") !== sectionName) {
+                // JS in the master section navigated away; clean up the empty element we created.
+                sectionElement.remove();
+                return;
+            }
         }
         await run(currentSection, `[[${sectionName}]]`);
 
+        if (get("_section") !== sectionName) {
+            // JS in this section navigated away; clean up the empty element we created.
+            sectionElement.remove();
+            return;
+        }
+
         // Setup validation after transitions complete (animations may have replaced DOM elements)
         setupInputValidation(currentSectionElement);
 
-        // The JS might have changed which section we're in
-        if (get("_section") == sectionName) {
-            set("_turncount", 0);
-            writeUndoLog();
-            save();
-        }
+        set("_turncount", 0);
+        writeUndoLog();
+        save();
+
         const newCanGoBack = canGoBack();
         if (newCanGoBack != oldCanGoBack) {
             emitter.emit("canGoBackChanged", { canGoBack: newCanGoBack });
@@ -224,7 +234,13 @@ export const init = async (options: SquiffyInitOptions): Promise<SquiffyApi> =>
             await processAttributes(section.attributes);
         }
         if (section.jsIndex !== undefined) {
+            const sectionBefore = get("_section");
             runJs(section.jsIndex);
+            if (get("_section") !== sectionBefore) {
+                // JS called squiffy.story.go() and navigated away; the destination
+                // section will handle rendering its own content.
+                return;
+            }
         }
 
         ui.write(section.text || "", source);