@spintax/core 0.5.2 → 0.6.0

package/dist/index.js

@@ -748,9 +748,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 +779,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 +796,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 +806,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);
@@ -918,7 +928,7 @@ function renderAst(ast, ctx) {
     locale: ctx.locale,
     depth: 0,
     onPluralError: ctx.onPluralError,
-    budget: { left: MAX_EXPANSION_CHARS }
+    budget: ctx.budget
   };
   const vars = Object.keys(ast.defDefs).length > 0 ? { ...base, ...rollDefinitions(ast.defDefs, base, ctx.runtimeContext, walkOpts) } : base;
   const text = renderNodes(ast.nodes, { ...walkOpts, vars });
@@ -1358,7 +1368,10 @@ function renderWith(input, rng, opts = {}) {
     resolver: opts.includeResolver,
     maxDepth: opts.maxDepth ?? DEFAULT_MAX_DEPTH,
     includeStack: [],
-    onPluralError: opts.onPluralError
+    onPluralError: opts.onPluralError,
+    // One allowance for the whole call. Created here rather than in renderAst because
+    // includes re-enter renderAst, and a budget made there is a budget per subtree.
+    budget: { left: MAX_EXPANSION_CHARS }
   };
   const ast = resolveAst(input);
   let out = renderAst(ast, ctx);