parseman 0.55.0 → 0.55.2

package/dist/cli/index.js

@@ -3703,19 +3703,22 @@ function hasDirectBuildDef(p, seen = /* @__PURE__ */ new Set()) {
       return false;
   }
 }
-function mayCommitFailure(p, seen = /* @__PURE__ */ new Set(), resolve2) {
-  if (seen.has(p)) return false;
-  seen.add(p);
+function mayCommitFailure(p, resolve2, memo = /* @__PURE__ */ new Map()) {
+  return reachesMarked(p, (node2) => commitFailureSuccessors(node2, resolve2), memo);
+}
+var NO_EDGES = [];
+function commitFailureSuccessors(p, resolve2) {
   const d = p._def;
   switch (d.tag) {
     case "dispatch":
+    case "unknown":
       return true;
     case "choice":
     case "sequence":
-      return d.parsers.some((x) => mayCommitFailure(x, seen, resolve2));
+      return d.parsers;
     // A contained transaction reports every failure uncommitted.
     case "attempt":
-      return d.contain !== true && mayCommitFailure(d.parser, seen, resolve2);
+      return d.contain === true ? NO_EDGES : [d.parser];
     case "many":
     case "oneOrMore":
     case "optional":
@@ -3724,31 +3727,77 @@ function mayCommitFailure(p, seen = /* @__PURE__ */ new Set(), resolve2) {
     case "field":
     case "grammar":
     case "node":
-      return mayCommitFailure(d.parser, seen, resolve2);
-    case "sepBy":
-      return mayCommitFailure(d.parser, seen, resolve2) || mayCommitFailure(d.separator, seen, resolve2);
     case "token":
     case "leaf":
-      return mayCommitFailure(d.parser, seen, resolve2);
     case "withCtx":
-      return mayCommitFailure(d.parser, seen, resolve2);
+      return [d.parser];
+    case "sepBy":
+      return [d.parser, d.separator];
     case "scanTo":
-      return mayCommitFailure(d.sentinel, seen, resolve2) || d.skip.some((x) => mayCommitFailure(x, seen, resolve2)) || d.recoverAt !== void 0 && mayCommitFailure(d.recoverAt, seen, resolve2) || d.stopAt !== void 0 && mayCommitFailure(d.stopAt, seen, resolve2);
+      return [
+        d.sentinel,
+        ...d.skip,
+        ...d.recoverAt === void 0 ? NO_EDGES : [d.recoverAt],
+        ...d.stopAt === void 0 ? NO_EDGES : [d.stopAt]
+      ];
     case "lazy": {
       try {
-        return mayCommitFailure(d.thunk(), seen, resolve2);
+        return [d.thunk()];
       } catch {
         const name = p._ruleName;
         const target = name === void 0 ? void 0 : resolve2?.(name);
-        return target === void 0 ? true : mayCommitFailure(target, seen, resolve2);
+        return target === void 0 ? true : [target];
       }
     }
-    case "unknown":
-      return true;
     default:
-      return false;
+      return NO_EDGES;
   }
 }
+function reachesMarked(root, successors, memo) {
+  const known = memo.get(root);
+  if (known !== void 0) return known;
+  const order = /* @__PURE__ */ new Map();
+  const low = [];
+  const found = [];
+  const stack = [];
+  const visit = (node2) => {
+    const at = low.length;
+    order.set(node2, at);
+    low.push(at);
+    found.push(false);
+    stack.push(node2);
+    const next = successors(node2);
+    if (next === true) found[at] = true;
+    else {
+      for (const child of next) {
+        if (found[at]) break;
+        const hit = memo.get(child);
+        if (hit !== void 0) {
+          if (hit) found[at] = true;
+          continue;
+        }
+        const seen = order.get(child);
+        if (seen !== void 0) {
+          if (seen < low[at]) low[at] = seen;
+          continue;
+        }
+        const k = visit(child);
+        if (low[k] < low[at]) low[at] = low[k];
+        if (found[k]) found[at] = true;
+      }
+    }
+    if (low[at] === at) {
+      const answer = found[at];
+      let member;
+      do {
+        member = stack.pop();
+        memo.set(member, answer);
+      } while (member !== node2);
+    }
+    return at;
+  };
+  return found[visit(root)];
+}
 
 // src/combinators/scalar.ts
 var SCALAR_TAG = /^(?:literal|regex|keywords|sequence|choice|many|oneOrMore|optional|transform|trivia|grammar|sepBy|lazy)$/;
@@ -6107,21 +6156,20 @@ var Encoder = class {
   nonCommittingChoiceSites = /* @__PURE__ */ new Set();
   failureRollbackCleanSites = /* @__PURE__ */ new Set();
   /**
-   * `hasSideWriter` memo for `failureNeedsRollback`, shared across every call
-   * for the lifetime of this `Encoder`. A cached entry is written only when
-   * `complete` is true, which means the answer is a path-independent fact
-   * about that combinator node — it does not depend on which root's traversal
-   * asked, only on the node's own reachable subgraph. Scoping the memo per call
-   * (as a local inside `failureNeedsRollback`) was correct but discarded that
-   * fact after every arm, so a grammar with many ordered-choice arms / optional
-   * / attempt sites re-walked the SAME shared rule graph from scratch for each
-   * site — O(sites × graph size) instead of O(graph size). Measured on the
-   * scss-parser grammar (composed CSS-base superset, the deepest/largest of the
-   * four grammars): 47-50s for one `compileRuleMap` with the per-call memo,
-   * versus the whole macro transform completing in under a second once this
-   * memo is hoisted here.
+   * `reachesSideWriter`'s answers, shared by every `failureNeedsRollback` call
+   * for the lifetime of this `Encoder`. Every entry is exact — it depends only on
+   * the node's own reachable subgraph, never on which root's walk asked — so each
+   * combinator is walked once per encode however many choice arms, optionals and
+   * attempt sites reach it.
    */
   sideWriterMemo = /* @__PURE__ */ new Map();
+  /**
+   * `mayCommitFailure`'s answers, shared by every choice site for the lifetime
+   * of this `Encoder` — exact for the graph and the `winners` resolver it is
+   * encoding, so the rule graph is walked once per encode rather than once per
+   * choice site.
+   */
+  commitFailureMemo = /* @__PURE__ */ new Map();
   labels = void 0;
   /** Trivia table in scope at the row being encoded — codegen's `ctx.activeTrivia`. */
   activeTrivia = void 0;
@@ -6552,63 +6600,45 @@ var Encoder = class {
    * writer census covers the side sinks that proof deliberately does not model:
    * fields, recovered errors, and interpreted scanners. Strict assemblies do
    * not run repeat recovery, but these rows can still publish through a caller's
-   * context. Cycles are safe to stop: revisiting the same combinator cannot
-   * discover a writer the first traversal did not already reach.
+   * context.
    */
   failureNeedsRollback(p, autoNot) {
     const refName = p._ruleName;
     const winner = refName === void 0 ? void 0 : this.winners?.[refName];
     const root = winner !== void 0 && !winnerWrapsReference2(winner, p) ? winner : p;
-    const sideWriterMemo = this.sideWriterMemo;
-    const seen = /* @__PURE__ */ new Set();
-    const hasSideWriter = (current) => {
-      const cached = sideWriterMemo.get(current);
-      if (cached !== void 0) return { found: cached, complete: true };
-      if (seen.has(current)) return { found: false, complete: false };
-      seen.add(current);
-      const def = current._def;
-      let result;
-      switch (def.tag) {
-        case "field":
-        case "expect":
-        case "recover":
-        case "scanTo":
-        case "unknown":
-          result = { found: true, complete: true };
-          break;
-        case "lazy": {
-          const name = current._ruleName;
-          const resolvedWinner = name === void 0 ? void 0 : this.winners?.[name];
-          if (resolvedWinner !== void 0 && !winnerWrapsReference2(resolvedWinner, current)) {
-            result = hasSideWriter(resolvedWinner);
-            break;
-          }
-          try {
-            result = hasSideWriter(def.thunk());
-          } catch {
-            result = { found: true, complete: true };
-          }
-          break;
-        }
-        default: {
-          let complete = true;
-          result = { found: false, complete: true };
-          for (const child of childrenOf(def)) {
-            const childResult = hasSideWriter(child);
-            if (childResult.found) {
-              result = { found: true, complete: true };
-              break;
-            }
-            complete &&= childResult.complete;
-          }
-          if (!result.found) result = { found: false, complete };
+    return mayLeavePartialCapture(root, /* @__PURE__ */ new Set(), true) || this.reachesSideWriter(root) || (autoNot?.length ?? 0) > 0 && capturesLeaf(root);
+  }
+  /**
+   * Whether a field, recovered error, interpreted scanner or unresolvable shape
+   * is reachable from `root` — the writer census of `failureNeedsRollback`,
+   * entering each combinator once per `Encoder` (see `reachesMarked`).
+   */
+  reachesSideWriter(root) {
+    return reachesMarked(root, (node2) => this.sideWriterSuccessors(node2), this.sideWriterMemo);
+  }
+  /** The census's edges out of `node`, or `true` when `node` is itself a writer. */
+  sideWriterSuccessors(node2) {
+    const def = node2._def;
+    switch (def.tag) {
+      case "field":
+      case "expect":
+      case "recover":
+      case "scanTo":
+      case "unknown":
+        return true;
+      case "lazy": {
+        const name = node2._ruleName;
+        const winner = name === void 0 ? void 0 : this.winners?.[name];
+        if (winner !== void 0 && !winnerWrapsReference2(winner, node2)) return [winner];
+        try {
+          return [def.thunk()];
+        } catch {
+          return true;
         }
       }
-      seen.delete(current);
-      if (result.found || result.complete) sideWriterMemo.set(current, result.found);
-      return result;
-    };
-    return mayLeavePartialCapture(root, /* @__PURE__ */ new Set(), true) || hasSideWriter(root).found || (autoNot?.length ?? 0) > 0 && capturesLeaf(root);
+      default:
+        return childrenOf(def);
+    }
   }
   /** A first set becomes a char class string, or −1 for `any`. */
   charClass(fs) {
@@ -6939,7 +6969,7 @@ var Encoder = class {
           this.code[head + 4 + kids.length + i] = this.expected(deriveExpected(arms[i]));
         }
         this.choiceRollbackMasks.set(head, rollbackMask);
-        if (arms.every((arm) => !mayCommitFailure(arm, /* @__PURE__ */ new Set(), rr))) {
+        if (arms.every((arm) => !mayCommitFailure(arm, rr, this.commitFailureMemo))) {
           this.nonCommittingChoiceSites.add(head);
         }
         return head;