parseman 0.51.1 → 0.52.0

package/dist/table/index.js

@@ -257,6 +257,10 @@ function firstSetBody(p, seen, resolve, activeTrivia) {
     case "node":
     case "sepBy":
     case "expect":
+    // A transaction accepts exactly what its inner accepts. Its own `_meta` is
+    // the inner's construction-time set, which reads `any` when the inner opens
+    // with a rule reference — resolve through it like any other wrapper.
+    case "attempt":
       return fs(d.parser);
     case "grammar":
       return firstSetOf(
@@ -1621,6 +1625,10 @@ function peelLabel(p) {
   return null;
 }
 function analyzeLabeledTrivia(trivia2) {
+  if (trivia2._def.tag === "trivia") {
+    const own = trivia2._meta.labeledTriviaSpec;
+    if (own !== void 0) return own;
+  }
   if (trivia2 === labeledTrivia0) return labeledSpec0;
   if (trivia2 === labeledTrivia1) return labeledSpec1;
   if (trivia2 === labeledTrivia2) return labeledSpec2;
@@ -3286,13 +3294,17 @@ function transform(combinator, fn) {
   };
 }
 function trivia(combinator) {
-  const kindLabels = analyzeLabeledTrivia(combinator)?.labels;
+  const labeled = analyzeLabeledTrivia(combinator);
+  const kindLabels = labeled?.labels;
   return {
     _tag: combinator._tag,
     _meta: {
       ...combinator._meta,
       isTrivia: true,
       triviaScanner: fastTriviaScanner(combinator),
+      // Every labeled scan of this trivia reads its spec; the module's four-slot
+      // memo alone thrashes on a grammar with more than four trivia tables.
+      labeledTriviaSpec: labeled,
       ...kindLabels ? { triviaKindLabels: kindLabels } : {}
     },
     _def: { tag: "trivia", parser: combinator },
@@ -3434,6 +3446,271 @@ function ref() {
   return slot;
 }
 
+// src/compiler/degradation.ts
+function formatDegradation(d) {
+  return `[parseman] degraded [${d.code}] ${d.where}: ${d.subject} \u2014 ${d.fellBackTo}; otherwise ${d.otherwise}`;
+}
+var DETAIL_CAP = 8;
+function formatDegradations(list) {
+  const byCode = /* @__PURE__ */ new Map();
+  for (const d of list) {
+    const bucket = byCode.get(d.code);
+    if (bucket) bucket.push(d);
+    else byCode.set(d.code, [d]);
+  }
+  const out = [];
+  for (const [code, items] of byCode) {
+    for (const d of items.slice(0, DETAIL_CAP)) out.push(formatDegradation(d));
+    if (items.length > DETAIL_CAP) {
+      out.push(
+        `[parseman] degraded [${code}] +${items.length - DETAIL_CAP} more site(s) not listed (${items.length} total). Set PARSEMAN_DEGRADATION=error to fail the build on these.`
+      );
+    }
+  }
+  return out;
+}
+var _sinks = [];
+function beginDegradationCapture() {
+  _sinks.push(/* @__PURE__ */ new Map());
+}
+function degradationCaptureDepth() {
+  return _sinks.length;
+}
+function unwindDegradationCapture(depth) {
+  const found = [];
+  while (_sinks.length > depth) {
+    const sink = _sinks.pop();
+    found.unshift(...sink.values());
+  }
+  return found;
+}
+function resolveDegradationLevel(explicit) {
+  if (explicit !== void 0) return explicit;
+  const env = typeof process !== "undefined" ? process.env?.PARSEMAN_DEGRADATION : void 0;
+  if (env === "off" || env === "warn" || env === "error") return env;
+  return "warn";
+}
+function degradationKey(d) {
+  return JSON.stringify([d.code, d.where, d.subject]);
+}
+function recordDegradation(d) {
+  const level = resolveDegradationLevel();
+  if (level === "off") return;
+  const key = degradationKey(d);
+  const sink = _sinks[_sinks.length - 1];
+  if (sink) {
+    if (!sink.has(key)) sink.set(key, d);
+    return;
+  }
+  if (_immediate.has(key)) return;
+  _immediate.add(key);
+  if (level === "error") throw new Error(`parseman: degraded compilation path
+${formatDegradation(d)}`);
+  console.warn(formatDegradation(d));
+}
+var _immediate = /* @__PURE__ */ new Set();
+function beginCompileDegradationDrain() {
+  if (resolveDegradationLevel() === "off" || _sinks.length > 0) return () => {
+  };
+  const depth = degradationCaptureDepth();
+  beginDegradationCapture();
+  return (report) => {
+    const found = unwindDegradationCapture(depth);
+    if (!report || found.length === 0) return;
+    const fresh = found.filter((d) => {
+      const k = degradationKey(d);
+      if (_immediate.has(k)) return false;
+      _immediate.add(k);
+      return true;
+    });
+    if (fresh.length === 0) return;
+    const lines = formatDegradations(fresh);
+    if (resolveDegradationLevel() === "error") {
+      throw new Error(`parseman: ${fresh.length} degraded compilation path(s)
+${lines.join("\n")}`);
+    }
+    for (const l of lines) console.warn(l);
+  };
+}
+
+// src/compiler/build-arity.ts
+function cstOutputHost(build) {
+  return build?._parsemanCstOutput === true;
+}
+var SINGLE_IDENT_ARROW_RE = /^[A-Za-z_$][\w$]*\s*=>/;
+var PARAM_LIST_OPEN_RE = /^(?:function\b[^(]*)?\(/;
+var NATIVE_CODE_RE = /\{\s*\[native code\]\s*\}/;
+var PARAM_HEAD_RE = /^[A-Za-z_$][\w$]*\s*\??\s*/;
+function confirmedBuildArity(src) {
+  const s = src.trim();
+  if (NATIVE_CODE_RE.test(s)) return null;
+  if (/\barguments\b/.test(s)) return null;
+  if (SINGLE_IDENT_ARROW_RE.test(s)) return 1;
+  const inner = paramListText(s);
+  if (inner === null) return null;
+  if (inner.trim() === "") return 0;
+  const parts = splitTopLevel(inner);
+  if (parts === null) return null;
+  for (const part of parts) {
+    if (!isConfirmableParam(part.trim())) return null;
+  }
+  return parts.length;
+}
+function paramListText(s) {
+  const open = PARAM_LIST_OPEN_RE.exec(s);
+  if (!open) return null;
+  const start = open[0].length;
+  const end = matchingParen(s, start);
+  if (end === null) return null;
+  if (!s.startsWith("function") && !/^\s*=>/.test(s.slice(end + 1))) return null;
+  return s.slice(start, end);
+}
+function matchingParen(s, start) {
+  let depth = 0;
+  for (let i = start; i < s.length; i++) {
+    const c = s[i];
+    if (c === '"' || c === "'" || c === "`") {
+      const close = skipString(s, i);
+      if (close === null) return null;
+      i = close;
+      continue;
+    }
+    if (c === "(" || c === "[" || c === "{") depth++;
+    else if (c === "]" || c === "}") {
+      if (--depth < 0) return null;
+    } else if (c === ")") {
+      if (depth === 0) return i;
+      depth--;
+    }
+  }
+  return null;
+}
+function skipString(s, open) {
+  const quote = s[open];
+  for (let i = open + 1; i < s.length; i++) {
+    if (s[i] === "\\") {
+      i++;
+      continue;
+    }
+    if (s[i] === quote) return i;
+  }
+  return null;
+}
+function splitTopLevel(inner) {
+  const parts = [];
+  let depth = 0;
+  let angle = 0;
+  let last = 0;
+  for (let i = 0; i < inner.length; i++) {
+    const c = inner[i];
+    if (c === "=" && inner[i + 1] === ">") {
+      i++;
+      continue;
+    }
+    if (c === '"' || c === "'" || c === "`") {
+      const close = skipString(inner, i);
+      if (close === null) return null;
+      i = close;
+      continue;
+    }
+    if (c === "(" || c === "[" || c === "{") depth++;
+    else if (c === ")" || c === "]" || c === "}") {
+      if (--depth < 0) return null;
+    } else if (c === "<") angle++;
+    else if (c === ">") {
+      if (--angle < 0) return null;
+    } else if (c === "," && depth === 0 && angle === 0) {
+      parts.push(inner.slice(last, i));
+      last = i + 1;
+    }
+  }
+  if (depth !== 0 || angle !== 0) return null;
+  parts.push(inner.slice(last));
+  return parts;
+}
+function isConfirmableParam(part) {
+  const head = PARAM_HEAD_RE.exec(part);
+  if (!head) return false;
+  const rest = part.slice(head[0].length);
+  if (rest === "") return true;
+  if (rest[0] !== ":") return false;
+  return !hasDefaultAssign(rest.slice(1));
+}
+function hasDefaultAssign(annotation) {
+  for (let i = 0; i < annotation.length; i++) {
+    if (annotation[i] !== "=") continue;
+    if (annotation[i + 1] === ">" || annotation[i + 1] === "=") {
+      i++;
+      continue;
+    }
+    const prev = annotation[i - 1];
+    if (prev === "<" || prev === ">" || prev === "!" || prev === "=") continue;
+    return true;
+  }
+  return false;
+}
+function buildAnalysisSrc(def) {
+  return def.buildSigSrc ?? def.buildSrc ?? def.build.toString();
+}
+var RESOLVER_REASONS = {
+  "rest-parameter": "its parameter list uses a rest parameter, so the declared arity is unbounded",
+  "arguments": "its body references `arguments`",
+  "reassigned": "the binding it names is reassigned, so the function read here is not decidable",
+  "not-a-function": "the binding it names is not a function declaration",
+  "unresolved-import": "its module could not be resolved or parsed",
+  "not-found": "the name did not resolve to any binding",
+  "computed": "it is a computed expression",
+  "foreign-source": "it is named in a module the resolver was never told about, so its offsets index no scope tree the resolver holds",
+  "ambiguous-source": "two distinct registered modules hold byte-identical text, so that text no longer names the module its offsets index"
+};
+function unconfirmableReason(def, src) {
+  const declared = def.buildArityUnresolved;
+  if (declared !== void 0 && RESOLVER_REASONS[declared]) return RESOLVER_REASONS[declared];
+  const s = src.trim();
+  const params = s.slice(0, s.indexOf(")") + 1);
+  if (params.includes("...")) return RESOLVER_REASONS["rest-parameter"];
+  if (/\barguments\b/.test(s)) return RESOLVER_REASONS["arguments"];
+  if (/^[A-Za-z_$][\w$]*(\s*\.\s*[A-Za-z_$][\w$]*)?$/.test(s)) {
+    return "it names a binding this build could not resolve to a function declaration";
+  }
+  return "its parameter list could not be parsed";
+}
+function confirmedArityForDef(def) {
+  if (def.buildArity !== void 0) return def.buildArity;
+  const src = buildAnalysisSrc(def);
+  const arity = confirmedBuildArity(src);
+  if (arity !== null) return arity;
+  const subject = `build reducer \`${(def.buildSrc ?? "<runtime fn>").trim().split("\n")[0].slice(0, 60)}\``;
+  recordDegradation({
+    code: "build-arity-unconfirmed",
+    severity: "warn",
+    where: `node("${def.type ?? "<inferred>"}")`,
+    subject,
+    fellBackTo: `could not confirm its declared arity \u2014 ${unconfirmableReason(def, src)} \u2014 so this node captures children, fields and raw children, logs trivia, and clones \`_ctx.state\` on every match`,
+    otherwise: "only the tiers the reducer actually declares would be captured (arity >= 1 children, >= 2 fields, >= 4 raw, >= 5 trivia, >= 6 state). Declare it with `node(..., { buildArity: n })` if it cannot be derived"
+  });
+  return null;
+}
+function buildReadsRaw(def) {
+  if (!def.build) return true;
+  if (def.buildRawUnused === true) return false;
+  const arity = confirmedArityForDef(def);
+  if (arity === null) return true;
+  return arity >= 4;
+}
+function buildReadsTrivia(def) {
+  if (!def.build) return true;
+  const arity = confirmedArityForDef(def);
+  if (arity === null) return true;
+  return arity >= 5;
+}
+function buildReadsState(def) {
+  if (!def.build) return true;
+  const arity = confirmedArityForDef(def);
+  if (arity === null) return true;
+  return arity >= 6;
+}
+
 // src/combinators/token.ts
 function token(root) {
   const meta = {
@@ -3638,363 +3915,98 @@ function scanTo(sentinel, { skip, raw = false, orEOF = false, recoverAt, stopAt
             if (recover.span.end <= cur) {
               throw new TypeError("scanTo recoverAt must consume input");
             }
-            if (recovery < 0) {
-              recovery = cur;
-              recoveryErrorCount = errorCount;
-            }
-            if (firstSentinel >= 0 && (sentinelCount & 1) === 1) {
-              return succeed(recoveredEnd());
-            }
-            cur = recover.span.end;
-            continue;
-          }
-        }
-        cur++;
-      }
-      if (recovery >= 0) return succeed(recoveredEnd());
-      if (orEOF) {
-        return succeed(cur);
-      }
-      const sentDef = sentinel._def;
-      const expected = sentDef.tag === "literal" ? [JSON.stringify(sentDef.value)] : ["sentinel"];
-      return { ok: false, expected, span: { start: pos, end: cur } };
-    }
-  };
-}
-function markSpec(outer, open, close, ownSkip, strict, raw) {
-  ;
-  outer._balancedSpec = { open, close, ownSkip, strict, raw };
-  return outer;
-}
-function balanced(open, close, options = {}) {
-  const ownSkip = options.skip ?? [];
-  const strict = options.strict ?? false;
-  const combi = buildBalancedInterior(open, close, ownSkip, strict);
-  if (options.raw) return markSpec(token(combi), open, close, ownSkip, strict, true);
-  const eagerParse = combi.parse.bind(combi);
-  const cache = /* @__PURE__ */ new Map();
-  combi._balancedAmbient = { open, close, ownSkip, strict };
-  combi.parse = (input, pos, ctx) => {
-    const amb = ctx.scanSkip;
-    if (!amb || amb.length === 0) return eagerParse(input, pos, ctx);
-    let interior = cache.get(amb);
-    if (!interior) {
-      interior = buildBalancedInterior(open, close, [...amb, ...ownSkip], strict);
-      cache.set(amb, interior);
-    }
-    return interior.parse(input, pos, ctx);
-  };
-  return markSpec(token(combi), open, close, ownSkip, strict, false);
-}
-function buildBalancedInterior(open, close, skips, strict = false) {
-  const self = ref();
-  const stop = /* @__PURE__ */ new Set([open, close]);
-  let bounded = true;
-  for (const sk of skips) {
-    const cs = firstSetClassChars(sk);
-    if (cs === null) {
-      bounded = false;
-      break;
-    }
-    for (const ch2 of cs) stop.add(ch2);
-  }
-  const cls = [...stop].map(escapeClassChar).join("");
-  const content = bounded ? regex(new RegExp(`[^${cls}]+`)) : regex(new RegExp(`[^${escapeClassChar(open)}${escapeClassChar(close)}]`));
-  const inner = many(choice(self, ...skips, content));
-  const closer = strict ? literal(close) : expect(literal(close));
-  const combi = transform(
-    sequence(literal(open), inner, closer),
-    // parts: strings (content/self) or arrays (a sequence-shaped skip) or a
-    // ParseError (recovered close). `c` is the close string or a ParseError.
-    ([o, parts, c]) => o + parts.map((p) => typeof p === "string" ? p : Array.isArray(p) ? p.join("") : "").join("") + (typeof c === "string" ? c : "")
-  );
-  if (combi._def.tag === "transform") {
-    combi._def.fnSrc = '([o, parts, c]) => o + parts.map(p => typeof p === "string" ? p : Array.isArray(p) ? p.join("") : "").join("") + (typeof c === "string" ? c : "")';
-    combi._def.recognitionOnly = true;
-  }
-  ;
-  combi._balanced = { open, close };
-  self.define(combi);
-  return combi;
-}
-function firstSetClassChars(c) {
-  const fs = c._meta.firstSet;
-  if (fs.kind === "empty") return [];
-  if (fs.kind !== "ranges") return null;
-  const out = [];
-  for (const { lo, hi } of fs.ranges) {
-    if (hi - lo > 8) return null;
-    for (let cp = lo; cp <= hi; cp++) out.push(String.fromCodePoint(cp));
-  }
-  return out;
-}
-function escapeClassChar(ch2) {
-  return ch2.replace(/[\\\]^-]/g, "\\$&");
-}
-
-// src/compiler/degradation.ts
-function formatDegradation(d) {
-  return `[parseman] degraded [${d.code}] ${d.where}: ${d.subject} \u2014 ${d.fellBackTo}; otherwise ${d.otherwise}`;
-}
-var DETAIL_CAP = 8;
-function formatDegradations(list) {
-  const byCode = /* @__PURE__ */ new Map();
-  for (const d of list) {
-    const bucket = byCode.get(d.code);
-    if (bucket) bucket.push(d);
-    else byCode.set(d.code, [d]);
-  }
-  const out = [];
-  for (const [code, items] of byCode) {
-    for (const d of items.slice(0, DETAIL_CAP)) out.push(formatDegradation(d));
-    if (items.length > DETAIL_CAP) {
-      out.push(
-        `[parseman] degraded [${code}] +${items.length - DETAIL_CAP} more site(s) not listed (${items.length} total). Set PARSEMAN_DEGRADATION=error to fail the build on these.`
-      );
-    }
-  }
-  return out;
-}
-var _sinks = [];
-function beginDegradationCapture() {
-  _sinks.push(/* @__PURE__ */ new Map());
-}
-function degradationCaptureDepth() {
-  return _sinks.length;
-}
-function unwindDegradationCapture(depth) {
-  const found = [];
-  while (_sinks.length > depth) {
-    const sink = _sinks.pop();
-    found.unshift(...sink.values());
-  }
-  return found;
-}
-function resolveDegradationLevel(explicit) {
-  if (explicit !== void 0) return explicit;
-  const env = typeof process !== "undefined" ? process.env?.PARSEMAN_DEGRADATION : void 0;
-  if (env === "off" || env === "warn" || env === "error") return env;
-  return "warn";
-}
-function degradationKey(d) {
-  return JSON.stringify([d.code, d.where, d.subject]);
-}
-function recordDegradation(d) {
-  const level = resolveDegradationLevel();
-  if (level === "off") return;
-  const key = degradationKey(d);
-  const sink = _sinks[_sinks.length - 1];
-  if (sink) {
-    if (!sink.has(key)) sink.set(key, d);
-    return;
-  }
-  if (_immediate.has(key)) return;
-  _immediate.add(key);
-  if (level === "error") throw new Error(`parseman: degraded compilation path
-${formatDegradation(d)}`);
-  console.warn(formatDegradation(d));
-}
-var _immediate = /* @__PURE__ */ new Set();
-function beginCompileDegradationDrain() {
-  if (resolveDegradationLevel() === "off" || _sinks.length > 0) return () => {
-  };
-  const depth = degradationCaptureDepth();
-  beginDegradationCapture();
-  return (report) => {
-    const found = unwindDegradationCapture(depth);
-    if (!report || found.length === 0) return;
-    const fresh = found.filter((d) => {
-      const k = degradationKey(d);
-      if (_immediate.has(k)) return false;
-      _immediate.add(k);
-      return true;
-    });
-    if (fresh.length === 0) return;
-    const lines = formatDegradations(fresh);
-    if (resolveDegradationLevel() === "error") {
-      throw new Error(`parseman: ${fresh.length} degraded compilation path(s)
-${lines.join("\n")}`);
+            if (recovery < 0) {
+              recovery = cur;
+              recoveryErrorCount = errorCount;
+            }
+            if (firstSentinel >= 0 && (sentinelCount & 1) === 1) {
+              return succeed(recoveredEnd());
+            }
+            cur = recover.span.end;
+            continue;
+          }
+        }
+        cur++;
+      }
+      if (recovery >= 0) return succeed(recoveredEnd());
+      if (orEOF) {
+        return succeed(cur);
+      }
+      const sentDef = sentinel._def;
+      const expected = sentDef.tag === "literal" ? [JSON.stringify(sentDef.value)] : ["sentinel"];
+      return { ok: false, expected, span: { start: pos, end: cur } };
     }
-    for (const l of lines) console.warn(l);
   };
 }
