@rohal12/twee-ts 1.4.0 → 1.6.0

package/dist/bin/twee-ts.js

@@ -194,7 +194,7 @@ function passageToTwee(p, outMode) {
   output += "\n\n";
   return output;
 }
-function passageToPassagedata(p, pid) {
+function passageToPassagedata(p, pid, options) {
   let position;
   let size;
   if (hasMetadataPosition(p)) {
@@ -211,7 +211,11 @@ function passageToPassagedata(p, pid) {
   } else {
     size = "100,100";
   }
-  return `<tw-passagedata pid="${pid}" name=${quote(fullAttrEscape(p.name))} tags=${quote(attrEscape(p.tags.join(" ")))} position=${quote(attrEscape(position))} size=${quote(attrEscape(size))}>${htmlEscape(p.text)}</tw-passagedata>`;
+  let attrs = `<tw-passagedata pid="${pid}" name=${quote(fullAttrEscape(p.name))} tags=${quote(attrEscape(p.tags.join(" ")))} position=${quote(attrEscape(position))} size=${quote(attrEscape(size))}`;
+  if (options?.sourceInfo && p.source) {
+    attrs += ` data-source-file=${quote(attrEscape(p.source.file))} data-source-line="${p.source.line}"`;
+  }
+  return `${attrs}>${htmlEscape(p.text)}</tw-passagedata>`;
 }
 function passageToTiddler(p, pid, obfuscateRot13 = false) {
   let position;
@@ -258,8 +262,21 @@ function quote(s) {
 }
 
 // src/story.ts
+var passageIndex = /* @__PURE__ */ new WeakMap();
+function getIndex(story) {
+  let index = passageIndex.get(story);
+  if (!index) {
+    index = /* @__PURE__ */ new Map();
+    for (let i = 0; i < story.passages.length; i++) {
+      const passage = story.passages[i];
+      if (passage) index.set(passage.name, i);
+    }
+    passageIndex.set(story, index);
+  }
+  return index;
+}
 function createStory() {
-  return {
+  const story = {
     name: "",
     ifid: "",
     passages: [],
@@ -275,16 +292,17 @@ function createStory() {
       zoom: 1
     }
   };
+  passageIndex.set(story, /* @__PURE__ */ new Map());
+  return story;
 }
 function storyHas(story, name) {
-  return story.passages.some((p) => p.name === name);
-}
-function storyIndex(story, name) {
-  return story.passages.findIndex((p) => p.name === name);
+  return getIndex(story).has(name);
 }
 function storyAppend(story, p, diagnostics) {
-  const i = storyIndex(story, p.name);
+  const index = getIndex(story);
+  const i = index.get(p.name) ?? -1;
   if (i === -1) {
+    index.set(p.name, story.passages.length);
     story.passages.push(p);
   } else {
     diagnostics.push({
@@ -295,9 +313,15 @@ function storyAppend(story, p, diagnostics) {
   }
 }
 function storyPrepend(story, p, diagnostics) {
-  const i = storyIndex(story, p.name);
+  const index = getIndex(story);
+  const i = index.get(p.name) ?? -1;
   if (i === -1) {
     story.passages.unshift(p);
+    index.clear();
+    for (let j = 0; j < story.passages.length; j++) {
+      const passage = story.passages[j];
+      if (passage) index.set(passage.name, j);
+    }
   } else {
     diagnostics.push({
       level: "warning",
@@ -587,11 +611,15 @@ function watchFilesystem(pathnames, outFilename, callback) {
   const watchers = [];
   let buildTimer = null;
   const BUILD_DEBOUNCE = 500;
-  function scheduleBuild() {
+  const pendingFiles = /* @__PURE__ */ new Set();
+  function scheduleBuild(changedFile) {
+    if (changedFile) pendingFiles.add(changedFile);
     if (buildTimer) clearTimeout(buildTimer);
     buildTimer = setTimeout(() => {
       buildTimer = null;
-      callback();
+      const files = pendingFiles.size > 0 ? new Set(pendingFiles) : void 0;
+      pendingFiles.clear();
+      callback(files);
     }, BUILD_DEBOUNCE);
   }
   for (const pathname of pathnames) {
@@ -601,7 +629,8 @@ function watchFilesystem(pathnames, outFilename, callback) {
         const abs = resolve(pathname, filename);
         if (abs === absOutFile) return;
         if (isKnownFileType(filename)) {
-          scheduleBuild();
+          const rel = relative(process.cwd(), abs);
+          scheduleBuild(rel || abs);
         }
       });
       watchers.push(watcher);
@@ -860,6 +889,7 @@ function readFormatSource(format) {
 
 // src/loader.ts
 import { basename } from "path";
+import { statSync as statSync3 } from "fs";
 
 // src/lexer.ts
 var EOF = -1;
@@ -1175,7 +1205,7 @@ function parseTwee(source, options = {}) {
         if (pCount > 1 && current) {
           passages.push(current);
         }
-        current = { name: "", tags: [], text: "" };
+        current = { name: "", tags: [], text: "", source: { file: filename, line: item.line } };
         break;
       case 3 /* Name */: {
         if (!current) break;
@@ -1367,54 +1397,182 @@ function loadInlineSources(story, sources, opts, diagnostics) {
     }
   }
 }
-function loadTwee(story, filename, opts, diagnostics) {
+function parseTweeFile(filename, opts) {
   const source = readUTF8(filename);
   const result = parseTwee(source, {
     filename,
     trim: opts.trim ?? true,
     twee2Compat: opts.twee2Compat ?? false
   });
-  diagnostics.push(...result.diagnostics);
-  for (const p of result.passages) {
-    storyAdd(story, p, diagnostics);
-  }
+  return { passages: result.passages, diagnostics: [...result.diagnostics] };
 }
-function loadTagged(story, tag, filename, diagnostics) {
+function parseTaggedFile(tag, filename) {
   const source = readUTF8(filename);
-  storyAdd(story, { name: basename(filename), tags: [tag], text: source }, diagnostics);
+  return { passages: [{ name: basename(filename), tags: [tag], text: source }], diagnostics: [] };
 }
-function loadMedia(story, tag, filename, diagnostics) {
+function parseMediaFile(tag, filename) {
   const source = readBase64(filename);
   const name = baseNameWithoutExt(filename);
-  storyAdd(
-    story,
-    {
-      name,
-      tags: [tag],
-      text: `data:${mediaTypeFromFilename(filename)};base64,${source}`
-    },
-    diagnostics
-  );
+  return {
+    passages: [{ name, tags: [tag], text: `data:${mediaTypeFromFilename(filename)};base64,${source}` }],
+    diagnostics: []
+  };
 }
-function loadFont(story, filename, diagnostics) {
+function parseFontFile(filename) {
   const source = readBase64(filename);
   const name = basename(filename);
   const family = baseNameWithoutExt(filename);
   const ext = normalizedFileExt(filename);
   const mediaType = mediaTypeFromExt(ext);
   const hint = fontFormatHint(ext);
-  storyAdd(
-    story,
-    {
-      name,
-      tags: ["stylesheet"],
-      text: `@font-face {
+  return {
+    passages: [
+      {
+        name,
+        tags: ["stylesheet"],
+        text: `@font-face {
 	font-family: "${family}";
 	src: url("data:${mediaType};base64,${source}") format("${hint}");
 }`
-    },
-    diagnostics
-  );
+      }
+    ],
+    diagnostics: []
+  };
+}
+function parseFile(filename, opts) {
+  const ext = normalizedFileExt(filename);
+  switch (ext) {
+    case "tw":
+    case "twee":
+      return parseTweeFile(filename, opts);
+    case "tw2":
+    case "twee2":
+      return parseTweeFile(filename, { ...opts, twee2Compat: true });
+    case "css":
+      return parseTaggedFile("stylesheet", filename);
+    case "js":
+      return parseTaggedFile("script", filename);
+    case "otf":
+    case "ttf":
+    case "woff":
+    case "woff2":
+      return parseFontFile(filename);
+    case "gif":
+    case "jpeg":
+    case "jpg":
+    case "png":
+    case "svg":
+    case "tif":
+    case "tiff":
+    case "webp":
+      return parseMediaFile("Twine.image", filename);
+    case "aac":
+    case "flac":
+    case "m4a":
+    case "mp3":
+    case "oga":
+    case "ogg":
+    case "opus":
+    case "wav":
+    case "wave":
+    case "weba":
+      return parseMediaFile("Twine.audio", filename);
+    case "mp4":
+    case "ogv":
+    case "webm":
+      return parseMediaFile("Twine.video", filename);
+    case "vtt":
+      return parseMediaFile("Twine.vtt", filename);
+    default:
+      return void 0;
+  }
+}
+function loadTwee(story, filename, opts, diagnostics) {
+  const result = parseTweeFile(filename, opts);
+  diagnostics.push(...result.diagnostics);
+  for (const p of result.passages) {
+    storyAdd(story, p, diagnostics);
+  }
+}
+function loadTagged(story, tag, filename, diagnostics) {
+  const result = parseTaggedFile(tag, filename);
+  for (const p of result.passages) {
+    storyAdd(story, p, diagnostics);
+  }
+}
+function loadMedia(story, tag, filename, diagnostics) {
+  const result = parseMediaFile(tag, filename);
+  for (const p of result.passages) {
+    storyAdd(story, p, diagnostics);
+  }
+}
+function loadFont(story, filename, diagnostics) {
+  const result = parseFontFile(filename);
+  for (const p of result.passages) {
+    storyAdd(story, p, diagnostics);
+  }
+}
+function loadSourcesCached(story, filenames, opts, diagnostics, processedFiles, cache, changedFiles) {
+  const currentFiles = /* @__PURE__ */ new Set();
+  for (const filename of filenames) {
+    if (processedFiles.has(filename)) {
+      diagnostics.push({ level: "warning", message: `load ${filename}: Skipping duplicate.` });
+      continue;
+    }
+    currentFiles.add(filename);
+    const cached = cache.get(filename);
+    if (changedFiles && cached && !changedFiles.has(filename)) {
+      diagnostics.push(...cached.diagnostics);
+      for (const p of cached.passages) {
+        storyAdd(story, p, diagnostics);
+      }
+      processedFiles.add(filename);
+      continue;
+    }
+    let mtimeMs;
+    try {
+      mtimeMs = statSync3(filename).mtimeMs;
+    } catch {
+      continue;
+    }
+    if (cached && cached.mtimeMs === mtimeMs) {
+      diagnostics.push(...cached.diagnostics);
+      for (const p of cached.passages) {
+        storyAdd(story, p, diagnostics);
+      }
+      processedFiles.add(filename);
+      continue;
+    }
+    try {
+      const result = parseFile(filename, opts);
+      if (!result) continue;
+      cache.set(filename, {
+        mtimeMs,
+        passages: result.passages,
+        diagnostics: result.diagnostics
+      });
+      diagnostics.push(...result.diagnostics);
+      for (const p of result.passages) {
+        storyAdd(story, p, diagnostics);
+      }
+    } catch (e) {
+      diagnostics.push({
+        level: "error",
+        message: `load ${filename}: ${e instanceof Error ? e.message : String(e)}`,
+        file: filename
+      });
+      continue;
+    }
+    processedFiles.add(filename);
+  }
+  for (const key of cache.keys()) {
+    if (!currentFiles.has(key)) {
+      cache.delete(key);
+    }
+  }
+  if (story.name !== "" && !story.passages.some((p) => p.name === "StoryTitle")) {
+    storyPrepend(story, { name: "StoryTitle", tags: [], text: story.name }, diagnostics);
+  }
 }
 
 // src/version.ts
@@ -1422,20 +1580,20 @@ var VERSION = "1.2.0";
 
 // src/output-twine2.ts
 var CREATOR_NAME = "Twee-ts";
-function toTwine2Archive(story, startName, diagnostics) {
-  return getTwine2DataChunk(story, startName, diagnostics) + "\n";
+function toTwine2Archive(story, startName, diagnostics, options) {
+  return getTwine2DataChunk(story, startName, diagnostics, options) + "\n";
 }
-function toTwine2HTML(story, format, startName, diagnostics) {
+function toTwine2HTML(story, format, startName, diagnostics, 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));
+    template = template.replace("{{STORY_DATA}}", getTwine2DataChunk(story, startName, diagnostics, options));
   }
   return template;
 }
-function getTwine2DataChunk(story, startName, diagnostics) {
+function getTwine2DataChunk(story, startName, diagnostics, options) {
   ensureIFID(story, diagnostics);
   const parts = [];
   let startID = "";
@@ -1490,7 +1648,7 @@ function getTwine2DataChunk(story, startName, diagnostics) {
     if (p.name === "StorySettings" && story.twine1.settings.size === 0) {
       continue;
     }
-    parts.push(passageToPassagedata(p, pid));
+    parts.push(passageToPassagedata(p, pid, options));
     if (startName === p.name) {
       startID = String(pid);
     }
@@ -1500,9 +1658,9 @@ function getTwine2DataChunk(story, startName, diagnostics) {
   for (const [opt, val] of story.twine2.options) {
     if (val) opts.push(opt);
   }
-  const options = opts.join(" ");
+  const optionsStr = opts.join(" ");
   const zoom = String(story.twine2.zoom);
-  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(options)}" tags="${attrEscape(story.twine2.tags)}" hidden>`;
+  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) {
@@ -1683,7 +1841,7 @@ function modifyHead(html, modulePaths, headFile, diagnostics) {
 }
 
 // src/remote-formats.ts
-import { mkdirSync, readFileSync as readFileSync3, writeFileSync, existsSync, readdirSync as readdirSync3, statSync as statSync3 } from "fs";
+import { mkdirSync, readFileSync as readFileSync3, writeFileSync, existsSync, readdirSync as readdirSync3, statSync as statSync4 } from "fs";
 import { join as join4 } from "path";
 import { homedir as homedir2 } from "os";
 var DEFAULT_SFA_INDICES = [
@@ -1895,7 +2053,7 @@ function discoverCachedFormats() {
   for (const name of names) {
     const nameDir = join4(cacheDir, name);
     try {
-      if (!statSync3(nameDir).isDirectory()) continue;
+      if (!statSync4(nameDir).isDirectory()) continue;
     } catch {
       continue;
     }
@@ -1936,11 +2094,12 @@ async function compileToFile(options) {
 }
 async function watch(options) {
   const controller = new AbortController();
+  const cache = /* @__PURE__ */ new Map();
   const filePaths = options.sources.filter((s) => typeof s === "string");
   const modulePaths = options.modules ?? [];
   const allPaths = [...filePaths, ...modulePaths];
-  const handle = watchFilesystem(allPaths, options.outFile, () => {
-    buildOutput(options).then((result) => {
+  const handle = watchFilesystem(allPaths, options.outFile, (changedFiles) => {
+    buildOutput(options, cache, changedFiles).then((result) => {
       writeFileSync2(options.outFile, result.output, "utf-8");
       options.onBuild?.(result);
     }).catch((e) => {
@@ -1950,13 +2109,14 @@ async function watch(options) {
   controller.signal.addEventListener("abort", () => handle.close());
   return controller;
 }
-async function buildOutput(options) {
+async function buildOutput(options, cache, changedFiles) {
   const diagnostics = [];
   const outputMode = options.outputMode ?? "html";
   const trim = options.trim ?? true;
   const twee2Compat = options.twee2Compat ?? false;
   const testMode = options.testMode ?? false;
   const noRemote = options.noRemote ?? false;
+  const sourceInfo = options.sourceInfo ?? false;
   clearIndexCache();
   const filePaths = [];
   const inlineSources = [];
@@ -1970,7 +2130,11 @@ async function buildOutput(options) {
   const sourceFilenames = getFilenames(filePaths);
   const story = createStory();
   const processedFiles = /* @__PURE__ */ new Set();
-  loadSources(story, sourceFilenames, { trim, twee2Compat }, diagnostics, processedFiles);
+  if (cache) {
+    loadSourcesCached(story, sourceFilenames, { trim, twee2Compat }, diagnostics, processedFiles, cache, changedFiles);
+  } else {
+    loadSources(story, sourceFilenames, { trim, twee2Compat }, diagnostics, processedFiles);
+  }
   loadInlineSources(story, inlineSources, { trim, twee2Compat }, diagnostics);
   if (options.tagAliases) {
     story.passages = applyTagAliases(story.passages, options.tagAliases);
@@ -2018,7 +2182,7 @@ async function buildOutput(options) {
       output = toTwee(story, outputMode);
       break;
     case "twine2-archive":
-      output = toTwine2Archive(story, startName, diagnostics);
+      output = toTwine2Archive(story, startName, diagnostics, { sourceInfo });
       break;
     case "twine1-archive":
       output = toTwine1Archive(story, startName);
@@ -2037,7 +2201,7 @@ async function buildOutput(options) {
         throw new TweeTsError("No story format available for HTML output.", diagnostics);
       }
       if (format.isTwine2) {
-        output = toTwine2HTML(story, format, startName, diagnostics);
+        output = toTwine2HTML(story, format, startName, diagnostics, { sourceInfo });
       } else {
         if (story.name === "" && !storyHas(story, "StoryTitle")) {
           diagnostics.push({
@@ -2168,7 +2332,7 @@ function validateConfig(data) {
       errors.push(`"${key}" must be a string.`);
     }
   }
-  for (const key of ["useTweegoPath", "trim", "twee2Compat", "testMode", "noRemote"]) {
+  for (const key of ["useTweegoPath", "trim", "twee2Compat", "testMode", "noRemote", "sourceInfo"]) {
     if (key in obj && typeof obj[key] !== "boolean") {
       errors.push(`"${key}" must be a boolean.`);
     }
@@ -2238,6 +2402,7 @@ var { values, positionals } = parseArgs({
     "format-url": { type: "string", multiple: true },
     "no-remote": { type: "boolean" },
     "tag-alias": { type: "string", multiple: true },
+    "source-info": { type: "boolean" },
     config: { type: "string", short: "c" },
     "no-config": { type: "boolean" }
   }
@@ -2306,7 +2471,8 @@ async function main() {
     formatIndices: values["format-index"] ?? config?.formatIndices,
     formatUrls: values["format-url"] ?? config?.formatUrls,
     noRemote: values["no-remote"] ?? config?.noRemote ?? false,
-    tagAliases
+    tagAliases,
+    sourceInfo: values["source-info"] ?? config?.sourceInfo ?? false
   };
   const outFile = values.output ?? config?.output ?? "-";
   if (values.watch) {
@@ -2432,6 +2598,7 @@ Options:
   --format-index <url>      SFA-compatible format index URL (repeatable)
   --format-url <url>        Direct format.js URL (repeatable)
   --tag-alias <alias=target> Map a tag to a special tag (repeatable)
+  --source-info             Emit source file/line as data- attributes on passages
   --no-remote               Disable remote format fetching
   -c, --config <file>       Config file path (default: ${CONFIG_FILENAME})
   --no-config               Skip config file loading