parseman 0.39.1 → 0.41.0

package/dist/index.js

@@ -2586,9 +2586,11 @@ function markUnusedValues(root) {
         visit(def.parser, consumed);
         visit(def.sentinel, false);
         return;
+      case "token":
+        visit(def.parser, false);
+        return;
       case "label":
       case "trivia":
-      case "token":
       case "attempt":
       case "withCtx":
       case "expect":
@@ -2990,12 +2992,30 @@ function isCstChild(value) {
 function missingInferredType() {
   throw new Error('node(): inferred node type requires a rules() key; pass node("Type", parser) outside rules()');
 }
+function normalizeProject(project) {
+  if (project === void 0) return void 0;
+  if (!Number.isInteger(project) || project < 0) {
+    throw new Error("node() project child must be a non-negative integer");
+  }
+  return project;
+}
+function projectChild(children2, project, type) {
+  if (!(project in children2)) {
+    throw new Error(`node(${JSON.stringify(type)}) project child ${project} was not captured`);
+  }
+  return unwrapChild(children2[project]);
+}
 function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
   const hasExplicitType = typeof typeOrCombinator === "string";
   const type = hasExplicitType ? typeOrCombinator : void 0;
   const combinator = hasExplicitType ? combinatorOrBuild : typeOrCombinator;
-  const build = hasExplicitType ? buildOrOpts : combinatorOrBuild;
-  const opts = hasExplicitType ? maybeOpts : buildOrOpts;
+  const buildArg = hasExplicitType ? buildOrOpts : combinatorOrBuild;
+  const build = typeof buildArg === "function" ? buildArg : void 0;
+  const opts = typeof buildArg === "function" ? maybeOpts : buildArg ?? maybeOpts;
+  const project = normalizeProject(opts?.project);
+  if (project !== void 0 && build !== void 0) {
+    throw new Error("node() options cannot combine project with a build callback");
+  }
   const baseDef = { tag: "node", parser: combinator, ...type === void 0 ? {} : { type }, ...build === void 0 ? {} : { build } };
   const meta = {
     firstSet: combinator._meta.firstSet,
@@ -3009,11 +3029,14 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
   if (unwrap && collapse) {
     throw new Error("node() options cannot set both unwrap and collapse");
   }
-  const def = unwrap || collapse || captureTrivia || trailingTrivia ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {} } : baseDef;
-  const capturesTrivia = captureTrivia || trailingTrivia || (build ? buildReadsTrivia(def) : true);
-  const clonesState = build ? buildReadsState(def) : true;
+  if (project !== void 0 && (unwrap || collapse)) {
+    throw new Error("node() options cannot combine project with unwrap or collapse");
+  }
+  const def = unwrap || collapse || project !== void 0 || captureTrivia || trailingTrivia ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...project !== void 0 ? { project } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {} } : baseDef;
+  const capturesTrivia = captureTrivia || trailingTrivia || (build ? buildReadsTrivia(def) : project === void 0);
+  const clonesState = build ? buildReadsState(def) : project === void 0;
   const hasOwnFields = parserHasOwnFields(combinator);
-  const capturesFields = hasOwnFields && (build ? buildReadsFields(def) : true);
+  const capturesFields = hasOwnFields && (build ? buildReadsFields(def) : project === void 0);
   const guardable = combinator._meta.firstSet.kind !== "any" && !matchesEmpty(combinator);
   let failExpected;
   return {
@@ -3028,14 +3051,15 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
         }
         return { ok: false, expected: failExpected, span: { start: pos, end: pos } };
       }
-      const hostCst = build !== void 0 && cstOutputHost(ctx.build);
+      const hasDirectValue = build !== void 0 || project !== void 0;
+      const hostCst = hasDirectValue && cstOutputHost(ctx.build);
       const effTrivia = capturesTrivia || hostCst;
       const effFields = capturesFields || hostCst && hasOwnFields;
       const saved = beginCstNodeCapture(ctx);
       const savedFields = ctx._fields;
       ctx._fields = effFields ? [] : void 0;
       const savedMask = ctx._triviaCaptureMask;
