@rohal12/twee-ts 1.4.0 → 1.5.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;
@@ -1175,7 +1179,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;
@@ -1422,20 +1426,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 +1494,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 +1504,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) {
@@ -1957,6 +1961,7 @@ async function buildOutput(options) {
   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 = [];
@@ -2018,7 +2023,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 +2042,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 +2173,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 +2243,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 +2312,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 +2439,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