parseman 0.51.1 → 0.52.0

package/dist/spec/index.js

@@ -221,6 +221,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(
@@ -1360,6 +1364,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;
@@ -3980,13 +3988,24 @@ function dispatch(selector, ...arms) {
 }
 
 // src/combinators/attempt.ts
-function attempt(parser2) {
+function containOption(options) {
+  if (options === void 0) return false;
+  for (const key of Object.keys(options)) {
+    if (key !== "contain") throw new TypeError(`attempt(): unknown option ${JSON.stringify(key)}`);
+  }
+  if (options.contain !== void 0 && typeof options.contain !== "boolean") {
+    throw new TypeError("attempt(): `contain` must be a boolean");
+  }
+  return options.contain === true;
+}
+function attempt(parser2, options) {
+  const contain = containOption(options);
   const guardable = parser2._meta.firstSet.kind !== "any" && !matchesEmpty(parser2);
   let failExpected;
   return {
     _tag: "attempt",
     _meta: parser2._meta,
-    _def: { tag: "attempt", parser: parser2 },
+    _def: contain ? { tag: "attempt", parser: parser2, contain: true } : { tag: "attempt", parser: parser2 },
     parse(input, pos, ctx) {
       if (guardable && ctx._probe === void 0 && !ctx._tolerant && !startsFirstSet(parser2, input, pos)) {
         if (failExpected === void 0) {
@@ -4003,7 +4022,7 @@ function attempt(parser2) {
       rollbackCstCapture(ctx, mark);
       if (log !== void 0 && ctx._triviaLog && ctx._triviaLog.length !== log) ctx._triviaLog.length = log;
       if (rootLog !== void 0 && ctx._rootTriviaLog && ctx._rootTriviaLog.length !== rootLog) ctx._rootTriviaLog.length = rootLog;
-      if (result.committed) return result;
+      if (result.committed && !contain) return result;
       return { ok: false, expected: result.expected, span: { start: pos, end: pos } };
     }
   };
@@ -4759,7 +4778,7 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
     throw new Error("node() options cannot combine project with unwrap or collapse");
   }
   const def = unwrap || collapse || project !== void 0 || captureTrivia || trailingTrivia || buildArity !== void 0 || tags !== void 0 && tags.length > 0 ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...project !== void 0 ? { project } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {}, ...buildArity !== void 0 ? { buildArity } : {}, ...tags !== void 0 && tags.length > 0 ? { tags } : {} } : baseDef;
-  const capturesTrivia = captureTrivia || trailingTrivia || (build ? buildReadsTrivia(def) : project === void 0);
+  const capturesTrivia = captureTrivia || (build ? buildReadsTrivia(def) : project === void 0);
   const clonesState = build ? buildReadsState(def) : project === void 0;
   const hasOwnFields = parserHasOwnFields(combinator);
   const capturesFields = hasOwnFields && (build ? buildReadsFields(def) : project === void 0);
@@ -4873,13 +4892,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 },
@@ -4933,6 +4956,12 @@ function field(name, combinator) {
 }
 
 // src/combinators/token.ts
+function semanticLeafValue(_ctx, _input, _start, _end, value) {
+  return value;
+}
+function sourceLeafValue(ctx, input, start, end, value) {
+  return cstOutputHost(ctx.build) ? input.slice(start, end) : value;
+}
 function token(root) {
   const meta = {
     firstSet: root._meta.firstSet,
@@ -4985,7 +5014,8 @@ function token(root) {
     }
   };
 }
-function leaf(root, fn) {
+function makeLeaf(root, fn, sourceCstValue) {
+  const cstValue = sourceCstValue ? sourceLeafValue : semanticLeafValue;
   const meta = {
     firstSet: root._meta.firstSet,
     canMatchNewline: root._meta.canMatchNewline,
@@ -4994,7 +5024,12 @@ function leaf(root, fn) {
   return {
     _tag: "leaf",
     _meta: meta,
-    _def: { tag: "leaf", parser: root, fn },
+    _def: {
+      tag: "leaf",
+      parser: root,
+      fn,
+      ...sourceCstValue ? { cstValue: "source" } : {}
+    },
     parse(input, pos, ctx) {
       const savedBuf = ctx._cstBuf;
       const savedChildren = ctx._cstChildren;
@@ -5022,11 +5057,21 @@ function leaf(root, fn) {
       }
       if (!result.ok) return result;
       const value = fn(result.value, result.span);
-      if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value, span: result.span });
+      if (wasCapturing) pushCstLeaf(ctx, {
+        _tag: "leaf",
+        value: cstValue(ctx, input, pos, result.span.end, value),
+        span: result.span
+      });
       return { ok: true, value, span: result.span };
     }
   };
 }
+function leaf(root, fn) {
+  return makeLeaf(root, fn, false);
+}
+function sourceLeaf(root, fn) {
+  return makeLeaf(root, fn, true);
+}
 
 // src/combinators/scanTo.ts
 function resolveScanSkip(explicitSkip, raw, ctx) {
@@ -5311,7 +5356,7 @@ function evalRuleMapIR(ir) {
     if (recognitionOnly) t._def.recognitionOnly = true;
     return t;
   };
-  const _lf = (child, src) => {
+  const _lf = (child, src, source = false) => {
     let fn2;
     try {
       fn2 = (0, eval)(`(${src})`);
@@ -5320,7 +5365,7 @@ function evalRuleMapIR(ir) {
         throw new Error("IR leaf fn not materialized");
       };
     }
-    const l = leaf(child, fn2);
+    const l = source ? sourceLeaf(child, fn2) : leaf(child, fn2);
     l._def.fnSrc = src;
     return l;
   };