parseman 0.51.1 → 0.52.0

package/dist/cli/index.js

@@ -265,6 +265,10 @@ function firstSetBody(p, seen, resolve2, 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(
@@ -1784,6 +1788,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;
@@ -4462,13 +4470,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) {
@@ -4485,7 +4504,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 } };
     }
   };
@@ -5304,7 +5323,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);
@@ -5418,13 +5437,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 },
@@ -5478,6 +5501,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,
@@ -5530,7 +5559,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,
@@ -5539,7 +5569,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;
@@ -5567,11 +5602,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) {
@@ -5856,7 +5901,7 @@ function evalRuleMapIR(ir) {
     if (recognitionOnly) t2._def.recognitionOnly = true;
     return t2;
   };
-  const _lf = (child, src) => {
+  const _lf = (child, src, source = false) => {
     let fn2;
     try {
       fn2 = (0, eval)(`(${src})`);
@@ -5865,7 +5910,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;
   };
@@ -6272,10 +6317,12 @@ function mayCommitFailure(p, seen = /* @__PURE__ */ new Set(), resolve2) {
     case "choice":
     case "sequence":
       return d.parsers.some((x) => mayCommitFailure(x, seen, resolve2));
+    // A contained transaction reports every failure uncommitted.
+    case "attempt":
+      return d.contain !== true && mayCommitFailure(d.parser, seen, resolve2);
     case "many":
     case "oneOrMore":
     case "optional":
-    case "attempt":
     case "transform":
     case "label":
     case "field":
@@ -6349,6 +6396,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 = {
@@ -6367,6 +6415,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",
@@ -8319,7 +8368,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();
@@ -8331,7 +8380,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),
@@ -8457,7 +8506,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;
@@ -8544,6 +8593,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];
@@ -9753,6 +9803,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;
@@ -9848,7 +9899,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 };
     }
@@ -9861,7 +9912,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 };
   }
@@ -9948,7 +9999,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;
@@ -9981,7 +10032,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;
       }
@@ -10014,7 +10065,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;
     }
@@ -10044,7 +10095,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) {
@@ -10930,8 +10981,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)";
@@ -10964,7 +11017,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
 }`;
@@ -11050,7 +11103,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
 }`;
@@ -11639,7 +11692,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){
@@ -11684,7 +11738,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
@@ -12056,7 +12111,7 @@ function assemble(t2, 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;
@@ -12074,6 +12129,7 @@ function assemble(t2, 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;
@@ -12101,7 +12157,7 @@ function assemble(t2, 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;
@@ -12119,6 +12175,7 @@ function assemble(t2, 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;
@@ -13143,6 +13200,7 @@ function assemble(t2, 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;
@@ -13155,7 +13213,10 @@ function assemble(t2, 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;
         };
@@ -13373,7 +13434,8 @@ function assemble(t2, 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) => {
@@ -13401,7 +13463,11 @@ function assemble(t2, 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;
         };
@@ -14601,11 +14667,11 @@ function assemble(t2, 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);
@@ -15431,7 +15497,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 ?? ""}`;
@@ -17969,7 +18035,7 @@ function rebuildCombinator(root, replacements) {
         out = d.polarity === "adjacent" ? adjacent() : d.kinds === void 0 ? notAdjacent() : notAdjacent({ kinds: d.kinds });
         break;
       case "attempt":
-        out = attempt(one(d.parser));
+        out = attempt(one(d.parser), d.contain === true ? { contain: true } : void 0);
         break;
       case "not":
         out = not(one(d.parser));
@@ -18006,7 +18072,7 @@ function rebuildCombinator(root, replacements) {
         out = token(one(d.parser));
         break;
       case "leaf":
-        out = leaf(one(d.parser), d.fn);
+        out = d.cstValue === "source" ? sourceLeaf(one(d.parser), d.fn) : leaf(one(d.parser), d.fn);
         break;
       // A LABELLED expect reproduces `d.expected` exactly (`expect` sets it to `[label]`).
       // An unlabelled one RE-DERIVES it from the rebuilt inner parser, so it can differ