squiffy-compiler 6.0.0-alpha.20 → 6.0.0-beta.0

package/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2024 Alex Warren, textadventures.co.uk and contributors
+Copyright (c) 2014-2026 Alex Warren, textadventures.co.uk and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/compiler.js

@@ -1,7 +1,7 @@
 import pkg from "../package.json" with { type: "json" };
 const version = pkg.version;
 export async function compile(settings) {
-    const story = new Story(settings.scriptBaseFilename);
+    const story = new Story();
     const errors = [];
     let autoSectionCount = 0;
     async function getJs(storyData, excludeHeader) {
@@ -235,6 +235,7 @@ export async function compile(settings) {
             else if (textStarted || stripLine.length > 0) {
                 if (inUiBlock) {
                     errors.push(`ERROR: ${inputFilename} line ${lineCount}: Unexpected text in @ui block.`);
+                    return false;
                 }
                 else if (!passage) {
                     section = ensureThisSectionExists();
@@ -286,6 +287,35 @@ export async function compile(settings) {
         };
     }
     async function processText(input, section, passage) {
+        // Helper to get the next section name
+        const getNextSectionName = () => {
+            const sectionNames = Object.keys(story.sections);
+            const currentIndex = sectionNames.indexOf(section.name);
+            return sectionNames[currentIndex + 1] || null;
+        };
+        // nextSectionLinkRegex matches [[text>]] - a link to the next section
+        const nextSectionLinkRegex = /\[\[([^\]]*?)>\]\]/g;
+        input = input.replace(nextSectionLinkRegex, (_match, text) => {
+            const nextSectionName = getNextSectionName();
+            if (!nextSectionName) {
+                settings.onWarning?.(`WARNING: ${section.filename} line ${section.line}: In section '${section.name}', there is a [[${text}>]] link but no following section exists`);
+                return `[[${text}]]`; // fallback
+            }
+            return `{{section "${nextSectionName}" text="${text}"}}`;
+        });
+        // namedNextSectionLinkRegex matches [[text]](>) or [[text]](>, setter=value)
+        // - a named link where target starts with >
+        const namedNextSectionLinkRegex = /\[\[([^\]]*?)\]\]\(>(.*?)\)/g;
+        input = input.replace(namedNextSectionLinkRegex, (_match, text, rest) => {
+            const nextSectionName = getNextSectionName();
+            if (!nextSectionName) {
+                settings.onWarning?.(`WARNING: ${section.filename} line ${section.line}: In section '${section.name}', there is a [[${text}]](>) link but no following section exists`);
+                return `[[${text}]]`; // fallback
+            }
+            // rest could be empty or ", setter=value"
+            const parsedName = getAdditionalLinkParameters(nextSectionName + rest);
+            return `{{section "${parsedName.target}" text="${text}"${parsedName.additionalParameters}}}`;
+        });
         // namedSectionLinkRegex matches:
         //   open [[
         //   any text - the link text
@@ -408,7 +438,7 @@ export async function compile(settings) {
     }
 }
 class Story {
-    constructor(inputFilename) {
+    constructor() {
         Object.defineProperty(this, "sections", {
             enumerable: true,
             configurable: true,
@@ -451,7 +481,7 @@ class Story {
             writable: true,
             value: []
         });
-        this.id = inputFilename || null;
+        this.id = crypto.randomUUID();
     }
     addSection(name, filename, line) {
         const section = new Section(name, filename, line);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "squiffy-compiler",
-  "version": "6.0.0-alpha.20",
+  "version": "6.0.0-beta.0",
   "description": "A tool for creating multiple-choice interactive stories",
   "author": "Alex Warren",
   "contributors": [
@@ -31,5 +31,5 @@
     "dist"
   ],
   "type": "module",
-  "gitHead": "eee4b8836ed791b68d8d56b0d5071129e6214d2b"
+  "gitHead": "dadcab6940e5e7ffdd600e8821c9297fdbf93160"
 }