@rohal12/twee-ts 1.3.0 → 1.5.0

package/dist/bin/twee-ts.js

@@ -64,6 +64,10 @@ function attrEscape(s) {
   if (s.length === 0) return s;
   return s.replace(/&/g, "&").replace(/"/g, """).replace(/'/g, "'");
 }
+function fullAttrEscape(s) {
+  if (s.length === 0) return s;
+  return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
+}
 function htmlEscape(s) {
   if (s.length === 0) return s;
   return s.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
@@ -86,6 +90,13 @@ function commentSanitize(s) {
 function htmlCommentSanitize(s) {
   return s.replace(/-->/g, "-- >");
 }
+function rot13(s) {
+  if (s.length === 0) return s;
+  return s.replace(/[A-Za-z]/g, (ch) => {
+    const base = ch <= "Z" ? 65 : 97;
+    return String.fromCharCode((ch.charCodeAt(0) - base + 13) % 26 + base);
+  });
+}
 function tweeUnescape(s) {
   if (s.length === 0) return s;
   let result = "";
@@ -150,12 +161,14 @@ function hasMetadataSize(p) {
   return p.metadata != null && p.metadata.size != null && p.metadata.size !== "";
 }
 function hasAnyMetadata(p) {
-  return hasMetadataPosition(p) || hasMetadataSize(p);
+  if (!p.metadata) return false;
+  return Object.values(p.metadata).some((v) => v != null && v !== "");
 }
 function marshalMetadata(meta) {
   const obj = {};
-  if (meta.position) obj.position = meta.position;
-  if (meta.size) obj.size = meta.size;
+  for (const [key, value] of Object.entries(meta)) {
+    if (typeof value === "string" && value) obj[key] = value;
+  }
   return JSON.stringify(obj);
 }
 function passageToTwee(p, outMode) {
@@ -181,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)) {
@@ -198,9 +211,13 @@ function passageToPassagedata(p, pid) {
   } else {
     size = "100,100";
   }
-  return `<tw-passagedata pid="${pid}" name=${quote(attrEscape(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) {
+function passageToTiddler(p, pid, obfuscateRot13 = false) {
   let position;
   if (hasMetadataPosition(p)) {
     position = p.metadata?.position ?? "";
@@ -211,7 +228,10 @@ function passageToTiddler(p, pid) {
     const yp = x === 0 ? y : y + 1;
     position = `${xp * 140 - 130},${yp * 140 - 130}`;
   }
-  return `<div tiddler=${quote(attrEscape(p.name))} tags=${quote(attrEscape(p.tags.join(" ")))} twine-position=${quote(attrEscape(position))}>${tiddlerEscape(p.text)}</div>`;
+  const created = (/* @__PURE__ */ new Date()).toISOString().replace(/[-:T]/g, "").slice(0, 12);
+  const content = obfuscateRot13 && p.name !== "StorySettings" ? tiddlerEscape(rot13(p.text)) : tiddlerEscape(p.text);
+  const nameComment = obfuscateRot13 ? `<!-- ${commentSanitize(p.name)} -->` : "";
+  return `<div tiddler=${quote(attrEscape(p.name))} tags=${quote(attrEscape(p.tags.join(" ")))} created=${quote(created)} modifier=${quote("twee")} twine-position=${quote(attrEscape(position))}>${nameComment}${content}</div>`;
 }
 function countWords(p) {
   let text = p.text;
@@ -254,6 +274,7 @@ function createStory() {
       formatVersion: "",
       options: /* @__PURE__ */ new Map(),
       start: "",
+      tags: "",
       tagColors: /* @__PURE__ */ new Map(),
       zoom: 1
     }
@@ -300,6 +321,7 @@ function marshalStoryData(story) {
   }
   if (options.length > 0) data.options = options;
   if (story.twine2.start) data.start = story.twine2.start;
+  if (story.twine2.tags) data.tags = story.twine2.tags;
   if (story.twine2.tagColors.size > 0) {
     data["tag-colors"] = Object.fromEntries(story.twine2.tagColors);
   }
@@ -327,6 +349,7 @@ function unmarshalStoryData(story, json) {
     }
   }
   if (typeof data.start === "string" && data.start) story.twine2.start = data.start;
+  if (typeof data.tags === "string") story.twine2.tags = data.tags;
   if (typeof data["tag-colors"] === "object" && data["tag-colors"] !== null && !Array.isArray(data["tag-colors"])) {
     for (const [tag, color] of Object.entries(data["tag-colors"])) {
       if (typeof color === "string") story.twine2.tagColors.set(tag, color);
@@ -398,7 +421,7 @@ function storyAdd(story, p, diagnostics) {
         processed = { ...p, text: marshalStoryData(story) };
       } else {
         diagnostics.push({
-          level: "error",
+          level: "warning",
           message: `Cannot unmarshal "StoryData" compiler special passage; ${err}.`
         });
       }
@@ -621,17 +644,41 @@ function baseNameWithoutExt(filename) {
 }
 
 // src/formats.ts
+function relaxedJSONParse(json) {
+  try {
+    return JSON.parse(json);
+  } catch {
+  }
+  let fixed = json;
+  fixed = fixed.replace(/'([^'\\]*(?:\\.[^'\\]*)*)'/g, '"$1"');
+  fixed = fixed.replace(/(?<=^|[{,]\s*)([A-Za-z_$][A-Za-z0-9_$]*)\s*:/gm, '"$1":');
+  fixed = fixed.replace(/,\s*([}\]])/g, "$1");
+  return JSON.parse(fixed);
+}
 function parseFormatJSON(source, formatId) {
   const first = source.indexOf("{");
   const last = source.lastIndexOf("}");
   if (first === -1 || last === -1) return null;
   let chunk = source.slice(first, last + 1);
   const parse = (json) => {
-    const raw = JSON.parse(json);
+    const raw = relaxedJSONParse(json);
     if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return null;
     const obj = raw;
-    if (typeof obj.name !== "string" || typeof obj.version !== "string" || typeof obj.source !== "string") return null;
-    return { name: obj.name, version: obj.version, source: obj.source, proofing: obj.proofing === true };
+    if (typeof obj.version !== "string" || typeof obj.source !== "string") return null;
+    if (!parseSemver(obj.version)) return null;
+    const name = typeof obj.name === "string" ? obj.name : "Untitled Story Format";
+    const result = {
+      name,
+      version: obj.version,
+      source: obj.source,
+      proofing: obj.proofing === true
+    };
+    if (typeof obj.author === "string") result.author = obj.author;
+    if (typeof obj.description === "string") result.description = obj.description;
+    if (typeof obj.image === "string") result.image = obj.image;
+    if (typeof obj.url === "string") result.url = obj.url;
+    if (typeof obj.license === "string") result.license = obj.license;
+    return result;
   };
   try {
     return parse(chunk);
@@ -697,17 +744,55 @@ function discoverFormats(searchDirs) {
             format.name = data.name;
             format.version = data.version;
             format.proofing = data.proofing ?? false;
+            if (data.author) format.author = data.author;
+            if (data.description) format.description = data.description;
+            if (data.image) format.image = data.image;
+            if (data.url) format.url = data.url;
+            if (data.license) format.license = data.license;
           } catch {
             continue;
           }
+        } else {
+          format.name = entry;
         }
         formats.set(entry, format);
         break;
       }
     }
   }
+  pruneFormats(formats);
   return formats;
 }
+function pruneFormats(formats) {
+  const bestByNameMajor = /* @__PURE__ */ new Map();
+  const seenNameVersion = /* @__PURE__ */ new Set();
+  for (const [id, f] of formats) {
+    if (!f.isTwine2 || !f.name || !f.version) continue;
+    const v = parseSemver(f.version);
+    if (!v) continue;
+    const nameVersionKey = `${f.name}@${f.version}`;
+    if (seenNameVersion.has(nameVersionKey)) {
+      formats.delete(id);
+      continue;
+    }
+    seenNameVersion.add(nameVersionKey);
+    const groupKey = `${f.name}@${v[0]}`;
+    const existing = bestByNameMajor.get(groupKey);
+    if (!existing || semverCompare(v, existing.version) > 0) {
+      bestByNameMajor.set(groupKey, { id, version: v });
+    }
+  }
+  for (const [id, f] of [...formats]) {
+    if (!f.isTwine2 || !f.name || !f.version) continue;
+    const v = parseSemver(f.version);
+    if (!v) continue;
+    const groupKey = `${f.name}@${v[0]}`;
+    const best = bestByNameMajor.get(groupKey);
+    if (best && best.id !== id) {
+      formats.delete(id);
+    }
+  }
+}
 function getFormatSearchDirs(extraPaths = [], useTweegoPath = true) {
   const subdirNames = ["storyformats", ".storyformats", "story-formats", "storyFormats", "targets"];
   const basePaths = /* @__PURE__ */ new Set();
@@ -1094,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;
@@ -1144,8 +1229,11 @@ function parseTwee(source, options = {}) {
           }
           const parsed = raw;
           const meta = {};
-          if (typeof parsed.position === "string") meta.position = parsed.position;
-          if (typeof parsed.size === "string") meta.size = parsed.size;
+          for (const [key, value] of Object.entries(parsed)) {
+            if (typeof value === "string") {
+              meta[key] = value;
+            }
+          }
           current.metadata = meta;
         } catch (e) {
           diagnostics.push({
@@ -1159,7 +1247,11 @@ function parseTwee(source, options = {}) {
       }
       case 6 /* Content */: {
         if (!current) break;
-        current.text = trim ? item.val.trim() : item.val;
+        if (trim) {
+          current.text = item.val.trim();
+        } else {
+          current.text = item.val.replace(/\n\s*$/, "");
+        }
         break;
       }
       default: {
@@ -1334,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 = "";
@@ -1387,8 +1479,12 @@ function getTwine2DataChunk(story, startName, diagnostics) {
     }
   }
   parts.push(`<script role="script" id="twine-user-script" type="text/twine-javascript">${scriptContent}</script>`);
+  const validTagColors = /* @__PURE__ */ new Set(["gray", "red", "orange", "yellow", "green", "blue", "purple"]);
+  const hexColorPattern = /^#[0-9a-fA-F]{3,8}$/;
   for (const [tag, color] of story.twine2.tagColors) {
-    parts.push(`<tw-tag name="${attrEscape(tag)}" color="${attrEscape(color)}"></tw-tag>`);
+    if (validTagColors.has(color) || hexColorPattern.test(color)) {
+      parts.push(`<tw-tag name="${attrEscape(tag)}" color="${attrEscape(color)}"></tw-tag>`);
+    }
   }
   pid = 1;
   for (const p of story.passages) {
@@ -1398,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);
     }
@@ -1408,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)}" 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) {
@@ -1426,7 +1522,7 @@ function ensureIFID(story, diagnostics) {
     story.ifid = ifid;
     diagnostics.push({
       level: "error",
-      message: `Story IFID not found. Add a StoryData passage with: {"ifid":"${ifid}"}`
+      message: `Story IFID not found. Add an IFID to your story: {"ifid":"${ifid}"}`
     });
   }
 }
@@ -1437,7 +1533,7 @@ import { join as join3, dirname } from "path";
 var CREATOR_NAME2 = "twee-ts";
 function toTwine1Archive(story, _startName) {
   const { data, count } = getTwine1PassageChunk(story);
-  return `<div id="storeArea" data-size="${count}" hidden>${data}</div>
+  return `<div id="storeArea" data-size="${count}">${data}</div>
 `;
 }
 function toTwine1HTML(story, format, startName, _diagnostics) {
@@ -1482,12 +1578,13 @@ function toTwine1HTML(story, format, startName, _diagnostics) {
   return template;
 }
 function getTwine1PassageChunk(story) {
+  const obfuscateRot13 = story.twine1.settings.get("obfuscate") === "rot13";
   let data = "";
   let count = 0;
   for (const p of story.passages) {
     if (hasTag(p, "Twine.private")) continue;
     count++;
-    data += passageToTiddler(p, count);
+    data += passageToTiddler(p, count, obfuscateRot13);
   }
   return { data, count };
 }
@@ -1864,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 = [];
@@ -1925,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);
@@ -1944,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({
@@ -1986,11 +2084,14 @@ function storyToJSON(story) {
         tags: p.tags,
         text: p.text
       };
-      if (p.metadata && (p.metadata.position || p.metadata.size)) {
+      if (p.metadata) {
         const meta = {};
-        if (p.metadata.position) meta.position = p.metadata.position;
-        if (p.metadata.size) meta.size = p.metadata.size;
-        entry.metadata = meta;
+        for (const [key, value] of Object.entries(p.metadata)) {
+          if (typeof value === "string") meta[key] = value;
+        }
+        if (Object.keys(meta).length > 0) {
+          entry.metadata = meta;
+        }
       }
       storyPassages.push(entry);
     }
@@ -2072,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.`);
     }
@@ -2142,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" }
   }
@@ -2210,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) {
@@ -2336,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