parseman 0.40.0 → 0.41.0

package/dist/plugin/index.js

@@ -2582,9 +2582,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":
@@ -3322,7 +3324,7 @@ function leaf(root, fn) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.40.0";
+var PARSEMAN_VERSION = "0.41.0";
 
 // src/cst/host-mode.ts
 var FUSED_HOST_MODE = /* @__PURE__ */ Symbol.for("parseman.fusedHostMode");
@@ -6266,7 +6268,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`,
@@ -6322,7 +6324,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) {
@@ -6382,7 +6384,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`,
@@ -6420,7 +6422,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`,
@@ -6506,6 +6508,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, ":");
 }
@@ -6548,10 +6553,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()) {
@@ -6810,6 +6824,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);
@@ -6875,7 +6900,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`,
     `}`
@@ -7336,14 +7361,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;
@@ -7573,19 +7603,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");
@@ -7610,13 +7641,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}`
         ] : []
@@ -7624,7 +7656,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}; ` : "";
@@ -7634,7 +7676,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)
     );
@@ -7649,7 +7691,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;
     }
   };
@@ -7674,10 +7716,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}`];
@@ -7880,6 +7922,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 (; ; ) {
@@ -8130,15 +8194,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) {
@@ -8177,16 +8242,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 sep2 = emitFallible(def.separator, ctx, sepAtPos, true);
       const { stmts: sepStmts, okVar: sepOk, endVar: sepEnd } = sep2;
       stmts.push(...sepStmts, `${ind(ctx)}if (!${sepOk}) { ${rollbackToSep}${sep2.mayCommit ? `if (_ctx._fc) ${committedFailBody(ctx)}; ` : ""}break }`);
@@ -8224,16 +8291,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 sep2 = emitFallible(def.separator, ctx, sepAtPos, true);
     const { stmts: sepStmts, okVar: sepOk, endVar: sepEnd } = sep2;
     stmts.push(...sepStmts, `${ind(ctx)}if (!${sepOk}) { ${sep2.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);
@@ -8303,7 +8372,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;
@@ -8342,6 +8411,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: [
@@ -8837,6 +8917,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);
@@ -9526,8 +9609,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)} } })`;
 }
@@ -9635,7 +9718,7 @@ function compileRuleMap(ruleMap, opts) {
     return [`function(input, _pos, _ctx) {`, ...body, `}`].join("\n");
   };
   const objBody = perEntry.map(({ key, rule, r }) => {
-    const src = publicRuleWrapperSource(rule, entryFnText(r, rule));
+    const src = publicRuleWrapperSource(rule, entryFnText(r, rule), ctx.triviaKindLabels);
     return `    ${JSON.stringify(key)}: ${src.split("\n").join("\n    ")}`;
   }).join(",\n");
   const replacement = [
@@ -9822,7 +9905,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();
@@ -10675,6 +10758,10 @@ function gate(predicate) {
   };
 }
 
+// src/cst/trivia-entries.ts
+var EMPTY_INDICES = Object.freeze([]);
+var EMPTY_GAPS = Object.freeze([]);
+
 // src/cst/offset-model.ts
 var { isFinite } = Number;