@rohal12/twee-ts 1.12.0 → 1.13.0

package/dist/bin/twee-ts.js

@@ -917,6 +917,17 @@ function readFormatSource(format) {
 import { basename } from "path";
 import { statSync as statSync3 } from "fs";
 
+// src/types.ts
+var ItemType = {
+  Error: 0,
+  EOF: 1,
+  Header: 2,
+  Name: 3,
+  Tags: 4,
+  Metadata: 5,
+  Content: 6
+};
+
 // src/lexer.ts
 var EOF = -1;
 var HEADER_DELIM = "::";
@@ -949,10 +960,16 @@ var LexerContext = class {
       throw new Error("backup would leave pos < start");
     }
   }
+  // Line-counting invariant: next() increments this.line for each newline during
+  // character-by-character scanning. However, Content items are produced by jumping
+  // this.pos directly (e.g. via indexOf) without calling next(), so those newlines
+  // haven't been counted yet. emit() re-counts newlines in [start, pos) for Content
+  // items to compensate. This is safe because this.start is reset to this.pos after
+  // every emit(), so no range is ever counted twice.
   emit(type) {
     const val = this.input.slice(this.start, this.pos);
     this.items.push({ type, line: this.line, pos: this.start, val });
-    if (type === 6 /* Content */) {
+    if (type === ItemType.Content) {
       for (let i = this.start; i < this.pos; i++) {
         if (this.input.charCodeAt(i) === 10) this.line++;
       }
@@ -973,7 +990,7 @@ var LexerContext = class {
   }
   errorf(message) {
     this.items.push({
-      type: 0 /* Error */,
+      type: ItemType.Error,
       line: this.line,
       pos: this.start,
       val: message
@@ -1015,7 +1032,7 @@ function lexProlog(ctx) {
     ctx.ignore();
     return lexHeaderDelim;
   }
-  ctx.emit(1 /* EOF */);
+  ctx.emit(ItemType.EOF);
   return null;
 }
 function lexContent(ctx) {
@@ -1025,19 +1042,19 @@ function lexContent(ctx) {
   const i = ctx.input.indexOf(NEWLINE_HEADER_DELIM, ctx.pos);
   if (i > -1) {
     ctx.pos = i + 1;
-    ctx.emit(6 /* Content */);
+    ctx.emit(ItemType.Content);
     return lexHeaderDelim;
   }
   ctx.pos = ctx.input.length;
   if (ctx.pos > ctx.start) {
-    ctx.emit(6 /* Content */);
+    ctx.emit(ItemType.Content);
   }
-  ctx.emit(1 /* EOF */);
+  ctx.emit(ItemType.EOF);
   return null;
 }
 function lexHeaderDelim(ctx) {
   ctx.pos += HEADER_DELIM.length;
-  ctx.emit(2 /* Header */);
+  ctx.emit(ItemType.Header);
   return lexName;
 }
 function lexName(ctx) {
@@ -1066,7 +1083,7 @@ function lexName(ctx) {
         break outer;
     }
   }
-  ctx.emit(3 /* Name */);
+  ctx.emit(ItemType.Name);
   switch (r) {
     case 91:
       return lexTags;
@@ -1083,7 +1100,7 @@ function lexName(ctx) {
       ctx.ignore();
       return lexContent;
   }
-  ctx.emit(1 /* EOF */);
+  ctx.emit(ItemType.EOF);
   return null;
 }
 function lexNextOptionalBlock(ctx) {
@@ -1106,7 +1123,7 @@ function lexNextOptionalBlock(ctx) {
       ctx.ignore();
       return lexContent;
     case EOF:
-      ctx.emit(1 /* EOF */);
+      ctx.emit(ItemType.EOF);
       return null;
   }
   return ctx.errorf(`illegal character '${String.fromCharCode(r)}' amid the optional blocks`);
@@ -1126,7 +1143,7 @@ function lexTags(ctx) {
         if (r === 10) ctx.backup();
         return ctx.errorf("unterminated tag block");
       case 93:
-        if (ctx.pos > ctx.start) ctx.emit(4 /* Tags */);
+        if (ctx.pos > ctx.start) ctx.emit(ItemType.Tags);
         return lexNextOptionalBlock;
       case 91:
         return ctx.errorf(`unexpected left square bracket '['`);
@@ -1159,7 +1176,7 @@ function lexMetadata(ctx) {
       case 125:
         depth--;
         if (depth === 0) {
-          if (ctx.pos > ctx.start) ctx.emit(5 /* Metadata */);
+          if (ctx.pos > ctx.start) ctx.emit(ItemType.Metadata);
           return lexNextOptionalBlock;
         }
         break;
@@ -1210,10 +1227,10 @@ function parseTwee(source, options = {}) {
   const passages = [];
   let current = null;
   let pCount = 0;
-  let lastType = 1 /* EOF */;
+  let lastType = ItemType.EOF;
   for (const item of tweeLexer(source)) {
     switch (item.type) {
-      case 0 /* Error */:
+      case ItemType.Error:
         diagnostics.push({
           level: "error",
           message: `line ${item.line}: Malformed twee source; ${item.val}.`,
@@ -1221,19 +1238,19 @@ function parseTwee(source, options = {}) {
           line: item.line
         });
         return { passages, diagnostics };
-      case 1 /* EOF */:
+      case ItemType.EOF:
         if (pCount > 0 && current) {
           passages.push(current);
         }
         return { passages, diagnostics };
-      case 2 /* Header */:
+      case ItemType.Header:
         pCount++;
         if (pCount > 1 && current) {
           passages.push(current);
         }
         current = { name: "", tags: [], text: "", source: { file: filename, line: item.line } };
         break;
-      case 3 /* Name */: {
+      case ItemType.Name: {
         if (!current) break;
         const name = tweeUnescape(item.val).trim();
         if (name.length === 0) {
@@ -1248,9 +1265,9 @@ function parseTwee(source, options = {}) {
         current.name = name;
         break;
       }
-      case 4 /* Tags */: {
+      case ItemType.Tags: {
         if (!current) break;
-        if (lastType !== 3 /* Name */) {
+        if (lastType !== ItemType.Name) {
           diagnostics.push({
             level: "error",
             message: `line ${item.line}: Malformed twee source; optional tags block must immediately follow the passage name.`,
@@ -1263,9 +1280,9 @@ function parseTwee(source, options = {}) {
         current.tags = tweeUnescape(inner).split(/\s+/).filter(Boolean);
         break;
       }
-      case 5 /* Metadata */: {
+      case ItemType.Metadata: {
         if (!current) break;
-        if (lastType !== 3 /* Name */ && lastType !== 4 /* Tags */) {
+        if (lastType !== ItemType.Name && lastType !== ItemType.Tags) {
           diagnostics.push({
             level: "error",
             message: `line ${item.line}: Malformed twee source; optional metadata block must immediately follow the passage name or tags block.`,
@@ -1297,7 +1314,7 @@ function parseTwee(source, options = {}) {
         }
         break;
       }
-      case 6 /* Content */: {
+      case ItemType.Content: {
         if (!current) break;
         if (trim) {
           current.text = item.val.trim();
@@ -4427,21 +4444,20 @@ var VERSION = "1.2.0";
 
 // src/output-twine2.ts
 var CREATOR_NAME = "Twee-ts";
-function toTwine2Archive(story, startName, diagnostics, options) {
-  return getTwine2DataChunk(story, startName, diagnostics, options) + "\n";
+function toTwine2Archive(story, startName, options) {
+  return getTwine2DataChunk(story, startName, options) + "\n";
 }
-function toTwine2HTML(story, format, startName, diagnostics, options) {
+function toTwine2HTML(story, format, startName, options) {
   let template = readFormatSource(format);
   if (template.includes("{{STORY_NAME}}")) {
     template = template.replaceAll("{{STORY_NAME}}", htmlEscape(story.name));
   }
   if (template.includes("{{STORY_DATA}}")) {
-    template = template.replace("{{STORY_DATA}}", getTwine2DataChunk(story, startName, diagnostics, options));
+    template = template.replace("{{STORY_DATA}}", getTwine2DataChunk(story, startName, options));
   }
   return template;
 }
-function getTwine2DataChunk(story, startName, diagnostics, options) {
-  ensureIFID(story, diagnostics);
+function getTwine2DataChunk(story, startName, options) {
   const parts = [];
   let startID = "";
   let pid = 0;
@@ -4510,23 +4526,6 @@ function getTwine2DataChunk(story, startName, diagnostics, options) {
   const wrapper = `<!-- UUID://${htmlCommentSanitize(story.ifid)}// --><tw-storydata name="${attrEscape(story.name)}" startnode="${attrEscape(startID)}" creator="${attrEscape(CREATOR_NAME)}" creator-version="${attrEscape(VERSION)}" ifid="${attrEscape(story.ifid)}" zoom="${attrEscape(zoom)}" format="${attrEscape(story.twine2.format)}" format-version="${attrEscape(story.twine2.formatVersion)}" options="${attrEscape(optionsStr)}" tags="${attrEscape(story.twine2.tags)}" hidden>`;
   return wrapper + parts.join("") + "</tw-storydata>";
 }
-function ensureIFID(story, diagnostics) {
-  if (story.ifid !== "") return;
-  if (story.legacyIFID !== "") {
-    story.ifid = story.legacyIFID;
-    diagnostics.push({
-      level: "warning",
-      message: 'Story IFID not found; reusing "ifid" entry from the "StorySettings" special passage.'
-    });
-  } else {
-    const ifid = generateIFID();
-    story.ifid = ifid;
-    diagnostics.push({
-      level: "error",
-      message: `Story IFID not found. Add an IFID to your story: {"ifid":"${ifid}"}`
-    });
-  }
-}
 
 // src/output-twine1.ts
 import { readFileSync as readFileSync2 } from "fs";
@@ -4537,7 +4536,7 @@ function toTwine1Archive(story, _startName) {
   return `<div id="storeArea" data-size="${count}">${data}</div>
 `;
 }
-function toTwine1HTML(story, format, startName, _diagnostics) {
+function toTwine1HTML(story, format, startName) {
   const formatDir = dirname(format.filename);
   const parentDir = dirname(formatDir);
   let template = readFormatSource(format);
@@ -5091,6 +5090,7 @@ async function buildOutput(options, cache, changedFiles) {
   if (testMode) {
     story.twine2.options.set("debug", true);
   }
+  ensureIFID(story, diagnostics);
   let output;
   switch (outputMode) {
     case "twee3":
@@ -5098,7 +5098,7 @@ async function buildOutput(options, cache, changedFiles) {
       output = toTwee(story, outputMode);
       break;
     case "twine2-archive":
-      output = toTwine2Archive(story, startName, diagnostics, { sourceInfo });
+      output = toTwine2Archive(story, startName, { sourceInfo });
       break;
     case "twine1-archive":
       output = toTwine1Archive(story, startName);
@@ -5117,7 +5117,7 @@ async function buildOutput(options, cache, changedFiles) {
         throw new TweeTsError("No story format available for HTML output.", diagnostics);
       }
       if (format.isTwine2) {
-        output = toTwine2HTML(story, format, startName, diagnostics, { sourceInfo });
+        output = toTwine2HTML(story, format, startName, { sourceInfo });
       } else {
         if (story.name === "" && !storyHas(story, "StoryTitle")) {
           diagnostics.push({
@@ -5125,7 +5125,7 @@ async function buildOutput(options, cache, changedFiles) {
             message: 'Special passage "StoryTitle" not found.'
           });
         }
-        output = toTwine1HTML(story, format, startName, diagnostics);
+        output = toTwine1HTML(story, format, startName);
       }
       const modulePaths = options.modules ? getFilenames(options.modules) : [];
       output = modifyHead(output, modulePaths, options.headFile, diagnostics);
@@ -5142,6 +5142,23 @@ async function buildOutput(options, cache, changedFiles) {
   };
   return { output, story, format, diagnostics, stats };
 }
+function ensureIFID(story, diagnostics) {
+  if (story.ifid !== "") return;
+  if (story.legacyIFID !== "") {
+    story.ifid = story.legacyIFID;
+    diagnostics.push({
+      level: "warning",
+      message: 'Story IFID not found; reusing "ifid" entry from the "StorySettings" special passage.'
+    });
+  } else {
+    const ifid = generateIFID();
+    story.ifid = ifid;
+    diagnostics.push({
+      level: "error",
+      message: `Story IFID not found. Add an IFID to your story: {"ifid":"${ifid}"}`
+    });
+  }
+}
 function storyToJSON(story) {
   const scripts = [];
   const stylesheets = [];