@spintax/core 0.5.3 → 0.6.1

package/dist/index.js

@@ -1,19 +1,32 @@
 // src/internal/ast.ts
 var AST_VERSION = 2;
 function walk(nodes, visit) {
-  for (const n of nodes) {
+  const stack = [{ list: nodes, i: 0 }];
+  while (stack.length > 0) {
+    const top = stack[stack.length - 1];
+    if (top.i >= top.list.length) {
+      stack.pop();
+      continue;
+    }
+    const n = top.list[top.i];
+    top.i += 1;
     visit(n);
+    let children;
     switch (n.type) {
       case "enumeration":
-        for (const opt of n.options) walk(opt, visit);
+        children = n.options;
         break;
       case "conditional":
-        walk(n.then, visit);
-        walk(n.else, visit);
+        children = [n.then, n.else];
         break;
       case "permutation":
-        for (const opt of n.options) walk(opt.nodes, visit);
+        children = n.options.map((opt) => opt.nodes);
         break;
+      default:
+        continue;
+    }
+    for (let k = children.length - 1; k >= 0; k -= 1) {
+      stack.push({ list: children[k], i: 0 });
     }
   }
 }
@@ -90,65 +103,102 @@ function stripComments(text) {
   return text.replace(/\/#[\s\S]*?#\//g, "");
 }
 function parseSequence(text) {
-  const nodes = [];
-  let literal = "";
-  let i = 0;
-  const flushLiteral = () => {
-    if (literal !== "") {
-      nodes.push({ type: "literal", value: literal });
-      literal = "";
-    }
-  };
-  while (i < text.length) {
-    const ch = text.charAt(i);
-    if (ch === "{") {
-      const end = findMatchingClose(text, i, "{", "}");
-      if (end === -1) {
-        literal += ch;
-        i += 1;
+  const frame = (t) => ({ text: t, i: 0, literal: "", nodes: [], plan: null, parts: [] });
+  const stack = [frame(text)];
+  while (stack.length > 0) {
+    const f = stack[stack.length - 1];
+    if (f.plan !== null) {
+      if (f.parts.length < f.plan.texts.length) {
+        stack.push(frame(f.plan.texts[f.parts.length]));
         continue;
       }
-      const content = text.slice(i + 1, end);
-      flushLiteral();
-      nodes.push(parseBraceConstruct(content));
-      i = end + 1;
+      f.nodes.push(f.plan.build(f.parts));
+      f.plan = null;
+      f.parts = [];
       continue;
     }
-    if (ch === "[") {
-      const end = findMatchingClose(text, i, "[", "]");
-      if (end === -1) {
-        literal += ch;
-        i += 1;
-        continue;
+    const flushLiteral = () => {
+      if (f.literal !== "") {
+        f.nodes.push({ type: "literal", value: f.literal });
+        f.literal = "";
       }
-      flushLiteral();
-      nodes.push(parsePermutation(text.slice(i + 1, end)));
-      i = end + 1;
-      continue;
-    }
-    if (ch === "%") {
-      const name = VARIABLE_RE.exec(text.slice(i))?.[1];
-      if (name !== void 0) {
+    };
+    let planned = null;
+    while (f.i < f.text.length && planned === null) {
+      const ch = f.text.charAt(f.i);
+      if (ch === "{" || ch === "[") {
+        const close = ch === "{" ? "}" : "]";
+        const end = findMatchingClose(f.text, f.i, ch, close);
+        if (end === -1) {
+          f.literal += ch;
+          f.i += 1;
+          continue;
+        }
+        const inner = f.text.slice(f.i + 1, end);
         flushLiteral();
-        nodes.push({ type: "variable", name });
-        i += name.length + 2;
+        planned = ch === "{" ? planBraceConstruct(inner) : planPermutation(inner);
+        f.i = end + 1;
         continue;
       }
+      if (ch === "%") {
+        const name = VARIABLE_RE.exec(f.text.slice(f.i))?.[1];
+        if (name !== void 0) {
+          flushLiteral();
+          f.nodes.push({ type: "variable", name });
+          f.i += name.length + 2;
+          continue;
+        }
+      }
+      f.literal += ch;
+      f.i += 1;
+    }
+    if (planned !== null) {
+      if ("node" in planned) f.nodes.push(planned.node);
+      else f.plan = planned;
+      continue;
     }
-    literal += ch;
-    i += 1;
+    flushLiteral();
+    stack.pop();
+    const parent = stack[stack.length - 1];
+    if (parent !== void 0) parent.parts.push(f.nodes);
+    else return f.nodes;
   }
-  flushLiteral();
-  return nodes;
+  return [];
 }
-function parseBraceConstruct(content) {
+function planBraceConstruct(content) {
   if (content.charAt(0) === "?") {
-    const cond = tryParseConditional(content);
-    if (cond) return cond;
+    const parts = splitConditional(content);
+    if (parts !== null) {
+      return {
+        texts: [parts.thenRaw, parts.elseRaw],
+        build: (children) => ({
+          type: "conditional",
+          name: parts.name,
+          inverted: parts.inverted,
+          then: children[0] ?? [],
+          else: children[1] ?? []
+        })
+      };
+    }
   } else if (content.startsWith(PLURAL_PREFIX) && content.slice(PLURAL_PREFIX.length).includes(":")) {
-    return parsePlural(content.slice(PLURAL_PREFIX.length));
+    return { node: parsePlural(content.slice(PLURAL_PREFIX.length)) };
   }
-  return { type: "enumeration", options: splitTopLevel(content).map((o) => parseSequence(o)) };
+  return {
+    texts: splitTopLevel(content),
+    build: (children) => ({ type: "enumeration", options: children })
+  };
+}
+function planPermutation(rawInner) {
+  const { config, content } = extractPermutationConfig(rawInner);
+  const { texts, separators } = permutationElements(splitTopLevel(content));
+  return {
+    texts,
+    build: (children) => ({
+      type: "permutation",
+      config,
+      options: children.map((nodes, i) => ({ nodes, separator: separators[i] ?? null }))
+    })
+  };
 }
 function recognizeConditional(text, contentStart, contentEnd) {
   let p = contentStart + 1;
@@ -177,17 +227,6 @@ function splitConditional(content) {
     elseRaw: sep < 0 ? "" : body.slice(sep + 1)
   };
 }
-function tryParseConditional(content) {
-  const parts = splitConditional(content);
-  if (parts === null) return null;
-  return {
-    type: "conditional",
-    name: parts.name,
-    inverted: parts.inverted,
-    then: parseSequence(parts.thenRaw),
-    else: parseSequence(parts.elseRaw)
-  };
-}
 function parsePlural(afterPrefix) {
   const colon = afterPrefix.indexOf(":");
   return { type: "plural", countRaw: afterPrefix.slice(0, colon), formsRaw: afterPrefix.slice(colon + 1) };
@@ -202,11 +241,6 @@ var PER_ELEM_HTML_RE = /^[a-zA-Z][a-zA-Z0-9]*\s/;
 function defaultPermConfig() {
   return { minsize: null, maxsize: null, sep: " ", lastsep: null };
 }
-function parsePermutation(rawInner) {
-  const { config, content } = extractPermutationConfig(rawInner);
-  const options = extractPerElementSeparators(splitTopLevel(content));
-  return { type: "permutation", config, options };
-}
 function extractPermutationConfig(content) {
   const trimmed = phpLtrim(content);
   if (trimmed === "" || trimmed.charAt(0) !== "<") {
@@ -250,8 +284,9 @@ function looksLikeHtmlStartTag(tagText, remaining) {
   const tagName = (m[1] ?? "").toLowerCase();
   return new RegExp(`</${escapeRegExp(tagName)}\\s*>`, "iu").test(remaining);
 }
-function extractPerElementSeparators(rawParts) {
-  const options = [];
+function permutationElements(rawParts) {
+  const texts = [];
+  const separators = [];
   let pendingSep = null;
   rawParts.forEach((part, i) => {
     let text = part;
@@ -265,11 +300,12 @@ function extractPerElementSeparators(rawParts) {
     }
     const trimmed = phpTrim(text);
     if (trimmed !== "") {
-      options.push({ nodes: parseSequence(trimmed), separator: pendingSep });
+      texts.push(trimmed);
+      separators.push(pendingSep);
     }
     pendingSep = trailingSep;
   });
-  return options;
+  return { texts, separators };
 }
 function extractTrailingSep(part) {
   const trimmed = phpRtrim(part);
@@ -748,9 +784,14 @@ function checkVariableReferences(text, idx, known, out) {
     for (const m of value.matchAll(/%(\w+)%/gu)) refs.push((m[1] ?? "").toLowerCase());
     refsOf.set(name, refs);
   }
-  const reachesCycle = namesThatReachACycle(defs, refsOf);
+  const { reaches: reachesCycle, via } = namesThatReachACycle(defs, refsOf);
   for (const name of defs.keys()) {
-    detectCycle(name, defs, refsOf, reachesCycle, defPos.get(name) ?? somewhere, out);
+    if (!reachesCycle.has(name)) continue;
+    out.push(err(
+      "variable.circular-reference",
+      `Circular variable reference: ${cyclePath(name, via)}.`,
+      { ...defPos.get(name) ?? somewhere, data: { name } }
+    ));
   }
   const body = text.replace(/^[ \t]*#(?:set|def)[ \t]+%\w+%[ \t]*=[ \t]*.*?$/gmu, (m) => m.replace(/[^\n]/g, " "));
   const seen = /* @__PURE__ */ new Set();
@@ -774,6 +815,12 @@ function namesThatReachACycle(defs, refsOf) {
   const BLACK = 2;
   const color = /* @__PURE__ */ new Map();
   const reaches = /* @__PURE__ */ new Set();
+  const via = /* @__PURE__ */ new Map();
+  const mark = (name, witness) => {
+    if (reaches.has(name)) return;
+    reaches.add(name);
+    via.set(name, witness);
+  };
   for (const root of defs.keys()) {
     if (color.has(root)) continue;
     const stack = [{ name: root, refs: refsOf.get(root) ?? [], i: 0 }];
@@ -785,9 +832,9 @@ function namesThatReachACycle(defs, refsOf) {
         top.i += 1;
         if (ref === top.name || !defs.has(ref)) continue;
         const c = color.get(ref);
-        if (c === GREY) reaches.add(top.name);
+        if (c === GREY) mark(top.name, ref);
         else if (c === BLACK) {
-          if (reaches.has(ref)) reaches.add(top.name);
+          if (reaches.has(ref)) mark(top.name, ref);
         } else {
           stack.push({ name: ref, refs: refsOf.get(ref) ?? [], i: 0 });
           color.set(ref, GREY);
@@ -795,42 +842,41 @@ function namesThatReachACycle(defs, refsOf) {
       } else {
         stack.pop();
         color.set(top.name, BLACK);
-        if (stack.length > 0 && reaches.has(top.name)) reaches.add(stack[stack.length - 1].name);
+        if (stack.length > 0 && reaches.has(top.name)) mark(stack[stack.length - 1].name, top.name);
       }
     }
   }
-  return reaches;
-}
-function detectCycle(root, defs, refsOf, reachesCycle, rootPos, out) {
-  if (!reachesCycle.has(root)) return;
-  const path = [root];
-  const onPath = /* @__PURE__ */ new Set([root]);
-  const stack = [{ name: root, refs: refsOf.get(root) ?? [], i: 0 }];
-  const leave = (frame) => {
-    stack.pop();
-    onPath.delete(frame.name);
-    path.pop();
-  };
-  while (stack.length > 0) {
-    const top = stack[stack.length - 1];
-    if (top.i >= top.refs.length) {
-      leave(top);
-      continue;
+  return { reaches, via };
+}
+var CYCLE_PATH_LIMIT = 8;
+function cyclePath(name, via) {
+  const seen = /* @__PURE__ */ new Set([name]);
+  const shown = [name];
+  let current = name;
+  for (; ; ) {
+    const next = via.get(current);
+    if (next === void 0) break;
+    if (seen.has(next)) {
+      shown.push(next);
+      return shown.join(" \u2192 ");
     }
-    const ref = top.refs[top.i];
-    top.i += 1;
-    if (ref === top.name) continue;
-    if (onPath.has(ref)) {
-      out.push(err("variable.circular-reference", `Circular variable reference: ${[...path, ref].join(" \u2192 ")}.`, rootPos));
-      leave(top);
-      continue;
-    }
-    if (defs.has(ref) && reachesCycle.has(ref)) {
-      stack.push({ name: ref, refs: refsOf.get(ref) ?? [], i: 0 });
-      onPath.add(ref);
-      path.push(ref);
+    if (shown.length >= CYCLE_PATH_LIMIT) {
+      let more = 0;
+      let walk2 = next;
+      while (!seen.has(walk2)) {
+        seen.add(walk2);
+        more += 1;
+        const step = via.get(walk2);
+        if (step === void 0) break;
+        walk2 = step;
+      }
+      return `${shown.join(" \u2192 ")} \u2192 \u2026 (${more} more)`;
     }
+    seen.add(next);
+    shown.push(next);
+    current = next;
   }
+  return shown.join(" \u2192 ");
 }
 function checkIncludeTargets(text, idx, known, out) {
   const set = new Set(known);
@@ -1004,9 +1050,34 @@ function directReferences(text) {
   return [...text.matchAll(/%(\w+)%/gu)].map((match) => (match[1] ?? "").toLowerCase());
 }
 function renderNodes(nodes, opts) {
-  let out = "";
-  for (const node of nodes) out += renderNode(node, opts);
-  return out;
+  const frame = (list) => ({ nodes: list, i: 0, out: [], pending: null });
+  const stack = [frame(nodes)];
+  while (stack.length > 0) {
+    const f = stack[stack.length - 1];
+    if (f.pending !== null) {
+      if (f.pending.done.length < f.pending.lists.length) {
+        stack.push(frame(f.pending.lists[f.pending.done.length]));
+        continue;
+      }
+      f.out.push(f.pending.assemble(f.pending.done));
+      f.pending = null;
+      continue;
+    }
+    if (f.i >= f.nodes.length) {
+      const text = f.out.join("");
+      stack.pop();
+      const parent = stack[stack.length - 1];
+      if (parent === void 0) return text;
+      parent.pending.done.push(text);
+      continue;
+    }
+    const node = f.nodes[f.i];
+    f.i += 1;
+    const step = renderNode(node, opts);
+    if (typeof step === "string") f.out.push(step);
+    else f.pending = step;
+  }
+  return "";
 }
 function renderNode(node, opts) {
   switch (node.type) {
@@ -1058,7 +1129,7 @@ function conditionalTakesThen(name, inverted, opts) {
 }
 function renderConditional(node, opts) {
   const truthy = conditionalTakesThen(node.name, node.inverted, opts);
-  return renderNodes(truthy ? node.then : node.else, opts);
+  return { lists: [truthy ? node.then : node.else], done: [], assemble: (parts) => parts[0] ?? "" };
 }
 function resolveCountConditionals(text, opts) {
   if (!text.includes("{?")) return text;
@@ -1143,7 +1214,7 @@ function renderPlural(node, opts) {
     return fullwidthVerbatim(countRaw, formsRaw);
   }
   const picked = pluralFor(base, Number.parseInt(count, 10), forms);
-  return renderNodes(parseSequence(picked), opts);
+  return { lists: [parseSequence(picked)], done: [], assemble: (parts) => parts[0] ?? "" };
 }
 function rawConstruct(countRaw, formsRaw) {
   return `{plural ${countRaw}:${formsRaw}}`;
@@ -1154,13 +1225,19 @@ function fullwidthVerbatim(countRaw, formsRaw) {
 function renderEnumeration(options, opts) {
   if (options.length === 0) return "";
   const picked = options[randomInt(opts.rng, 0, options.length - 1)];
-  return picked ? renderNodes(picked, opts) : "";
+  if (!picked) return "";
+  return { lists: [picked], done: [], assemble: (parts) => parts[0] ?? "" };
 }
 function renderPermutation(node, opts) {
-  const elements = node.options.map((o) => ({
-    text: renderNodes(o.nodes, opts),
-    sep: o.separator
-  }));
+  if (node.options.length === 0) return "";
+  return {
+    lists: node.options.map((o) => o.nodes),
+    done: [],
+    assemble: (parts) => assemblePermutation(node, parts, opts)
+  };
+}
+function assemblePermutation(node, rendered, opts) {
+  const elements = node.options.map((o, i) => ({ text: rendered[i] ?? "", sep: o.separator }));
   const total = elements.length;
   if (total === 0) return "";
   const { config } = node;