@spintax/core 0.3.2 → 0.3.3

package/dist/index.js

@@ -59,6 +59,15 @@ function extractDirectives(text) {
   const setDefs = {};
   const defDefs = {};
   const occurrences = [];
+  let cursorOffset = 0;
+  let cursorLine = 1;
+  const lineAt = (offset) => {
+    for (let i = cursorOffset; i < offset; i += 1) {
+      if (text.charCodeAt(i) === 10) cursorLine += 1;
+    }
+    cursorOffset = offset;
+    return cursorLine;
+  };
   DIRECTIVE_RE.lastIndex = 0;
   const stripped = text.replace(
     DIRECTIVE_RE,
@@ -68,7 +77,7 @@ function extractDirectives(text) {
         kind,
         name,
         value,
-        line: countLines(text, offset)
+        line: lineAt(offset)
       });
       if (kind === "def") defDefs[name] = value;
       else setDefs[name] = value;
@@ -77,11 +86,6 @@ function extractDirectives(text) {
   );
   return { body: stripped.replace(/\n{3,}/gu, "\n\n"), setDefs, defDefs, occurrences };
 }
-function countLines(text, offset) {
-  let line = 1;
-  for (let i = 0; i < offset; i += 1) if (text[i] === "\n") line += 1;
-  return line;
-}
 function stripComments(text) {
   return text.replace(/\/#[\s\S]*?#\//g, "");
 }
@@ -418,13 +422,14 @@ var INCLUDE_RE = /^[ \t]*#include[ \t\n\r\f\x0B]+"([^"]+)"[ \t\n\r\f\x0B]*$/gmu;
 function validateTemplate(src, opts = {}) {
   const diagnostics = [];
   const text = stripComments(src);
+  const idx = buildLineIndex(text);
   checkBrackets(text, diagnostics);
   checkDirectives(text, diagnostics);
-  checkPermutationConfigs(text, diagnostics);
-  checkPlurals(text, opts.locale, diagnostics);
-  checkVariableReferences(text, opts.knownVariables, diagnostics);
+  checkPermutationConfigs(text, idx, diagnostics);
+  checkPlurals(text, idx, opts.locale, diagnostics);
+  checkVariableReferences(text, idx, opts.knownVariables, diagnostics);
   if (opts.knownIncludes && opts.knownIncludes.length > 0) {
-    checkIncludeTargets(text, opts.knownIncludes, diagnostics);
+    checkIncludeTargets(text, idx, opts.knownIncludes, diagnostics);
   }
   return diagnostics;
 }
@@ -434,21 +439,27 @@ function err(code, message, pos) {
 function warn(code, message, pos) {
   return { severity: "warning", code, message, ...pos };
 }
-function offsetToLineCol(text, offset) {
-  let line = 1;
-  let lineStart = 0;
-  const end = Math.min(Math.max(offset, 0), text.length);
-  for (let i = 0; i < end; i += 1) {
-    if (text.charAt(i) === "\n") {
-      line += 1;
-      lineStart = i + 1;
-    }
+function buildLineIndex(text) {
+  const starts = [0];
+  for (let i = 0; i < text.length; i += 1) {
+    if (text.charCodeAt(i) === 10) starts.push(i + 1);
+  }
+  return { starts, length: text.length };
+}
+function offsetToLineCol(idx, offset) {
+  const end = Math.min(Math.max(offset, 0), idx.length);
+  let lo = 0;
+  let hi = idx.starts.length - 1;
+  while (lo < hi) {
+    const mid = lo + hi + 1 >> 1;
+    if ((idx.starts[mid] ?? 0) <= end) lo = mid;
+    else hi = mid - 1;
   }
-  return { line, column: end - lineStart + 1 };
+  return { line: lo + 1, column: end - (idx.starts[lo] ?? 0) + 1 };
 }
-function span(text, offset, length) {
-  const s = offsetToLineCol(text, offset);
-  const e = offsetToLineCol(text, offset + length);
+function span(idx, offset, length) {
+  const s = offsetToLineCol(idx, offset);
+  const e = offsetToLineCol(idx, offset + length);
   return { line: s.line, column: s.column, endLine: e.line, endColumn: e.column };
 }
 function checkBrackets(text, out) {
@@ -516,7 +527,7 @@ function checkDirectives(text, out) {
     }
   }
 }
-function checkPermutationConfigs(text, out) {
+function checkPermutationConfigs(text, idx, out) {
   for (const m of text.matchAll(/\[<([^>]*?)>/gu)) {
     const configStr = m[1] ?? "";
     if (!/\w+\s*=/.test(configStr)) continue;
@@ -527,7 +538,7 @@ function checkPermutationConfigs(text, out) {
         out.push(err(
           "permutation.unknown-key",
           `Unknown permutation config key: '${km[1]}'.`,
-          { ...span(text, configBase + (km.index ?? 0), (km[1] ?? "").length), data: { key: km[1] } }
+          { ...span(idx, configBase + (km.index ?? 0), (km[1] ?? "").length), data: { key: km[1] } }
         ));
       }
     }
@@ -536,7 +547,7 @@ function checkPermutationConfigs(text, out) {
       out.push(err(
         "permutation.minsize-not-integer",
         `minsize must be a positive integer, got '${min[1]}'.`,
-        { ...span(text, configBase + min.index, min[0].length), data: { value: min[1] } }
+        { ...span(idx, configBase + min.index, min[0].length), data: { value: min[1] } }
       ));
     }
     const max = /maxsize\s*=\s*([^;>\s]+)/i.exec(configStr);
@@ -544,17 +555,17 @@ function checkPermutationConfigs(text, out) {
       out.push(err(
         "permutation.maxsize-not-integer",
         `maxsize must be a positive integer, got '${max[1]}'.`,
-        { ...span(text, configBase + max.index, max[0].length), data: { value: max[1] } }
+        { ...span(idx, configBase + max.index, max[0].length), data: { value: max[1] } }
       ));
     }
   }
 }
-function checkPlurals(text, locale, out) {
+function checkPlurals(text, idx, locale, out) {
   const base = locale && locale !== "" ? normalizeBaseLang(locale) : "";
   const arity = base !== "" ? pluralArity(base) : 0;
   const tainted = macroTaintedNames(text);
   for (const block of findPluralBlocks(text)) {
-    const at = span(text, block.start, block.end - block.start);
+    const at = span(idx, block.start, block.end - block.start);
     for (const m of block.countSlot.matchAll(/%(\w+)%/gu)) {
       const name = (m[1] ?? "").toLowerCase();
       if (!tainted.has(name)) continue;
@@ -584,25 +595,34 @@ var UNRESOLVED_AT_PLURAL_TIME = /\[|\{(?!\?)/u;
 function macroTaintedNames(text) {
   const macros = extractDirectives(text).setDefs;
   const tainted = /* @__PURE__ */ new Set();
+  const queue = [];
+  for (const [name, value] of Object.entries(macros)) {
+    if (UNRESOLVED_AT_PLURAL_TIME.test(value)) {
+      tainted.add(name);
+      queue.push(name);
+    }
+  }
+  const dependents = /* @__PURE__ */ new Map();
   for (const [name, value] of Object.entries(macros)) {
-    if (UNRESOLVED_AT_PLURAL_TIME.test(value)) tainted.add(name);
+    for (const m of value.matchAll(/%(\w+)%/gu)) {
+      const ref = (m[1] ?? "").toLowerCase();
+      const list = dependents.get(ref);
+      if (list === void 0) dependents.set(ref, [name]);
+      else list.push(name);
+    }
   }
-  let grew = true;
-  while (grew) {
-    grew = false;
-    for (const [name, value] of Object.entries(macros)) {
-      if (tainted.has(name)) continue;
-      for (const m of value.matchAll(/%(\w+)%/gu)) {
-        if (!tainted.has((m[1] ?? "").toLowerCase())) continue;
+  while (queue.length > 0) {
+    const source = queue.pop();
+    for (const name of dependents.get(source) ?? []) {
+      if (!tainted.has(name)) {
         tainted.add(name);
-        grew = true;
-        break;
+        queue.push(name);
       }
     }
   }
   return tainted;
 }
-function checkVariableReferences(text, known, out) {
+function checkVariableReferences(text, idx, known, out) {
   const knownSet = new Set((known ?? []).map((n) => n.toLowerCase()));
   const defs = /* @__PURE__ */ new Map();
   const defPos = /* @__PURE__ */ new Map();
@@ -610,7 +630,7 @@ function checkVariableReferences(text, known, out) {
     const name = (m[1] ?? "").toLowerCase();
     defs.set(name, m[2] ?? "");
     const nameOffset = (m.index ?? 0) + m[0].indexOf("%");
-    defPos.set(name, span(text, nameOffset, name.length + 2));
+    defPos.set(name, span(idx, nameOffset, name.length + 2));
   }
   const somewhere = { line: 1, column: 1 };
   for (const [name, value] of defs) {
@@ -618,8 +638,15 @@ function checkVariableReferences(text, known, out) {
       out.push(err("variable.self-reference", `Variable '${name}' references itself.`, defPos.get(name) ?? somewhere));
     }
   }
+  const refsOf = /* @__PURE__ */ new Map();
+  for (const [name, value] of defs) {
+    const refs = [];
+    for (const m of value.matchAll(/%(\w+)%/gu)) refs.push((m[1] ?? "").toLowerCase());
+    refsOf.set(name, refs);
+  }
+  const reachesCycle = namesThatReachACycle(defs, refsOf);
   for (const name of defs.keys()) {
-    detectCycle(name, defs, [name], defPos.get(name) ?? somewhere, out);
+    detectCycle(name, defs, refsOf, reachesCycle, defPos.get(name) ?? somewhere, out);
   }
   const body = text.replace(/^[ \t]*#(?:set|def)[ \t]+%\w+%[ \t]*=[ \t]*.*?$/gmu, (m) => m.replace(/[^\n]/g, " "));
   const seen = /* @__PURE__ */ new Set();
@@ -630,7 +657,7 @@ function checkVariableReferences(text, known, out) {
     out.push(warn(
       "variable.undefined",
       `Variable '${name}' is not defined \u2014 may be a runtime variable.`,
-      { ...span(text, offset, length), data: { name } }
+      { ...span(idx, offset, length), data: { name } }
     ));
   };
   for (const m of body.matchAll(/%(\w+)%/gu)) undefinedAt(m[1] ?? "", m.index ?? 0, m[0].length);
@@ -638,19 +665,70 @@ function checkVariableReferences(text, known, out) {
     undefinedAt(m[1] ?? "", (m.index ?? 0) + m[0].indexOf(m[1] ?? ""), (m[1] ?? "").length);
   }
 }
-function detectCycle(current, defs, visited, rootPos, out) {
-  const value = defs.get(current) ?? "";
-  for (const m of value.matchAll(/%(\w+)%/gu)) {
-    const ref = (m[1] ?? "").toLowerCase();
-    if (ref === current) continue;
-    if (visited.includes(ref)) {
-      out.push(err("variable.circular-reference", `Circular variable reference: ${[...visited, ref].join(" \u2192 ")}.`, rootPos));
-      return;
+function namesThatReachACycle(defs, refsOf) {
+  const GREY = 1;
+  const BLACK = 2;
+  const color = /* @__PURE__ */ new Map();
+  const reaches = /* @__PURE__ */ new Set();
+  for (const root of defs.keys()) {
+    if (color.has(root)) continue;
+    const stack = [{ name: root, refs: refsOf.get(root) ?? [], i: 0 }];
+    color.set(root, GREY);
+    while (stack.length > 0) {
+      const top = stack[stack.length - 1];
+      if (top.i < top.refs.length) {
+        const ref = top.refs[top.i];
+        top.i += 1;
+        if (ref === top.name || !defs.has(ref)) continue;
+        const c = color.get(ref);
+        if (c === GREY) reaches.add(top.name);
+        else if (c === BLACK) {
+          if (reaches.has(ref)) reaches.add(top.name);
+        } else {
+          stack.push({ name: ref, refs: refsOf.get(ref) ?? [], i: 0 });
+          color.set(ref, GREY);
+        }
+      } else {
+        stack.pop();
+        color.set(top.name, BLACK);
+        if (stack.length > 0 && reaches.has(top.name)) reaches.add(stack[stack.length - 1].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;
+    }
+    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 (defs.has(ref)) detectCycle(ref, defs, [...visited, ref], rootPos, out);
   }
 }
-function checkIncludeTargets(text, known, out) {
+function checkIncludeTargets(text, idx, known, out) {
   const set = new Set(known);
   INCLUDE_RE.lastIndex = 0;
   for (const m of text.matchAll(INCLUDE_RE)) {
@@ -660,7 +738,7 @@ function checkIncludeTargets(text, known, out) {
       out.push(err(
         "include.unknown-target",
         `#include target '${ref}' does not match any known template.`,
-        { ...span(text, refOffset, ref.length), data: { target: ref } }
+        { ...span(idx, refOffset, ref.length), data: { target: ref } }
       ));
     }
   }