-      if (build === void 0 && ctx.build?._parsemanTriviaKinds !== void 0 && def.type !== void 0) {
+      if (build === void 0 && project === void 0 && ctx.build?._parsemanTriviaKinds !== void 0 && def.type !== void 0) {
         ctx._triviaCaptureMask = ctx.build._parsemanTriviaKinds(def.type);
       }
       if (!effTrivia) ctx.captureTrivia = false;
@@ -3053,7 +3077,7 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const nodeType = def.type ?? missingInferredType();
       const cstOutput = cstOutputHost(ctx.build);
       const hostState = clonesState ? st : ctx.state !== void 0 ? Object.assign({}, ctx.state) : void 0;
-      const built = unwrap && children2.length === 1 ? unwrapChild(children2[0]) : collapse && children2.length === 1 ? children2[0] : !build && ctx.build?._parsemanCstCollapse && children2.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children2[0], children2, rawChildren) ? children2[0] : build ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, hostState) : build(children2, fields, r.span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: { start: r.span.start, end: r.span.end }, state: st ?? null, children: children2 };
+      const built = unwrap && children2.length === 1 ? unwrapChild(children2[0]) : collapse && children2.length === 1 ? children2[0] : !build && project === void 0 && ctx.build?._parsemanCstCollapse && children2.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children2[0], children2, rawChildren) ? children2[0] : project !== void 0 ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, hostState) : projectChild(children2, project, nodeType) : build ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, hostState) : build(children2, fields, r.span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: { start: r.span.start, end: r.span.end }, state: st ?? null, children: children2 };
       const rawEntry = isCstChild(built) ? built : { _tag: "leaf", value: typeof built === "string" ? built : typeof built === "object" && built !== null ? input.slice(r.span.start, r.span.end) : "", span: r.span };
       if (saved.buf !== void 0 || saved.ch !== void 0) {
         pushCstChild(ctx, built, rawEntry);
@@ -3331,7 +3355,7 @@ function leaf(root, fn) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.39.1";
+var PARSEMAN_VERSION = "0.41.0";
 
 // src/cst/host-mode.ts
 var FUSED_HOST_MODE = /* @__PURE__ */ Symbol.for("parseman.fusedHostMode");
@@ -6275,7 +6299,7 @@ function scanBranchLabeled(shape, kindIndex, mint) {
     `    if (${m.end} > _e) {`,
     `      if (_cap) {`,
     `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, ${m.end}, ${kindIndex})`,
-    `        if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << kindIndex}))) _ctx._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${kindIndex})`,
+    `        if (_cap === 1 && _ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << kindIndex}))) _ctx._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${kindIndex})`,
     `      }`,
     `      _e = ${m.end}`,
     `      continue`,
@@ -6331,7 +6355,7 @@ function analyzeTriviaFastPath(trivia2) {
 var CAP_RECORD = [
   `  if (_cap && _e > _pos) {`,
   `    if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_pos, _e)`,
-  `    if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
+  `    if (_cap === 1 && _ctx._cstTriviaLog !== undefined && _ctx.captureTrivia) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
   `  }`
 ].join("\n");
 function composeFastLoop(shapes) {
@@ -6391,7 +6415,7 @@ function buildLabeledRegexTriviaFnDecl(fnName, spec, reNames) {
       `      const _ce = _e + _m${i}[0].length`,
       `      if (_cap) {`,
       `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, _ce, ${k})`,
-      `        if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_cap === 1 && _ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -6429,7 +6453,7 @@ function buildLabeledRuntimeTriviaFnDecl(fnName, spec, rpStartIndex) {
       `      const _ce = _r${i}.span.end`,
       `      if (_cap) {`,
       `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, _ce, ${k})`,
-      `        if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_cap === 1 && _ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -6515,6 +6539,9 @@ function transformFnSource(fn, fnSrc) {
 function replaceParam(body, param, valueVar) {
   return body.replace(new RegExp(`\\b${escapeRegExp2(param)}\\b`, "g"), valueVar);
 }
+function hasExplicitObjectKey(body, param) {
+  return new RegExp(`\\b${escapeRegExp2(param)}\\b\\s*:`).test(body);
+}
 function stripForIdCheck(body) {
   return body.replace(/'[^'\\]*(?:\\.[^'\\]*)*'|"[^"\\]*(?:\\.[^"\\]*)*"/g, '""').replace(/\bas\s+const\b/g, "").replace(/\b[A-Za-z_$][\w$]*\s*:/g, ":");
 }
@@ -6557,10 +6584,19 @@ function tryInlineDestructureTransform(src, valueVars) {
   const allowed = new Set(valueVars);
   for (let i = 0; i < slots.length; i++) {
     const name = slots[i];
-    if (name) body = replaceParam(body, name, valueVars[i]);
+    if (!name) continue;
+    if (hasExplicitObjectKey(body, name)) return null;
+    body = replaceParam(body, name, valueVars[i]);
   }
   return hasFreeIdentifiers(body, allowed) ? null : body;
 }
+function isDispatchTailOnlyTransform(src) {
+  const m = src.match(/^\(\s*\[([^\]]*)\]\s*\)\s*=>\s*(.+)$/s);
+  if (!m) return false;
+  const slots = parseArrayDestructure(m[1], 2);
+  const tail = slots[1];
+  return tail !== null && m[2].trim() === tail;
+}
 
 // src/compiler/codegen.ts
 function leadingFirstSetRecipe(p, seen = /* @__PURE__ */ new Set()) {
@@ -6811,6 +6847,17 @@ function ensureRegexDecl(ctx, source, flags) {
   }
   return rName;
 }
+function ensurePlainRegexDecl(ctx, source, flags) {
+  const f = flags.replace(/[gy]/g, "");
+  const key = `${source}/${f}`;
+  let rName = ctx.regexMap.get(key);
+  if (rName === void 0) {
+    rName = `${nsp(ctx)}_re${ctx.regexDecls.length}`;
+    ctx.regexDecls.push(`const ${rName} = ${new RegExp(source, f).toString()}`);
+    ctx.regexMap.set(key, rName);
+  }
+  return rName;
+}
 function ensureTriviaFn(ctx) {
   const trivia2 = ctx.activeTrivia;
   const existing = ctx.triviaFnNames.get(trivia2);
@@ -6876,7 +6923,7 @@ function ensureTriviaFn(ctx) {
     `  }`,
     `  if (_cap && _e > _pos) {`,
     `    if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_pos, _e)`,
-    `    if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
+    `    if (_cap === 1 && _ctx._cstTriviaLog !== undefined && _ctx.captureTrivia) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
     `  }`,
     `  return _e`,
     `}`
@@ -7337,14 +7384,19 @@ function emitSeqValues(def, ctx, pos) {
         continue;
       } else {
         const trivFn = ensureTriviaFn(ctx);
+        const markLog = v(ctx, "_mklg");
         const scanEndV = v(ctx, "_sne");
-        stmts.push(`${ind(ctx)}const ${scanEndV} = ${trivFn}(input, ${curV}, _ctx)`);
+        const capArg = ctx.noHoist ? "0" : "_ctx._triviaLog !== undefined ? 2 : 0";
+        stmts.push(
+          `${ind(ctx)}const ${markLog} = _ctx._triviaLog ? _ctx._triviaLog.length : 0`,
+          `${ind(ctx)}const ${scanEndV} = ${trivFn}(input, ${curV}, _ctx, ${capArg})`
+        );
         const r2 = emit(def.parsers[i], ctx, scanEndV);
         stmts.push(...r2.stmts);
         const endAfterV = v(ctx, "_sea");
         stmts.push(
           `${ind(ctx)}const ${endAfterV} = ${r2.endVar}`,
-          `${ind(ctx)}if (${endAfterV} > ${scanEndV}) ${curV} = ${endAfterV}`
+          `${ind(ctx)}if (${endAfterV} > ${scanEndV}) ${curV} = ${endAfterV}; else if (_ctx._triviaLog && _ctx._triviaLog.length !== ${markLog}) _ctx._triviaLog.length = ${markLog}`
         );
         valueVars.push(r2.valueVar);
         continue;
@@ -7574,19 +7626,20 @@ function mayRecordRecoveryError(p, recovery, seen = /* @__PURE__ */ new Set()) {
       return false;
   }
 }
-function emitDispatchCombinator(parser2, def, ctx, pos) {
+function emitDispatchCombinator(parser2, def, ctx, pos, valueMode = "pair") {
   if (parserUsesRouted2(def.selector)) {
     throw new Error("parseman: routed() can only appear inside a dispatch() branch");
   }
   const coverageIds = ctx.coverage?.plan.dispatches.get(parser2) ?? [];
   const branchUsesRouted2 = (entry) => entry.usesRouted === true || parserUsesRouted2(entry.parser);
   const hasRoutedBranch = def.cases.some(branchUsesRouted2) || (def.matchers ? def.matchers.some(branchUsesRouted2) : false) || (def.otherwise ? def.otherwiseUsesRouted === true || parserUsesRouted2(def.otherwise) : false);
-  const selectorLeafMark = hasRoutedBranch ? v(ctx, "_dsl") : null;
-  const selectorRawMark = hasRoutedBranch ? v(ctx, "_dsr") : null;
-  const selectorTriviaMark = hasRoutedBranch ? v(ctx, "_dst") : null;
-  const selectorLogMark = hasRoutedBranch ? v(ctx, "_dsg") : null;
-  const selectorFieldMark = hasRoutedBranch ? v(ctx, "_dsf") : null;
-  const selectorErrorMark = hasRoutedBranch ? v(ctx, "_dse") : null;
+  const selectorNeedsRollback = hasRoutedBranch && (ctx.capturing === true && capturesLeaf(def.selector) || ctx.activeTrivia !== void 0 && parserHasTriviaSite(def.selector) || parserEnablesTriviaCapture(def.selector) || parserHasOwnFields(def.selector) || mayRecordRecoveryError(def.selector, !!ctx.recovery));
+  const selectorLeafMark = selectorNeedsRollback ? v(ctx, "_dsl") : null;
+  const selectorRawMark = selectorNeedsRollback ? v(ctx, "_dsr") : null;
+  const selectorTriviaMark = selectorNeedsRollback ? v(ctx, "_dst") : null;
+  const selectorLogMark = selectorNeedsRollback ? v(ctx, "_dsg") : null;
+  const selectorFieldMark = selectorNeedsRollback ? v(ctx, "_dsf") : null;
+  const selectorErrorMark = selectorNeedsRollback ? v(ctx, "_dse") : null;
   const selector = emit(def.selector, ctx, pos);
   const outV = v(ctx, "_dval");
   const outE = v(ctx, "_dend");
@@ -7611,13 +7664,14 @@ function emitDispatchCombinator(parser2, def, ctx, pos) {
     stmts.push(head);
     ctx.indent++;
     const usesRouted = branchUsesRouted2(entry);
-    const routedV = usesRouted ? v(ctx, "_drt") : null;
+    const needsRoutedContext = usesRouted && routedNeedsContextBridge(parser3, ctx);
+    const routedV = needsRoutedContext ? v(ctx, "_drt") : null;
     const mayError = mayRecordRecoveryError(parser3, !!ctx.recovery);
     const errMark = mayError ? v(ctx, "_derr") : null;
     const logMark = ctx.activeTrivia ? v(ctx, "_dlog") : null;
-    if (routedV) {
+    if (usesRouted) {
       stmts.push(
-        `${ind(ctx)}const ${routedV} = _ctx._routed; _ctx._routed = { value: ${selector.valueVar}, span: { start: ${pos}, end: ${selector.endVar} } }`,
+        ...routedV ? [`${ind(ctx)}const ${routedV} = _ctx._routed; _ctx._routed = { value: ${selector.valueVar}, span: { start: ${pos}, end: ${selector.endVar} } }`] : [],
         ...selectorLeafMark ? [
           `${ind(ctx)}if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${selectorLeafMark}) _ctx._cstLeaves.length = ${selectorLeafMark}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${selectorRawMark}) _ctx._cstRawChildren.length = ${selectorRawMark}; if (_ctx._cstTriviaLog && _ctx._cstTriviaLog.length !== ${selectorTriviaMark}) _ctx._cstTriviaLog.length = ${selectorTriviaMark}; if (_ctx._triviaLog && _ctx._triviaLog.length !== ${selectorLogMark}) _ctx._triviaLog.length = ${selectorLogMark}; if (_ctx._fields && _ctx._fields.length !== ${selectorFieldMark}) _ctx._fields.length = ${selectorFieldMark}; if (_ctx._errors && _ctx._errors.length !== ${selectorErrorMark}) _ctx._errors.length = ${selectorErrorMark}`
         ] : []
@@ -7625,7 +7679,17 @@ function emitDispatchCombinator(parser2, def, ctx, pos) {
     }
     if (errMark) stmts.push(`${ind(ctx)}const ${errMark} = _ctx._errors?.length ?? 0`);
     if (logMark) stmts.push(`${ind(ctx)}const ${logMark} = _ctx._triviaLog?.length ?? 0`);
+    const savedRoutedLocal = ctx.routedLocal;
+    const savedNoHoist = ctx.noHoist;
+    if (usesRouted && !needsRoutedContext) {
+      ctx.routedLocal = { valueVar: selector.valueVar, startVar: pos, endVar: selector.endVar };
+      ctx.noHoist = true;
+    } else if (usesRouted) {
+      ctx.routedLocal = void 0;
+    }
     const tail = emitTailFallible(parser3, ctx, usesRouted ? pos : selector.endVar);
+    ctx.routedLocal = savedRoutedLocal;
+    ctx.noHoist = savedNoHoist;
     stmts.push(...coverageAttempt(ctx, coverageId, pos));
     const errorRollback = errMark ? `if (_ctx._errors && _ctx._errors.length !== ${errMark}) _ctx._errors.length = ${errMark}; ` : "";
     const logRollback = logMark ? `if (_ctx._triviaLog && _ctx._triviaLog.length !== ${logMark}) _ctx._triviaLog.length = ${logMark}; ` : "";
@@ -7635,7 +7699,7 @@ function emitDispatchCombinator(parser2, def, ctx, pos) {
       ...tail.stmts,
       `${ind(ctx)}if (!${tail.okVar}) { ${routedRollback}${errorRollback}${logRollback}${coverageFailure}${committedFailBody(ctx)} }`,
       ...routedV ? [`${ind(ctx)}_ctx._routed = ${routedV}`] : [],
-      `${ind(ctx)}${outV} = [${selector.valueVar}, ${tail.valVar}]`,
+      `${ind(ctx)}${outV} = ${valueMode === "tail" ? tail.valVar : `[${selector.valueVar}, ${tail.valVar}]`}`,
       `${ind(ctx)}${outE} = ${tail.endVar}`,
       ...coverageHit(ctx, coverageId, pos, tail.endVar)
     );
@@ -7650,7 +7714,7 @@ function emitDispatchCombinator(parser2, def, ctx, pos) {
   }
   const emitMatcherTails = () => {
     for (const matcher of def.matchers ?? []) {
-      emitSelectedTail(matcher, wroteBranch ? "else if" : "if", emitDispatchMatcherCondition(keyV, matcher), coverageIds[coverageIndex++]);
+      emitSelectedTail(matcher, wroteBranch ? "else if" : "if", emitDispatchMatcherCondition(ctx, keyV, matcher), coverageIds[coverageIndex++]);
       wroteBranch = true;
     }
   };
@@ -7675,10 +7739,10 @@ function emitDispatchKeyCondition(valueVar, key, caseInsensitive) {
   }
   return parts.join(" && ");
 }
-function emitDispatchMatcherCondition(valueVar, matcher) {
+function emitDispatchMatcherCondition(ctx, valueVar, matcher) {
   if (matcher.kind === "matches") {
     const flags = matcher.caseInsensitive && !matcher.flags?.includes("i") ? `${matcher.flags ?? ""}i` : matcher.flags ?? "";
-    return `${new RegExp(matcher.value, flags).toString()}.test(${valueVar})`;
+    return `${ensurePlainRegexDecl(ctx, matcher.value, flags)}.test(${valueVar})`;
   }
   const text = matcher.value;
   const parts = [`${valueVar}.length >= ${text.length}`];
@@ -7881,6 +7945,28 @@ function emitsAsNamedFn(p, ctx) {
   const usage = ctx.lazyUsage;
   return !!usage && !ctx.noHoist && !ctx.capAsTrivia && isHoistableTag(p._def.tag) && (usage.counts.get(p) ?? 0) > 1 && (usage.sizes.get(p) ?? 0) >= HOIST_MIN_SUBTREE;
 }
+function routedNeedsContextBridge(p, ctx, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(p)) return false;
+  seen.add(p);
+  if (p._def.tag === "lazy") {
+    if (ctx.ruleNames?.has(p) || ctx.namedParsers.has(p)) return parserUsesRouted2(p);
+    const usage = ctx.lazyUsage;
+    if (usage && (usage.counts.get(p) ?? 0) <= 1 && !usage.recursive.has(p)) {
+      try {
+        return routedNeedsContextBridge(p._def.thunk(), ctx, seen);
+      } catch {
+        return parserUsesRouted2(p);
+      }
+    }
+    return parserUsesRouted2(p);
+  }
+  if (ctx.ruleNames?.has(p)) return parserUsesRouted2(p);
+  if (ctx.namedParsers.has(p)) return parserUsesRouted2(p);
+  const d = p._def;
+  if (d.tag === "dispatch") return false;
+  if (d.tag === "withCtx") return parserUsesRouted2(d.parser);
+  return childrenOf2(d).some((child) => routedNeedsContextBridge(child, ctx, seen));
+}
 function armReplayInScope(arm, ctx) {
   let p = arm;
   for (; ; ) {
@@ -8131,15 +8217,16 @@ function emitSepBy(_p, def, ctx, pos) {
   const itemFailBreak = (sepEndVar, sepRb, postSepRb) => def.trailing === void 0 ? `${sepRb}break` : `${postSepRb}${curV} = ${sepEndVar}; break`;
   const postSepMarks = () => {
     if (def.trailing === void 0 || !ctx.capturing) return { decl: [], rb: "" };
-    const lv = v(ctx, "_tlv"), rw = v(ctx, "_trw"), tl = v(ctx, "_ttl"), lg = v(ctx, "_tlg");
+    const lv = v(ctx, "_tlv"), rw = v(ctx, "_trw"), tl = v(ctx, "_ttl"), lg = v(ctx, "_tlg"), fl = v(ctx, "_tlf");
     return {
       decl: [
         `${ind(ctx)}const ${lv} = _ctx._cstLeaves ? _ctx._cstLeaves.length : 0`,
         `${ind(ctx)}const ${rw} = _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0`,
         `${ind(ctx)}const ${tl} = _ctx._cstTriviaLog ? _ctx._cstTriviaLog.length : 0`,
-        `${ind(ctx)}const ${lg} = _ctx._triviaLog ? _ctx._triviaLog.length : 0`
+        `${ind(ctx)}const ${lg} = _ctx._triviaLog ? _ctx._triviaLog.length : 0`,
+        `${ind(ctx)}const ${fl} = _ctx._fields ? _ctx._fields.length : 0`
       ],
-      rb: `if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${lv}) _ctx._cstLeaves.length = ${lv}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${rw}) _ctx._cstRawChildren.length = ${rw}; if (_ctx._cstTriviaLog && _ctx._cstTriviaLog.length !== ${tl}) _ctx._cstTriviaLog.length = ${tl}; if (_ctx._triviaLog && _ctx._triviaLog.length !== ${lg}) _ctx._triviaLog.length = ${lg}; `
+      rb: `if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${lv}) _ctx._cstLeaves.length = ${lv}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${rw}) _ctx._cstRawChildren.length = ${rw}; if (_ctx._cstTriviaLog && _ctx._cstTriviaLog.length !== ${tl}) _ctx._cstTriviaLog.length = ${tl}; if (_ctx._triviaLog && _ctx._triviaLog.length !== ${lg}) _ctx._triviaLog.length = ${lg}; if (_ctx._fields && _ctx._fields.length !== ${fl}) _ctx._fields.length = ${fl}; `
     };
   };
   if (rec) {
@@ -8178,16 +8265,18 @@ function emitSepBy(_p, def, ctx, pos) {
       const markTl = v(ctx, "_mktl");
       const markLog = v(ctx, "_mklg");
       const markLv = v(ctx, "_mklv");
+      const markFld = v(ctx, "_mkf");
       const spV = v(ctx, "_sp");
       stmts.push(
         `${ind(ctx)}const ${markV} = _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0`,
         `${ind(ctx)}const ${markTl} = _ctx._cstTriviaLog ? _ctx._cstTriviaLog.length : 0`,
         `${ind(ctx)}const ${markLog} = _ctx._triviaLog ? _ctx._triviaLog.length : 0`,
         `${ind(ctx)}const ${markLv} = _ctx._cstLeaves ? _ctx._cstLeaves.length : 0`,
+        `${ind(ctx)}const ${markFld} = _ctx._fields ? _ctx._fields.length : 0`,
         `${ind(ctx)}const ${spV} = ${capFn}(input, ${curV}, _ctx, 1)`
       );
       sepAtPos = spV;
-      const rollbackToSep = `if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${markLv}) _ctx._cstLeaves.length = ${markLv}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${markV}) _ctx._cstRawChildren.length = ${markV}; if (_ctx._cstTriviaLog && _ctx._cstTriviaLog.length !== ${markTl}) _ctx._cstTriviaLog.length = ${markTl}; if (_ctx._triviaLog && _ctx._triviaLog.length !== ${markLog}) _ctx._triviaLog.length = ${markLog}; `;
+      const rollbackToSep = `if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${markLv}) _ctx._cstLeaves.length = ${markLv}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${markV}) _ctx._cstRawChildren.length = ${markV}; if (_ctx._cstTriviaLog && _ctx._cstTriviaLog.length !== ${markTl}) _ctx._cstTriviaLog.length = ${markTl}; if (_ctx._triviaLog && _ctx._triviaLog.length !== ${markLog}) _ctx._triviaLog.length = ${markLog}; if (_ctx._fields && _ctx._fields.length !== ${markFld}) _ctx._fields.length = ${markFld}; `;
       const sep = emitFallible(def.separator, ctx, sepAtPos, true);
       const { stmts: sepStmts, okVar: sepOk, endVar: sepEnd } = sep;
       stmts.push(...sepStmts, `${ind(ctx)}if (!${sepOk}) { ${rollbackToSep}${sep.mayCommit ? `if (_ctx._fc) ${committedFailBody(ctx)}; ` : ""}break }`);
@@ -8225,16 +8314,18 @@ function emitSepBy(_p, def, ctx, pos) {
   } else {
     const markLv = ctx.capturing ? v(ctx, "_mklv") : null;
     const markRw = ctx.capturing ? v(ctx, "_mkrw") : null;
+    const markFld = ctx.capturing ? v(ctx, "_mkf") : null;
     if (markLv) {
       stmts.push(
         `${ind(ctx)}const ${markLv} = _ctx._cstLeaves ? _ctx._cstLeaves.length : 0`,
-        `${ind(ctx)}const ${markRw} = _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0`
+        `${ind(ctx)}const ${markRw} = _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0`,
+        `${ind(ctx)}const ${markFld} = _ctx._fields ? _ctx._fields.length : 0`
       );
     }
     const sep = emitFallible(def.separator, ctx, sepAtPos, true);
     const { stmts: sepStmts, okVar: sepOk, endVar: sepEnd } = sep;
     stmts.push(...sepStmts, `${ind(ctx)}if (!${sepOk}) { ${sep.mayCommit ? `if (_ctx._fc) ${committedFailBody(ctx)}; ` : ""}break }`);
-    const nextRb = markLv ? `if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${markLv}) _ctx._cstLeaves.length = ${markLv}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${markRw}) _ctx._cstRawChildren.length = ${markRw}; ` : "";
+    const nextRb = markLv ? `if (_ctx._cstLeaves && _ctx._cstLeaves.length !== ${markLv}) _ctx._cstLeaves.length = ${markLv}; if (_ctx._cstRawChildren && _ctx._cstRawChildren.length !== ${markRw}) _ctx._cstRawChildren.length = ${markRw}; if (_ctx._fields && _ctx._fields.length !== ${markFld}) _ctx._fields.length = ${markFld}; ` : "";
     const post = postSepMarks();
     stmts.push(...post.decl);
     const next = emitFallible(def.parser, ctx, sepEnd, true);
@@ -8304,7 +8395,7 @@ function emitScanTo(def, ctx, pos) {
   return { stmts, valueVar: valV, endVar: curV };
 }
 function emitNot(def, ctx, pos) {
-  const sinksLive = !!ctx.capturing || !!ctx.recovery;
+  const sinksLive = !!ctx.capturing || !!ctx.recovery || !!ctx.activeTrivia;
   const leaves = sinksLive ? v(ctx, "_ntl") : null;
   const raw = sinksLive ? v(ctx, "_ntr") : null;
   const tl = sinksLive ? v(ctx, "_ntt") : null;
@@ -8343,6 +8434,17 @@ function emitPeek(def, ctx, pos) {
   };
 }
 function emitRouted(ctx, pos) {
+  const local = ctx.routedLocal;
+  if (local !== void 0) {
+    return {
+      stmts: [
+        ...emitIfFail(ctx, `${local.startVar} !== ${pos}`, failBody(ctx, '"routed()"', pos)),
+        ...emitLeafCapture(ctx, local.valueVar, local.startVar, local.endVar)
+      ],
+      valueVar: local.valueVar,
+      endVar: local.endVar
+    };
+  }
   const item = v(ctx, "_rt");
   return {
     stmts: [
@@ -8494,14 +8596,20 @@ function emitLeaf(def, ctx, pos) {
     endVar: inner.endVar
   };
 }
+function emitNodeProjectExpr(type, project, chV) {
+  const child = `${chV}[${project}]`;
+  const missing = `(() => { throw new Error(${JSON.stringify(`node(${JSON.stringify(type)}) project child ${project} was not captured`)}) })()`;
+  const value = `(${child} !== null && typeof ${child} === 'object' && ${child}._tag === 'leaf' ? ${child}.value : ${child})`;
+  return `(${project} in ${chV} ? ${value} : ${missing})`;
+}
 function emitNode(def, ctx, pos) {
   if (def.type === void 0) {
     throw new Error('node(): inferred node type requires a rules() key; pass node("Type", parser) outside rules()');
   }
-  const structural = def.build === void 0;
-  const mkType = structural ? null : analyzeMkInlineBuild(def);
+  const structural = def.build === void 0 && def.project === void 0;
+  const mkType = structural || def.project !== void 0 ? null : analyzeMkInlineBuild(def);
   let buildIdx = null;
-  if (!mkType && !structural) {
+  if (!mkType && !structural && def.project === void 0) {
     buildIdx = ctx.buildFns.length;
     ctx.buildFns.push(def.build);
     ctx.buildSrcs.push(def.buildSrc ?? null);
@@ -8509,12 +8617,13 @@ function emitNode(def, ctx, pos) {
   const i = ind(ctx);
   const cstOut = ctx.hostMode === "cst" && !structural;
   if (!structural && !cstOut) ctx.hostBranchElided = true;
-  const capturesTrivia = cstOut || mkType !== null || def.captureTrivia === true || def.trailingTrivia === true || !structural && buildReadsTrivia(def);
-  const clonesState = !structural && (cstOut || buildReadsState(def));
-  const capturesChildren = !structural && (cstOut || mkType !== null || def.unwrap || def.collapse || buildReadsChildren(def));
-  const capturesRaw = !structural && (cstOut || mkType !== null || buildReadsRaw(def));
+  const hasProject = def.project !== void 0;
+  const capturesTrivia = cstOut || mkType !== null || def.captureTrivia === true || def.trailingTrivia === true || !structural && !hasProject && buildReadsTrivia(def);
+  const clonesState = !structural && (cstOut || !hasProject && buildReadsState(def));
+  const capturesChildren = !structural && (cstOut || mkType !== null || def.unwrap || def.collapse || def.project !== void 0 || buildReadsChildren(def));
+  const capturesRaw = !structural && (cstOut || mkType !== null || def.project === void 0 && buildReadsRaw(def));
   const hasFields = parserHasOwnFields(def.parser);
-  const capturesFields = hasFields && !structural && (cstOut || buildReadsFields(def));
+  const capturesFields = hasFields && !structural && (cstOut || !hasProject && buildReadsFields(def));
   const innerEnablesTriviaCapture = parserEnablesTriviaCapture(def.parser);
   const chV = v(ctx, "_ch");
   const rawV = v(ctx, "_raw");
@@ -8612,7 +8721,7 @@ ${i}const ${chV} = ${chAlloc}, ${rawV} = ${profileRecognizer} ? undefined : [],
     );
   }
   const ndV = v(ctx, "_nd");
-  const buildExpr = structural ? `{ _tag: 'node', type: ${JSON.stringify(def.type)}, span: { start: ${pos}, end: ${endVar} }, state: ${stV} ?? null, children: ${chV} }` : mkType ? emitInlineMkNodeExpr(mkType, chV, rawV, pos, endVar, tlV) : `${buildRef(ctx)}[${buildIdx}](${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
+  const buildExpr = structural ? `{ _tag: 'node', type: ${JSON.stringify(def.type)}, span: { start: ${pos}, end: ${endVar} }, state: ${stV} ?? null, children: ${chV} }` : mkType ? emitInlineMkNodeExpr(mkType, chV, rawV, pos, endVar, tlV) : def.project !== void 0 ? emitNodeProjectExpr(def.type, def.project, chV) : `${buildRef(ctx)}[${buildIdx}](${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
   const hostBuildExpr = `_ctx._pmProfile?.phase === 'host' && _ctx._pmProfile.hostCalls++, _ctx.build(${JSON.stringify(def.type)}, ${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
   const ndExpr = structural ? `_ctx.build !== undefined ? (${hostBuildExpr}) : (${buildExpr})` : cstOut ? hostBuildExpr : buildExpr;
   const hostCollapseExpr = structural ? `_ctx.build !== undefined && _ctx.build._parsemanCstCollapse !== undefined && ${chV}.length === 1 && ${rawV}.length === 1 && _ctx.build._parsemanCstCollapse(${JSON.stringify(def.type)}, ${chV}[0], ${chV}, ${rawV}) ? ${chV}[0] : (${ndExpr})` : ndExpr;
@@ -8831,6 +8940,9 @@ function emitDispatch(p, ctx, pos) {
       return emitSepBy(p, def, ctx, pos);
     case "transform": {
       const fnSrc = transformFnSource(def.fn, def.fnSrc);
+      if (fnSrc && def.parser._def.tag === "dispatch" && isDispatchTailOnlyTransform(fnSrc)) {
+        return emitDispatchCombinator(def.parser, def.parser._def, ctx, pos, "tail");
+      }
       if (fnSrc && def.parser._def.tag === "sequence") {
         const seqR = emitSeqValues(def.parser._def, ctx, pos);
         const inlined = tryInlineDestructureTransform(fnSrc, seqR.valueVars);
@@ -9520,8 +9632,8 @@ function assertRuleName(name) {
     );
   }
 }
-function publicRuleWrapperSource(rule, fnSource) {
-  const labels = rule._meta.triviaKindLabels;
+function publicRuleWrapperSource(rule, fnSource, ambientTriviaKindLabels) {
+  const labels = rule._meta.triviaKindLabels ?? ambientTriviaKindLabels;
   if (labels === void 0) return fnSource;
   return `Object.assign(${fnSource}, { _meta: { triviaKindLabels: ${JSON.stringify(labels)} } })`;
 }
@@ -9690,7 +9802,7 @@ function compileLinkable(ruleMapArg, ns, opts) {
       ...r.stmts,
       `  return { ok: true, value: ${r.valueVar}, span: { start: _pos, end: ${r.endVar} } }`,
       `}`
-    ].join("\n")));
+    ].join("\n"), ctx.triviaKindLabels));
   }
   const firstSets = /* @__PURE__ */ new Map();
   const firstSetRecipes = /* @__PURE__ */ new Map();
@@ -9897,6 +10009,10 @@ function repeatOpts(min, max, trailing) {
   if (trailing !== void 0) parts.push(`trailing: ${JSON.stringify(trailing)}`);
   return parts.length === 0 ? "" : `, { ${parts.join(", ")} }`;
 }
+function projectOpt(project) {
+  if (project === void 0) return void 0;
+  return `project: ${project}`;
+}
 function matcherExpr(entry) {
   switch (entry.kind) {
     case "startsWith":
@@ -10290,9 +10406,11 @@ ${outerDecls.map((d) => "  " + d).join("\n")}
       }
       case "node": {
         if (def.build !== void 0 && def.buildSrc === void 0) throw new Unserializable("node build without buildSrc");
+        const projectEntry = projectOpt(def.project);
         const optEntries = [
           ...def.unwrap ? ["unwrap: true"] : [],
           ...def.collapse ? ["collapse: true"] : [],
+          ...projectEntry === void 0 ? [] : [projectEntry],
           ...def.captureTrivia ? ["captureTrivia: true"] : [],
           ...def.trailingTrivia ? ["trailingTrivia: true"] : []
         ];
@@ -11202,8 +11320,158 @@ function parseDoc(registry, rootRule, input, opts = {}) {
   return new ParseDocImpl(registry, rootRule, opts, { abs: null }, [fail], null, input);
 }
 
+// src/cst/trivia-entries.ts
+var EMPTY_INDICES = Object.freeze([]);
+var EMPTY_GAPS = Object.freeze([]);
+function entryOffset(i, stride) {
+  return i * stride;
+}
+function triviaEntries(log, labels, opts) {
+  const baseStride = opts?.nodeLog ? 3 : 2;
+  const stride = labels ? baseStride + 1 : baseStride;
+  const length = Math.floor(log.length / stride);
+  return {
+    length,
+    labels,
+    stride,
+    start(i) {
+      return log[entryOffset(i, stride)];
+    },
+    end(i) {
+      return log[entryOffset(i, stride) + 1];
+    },
+    insertIndex(i) {
+      return opts?.nodeLog ? log[entryOffset(i, stride) + 2] : void 0;
+    },
+    kindIndex(i) {
+      if (!labels) return void 0;
+      return log[entryOffset(i, stride) + baseStride];
+    },
+    kind(i) {
+      const ki = labels ? log[entryOffset(i, stride) + baseStride] : void 0;
+      return ki !== void 0 ? labels[ki] : void 0;
+    },
+    text(i, input) {
+      const s = log[entryOffset(i, stride)];
+      const e = log[entryOffset(i, stride) + 1];
+      return input.slice(s, e);
+    }
+  };
+}
+function appendEntryRange(map, key, first, last) {
+  let indices = map.get(key);
+  if (!indices) {
+    indices = [];
+    map.set(key, indices);
+  }
+  for (let i = first; i <= last; i++) indices.push(i);
+}
+function buildGap(entries, start, end, first, last) {
+  const entryIndices = [];
+  for (let i = first; i <= last; i++) entryIndices.push(i);
+  return {
+    start,
+    end,
+    entryIndices,
+    hasKind(kind) {
+      for (const i of entryIndices) {
+        if (entries.kind(i) === kind) return true;
+      }
+      return false;
+    },
+    text(input) {
+      return input.slice(start, end);
+    }
+  };
+}
+function buildRootMaps(entries) {
+  const before = /* @__PURE__ */ new Map();
+  const after = /* @__PURE__ */ new Map();
+  const beforeGaps = /* @__PURE__ */ new Map();
+  const afterGaps = /* @__PURE__ */ new Map();
+  const gaps = [];
+  if (entries.length === 0) return { before, after, beforeGaps, afterGaps, gaps };
+  const appendGap = (first2, last, start2, end2) => {
+    const gap = buildGap(entries, start2, end2, first2, last);
+    gaps.push(gap);
+    afterGaps.set(start2, gap);
+    beforeGaps.set(end2, gap);
+    appendEntryRange(after, start2, first2, last);
+    appendEntryRange(before, end2, first2, last);
+  };
+  let first = 0;
+  let start = entries.start(0);
+  let end = entries.end(0);
+  for (let i = 1; i < entries.length; i++) {
+    const nextStart = entries.start(i);
+    const nextEnd = entries.end(i);
+    if (nextStart === end) {
+      end = nextEnd;
+      continue;
+    }
+    appendGap(first, i - 1, start, end);
+    first = i;
+    start = nextStart;
+    end = nextEnd;
+  }
+  appendGap(first, entries.length - 1, start, end);
+  return { before, after, beforeGaps, afterGaps, gaps };
+}
+function buildRootTriviaIndex(log, labels) {
+  const entries = triviaEntries(log, labels);
+  let maps;
+  const getMaps = () => {
+    maps ??= buildRootMaps(entries);
+    return maps;
+  };
+  return {
+    entries,
+    labels,
+    get before() {
+      return getMaps().before;
+    },
+    get after() {
+      return getMaps().after;
+    },
+    entryIndicesBefore(offset) {
+      return getMaps().before.get(offset) ?? EMPTY_INDICES;
+    },
+    entryIndicesAfter(offset) {
+      return getMaps().after.get(offset) ?? EMPTY_INDICES;
+    },
+    gapBefore(offset) {
+      return getMaps().beforeGaps.get(offset);
+    },
+    gapAfter(offset) {
+      return getMaps().afterGaps.get(offset);
+    },
+    gaps() {
+      return getMaps().gaps;
+    },
+    gapsWithKind(kind) {
+      const kinds = typeof kind === "string" ? [kind] : kind;
+      const matches2 = [];
+      for (const gap of getMaps().gaps) {
+        for (const k of kinds) {
+          if (gap.hasKind(k)) {
+            matches2.push(gap);
+            break;
+          }
+        }
+      }
+      return matches2.length === 0 ? EMPTY_GAPS : matches2;
+    }
+  };
+}
+
 // src/functional/run.ts
 var invoke = (r, input, pos, ctx) => typeof r === "function" ? r(input, pos, ctx) : r.parse(input, pos, ctx);
+function triviaKindLabelsFromRunnable(r) {
+  if (!r) return void 0;
+  if (typeof r === "function") return r._meta?.triviaKindLabels;
+  const grammarTrivia = r._meta.grammarTrivia;
+  return r._meta.triviaKindLabels ?? grammarTrivia?._meta.triviaKindLabels ?? (r._def.tag === "grammar" ? r._def.triviaParser?._meta.triviaKindLabels : void 0);
+}
 function runOnce(entry, input, options, phase, profileState) {
   if (typeof entry !== "function" && typeof entry?.parse !== "function") {
     throw new TypeError(
@@ -11216,6 +11484,7 @@ function runOnce(entry, input, options, phase, profileState) {
   const skipGlobalSinks = phase === "recognizer" || phase === "capture";
   const grammarTrivia = typeof entry !== "function" ? entry._meta.grammarTrivia : void 0;
   const grammarScanSkip = typeof entry !== "function" ? entry._meta.grammarScanSkip : void 0;
+  const triviaKindLabels = triviaKindLabelsFromRunnable(entry) ?? triviaKindLabelsFromRunnable(options.trivia);
   const stamped = entry;
   assertHostModeCompatible(
     typeof entry === "function" ? stamped[FUSED_HOST_MODE] ?? "ast" : entry._meta.grammarHostMode ?? "ast",
@@ -11227,7 +11496,7 @@ function runOnce(entry, input, options, phase, profileState) {
     ...skipGlobalSinks ? { _pmProfile: profile } : { _triviaLog: triviaLog, _errors: errors, ...profile === void 0 ? {} : { _pmProfile: profile } },
     build: options.build,
     state: options.state,
-    ...grammarTrivia !== void 0 ? { trivia: grammarTrivia, ...grammarTrivia._meta.triviaKindLabels ? { triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {} } : {},
+    ...grammarTrivia !== void 0 ? { trivia: grammarTrivia, ...triviaKindLabels ? { triviaKindLabels } : {} } : triviaKindLabels ? { triviaKindLabels } : {},
     ...grammarScanSkip !== void 0 ? { scanSkip: grammarScanSkip } : {},
     ...options.triviaCaptureMask !== void 0 ? { _triviaCaptureMask: options.triviaCaptureMask } : {},
     ...options.tolerant ? { _tolerant: true, _rec: REC } : {},
@@ -11250,6 +11519,8 @@ function runOnce(entry, input, options, phase, profileState) {
     expected: r.ok ? [] : r.expected ?? [],
     errors,
     triviaLog,
+    ...triviaKindLabels === void 0 ? {} : { triviaKindLabels },
+    triviaMap: buildRootTriviaIndex(triviaLog, triviaKindLabels),
     unconsumedFrom
   };
 }
@@ -11572,7 +11843,7 @@ function coverageEntry(entry, collector, maps, trace) {
         case "peek":
           return peek(build(def.parser));
         case "node": {
-          const opts = { ...def.unwrap ? { unwrap: true } : {}, ...def.collapse ? { collapse: true } : {}, ...def.captureTrivia ? { captureTrivia: true } : {}, ...def.trailingTrivia ? { trailingTrivia: true } : {} };
+          const opts = { ...def.unwrap ? { unwrap: true } : {}, ...def.collapse ? { collapse: true } : {}, ...def.project !== void 0 ? { project: def.project } : {}, ...def.captureTrivia ? { captureTrivia: true } : {}, ...def.trailingTrivia ? { trailingTrivia: true } : {} };
           return def.type === void 0 ? node(build(def.parser), def.build, opts) : node(def.type, build(def.parser), def.build, opts);
         }
         case "guard":
@@ -11708,43 +11979,6 @@ function createVisitor(handlers) {
   return (node2) => api.visit(node2);
 }
 
-// src/cst/trivia-entries.ts
-function entryOffset(i, stride) {
-  return i * stride;
-}
-function triviaEntries(log, labels, opts) {
-  const baseStride = opts?.nodeLog ? 3 : 2;
-  const stride = labels ? baseStride + 1 : baseStride;
-  const length = Math.floor(log.length / stride);
-  return {
-    length,
-    labels,
-    stride,
-    start(i) {
-      return log[entryOffset(i, stride)];
-    },
-    end(i) {
-      return log[entryOffset(i, stride) + 1];
-    },
-    insertIndex(i) {
-      return opts?.nodeLog ? log[entryOffset(i, stride) + 2] : void 0;
-    },
-    kindIndex(i) {
-      if (!labels) return void 0;
-      return log[entryOffset(i, stride) + baseStride];
-    },
-    kind(i) {
-      const ki = labels ? log[entryOffset(i, stride) + baseStride] : void 0;
-      return ki !== void 0 ? labels[ki] : void 0;
-    },
-    text(i, input) {
-      const s = log[entryOffset(i, stride)];
-      const e = log[entryOffset(i, stride) + 1];
-      return input.slice(s, e);
-    }
-  };
-}
-
 // src/cst/offset-model.ts
 var { isFinite } = Number;
 function floorIndex(arr, len, x) {
@@ -11957,6 +12191,7 @@ export {
   blankLinesIn,
   buildLineIndex,
   buildOffsetIndex,
+  buildRootTriviaIndex,
   buildTriviaIndex,
   charClassMembers,
   choice,