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

package/dist/compiler.js

@@ -93,6 +93,7 @@ export async function compile(settings) {
     }
     const regexes = {
         section: /^\[\[(.*)\]\]:$/,
+        snippet: /^\[snippet:\s*(.+)\]:$/,
         passage: /^\[(.*)\]:$/,
         title: /^@title (.*)$/,
         import: /^@import (.*)$/,
@@ -112,6 +113,7 @@ export async function compile(settings) {
         let passage = null; // annotated differently to section, as a workaround for TypeScript "Property does not exist on type never"
         let textStarted = false;
         let inUiBlock = false;
+        let inSnippet = false;
         const ensureThisSectionExists = () => {
             return ensureSectionExists(section, isFirst, inputFilename, lineCount);
         };
@@ -134,11 +136,21 @@ export async function compile(settings) {
                     match[key] = result;
                 }
             }
-            if (match.section) {
+            if (match.snippet) {
+                inSnippet = true;
+                section = null;
+                passage = null;
+                textStarted = false;
+            }
+            else if (match.section) {
+                inSnippet = false;
                 section = story.addSection(match.section[1], inputFilename, lineCount);
                 passage = null;
                 textStarted = false;
             }
+            else if (inSnippet) {
+                // skip all content inside snippet blocks
+            }
             else if (match.passage) {
                 if (!section) {
                     errors.push(`ERROR: ${inputFilename} line ${lineCount}: Can't add passage "${match.passage[1]}" as no section has been created.`);
@@ -383,8 +395,15 @@ export async function compile(settings) {
         // Link destination data may look like:
         //   passageName
         //   passageName, my_attribute=2
+        //   passage name with a comma, in the name
         // We're only interested in checking if the named passage or section exists.
-        const linkDestination = link.split(",")[0];
+        // First check if the full link is a valid destination (handles names containing commas).
+        const trimmedLink = link.trim();
+        if (Object.keys(keys).includes(trimmedLink)) {
+            return true;
+        }
+        // Otherwise, assume a comma separates the destination from setters.
+        const linkDestination = trimmedLink.split(",")[0].trim();
         return Object.keys(keys).includes(linkDestination);
     }
     function showBadLinksWarning(badLinks, linkTo, before, after, section, passage) {

package/package.json

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