-
-// src/compiler/build-arity.ts
-function cstOutputHost(build) {
-  return build?._parsemanCstOutput === true;
-}
-var SINGLE_IDENT_ARROW_RE = /^[A-Za-z_$][\w$]*\s*=>/;
-var PARAM_LIST_OPEN_RE = /^(?:function\b[^(]*)?\(/;
-var NATIVE_CODE_RE = /\{\s*\[native code\]\s*\}/;
-var PARAM_HEAD_RE = /^[A-Za-z_$][\w$]*\s*\??\s*/;
-function confirmedBuildArity(src) {
-  const s = src.trim();
-  if (NATIVE_CODE_RE.test(s)) return null;
-  if (/\barguments\b/.test(s)) return null;
-  if (SINGLE_IDENT_ARROW_RE.test(s)) return 1;
-  const inner = paramListText(s);
-  if (inner === null) return null;
-  if (inner.trim() === "") return 0;
-  const parts = splitTopLevel(inner);
-  if (parts === null) return null;
-  for (const part of parts) {
-    if (!isConfirmableParam(part.trim())) return null;
-  }
-  return parts.length;
-}
-function paramListText(s) {
-  const open = PARAM_LIST_OPEN_RE.exec(s);
-  if (!open) return null;
-  const start = open[0].length;
-  const end = matchingParen(s, start);
-  if (end === null) return null;
-  if (!s.startsWith("function") && !/^\s*=>/.test(s.slice(end + 1))) return null;
-  return s.slice(start, end);
-}
-function matchingParen(s, start) {
-  let depth = 0;
-  for (let i = start; i < s.length; i++) {
-    const c = s[i];
-    if (c === '"' || c === "'" || c === "`") {
-      const close = skipString(s, i);
-      if (close === null) return null;
-      i = close;
-      continue;
-    }
-    if (c === "(" || c === "[" || c === "{") depth++;
-    else if (c === "]" || c === "}") {
-      if (--depth < 0) return null;
-    } else if (c === ")") {
-      if (depth === 0) return i;
-      depth--;
-    }
-  }
-  return null;
+function markSpec(outer, open, close, ownSkip, strict, raw) {
+  ;
+  outer._balancedSpec = { open, close, ownSkip, strict, raw };
+  return outer;
 }
-function skipString(s, open) {
-  const quote = s[open];
-  for (let i = open + 1; i < s.length; i++) {
-    if (s[i] === "\\") {
-      i++;
-      continue;
+function balanced(open, close, options = {}) {
+  const ownSkip = options.skip ?? [];
+  const strict = options.strict ?? false;
+  const combi = buildBalancedInterior(open, close, ownSkip, strict);
+  if (options.raw) return markSpec(token(combi), open, close, ownSkip, strict, true);
+  const eagerParse = combi.parse.bind(combi);
+  const cache = /* @__PURE__ */ new Map();
+  combi._balancedAmbient = { open, close, ownSkip, strict };
+  combi.parse = (input, pos, ctx) => {
+    const amb = ctx.scanSkip;
+    if (!amb || amb.length === 0) return eagerParse(input, pos, ctx);
+    let interior = cache.get(amb);
+    if (!interior) {
+      interior = buildBalancedInterior(open, close, [...amb, ...ownSkip], strict);
+      cache.set(amb, interior);
     }
-    if (s[i] === quote) return i;
-  }
-  return null;
+    return interior.parse(input, pos, ctx);
+  };
+  return markSpec(token(combi), open, close, ownSkip, strict, false);
 }
-function splitTopLevel(inner) {
-  const parts = [];
-  let depth = 0;
-  let angle = 0;
-  let last = 0;
-  for (let i = 0; i < inner.length; i++) {
-    const c = inner[i];
-    if (c === "=" && inner[i + 1] === ">") {
-      i++;
-      continue;
-    }
-    if (c === '"' || c === "'" || c === "`") {
-      const close = skipString(inner, i);
-      if (close === null) return null;
-      i = close;
-      continue;
-    }
-    if (c === "(" || c === "[" || c === "{") depth++;
-    else if (c === ")" || c === "]" || c === "}") {
-      if (--depth < 0) return null;
-    } else if (c === "<") angle++;
-    else if (c === ">") {
-      if (--angle < 0) return null;
-    } else if (c === "," && depth === 0 && angle === 0) {
-      parts.push(inner.slice(last, i));
-      last = i + 1;
+function buildBalancedInterior(open, close, skips, strict = false) {
+  const self = ref();
+  const stop = /* @__PURE__ */ new Set([open, close]);
+  let bounded = true;
+  for (const sk of skips) {
+    const cs = firstSetClassChars(sk);
+    if (cs === null) {
+      bounded = false;
+      break;
     }
+    for (const ch2 of cs) stop.add(ch2);
   }
-  if (depth !== 0 || angle !== 0) return null;
-  parts.push(inner.slice(last));
-  return parts;
-}
-function isConfirmableParam(part) {
-  const head = PARAM_HEAD_RE.exec(part);
-  if (!head) return false;
-  const rest = part.slice(head[0].length);
-  if (rest === "") return true;
-  if (rest[0] !== ":") return false;
-  return !hasDefaultAssign(rest.slice(1));
-}
-function hasDefaultAssign(annotation) {
-  for (let i = 0; i < annotation.length; i++) {
-    if (annotation[i] !== "=") continue;
-    if (annotation[i + 1] === ">" || annotation[i + 1] === "=") {
-      i++;
-      continue;
-    }
-    const prev = annotation[i - 1];
-    if (prev === "<" || prev === ">" || prev === "!" || prev === "=") continue;
-    return true;
+  const cls = [...stop].map(escapeClassChar).join("");
+  const content = bounded ? regex(new RegExp(`[^${cls}]+`)) : regex(new RegExp(`[^${escapeClassChar(open)}${escapeClassChar(close)}]`));
+  const inner = many(choice(self, ...skips, content));
+  const closer = strict ? literal(close) : expect(literal(close));
+  const combi = transform(
+    sequence(literal(open), inner, closer),
+    // parts: strings (content/self) or arrays (a sequence-shaped skip) or a
+    // ParseError (recovered close). `c` is the close string or a ParseError.
+    ([o, parts, c]) => o + parts.map((p) => typeof p === "string" ? p : Array.isArray(p) ? p.join("") : "").join("") + (typeof c === "string" ? c : "")
+  );
+  if (combi._def.tag === "transform") {
+    combi._def.fnSrc = '([o, parts, c]) => o + parts.map(p => typeof p === "string" ? p : Array.isArray(p) ? p.join("") : "").join("") + (typeof c === "string" ? c : "")';
+    combi._def.recognitionOnly = true;
   }
-  return false;
-}
-function buildAnalysisSrc(def) {
-  return def.buildSigSrc ?? def.buildSrc ?? def.build.toString();
+  ;
+  combi._balanced = { open, close };
+  self.define(combi);
+  return combi;
 }
-var RESOLVER_REASONS = {
-  "rest-parameter": "its parameter list uses a rest parameter, so the declared arity is unbounded",
-  "arguments": "its body references `arguments`",
-  "reassigned": "the binding it names is reassigned, so the function read here is not decidable",
-  "not-a-function": "the binding it names is not a function declaration",
-  "unresolved-import": "its module could not be resolved or parsed",
-  "not-found": "the name did not resolve to any binding",
-  "computed": "it is a computed expression",
-  "foreign-source": "it is named in a module the resolver was never told about, so its offsets index no scope tree the resolver holds",
-  "ambiguous-source": "two distinct registered modules hold byte-identical text, so that text no longer names the module its offsets index"
-};
-function unconfirmableReason(def, src) {
-  const declared = def.buildArityUnresolved;
-  if (declared !== void 0 && RESOLVER_REASONS[declared]) return RESOLVER_REASONS[declared];
-  const s = src.trim();
-  const params = s.slice(0, s.indexOf(")") + 1);
-  if (params.includes("...")) return RESOLVER_REASONS["rest-parameter"];
-  if (/\barguments\b/.test(s)) return RESOLVER_REASONS["arguments"];
-  if (/^[A-Za-z_$][\w$]*(\s*\.\s*[A-Za-z_$][\w$]*)?$/.test(s)) {
-    return "it names a binding this build could not resolve to a function declaration";
+function firstSetClassChars(c) {
+  const fs = c._meta.firstSet;
+  if (fs.kind === "empty") return [];
+  if (fs.kind !== "ranges") return null;
+  const out = [];
+  for (const { lo, hi } of fs.ranges) {
+    if (hi - lo > 8) return null;
+    for (let cp = lo; cp <= hi; cp++) out.push(String.fromCodePoint(cp));
   }
-  return "its parameter list could not be parsed";
-}
-function confirmedArityForDef(def) {
-  if (def.buildArity !== void 0) return def.buildArity;
-  const src = buildAnalysisSrc(def);
-  const arity = confirmedBuildArity(src);
-  if (arity !== null) return arity;
-  const subject = `build reducer \`${(def.buildSrc ?? "<runtime fn>").trim().split("\n")[0].slice(0, 60)}\``;
-  recordDegradation({
-    code: "build-arity-unconfirmed",
-    severity: "warn",
-    where: `node("${def.type ?? "<inferred>"}")`,
-    subject,
-    fellBackTo: `could not confirm its declared arity \u2014 ${unconfirmableReason(def, src)} \u2014 so this node captures children, fields and raw children, logs trivia, and clones \`_ctx.state\` on every match`,
-    otherwise: "only the tiers the reducer actually declares would be captured (arity >= 1 children, >= 2 fields, >= 4 raw, >= 5 trivia, >= 6 state). Declare it with `node(..., { buildArity: n })` if it cannot be derived"
-  });
-  return null;
-}
-function buildReadsRaw(def) {
-  if (!def.build) return true;
-  if (def.buildRawUnused === true) return false;
-  const arity = confirmedArityForDef(def);
-  if (arity === null) return true;
-  return arity >= 4;
-}
-function buildReadsTrivia(def) {
-  if (!def.build) return true;
-  const arity = confirmedArityForDef(def);
-  if (arity === null) return true;
-  return arity >= 5;
+  return out;
 }
-function buildReadsState(def) {
-  if (!def.build) return true;
-  const arity = confirmedArityForDef(def);
-  if (arity === null) return true;
-  return arity >= 6;
+function escapeClassChar(ch2) {
+  return ch2.replace(/[\\\]^-]/g, "\\$&");
 }
 
 // src/compiler/fields.ts
@@ -4181,6 +4193,7 @@ var OP_COV = 40;
 var OP_SCOPE_PLAIN = 41;
 var OP_LEX_BODY = 42;
 var OP_LEX_PROGRAM = 43;
+var OP_SOURCE_LEAF = 44;
 var OP_DISPATCH = 25;
 var OP_ROUTED = 26;
 var OP_NAMES = {
@@ -4199,6 +4212,7 @@ var OP_NAMES = {
   [OP_NOT]: "NOT",
   [OP_PEEK]: "PEEK",
   [OP_LEAF]: "LEAF",
+  [OP_SOURCE_LEAF]: "SOURCE_LEAF",
   [OP_EMPTY]: "EMPTY",
   [OP_LIT_TRACK]: "LIT_TRACK",
   [OP_RX_TRACK]: "RX_TRACK",
@@ -6047,6 +6061,7 @@ function childSlots(code, ip, out) {
     case OP_NODE_TRACK:
     case OP_FIELD:
     case OP_LEAF:
+    case OP_SOURCE_LEAF:
     case OP_ARMGATE:
       out.push(code[ip + 2]);
       return true;
@@ -6142,7 +6157,7 @@ function transfer(code, ip, at, hostCst) {
   }
   if (op === OP_NODE || op === OP_NODE_TRACK) {
     const flags = code[ip + 3];
-    const directChildren = !hostCst && op === OP_NODE && code[ip + 1] >= 0 && code[ip + 4] < 0 && (flags === 2 || flags === 18 || flags === 34);
+    const directChildren = !hostCst && op === OP_NODE && code[ip + 1] >= 0 && code[ip + 4] < 0 && ((flags & ~128) === 2 || flags === 18 || flags === 34);
     if (directChildren) {
       return { tri: at.tri, buf: false, raw: RAW_UNKNOWN, cap: CAP_OFF };
     }
@@ -6155,7 +6170,7 @@ function transfer(code, ip, at, hostCst) {
     if (at.tri === TRI_NONE && !at.buf) return at;
     return { tri: TRI_NONE, buf: false, raw: RAW_UNKNOWN, cap: at.cap };
   }
-  if (op === OP_LEAF) {
+  if (op === OP_LEAF || op === OP_SOURCE_LEAF) {
     if (!at.buf) return at;
     return { tri: at.tri, buf: false, raw: RAW_UNKNOWN, cap: at.cap };
   }
@@ -6242,7 +6257,7 @@ function leadingScalarTerminal(code, ip, minDepth = 2, throughAttempt = true, th
       depth++;
       continue;
     }
-    if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+    if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
       at = code[at + 2];
       depth++;
       continue;
@@ -6275,7 +6290,7 @@ function leadingScalarSequence(code, ip) {
         at2 = code[at2 + 1];
         continue;
       }
-      if (op === OP_GATE || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+      if (op === OP_GATE || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
         at2 = code[at2 + 2];
         continue;
       }
@@ -6308,7 +6323,7 @@ function leadingScalarSequence(code, ip) {
       at = code[at + 2];
       continue;
     }
-    if (op === OP_GATE || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+    if (op === OP_GATE || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
       at = code[at + 2];
       continue;
     }
@@ -6338,7 +6353,7 @@ function leadingLiteralFamily(code, constants, ip, minDepth = 2, limit = 4) {
       if (op === OP_RULE || op === OP_LABEL || op === OP_TOKEN || op === OP_ATTEMPT || op === OP_PEEK) {
         return walk(code[at + 1], depth + 1);
       }
-      if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+      if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
         return walk(code[at + 2], depth + 1);
       }
       if (op === OP_SEQ || op === OP_SEQV) {
@@ -7224,8 +7239,10 @@ ${rootCap ? "ctx._rootTriviaCapture=sR\n" : ""}return v
       }
       /* ── boundaries ──────────────────────────────────────────────────────── */
       case OP_TOKEN:
-      case OP_LEAF: {
+      case OP_LEAF:
+      case OP_SOURCE_LEAF: {
         const isToken = op === OP_TOKEN;
+        const capturesSource = isToken || op === OP_SOURCE_LEAF && hostCst;
         const fn = isToken ? void 0 : fnRef(code[ip + 1]);
         const child = link(isToken ? code[ip + 1] : code[ip + 2]);
         const wasCap = L.buf ? "true" : "(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)";
@@ -7258,7 +7275,7 @@ ctx._triviaLog=sOtl
 if(v===FAIL)return FAIL
 const e=EC.e
 const out=${isToken ? "input.slice(pos,e)" : `${fn}(v,{start:pos,end:e})`}
-if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:out,span:{start:pos,end:e}})
+if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:${capturesSource ? "input.slice(pos,e)" : "out"},span:{start:pos,end:e}})
 EC.e=e
 return out
 }`;
@@ -7344,7 +7361,7 @@ ${clean ? "" : emitMark(p, L.buf, L.raw, sinks)}
 const v=${child}(input,pos,ctx)
 if(v!==FAIL)return v
 ${clean ? "" : emitRollback(p, L.buf, L.raw, sinks)}
-if(ctx._fc===true)return FAIL
+${code[ip + 2] === 1 ? "ctx._fc=false" : "if(ctx._fc===true)return FAIL"}
 ctx._fe=pos
 return FAIL
 }`;
@@ -7933,7 +7950,8 @@ return nd
         const unwrap = (flags & 64) !== 0;
         const trailingTrivia = (flags & 128) !== 0;
         const build = buildIdx >= 0 ? fnRef(buildIdx) : void 0;
-        if (!hostCst && !tracked && build !== void 0 && proj < 0 && (flags === 2 || flags === 18 || flags === 34)) {
+        const leanFlags = flags & ~128;
+        if (!hostCst && !tracked && build !== void 0 && proj < 0 && (leanFlags === 2 || (flags === 18 || flags === 34))) {
           const fields = flags === 18;
           const collapseChildren = flags === 34;
           const publish = L.buf && L.raw === RAW_OMIT ? "_pushNodeNoRawBuf(ctx,nd)" : L.buf && L.raw === RAW_CAPTURE ? `if(sBuf!==undefined){
@@ -7978,7 +7996,8 @@ ctx._cstTriviaLog=undefined
 ctx.captureTrivia=false
 ctx._fields=${fields ? "[]" : "undefined"}
 const v=${child}(input,pos,ctx)
-const captured=_capturedFlatChildren(flat)
+${trailingTrivia && L.tri !== TRI_NONE ? `if(v!==FAIL${L.tri === TRI_UNKNOWN ? "&&ctx.trivia!==undefined" : ""})EC.e=consumeTrivia(input,EC.e,ctx)
+` : ""}const captured=_capturedFlatChildren(flat)
 ${fields ? "const fieldMap=buildFieldMap(ctx._fields)\n" : ""}ctx._fields=sFields
 ctx._cstBuf=sBuf
 ctx._cstChildren=sCh
@@ -8374,7 +8393,7 @@ function assemble(t, prog, cfg) {
     const lf = { _tag: "leaf", value, span: { start: s, end: e } };
     pushCstLeaf(ctx, lf);
   }
-  function plainBuildNode(child, build) {
+  function plainBuildNode(child, build, trailing) {
     return (input, pos, ctx) => {
       const sCh = ctx._cstChildren;
       const sLv = ctx._cstLeaves;
@@ -8392,6 +8411,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = false;
       ctx._fields = void 0;
       const value = child(input, pos, ctx);
+      if (trailing && value !== FAIL && ctx.trivia !== void 0) EC.e = consumeTrivia(input, EC.e, ctx);
       const kids = buf.ch ?? (buf.single !== void 0 ? [buf.single] : EMPTY_CH);
       const rawKids = buf.raw ?? (buf.rawSingle !== void 0 ? [buf.rawSingle] : EMPTY_CH);
       ctx._fields = savedFields;
@@ -8419,7 +8439,7 @@ function assemble(t, prog, cfg) {
     while (first < children2.length && children2[first] === void 0) first++;
     return first === children2.length ? EMPTY_CH : children2.slice(first);
   }
-  function childrenOnlyBuildNode(child, build) {
+  function childrenOnlyBuildNode(child, build, trailing) {
     return (input, pos, ctx) => {
       const sCh = ctx._cstChildren;
       const sLv = ctx._cstLeaves;
@@ -8437,6 +8457,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = false;
       ctx._fields = void 0;
       const value = child(input, pos, ctx);
+      if (trailing && value !== FAIL && ctx.trivia !== void 0) EC.e = consumeTrivia(input, EC.e, ctx);
       const captured = capturedFlatChildren(kids);
       ctx._fields = savedFields;
       ctx._cstBuf = sBuf;
@@ -9461,6 +9482,7 @@ function assemble(t, prog, cfg) {
       /* ── transaction ─────────────────────────────────────────────────────── */
       case OP_ATTEMPT: {
         const child = link(code[ip + 1]);
+        const contain = code[ip + 2] === 1;
         return (input, pos, ctx) => {
           const need = markCst(ctx);
           const mRaw = MRAW;
@@ -9473,7 +9495,10 @@ function assemble(t, prog, cfg) {
           const v = child(input, pos, ctx);
           if (v !== FAIL) return v;
           if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-          if (committed3(ctx)) return FAIL;
+          if (committed3(ctx)) {
+            if (!contain) return FAIL;
+            ctx._fc = false;
+          }
           ctx._fe = pos;
           return FAIL;
         };
@@ -9691,7 +9716,8 @@ function assemble(t, prog, cfg) {
           return value;
         };
       }
-      case OP_LEAF: {
+      case OP_LEAF:
+      case OP_SOURCE_LEAF: {
         const fn = fns[code[ip + 1]];
         const child = link(code[ip + 2]);
         return (input, pos, ctx) => {
@@ -9719,7 +9745,11 @@ function assemble(t, prog, cfg) {
           if (v === FAIL) return FAIL;
           const end = EC.e;
           const out = fn(v, { start: pos, end });
-          if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value: out, span: { start: pos, end } });
+          if (wasCapturing) pushCstLeaf(ctx, {
+            _tag: "leaf",
+            value: op === OP_SOURCE_LEAF && hostCst ? input.slice(pos, end) : out,
+            span: { start: pos, end }
+          });
           EC.e = end;
           return out;
         };
@@ -10919,11 +10949,11 @@ function assemble(t, prog, cfg) {
         const trailingTrivia = (flags & 128) !== 0;
         const build = buildIdx >= 0 ? fns[buildIdx] : void 0;
         if (!hostCst && !tracked) {
-          if (build !== void 0 && proj < 0 && flags === 0) {
-            return plainBuildNode(child, build);
+          if (build !== void 0 && proj < 0 && (flags & ~128) === 0) {
+            return plainBuildNode(child, build, trailingTrivia);
           }
-          if (build !== void 0 && proj < 0 && flags === 2) {
-            return childrenOnlyBuildNode(child, build);
+          if (build !== void 0 && proj < 0 && (flags & ~128) === 2) {
+            return childrenOnlyBuildNode(child, build, trailingTrivia);
           }
           if (build !== void 0 && proj < 0 && flags === 18) {
             return childrenOnlyFieldsBuildNode(child, build);
@@ -11801,10 +11831,12 @@ function mayCommitFailure(p, seen = /* @__PURE__ */ new Set(), resolve) {
     case "choice":
     case "sequence":
       return d.parsers.some((x) => mayCommitFailure(x, seen, resolve));
+    // A contained transaction reports every failure uncommitted.
+    case "attempt":
+      return d.contain !== true && mayCommitFailure(d.parser, seen, resolve);
     case "many":
     case "oneOrMore":
     case "optional":
-    case "attempt":
     case "transform":
     case "label":
     case "field":
@@ -13136,7 +13168,7 @@ var Encoder = class {
       }
       case "leaf": {
         const child = this.node(d.parser).ip;
-        return this.emit(OP_LEAF, this.fn(d.fn, d.fnSrc ?? null), child);
+        return this.emit(d.cstValue === "source" ? OP_SOURCE_LEAF : OP_LEAF, this.fn(d.fn, d.fnSrc ?? null), child);
       }
       case "node": {
         if (d.type === void 0) missingInferredType();
@@ -13148,7 +13180,7 @@ var Encoder = class {
         const derivedState = d.build !== void 0 ? buildReadsState(d) : noBuildCaptures;
         const derivedFields = d.build !== void 0 ? buildReadsFields(d) : noBuildCaptures;
         const wantsFields = parserHasOwnFields(d.parser) && (cstOut || derivedFields);
-        const flags = (cstOut || d.captureTrivia === true || d.trailingTrivia === true || derivedTrivia ? 4 : 0) | (!cstOut && omitsRaw ? 2 : 0) | (cstOut || derivedState ? 8 : 0) | (wantsFields ? 16 : 0) | (d.collapse === true ? 32 : 0) | (d.unwrap === true ? 64 : 0) | (d.trailingTrivia === true ? 128 : 0) | (d.captureTrivia === true ? 1 : 0);
+        const flags = (cstOut || d.captureTrivia === true || derivedTrivia ? 4 : 0) | (!cstOut && omitsRaw ? 2 : 0) | (cstOut || derivedState ? 8 : 0) | (wantsFields ? 16 : 0) | (d.collapse === true ? 32 : 0) | (d.unwrap === true ? 64 : 0) | (d.trailingTrivia === true ? 128 : 0) | (d.captureTrivia === true ? 1 : 0);
         const body = this.emit(
           this.track ? OP_NODE_TRACK : OP_NODE,
           d.build === void 0 ? -1 : this.fn(d.build, d.buildSrc ?? null),
@@ -13274,7 +13306,7 @@ var Encoder = class {
       // A TRANSACTION IS A ROW. See `OP_ATTEMPT` for why the transparent
       // lowering was correct only for a choice arm.
       case "attempt": {
-        const inner = this.emit(OP_ATTEMPT, this.node(d.parser).ip);
+        const inner = this.emit(OP_ATTEMPT, this.node(d.parser).ip, d.contain === true ? 1 : 0);
         if (!this.failureNeedsRollback(d.parser, void 0)) this.failureRollbackCleanSites.add(inner);
         const fs = d.parser._def.tag === "lazy" ? firstSetOf(d.parser, /* @__PURE__ */ new Set(), this.refResolver(), this.activeTrivia) : d.parser._meta.firstSet;
         if (fs.kind === "any" || matchesEmpty(d.parser)) return inner;
@@ -13361,6 +13393,7 @@ var Encoder = class {
         case OP_WITHCTX:
         case OP_XFORM:
         case OP_LEAF:
+        case OP_SOURCE_LEAF:
         case OP_NODE:
         case OP_NODE_TRACK:
           return [ip + 2];
@@ -13853,7 +13886,7 @@ function payloadKey(p, d) {
     case "transform":
       return `transform\0${fnKey(d.fnSrc, d.fn)}\0${d.recognitionOnly === true}`;
     case "leaf":
-      return `leaf\0${fnKey(d.fnSrc, d.fn)}`;
+      return `leaf\0${d.cstValue ?? "value"}\0${fnKey(d.fnSrc, d.fn)}`;
     case "many":
     case "oneOrMore":
       return `${d.tag}\0${d.min}\0${d.max ?? ""}`;