parseman 0.40.0 → 0.42.0

package/dist/index.cjs

@@ -33,12 +33,14 @@ __export(index_exports, {
   analyzeGatingRules: () => analyzeGatingRules,
   analyzeGrammarGating: () => analyzeGrammarGating,
   annotateSpan: () => annotateSpan,
+  annotateTreeSpans: () => annotateTreeSpans,
   applyEdit: () => applyEdit,
   attempt: () => attempt,
   balanced: () => balanced,
   blankLinesIn: () => blankLinesIn,
   buildLineIndex: () => buildLineIndex,
   buildOffsetIndex: () => buildOffsetIndex,
+  buildRootTriviaIndex: () => buildRootTriviaIndex,
   buildTriviaIndex: () => buildTriviaIndex,
   charClassMembers: () => charClassMembers,
   choice: () => choice,
@@ -53,6 +55,7 @@ __export(index_exports, {
   createGrammarCoverageCollector: () => createGrammarCoverageCollector,
   createGrammarInstrumentationContext: () => createGrammarInstrumentationContext,
   createGrammarTraceSink: () => createGrammarTraceSink,
+  createLineIndex: () => createLineIndex,
   createVisitor: () => createVisitor,
   cstBuildHost: () => cstBuildHost,
   dispatch: () => dispatch,
@@ -86,6 +89,7 @@ __export(index_exports, {
   matches: () => matches,
   noTrivia: () => noTrivia,
   node: () => node,
+  normalizeLineIndex: () => normalizeLineIndex,
   not: () => not,
   offsetToLineCol: () => offsetToLineCol,
   oneOrMore: () => oneOrMore,
@@ -96,6 +100,7 @@ __export(index_exports, {
   parseDoc: () => parseDoc,
   parser: () => parser,
   peek: () => peek,
+  recordLineRange: () => recordLineRange,
   ref: () => ref,
   regex: () => regex,
   relativize: () => relativize,
@@ -362,6 +367,87 @@ function failAt(ctx, expected, pos) {
   return r;
 }
 
+// src/line-index.ts
+function createLineIndex() {
+  return { lineStarts: [0] };
+}
+function buildLineIndex(input) {
+  const lineStarts = [0];
+  for (let i = 0; i < input.length; i++) {
+    if (input.charCodeAt(i) === 10) lineStarts.push(i + 1);
+  }
+  return { lineStarts };
+}
+function recordLineRange(index, input, start, end) {
+  const lineStarts = index.lineStarts;
+  for (let i = start; i < end; i++) {
+    if (input.charCodeAt(i) === 10) lineStarts.push(i + 1);
+  }
+}
+function recordLineRangeFromContext(ctx, input, _startHint, end) {
+  if (!ctx.trackLines) return;
+  const from = ctx._lineScannedTo ?? 0;
+  if (end <= from) return;
+  const index = ctx._lineIndex ?? (ctx._lineStarts ? { lineStarts: ctx._lineStarts } : void 0);
+  if (!index) return;
+  recordLineRange(index, input, from, end);
+  ctx._lineScannedTo = end;
+}
+function normalizeLineIndex(index) {
+  const starts = index.lineStarts;
+  starts.sort((a, b) => a - b);
+  let write = 0;
+  for (let read = 0; read < starts.length; read++) {
+    const value = starts[read];
+    if (write === 0 || starts[write - 1] !== value) starts[write++] = value;
+  }
+  starts.length = write;
+  if (starts.length === 0 || starts[0] !== 0) starts.unshift(0);
+  return index;
+}
+function offsetToLineCol(index, offset) {
+  const { lineStarts } = index;
+  let lo = 0;
+  let hi = lineStarts.length - 1;
+  while (lo < hi) {
+    const mid = lo + hi + 1 >> 1;
+    if (lineStarts[mid] <= offset) lo = mid;
+    else hi = mid - 1;
+  }
+  return { line: lo + 1, col: offset - lineStarts[lo] + 1 };
+}
+function annotateSpan(span, index) {
+  const s = offsetToLineCol(index, span.start);
+  const e = offsetToLineCol(index, span.end);
+  return {
+    ...span,
+    startLine: s.line,
+    startColumn: s.col,
+    endLine: e.line,
+    endColumn: e.col
+  };
+}
+function annotateSpanFromLineContext(span, ctx) {
+  if (!ctx.trackLines) return span;
+  const index = ctx._lineIndex ?? (ctx._lineStarts ? { lineStarts: ctx._lineStarts } : void 0);
+  return index ? annotateSpan(span, index) : span;
+}
+function isSpan(value) {
+  return !!value && typeof value === "object" && typeof value.start === "number" && typeof value.end === "number";
+}
+function annotateTreeSpans(value, index, seen = /* @__PURE__ */ new WeakSet()) {
+  if (!value || typeof value !== "object") return value;
+  if (seen.has(value)) return value;
+  seen.add(value);
+  const obj = value;
+  if (isSpan(obj.span)) obj.span = annotateSpan(obj.span, index);
+  for (const key of Object.keys(obj)) {
+    const child = obj[key];
+    if (child && typeof child === "object") annotateTreeSpans(child, index, seen);
+  }
+  return value;
+}
+
 // src/cst/capture-buffer.ts
 var EMPTY = [];
 var EMPTY_TL = [];
@@ -403,7 +489,12 @@ function endCstNodeCapture(ctx, saved) {
   return materialized;
 }
 function pushCstLeaf(ctx, leaf2) {
-  pushCstChild(ctx, leaf2, leaf2);
+  if (!ctx.trackLines) {
+    pushCstChild(ctx, leaf2, leaf2);
+    return;
+  }
+  const annotated = leaf2 && typeof leaf2 === "object" && leaf2.span ? { ...leaf2, span: annotateSpanFromLineContext(leaf2.span, ctx) } : leaf2;
+  pushCstChild(ctx, annotated, annotated);
 }
 function pushCstChild(ctx, built, rawEntry) {
   const b = ctx._cstBuf;
@@ -537,6 +628,7 @@ function literal(value, opts = {}) {
     canMatchNewline: value.includes("\n"),
     isTrivia: false
   };
+  const canMatchNewline = meta.canMatchNewline;
   if (caseInsensitive) {
     const upper = value.toUpperCase();
     const lower = value.toLowerCase();
@@ -553,6 +645,7 @@ function literal(value, opts = {}) {
     return function parse3(input, pos, ctx) {
       if (input.charCodeAt(pos) === code) {
         const span = { start: pos, end: pos + 1 };
+        if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, span.end);
         if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span });
         return { ok: true, value, span };
       }
@@ -566,6 +659,7 @@ function literal(value, opts = {}) {
     const matchedValue = caseInsensitive ? input.slice(pos, end) : value;
     if (caseInsensitive ? asciiFoldEq(matchedValue, value) : input.startsWith(value, pos)) {
       const span = { start: pos, end };
+      if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, end);
       if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value: matchedValue, span });
       return { ok: true, value: matchedValue, span };
     }
@@ -733,6 +827,7 @@ function regex(pattern, flags = "") {
         if (scanEnd === null) return failAt(ctx, [`/${source}/`], pos);
         const value = input.slice(pos, scanEnd);
         const span2 = { start: pos, end: scanEnd };
+        if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, scanEnd);
         if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span: span2 });
         return { ok: true, value, span: span2 };
       }
@@ -742,6 +837,7 @@ function regex(pattern, flags = "") {
         return failAt(ctx, [`/${source}/`], pos);
       }
       const span = { start: pos, end: pos + m[0].length };
+      if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, span.end);
       if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value: m[0], span });
       return { ok: true, value: m[0], span };
     }
@@ -880,8 +976,8 @@ function parseRegex(src) {
     }
     if (src[k] !== "]") throw BAIL;
     i = k + 1;
-    if (negated) return charNode(any(), true);
     const ranges = parseClassRanges(body);
+    if (negated) return charNode(any(), !ranges || !rangesHaveNewline(ranges));
     if (!ranges) return charNode(any(), true);
     return charNode(rangesToSet(ranges), rangesHaveNewline(ranges));
   };
@@ -977,7 +1073,7 @@ function firstSet(n) {
     }
   }
 }
-function firstCanBeNewline(n) {
+function canConsumeNewline(n) {
   switch (n.t) {
     case "char":
       return n.nl;
@@ -986,16 +1082,11 @@ function firstCanBeNewline(n) {
     case "empty":
       return false;
     case "rep":
-      return firstCanBeNewline(n.node);
+      return canConsumeNewline(n.node);
     case "alt":
-      return n.arms.some(firstCanBeNewline);
-    case "seq": {
-      for (const part of n.parts) {
-        if (firstCanBeNewline(part)) return true;
-        if (!nullable(part)) break;
-      }
-      return false;
-    }
+      return n.arms.some(canConsumeNewline);
+    case "seq":
+      return n.parts.some(canConsumeNewline);
   }
 }
 function firstSetFromRegex(source) {
@@ -1005,8 +1096,8 @@ function firstSetFromRegex(source) {
   } catch {
     return { firstSet: any(), canMatchNewline: true };
   }
-  if (nullable(ast)) return { firstSet: any(), canMatchNewline: true };
-  return { firstSet: firstSet(ast), canMatchNewline: firstCanBeNewline(ast) };
+  if (nullable(ast)) return { firstSet: any(), canMatchNewline: canConsumeNewline(ast) };
+  return { firstSet: firstSet(ast), canMatchNewline: canConsumeNewline(ast) };
 }
 
 // src/combinators/case-fold.ts
@@ -1168,7 +1259,9 @@ function firstSetSentinel(fs) {
 function recoverScan(input, from, ctx, sync, expected) {
   let scanPos = from;
   while (scanPos < input.length && !probeAt(sync, input, scanPos, ctx)) scanPos++;
-  const error = { _tag: "parseError", span: { start: from, end: scanPos }, expected };
+  const span = { start: from, end: scanPos };
+  if (ctx.trackLines) recordLineRangeFromContext(ctx, input, from, scanPos);
+  const error = { _tag: "parseError", span: ctx.trackLines ? annotateSpanFromLineContext(span, ctx) : span, expected };
   ctx._errors?.push(error);
   return { error, end: scanPos };
 }
@@ -1271,7 +1364,8 @@ function expect(combinator, label2) {
     parse(input, pos, ctx) {
       const result = combinator.parse(input, pos, ctx);
       if (result.ok) return result;
-      const error = { _tag: "parseError", span: { start: pos, end: pos }, expected };
+      const span = { start: pos, end: pos };
+      const error = { _tag: "parseError", span: ctx.trackLines ? annotateSpanFromLineContext(span, ctx) : span, expected };
       ctx._errors?.push(error);
       if (ctx._tolerant) captureError(ctx, error);
       return { ok: true, value: error, span: { start: pos, end: pos } };
@@ -1719,6 +1813,18 @@ function rollbackTrivia(ctx, mark) {
   rollbackCstCapture(ctx, { raw: mark.raw, tlog: mark.tlog, leaves: mark.leaves, fields: mark.fields, errors: mark.errors });
   if (ctx._triviaLog && ctx._triviaLog.length !== mark.log) ctx._triviaLog.length = mark.log;
 }
+function parseTriviaNoCapture(triviaP, input, cur, ctx) {
+  const probeCtx = {
+    trackLines: ctx.trackLines,
+    state: ctx.state,
+    ...ctx._lineIndex ? { _lineIndex: ctx._lineIndex } : {},
+    ...ctx._lineStarts ? { _lineStarts: ctx._lineStarts } : {},
+    ...ctx._lineScannedTo !== void 0 ? { _lineScannedTo: ctx._lineScannedTo } : {}
+  };
+  const result = triviaP.parse(input, cur, probeCtx);
+  ctx._lineScannedTo = probeCtx._lineScannedTo;
+  return result;
+}
 function saveLookaheadMark(ctx) {
   return { ...saveTriviaMark(ctx), probeBest: ctx._probe ? ctx._probe.best : null };
 }
@@ -1741,13 +1847,29 @@ function scanWithLabels(input, cur, ctx) {
 function advanceTrivia(input, cur, ctx) {
   const triviaP = ctx.trivia;
   if (!triviaP) return cur;
+  if (!ctx.trackLines) {
+    const fast2 = fastTriviaScanner(triviaP);
+    if (fast2) return fast2(input, cur);
+    if (ctx.triviaKindLabels) {
+      const scan = scanWithLabels(input, cur, ctx);
+      return scan.end;
+    }
+    const tr2 = triviaP.parse(input, cur, { trackLines: ctx.trackLines, state: ctx.state });
+    return tr2.ok && tr2.span.end > cur ? tr2.span.end : cur;
+  }
+  const trackTriviaLines = ctx.trackLines && triviaP._meta.canMatchNewline;
   const fast = fastTriviaScanner(triviaP);
-  if (fast) return fast(input, cur);
+  if (fast) {
+    const end = fast(input, cur);
+    if (trackTriviaLines) recordLineRangeFromContext(ctx, input, cur, end);
+    return end;
+  }
   if (ctx.triviaKindLabels) {
     const scan = scanWithLabels(input, cur, ctx);
+    if (trackTriviaLines) recordLineRangeFromContext(ctx, input, cur, scan.end);
     return scan.end;
   }
-  const tr = triviaP.parse(input, cur, { trackLines: ctx.trackLines, state: ctx.state });
+  const tr = parseTriviaNoCapture(triviaP, input, cur, ctx);
   return tr.ok && tr.span.end > cur ? tr.span.end : cur;
 }
 function scanTrivia(input, cur, ctx) {
@@ -1755,18 +1877,46 @@ function scanTrivia(input, cur, ctx) {
   if (!triviaP) return { end: cur, commit: NOOP_COMMIT };
   const log = ctx._triviaLog;
   const captureTl = ctx.captureTrivia && (ctx._cstBuf !== void 0 || ctx._cstTriviaLog !== void 0);
+  if (!ctx.trackLines) {
+    const fast2 = !ctx.triviaKindLabels ? fastTriviaScanner(triviaP) : null;
+    if (fast2 && log === void 0 && !captureTl) {
+      return { end: fast2(input, cur), commit: NOOP_COMMIT };
+    }
+    if (ctx.triviaKindLabels && (log !== void 0 || captureTl)) {
+      return scanWithLabels(input, cur, ctx);
+    }
+    if (log !== void 0 || captureTl) {
+      const tr3 = triviaP.parse(input, cur, {
+        trackLines: log !== void 0 ? false : ctx.trackLines,
+        state: ctx.state
+      });
+      if (!tr3.ok || tr3.span.end === cur) return { end: cur, commit: NOOP_COMMIT };
+      const end = tr3.span.end;
+      return {
+        end,
+        commit: () => {
+          pushTriviaLogEntry(ctx, cur, end);
+          if (captureTl) pushCstTriviaEntry(ctx, cur, end);
+        }
+      };
+    }
+    const tr2 = triviaP.parse(input, cur, { trackLines: ctx.trackLines, state: ctx.state });
+    return { end: tr2.ok ? tr2.span.end : cur, commit: NOOP_COMMIT };
+  }
+  const trackTriviaLines = ctx.trackLines && triviaP._meta.canMatchNewline;
   const fast = !ctx.triviaKindLabels ? fastTriviaScanner(triviaP) : null;
   if (fast && log === void 0 && !captureTl) {
-    return { end: fast(input, cur), commit: NOOP_COMMIT };
+    const end = fast(input, cur);
+    if (trackTriviaLines) recordLineRangeFromContext(ctx, input, cur, end);
+    return { end, commit: NOOP_COMMIT };
   }
   if (ctx.triviaKindLabels && (log !== void 0 || captureTl)) {
-    return scanWithLabels(input, cur, ctx);
+    const scan = scanWithLabels(input, cur, ctx);
+    if (trackTriviaLines) recordLineRangeFromContext(ctx, input, cur, scan.end);
+    return scan;
   }
   if (log !== void 0 || captureTl) {
-    const tr2 = triviaP.parse(input, cur, {
-      trackLines: log !== void 0 ? false : ctx.trackLines,
-      state: ctx.state
-    });
+    const tr2 = parseTriviaNoCapture(triviaP, input, cur, ctx);
     if (!tr2.ok || tr2.span.end === cur) return { end: cur, commit: NOOP_COMMIT };
     const end = tr2.span.end;
     return {
@@ -1777,7 +1927,7 @@ function scanTrivia(input, cur, ctx) {
       }
     };
   }
-  const tr = triviaP.parse(input, cur, { trackLines: ctx.trackLines, state: ctx.state });
+  const tr = parseTriviaNoCapture(triviaP, input, cur, ctx);
   return { end: tr.ok ? tr.span.end : cur, commit: NOOP_COMMIT };
 }
 function consumeTrivia(input, cur, ctx) {
@@ -2711,9 +2861,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":
@@ -3199,13 +3351,14 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const st = clonesState && ctx.state !== void 0 ? Object.assign({}, ctx.state) : void 0;
       const nodeType = def.type ?? missingInferredType();
       const cstOutput = cstOutputHost(ctx.build);
+      const span = ctx.trackLines ? annotateSpanFromLineContext(r.span, ctx) : r.span;
       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 && 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 };
+      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, span, rawChildren, triviaLog, hostState) : projectChild(children2, project, nodeType) : build ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, hostState) : build(children2, fields, span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: ctx.trackLines ? { ...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 };
       if (saved.buf !== void 0 || saved.ch !== void 0) {
         pushCstChild(ctx, built, rawEntry);
       }
-      return { ok: true, value: built, span: r.span };
+      return { ok: true, value: built, span };
     }
   };
 }
@@ -3276,38 +3429,24 @@ function field(name, combinator) {
   };
 }
 
-// src/compiler/line-index.ts
-function buildLineIndex(input) {
-  const lineStarts = [0];
-  for (let i = 0; i < input.length; i++) {
-    if (input.charCodeAt(i) === 10) lineStarts.push(i + 1);
-  }
-  return { lineStarts };
-}
-function offsetToLineCol(index, offset) {
-  const { lineStarts } = index;
-  let lo = 0;
-  let hi = lineStarts.length - 1;
-  while (lo < hi) {
-    const mid = lo + hi + 1 >> 1;
-    if (lineStarts[mid] <= offset) lo = mid;
-    else hi = mid - 1;
+// src/combinators/grammar.ts
+function annotateResultLines(result, index) {
+  const annotated = { ...result, span: annotateSpan(result.span, index) };
+  const errors = annotated.errors;
+  if (errors) {
+    ;
+    annotated.errors = errors.map((error) => ({
+      ...error,
+      span: annotateSpan(error.span, index)
+    }));
   }
-  return { line: lo + 1, col: offset - lineStarts[lo] + 1 };
+  return annotated;
 }
-function annotateSpan(span, index) {
-  const s = offsetToLineCol(index, span.start);
-  const e = offsetToLineCol(index, span.end);
-  return {
-    ...span,
-    startLine: s.line,
-    startColumn: s.col,
-    endLine: e.line,
-    endColumn: e.col
-  };
+function createParseLineContext(input, pos) {
+  const lineIndex = createLineIndex();
+  if (pos > 0) recordLineRange(lineIndex, input, 0, pos);
+  return { lineIndex, lineScannedTo: pos };
 }
-
-// src/combinators/grammar.ts
 function parser(opts, root) {
   const clearTrivia = opts.trivia === null;
   return {
@@ -3323,9 +3462,13 @@ function parser(opts, root) {
     },
     parse(input, pos, _ctx) {
       const trackLines = opts.trackLines ?? _ctx?.trackLines ?? false;
+      const lineContext = trackLines && _ctx?._lineIndex === void 0 && _ctx?._lineStarts === void 0 ? createParseLineContext(input, pos ?? 0) : void 0;
+      const lineIndex = trackLines ? _ctx?._lineIndex ?? (_ctx?._lineStarts ? { lineStarts: _ctx._lineStarts } : lineContext.lineIndex) : void 0;
       const ctx = {
         ..._ctx,
         trackLines,
+        ...lineIndex ? { _lineIndex: lineIndex } : {},
+        ...lineContext ? { _lineScannedTo: lineContext.lineScannedTo } : {},
         // trivia: null clears (contiguous terms); a Combinator sets; undefined inherits.
         ...clearTrivia ? {
           trivia: void 0,
@@ -3343,11 +3486,10 @@ function parser(opts, root) {
         ...opts.captureTriviaKinds && !clearTrivia ? { _triviaCaptureMask: triviaKindMask(opts.trivia?._meta.triviaKindLabels ?? _ctx?.triviaKindLabels, opts.captureTriviaKinds) } : {}
       };
       const result = root.parse(input, pos ?? 0, ctx);
-      if (trackLines) {
-        const idx = buildLineIndex(input);
-        return { ...result, span: annotateSpan(result.span, idx) };
+      if (trackLines && _ctx && ctx._lineScannedTo !== void 0) {
+        _ctx._lineScannedTo = Math.max(_ctx._lineScannedTo ?? 0, ctx._lineScannedTo);
       }
-      return result;
+      return lineIndex ? annotateResultLines(result, normalizeLineIndex(lineIndex)) : result;
     }
   };
 }
@@ -3361,25 +3503,25 @@ function parse(combinator, input, opts = {}) {
     markUnusedValues(combinator);
   }
   const trackLines = opts.trackLines ?? false;
+  const lineContext = trackLines ? createParseLineContext(input, 0) : void 0;
+  const lineIndex = lineContext?.lineIndex;
   const _errors = opts.recover ? [] : void 0;
   const _probe = opts.recover ? { offset: input.length, best: null } : void 0;
   const grammarTrivia = combinator._meta.grammarTrivia;
   const grammarScanSkip = combinator._meta.grammarScanSkip;
   const ctx = {
     trackLines,
+    ...lineIndex ? { _lineIndex: lineIndex } : {},
+    ...lineContext ? { _lineScannedTo: lineContext.lineScannedTo } : {},
     ...grammarTrivia !== void 0 ? { trivia: grammarTrivia, ...grammarTrivia._meta.triviaKindLabels ? { triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {} } : {},
     ...grammarScanSkip !== void 0 ? { scanSkip: grammarScanSkip } : {},
     ..._errors !== void 0 ? { _errors } : {},
     ..._probe !== void 0 ? { _probe } : {}
   };
   const result = combinator.parse(input, 0, ctx);
-  if (!result.ok) return result;
+  if (!result.ok) return lineIndex ? annotateResultLines(result, normalizeLineIndex(lineIndex)) : result;
   const withErrors = _errors !== void 0 ? { ...result, errors: _errors, furthestFail: _probe?.best ?? null } : result;
-  if (trackLines) {
-    const idx = buildLineIndex(input);
-    return { ...withErrors, span: annotateSpan(withErrors.span, idx) };
-  }
-  return withErrors;
+  return lineIndex ? annotateResultLines(withErrors, normalizeLineIndex(lineIndex)) : withErrors;
 }
 
 // src/combinators/token.ts
@@ -3478,7 +3620,7 @@ function leaf(root, fn) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.40.0";
+var PARSEMAN_VERSION = "0.42.0";
 
 // src/cst/host-mode.ts
 var FUSED_HOST_MODE = /* @__PURE__ */ Symbol.for("parseman.fusedHostMode");
@@ -5162,7 +5304,7 @@ function scanTo(sentinel, { skip: skip2, raw = false, orEOF = false } = {}) {
       let cur = pos;
       const skip3 = resolveScanSkip(explicitSkip, raw, ctx);
       const probeCtx = {
-        trackLines: ctx.trackLines,
+        trackLines: false,
         state: ctx.state,
         ...ctx._errors !== void 0 ? { _errors: ctx._errors } : {}
       };
@@ -5175,6 +5317,7 @@ function scanTo(sentinel, { skip: skip2, raw = false, orEOF = false } = {}) {
       while (cur < input.length) {
         const s = sentinel.parse(input, cur, probeCtx);
         if (s.ok) {
+          if (ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, cur);
           emit2(cur);
           return { ok: true, value: input.slice(pos, cur), span: { start: pos, end: cur } };
         }
@@ -5190,6 +5333,7 @@ function scanTo(sentinel, { skip: skip2, raw = false, orEOF = false } = {}) {
         if (!advanced) cur++;
       }
       if (orEOF) {
+        if (ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, cur);
         emit2(cur);
         return { ok: true, value: input.slice(pos, cur), span: { start: pos, end: cur } };
       }
@@ -6422,7 +6566,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`,
@@ -6478,7 +6622,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) {
@@ -6538,7 +6682,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`,
@@ -6576,7 +6720,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`,
@@ -6628,8 +6772,8 @@ function analyzeMkInlineBuild(def) {
   if (looseMkBuildRe(def.type).test(src)) return def.type;
   return null;
 }
-function emitInlineMkNodeExpr(type, chV, rawV, pos, endVar, tlV) {
-  return `{ _tag: 'node', type: ${JSON.stringify(type)}, span: { start: ${pos}, end: ${endVar} }, children: ${chV}, rawCount: ${rawV}.length, localTriviaLen: ${tlV}.length }`;
+function emitInlineMkNodeExpr(type, chV, rawV, spanExpr, tlV) {
+  return `{ _tag: 'node', type: ${JSON.stringify(type)}, span: ${spanExpr}, children: ${chV}, rawCount: ${rawV}.length, localTriviaLen: ${tlV}.length }`;
 }
 
 // src/compiler/inline-callback.ts
@@ -6662,6 +6806,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, ":");
 }
@@ -6704,10 +6851,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()) {
@@ -6799,6 +6955,8 @@ function leadingFirstSetRecipe(p, seen = /* @__PURE__ */ new Set()) {
   }
 }
 var HOST_READS_DECL = "const _hostReads = (b, n) => { if (b === undefined) return false; let s; try { s = Function.prototype.toString.call(b) } catch (e) { return true } if (/\\barguments\\b/.test(s)) return true; const m = /^[^(]*\\(([\\s\\S]*?)\\)/.exec(s); if (m && /\\.\\.\\.|=/.test(m[1])) return true; return b.length > n }";
+var LINE_TRACK_DECL = "const _trackLines = (_ctx, input, start, end) => { const from = _ctx._lineScannedTo ?? 0; if (end <= from) return; for (let i = from; i < end; i++) if (input.charCodeAt(i) === 10) _ctx._lineStarts.push(i + 1); _ctx._lineScannedTo = end }";
+var LINE_SPAN_DECL = "const _lineCol = (_ctx, offset) => { const starts = _ctx._lineStarts; let lo = 0, hi = starts.length - 1; while (lo < hi) { const mid = (lo + hi + 1) >> 1; if (starts[mid] <= offset) lo = mid; else hi = mid - 1 } return [lo + 1, offset - starts[lo] + 1] }\nconst _spanLines = (_ctx, start, end) => { const s = _lineCol(_ctx, start), e = _lineCol(_ctx, end); return { start, end, startLine: s[0], startColumn: s[1], endLine: e[0], endColumn: e[1] } }";
 var _loweringSink = null;
 function v(ctx, prefix = "_v") {
   return `${prefix}${ctx.vars++}`;
@@ -6939,14 +7097,46 @@ function emitLeafCapture(ctx, valExpr, startExpr, endExpr) {
   if (ctx.capAsTrivia) return [];
   const i = ind(ctx);
   const lf = v(ctx, "_lf");
+  const spanExpr = emitSpanExpr(ctx, startExpr, endExpr);
   return [
     `${i}if (_ctx._cstLeaves || _ctx._cstRawChildren) {`,
-    `${i}  const ${lf} = { _tag: 'leaf', value: ${valExpr}, span: { start: ${startExpr}, end: ${endExpr} } }`,
+    `${i}  const ${lf} = { _tag: 'leaf', value: ${valExpr}, span: ${spanExpr} }`,
     `${i}  if (_ctx._cstLeaves) _ctx._cstLeaves.push(${lf})`,
     `${i}  if (_ctx._cstRawChildren) _ctx._cstRawChildren.push(${lf})`,
     `${i}}`
   ];
 }
+function emitSpanExpr(ctx, startExpr, endExpr) {
+  if (!ctx.lineTracking) return `{ start: ${startExpr}, end: ${endExpr} }`;
+  ctx.needsLineSpan = true;
+  return `_spanLines(_ctx, ${startExpr}, ${endExpr})`;
+}
+function emitLineTrack(ctx, startExpr, endExpr) {
+  if (!ctx.lineTracking) return [];
+  ctx.needsLineTrack = true;
+  return [`${ind(ctx)}_trackLines(_ctx, input, ${startExpr}, ${endExpr})`];
+}
+function emitLiteralLineTrack(ctx, startExpr, value) {
+  if (!ctx.lineTracking) return [];
+  const lineDeltas = [];
+  for (let i = 0; i < value.length; i++) {
+    if (value.charCodeAt(i) === 10) lineDeltas.push(i + 1);
+  }
+  if (lineDeltas.length === 0) return [];
+  const fromV = v(ctx, "_ltFrom");
+  const endExpr = value.length === 0 ? startExpr : `${startExpr} + ${value.length}`;
+  return [
+    `${ind(ctx)}const ${fromV} = _ctx._lineScannedTo ?? 0`,
+    `${ind(ctx)}if (${endExpr} > ${fromV}) {`,
+    `${ind(ctx)}  for (let i = ${fromV}; i < ${startExpr}; i++) if (input.charCodeAt(i) === 10) _ctx._lineStarts.push(i + 1)`,
+    ...lineDeltas.map((delta) => {
+      const lineStart = `${startExpr} + ${delta}`;
+      return `${ind(ctx)}  if (${lineStart} > ${fromV}) _ctx._lineStarts.push(${lineStart})`;
+    }),
+    `${ind(ctx)}  _ctx._lineScannedTo = ${endExpr}`,
+    `${ind(ctx)}}`
+  ];
+}
 function ensureRegexDecl(ctx, source, flags) {
   const f = "y" + flags.replace(/[gy]/g, "");
   const key = `${source}/${f}`;
@@ -6958,6 +7148,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);
@@ -7023,7 +7224,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`,
     `}`
@@ -7320,6 +7521,7 @@ function emitLit(def, ctx, pos) {
     );
   }
   const endVar = len === 0 ? pos : `${pos} + ${len}`;
+  stmts.push(...emitLiteralLineTrack(ctx, pos, value));
   stmts.push(...emitLeafCapture(ctx, vv, pos, endVar));
   return { stmts, valueVar: vv, endVar };
 }
@@ -7399,7 +7601,7 @@ function emitKeywords(def, ctx, pos) {
   stmts.push(...emitLeafCapture(ctx, vv, pos, endVar));
   return { stmts, valueVar: vv, endVar };
 }
-function emitRegex(def, ctx, pos) {
+function emitRegex(def, ctx, pos, canMatchNewline = true) {
   const expectedStr = JSON.stringify(`/${def.source}/`);
   const shape = scanShapeFromRegex(def.source, def.flags);
   if (shape) {
@@ -7412,7 +7614,11 @@ function emitRegex(def, ctx, pos) {
       fresh: (prefix) => v(ctx, prefix)
     });
     if (scanned) {
-      const stmts2 = [...scanned.stmts, ...emitLeafCapture(ctx, vv2, pos, scanned.endVar)];
+      const stmts2 = [
+        ...scanned.stmts,
+        ...canMatchNewline ? emitLineTrack(ctx, pos, scanned.endVar) : [],
+        ...emitLeafCapture(ctx, vv2, pos, scanned.endVar)
+      ];
       return { stmts: stmts2, valueVar: vv2, endVar: scanned.endVar };
     }
   }
@@ -7434,6 +7640,7 @@ function emitRegex(def, ctx, pos) {
     `${ind(ctx)}const ${vv} = ${mv}[0]`
   ];
   const endVar = `${pos} + ${vv}.length`;
+  if (canMatchNewline) stmts.push(...emitLineTrack(ctx, pos, endVar));
   stmts.push(...emitLeafCapture(ctx, vv, pos, endVar));
   return { stmts, valueVar: vv, endVar };
 }
@@ -7471,7 +7678,8 @@ function emitSeqValues(def, ctx, pos) {
           `${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 ${scanEndV} = ${capFn}(input, ${curV}, _ctx, 1)`
+          `${ind(ctx)}const ${scanEndV} = ${capFn}(input, ${curV}, _ctx, 1)`,
+          ...emitLineTrack(ctx, curV, scanEndV)
         );
         const r2 = emit(def.parsers[i], ctx, scanEndV);
         stmts.push(...r2.stmts);
@@ -7484,14 +7692,20 @@ 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})`,
+          ...emitLineTrack(ctx, curV, scanEndV)
+        );
         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;
@@ -7721,19 +7935,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");
@@ -7758,13 +7973,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}`
         ] : []
@@ -7772,7 +7988,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}; ` : "";
@@ -7782,7 +8008,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)
     );
@@ -7797,7 +8023,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;
     }
   };
@@ -7822,10 +8048,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}`];
@@ -8028,6 +8254,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 (; ; ) {
@@ -8150,14 +8398,15 @@ function emitMany(def, ctx, pos) {
         `${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 ${npV} = ${capFn}(input, ${curV}, _ctx, 1)`
+        `${ind(ctx)}const ${npV} = ${capFn}(input, ${curV}, _ctx, 1)`,
+        ...emitLineTrack(ctx, curV, npV)
       );
       itemPos = npV;
       rollback = `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}; `;
     } else {
       const trivFn = ensureTriviaFn(ctx);
       const npV = v(ctx, "_np");
-      stmts.push(`${ind(ctx)}const ${npV} = ${trivFn}(input, ${curV}, _ctx)`);
+      stmts.push(`${ind(ctx)}const ${npV} = ${trivFn}(input, ${curV}, _ctx)`, ...emitLineTrack(ctx, curV, npV));
       itemPos = npV;
     }
   }
@@ -8278,15 +8527,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) {
@@ -8325,23 +8575,26 @@ 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 ${spV} = ${capFn}(input, ${curV}, _ctx, 1)`
+        `${ind(ctx)}const ${markFld} = _ctx._fields ? _ctx._fields.length : 0`,
+        `${ind(ctx)}const ${spV} = ${capFn}(input, ${curV}, _ctx, 1)`,
+        ...emitLineTrack(ctx, curV, spV)
       );
       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 }`);
       const post = postSepMarks();
       stmts.push(...post.decl);
       const npV = v(ctx, "_np");
-      stmts.push(`${ind(ctx)}const ${npV} = ${capFn}(input, ${sepEnd}, _ctx, 1)`);
+      stmts.push(`${ind(ctx)}const ${npV} = ${capFn}(input, ${sepEnd}, _ctx, 1)`, ...emitLineTrack(ctx, sepEnd, npV));
       const next = emitFallible(def.parser, ctx, npV, true);
       const { stmts: nextStmts, okVar: nextOk, valVar: nextVal, endVar: nextEnd } = next;
       stmts.push(
@@ -8353,13 +8606,13 @@ function emitSepBy(_p, def, ctx, pos) {
     } else {
       const trivFn = ensureTriviaFn(ctx);
       const spV = v(ctx, "_sp");
-      stmts.push(`${ind(ctx)}const ${spV} = ${trivFn}(input, ${curV}, _ctx)`);
+      stmts.push(`${ind(ctx)}const ${spV} = ${trivFn}(input, ${curV}, _ctx)`, ...emitLineTrack(ctx, curV, spV));
       sepAtPos = spV;
       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 npV = v(ctx, "_np");
-      stmts.push(`${ind(ctx)}const ${npV} = ${trivFn}(input, ${sepEnd}, _ctx)`);
+      stmts.push(`${ind(ctx)}const ${npV} = ${trivFn}(input, ${sepEnd}, _ctx)`, ...emitLineTrack(ctx, sepEnd, npV));
       const next = emitFallible(def.parser, ctx, npV, true);
       const { stmts: nextStmts, okVar: nextOk, valVar: nextVal, endVar: nextEnd } = next;
       stmts.push(
@@ -8372,16 +8625,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);
@@ -8444,6 +8699,7 @@ function emitScanTo(def, ctx, pos) {
   }
   const valV = v(ctx);
   stmts.push(`${ind(ctx)}const ${valV} = input.slice(${pos}, ${curV})`);
+  stmts.push(...emitLineTrack(ctx, pos, curV));
   if (ctx.capturing) {
     const cap = reindentStmts(emitLeafCapture(ctx, valV, pos, curV), ctx.indent + 1);
     stmts.push(`${ind(ctx)}if (${curV} > ${pos}) {`, ...cap, `${ind(ctx)}}`);
@@ -8451,7 +8707,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;
@@ -8490,6 +8746,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: [
@@ -8576,7 +8843,7 @@ function tokenNullableRegex(def) {
 }
 function emitToken(def, ctx, pos) {
   const lowered = tokenNullableRegex(def);
-  if (lowered) return emitRegex(lowered, ctx, pos);
+  if (lowered) return emitRegex(lowered, ctx, pos, def.parser._meta.canMatchNewline);
   const savedTrivia = ctx.activeTrivia;
   const savedKindLabels = ctx.triviaKindLabels;
   ctx.activeTrivia = void 0;
@@ -8726,7 +8993,7 @@ ${i}const ${chV} = ${chAlloc}, ${rawV} = ${profileRecognizer} ? undefined : [],
   stmts.push(...innerStmts);
   if (def.trailingTrivia === true && ctx.activeTrivia) {
     const triviaFn = ensureTriviaFn(ctx);
-    stmts.push(`${i}const ${endVar} = ${okVar} ? ${triviaFn}(input, ${innerEndVar}, _ctx, 1) : ${innerEndVar}`);
+    stmts.push(`${i}const ${endVar} = ${okVar} ? ${triviaFn}(input, ${innerEndVar}, _ctx, 1) : ${innerEndVar}`, ...emitLineTrack(ctx, innerEndVar, endVar));
   }
   if (sf && fArr) {
     stmts.push(`${i}const ${fArr} = _ctx._fields`);
@@ -8766,8 +9033,11 @@ ${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) : 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 nodeSpanExpr = emitSpanExpr(ctx, pos, endVar);
+  const nodeSpanV = ctx.lineTracking ? v(ctx, "_nspan") : nodeSpanExpr;
+  if (ctx.lineTracking) stmts.push(`${i}const ${nodeSpanV} = ${nodeSpanExpr}`);
+  const buildExpr = structural ? `{ _tag: 'node', type: ${JSON.stringify(def.type)}, span: ${nodeSpanV}, state: ${stV} ?? null, children: ${chV} }` : mkType ? emitInlineMkNodeExpr(mkType, chV, rawV, nodeSpanV, tlV) : def.project !== void 0 ? emitNodeProjectExpr(def.type, def.project, chV) : `${buildRef(ctx)}[${buildIdx}](${chV}, ${fObj}, ${nodeSpanV}, ${rawV}, ${tlV}, ${stV})`;
+  const hostBuildExpr = `_ctx._pmProfile?.phase === 'host' && _ctx._pmProfile.hostCalls++, _ctx.build(${JSON.stringify(def.type)}, ${chV}, ${fObj}, ${nodeSpanV}, ${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;
   const unwrapExpr = `${chV}.length === 1 ? (${chV}[0] !== null && typeof ${chV}[0] === 'object' && ${chV}[0]._tag === 'leaf' ? ${chV}[0].value : ${chV}[0]) : (${ndExpr})`;
@@ -8777,7 +9047,7 @@ ${i}const ${chV} = ${chAlloc}, ${rawV} = ${profileRecognizer} ? undefined : [],
     `${i}const ${ndV} = (${profileRecognizer} || ${profileCapture}) ? undefined : (${finalExpr})`,
     `${i}if (!(${profileRecognizer})) {`,
     `${i}  if (${sc}) ${sc}.push(${ndV})`,
-    `${i}  if (${sr}) ${sr}.push((typeof ${ndV} === 'object' && ${ndV} !== null && (${ndV}._tag === 'node' || ${ndV}._tag === 'leaf' || ${ndV}._tag === 'parseError')) ? ${ndV} : { _tag: 'leaf', value: typeof ${ndV} === 'string' ? ${ndV} : (typeof ${ndV} === 'object' && ${ndV} !== null ? input.slice(${pos}, ${endVar}) : ''), span: { start: ${pos}, end: ${endVar} } })`,
+    `${i}  if (${sr}) ${sr}.push((typeof ${ndV} === 'object' && ${ndV} !== null && (${ndV}._tag === 'node' || ${ndV}._tag === 'leaf' || ${ndV}._tag === 'parseError')) ? ${ndV} : { _tag: 'leaf', value: typeof ${ndV} === 'string' ? ${ndV} : (typeof ${ndV} === 'object' && ${ndV} !== null ? input.slice(${pos}, ${endVar}) : ''), span: ${nodeSpanV} })`,
     `${i}}`
   );
   return { stmts, valueVar: ndV, endVar };
@@ -8793,7 +9063,8 @@ function emitRuntimeFallback(parser2, ctx, pos) {
     `${ind(ctx)}const ${rv} = _rp[${idx}].parse(input, ${pos}, _ctx)`,
     ...emitIfFail(ctx, `!${rv}.ok`, failStmt),
     `${ind(ctx)}const ${vv} = ${rv}.value`,
-    `${ind(ctx)}const ${ev} = ${rv}.span.end`
+    `${ind(ctx)}const ${ev} = ${rv}.span.end`,
+    ...parser2._meta.canMatchNewline ? emitLineTrack(ctx, pos, ev) : []
   ];
   return { stmts, valueVar: vv, endVar: ev };
 }
@@ -8859,7 +9130,8 @@ function emitRecover(def, ctx, pos) {
     `${ind0}    if (${sentOk}) break`,
     `${ind0}    ${scanV}++`,
     `${ind0}  }`,
-    `${ind0}  const ${errV} = { _tag: 'parseError', span: { start: ${pos}, end: ${scanV} }, expected: ${JSON.stringify(deriveExpected(def.parser))} }`,
+    ...emitLineTrack(ctx, pos, scanV).map((s) => `${ind0}  ${s.trim()}`),
+    `${ind0}  const ${errV} = { _tag: 'parseError', span: ${emitSpanExpr(ctx, pos, scanV)}, expected: ${JSON.stringify(deriveExpected(def.parser))} }`,
     `${ind0}  if (_ctx._errors) _ctx._errors.push(${errV})`,
     `${ind0}  ${valVar} = ${errV}`,
     `${ind0}  ${endVar} = ${scanV}`,
@@ -8875,7 +9147,7 @@ function emitExpect(def, ctx, pos) {
   const stmts = [
     ...innerStmts,
     `${ind0}if (!${okVar}) {`,
-    `${ind0}  const ${errV} = { _tag: 'parseError', span: { start: ${pos}, end: ${pos} }, expected: ${JSON.stringify(def.expected)} }`,
+    `${ind0}  const ${errV} = { _tag: 'parseError', span: ${emitSpanExpr(ctx, pos, pos)}, expected: ${JSON.stringify(def.expected)} }`,
     `${ind0}  if (_ctx._errors) _ctx._errors.push(${errV})`,
     // Embed the missing-token error as a `parseError` CST child, mirroring the
     // interpreter (expect.ts) and the list-recovery emit sites — guarded on
@@ -8965,7 +9237,7 @@ function emitDispatch(p, ctx, pos) {
     case "literal":
       return emitLit(def, ctx, pos);
     case "regex":
-      return emitRegex(def, ctx, pos);
+      return emitRegex(def, ctx, pos, p._meta.canMatchNewline);
     case "keywords":
       return emitKeywords(def, ctx, pos);
     case "sequence":
@@ -8985,6 +9257,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);
@@ -9212,6 +9487,20 @@ function hasNodeDef(p, seen = /* @__PURE__ */ new Set()) {
       return false;
   }
 }
+function hasLineTrackingDef(p, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(p)) return false;
+  seen.add(p);
+  const d = p._def;
+  if (d.tag === "grammar" && d.trackLines) return true;
+  if (d.tag === "lazy") {
+    try {
+      return hasLineTrackingDef(d.thunk(), seen);
+    } catch {
+      return false;
+    }
+  }
+  return childrenOf2(d).some((child) => hasLineTrackingDef(child, seen));
+}
 function parserUsesRouted2(p, seen = /* @__PURE__ */ new Set()) {
   if (seen.has(p)) return false;
   seen.add(p);
@@ -9579,6 +9868,7 @@ function compile(combinator, mapFnSources, opts) {
     capturing: hasNodeDef(combinator),
     recovery: opts?.recovery ?? false,
     hostMode: opts?.hostMode ?? grammarHostMode ?? "ast",
+    lineTracking: opts?.trackLines === true || hasLineTrackingDef(combinator),
     ...opts?.coverage ? { coverage: { plan: buildGrammarPlan(combinator), entry: combinator } } : {},
     lazyUsage: analyzeLazyUsage(combinator),
     ...grammarTrivia ? { activeTrivia: grammarTrivia, triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {},
@@ -9602,9 +9892,13 @@ function compile(combinator, mapFnSources, opts) {
   const namedPrelude = ctx.namedFnDecls.length > 0 ? [...namedFnPrelude(), ""] : [];
   const emptyTlDecls = ctx.needsEmptyTl ? ["const _EMPTY_TL = Object.freeze([])"] : [];
   const hostReadsDecls = ctx.needsHostReads ? [HOST_READS_DECL] : [];
+  const lineTrackDecls = ctx.needsLineTrack ? [LINE_TRACK_DECL] : [];
+  const lineSpanDecls = ctx.needsLineSpan ? [LINE_SPAN_DECL] : [];
   const source = [
     ...emptyTlDecls,
     ...hostReadsDecls,
+    ...lineTrackDecls,
+    ...lineSpanDecls,
     ...ctx.regexDecls,
     ...ctx.expectedDecls,
     "",
@@ -9617,6 +9911,8 @@ function compile(combinator, mapFnSources, opts) {
   const fn = new Function("input", "_pos", "_rp", "_mf", "_build", "_ctx", [
     ...emptyTlDecls,
     ...hostReadsDecls,
+    ...lineTrackDecls,
+    ...lineSpanDecls,
     ...ctx.regexDecls,
     ...ctx.expectedDecls,
     ...namedPrelude,
@@ -9635,6 +9931,25 @@ function compile(combinator, mapFnSources, opts) {
     trackLines: false,
     ...ctx.triviaKindLabels ? { triviaKindLabels: ctx.triviaKindLabels } : {}
   };
+  const annotateWithTrackedLines = (result, lineStarts) => {
+    const index = normalizeLineIndex({ lineStarts });
+    const annotated = { ...result, span: annotateSpan(result.span, index) };
+    const errors = annotated.errors;
+    if (errors) {
+      ;
+      annotated.errors = errors.map((error) => ({
+        ...error,
+        span: annotateSpan(error.span, index)
+      }));
+    }
+    return annotated;
+  };
+  const trackedCtx = (base, input, pos) => {
+    if (!ctx.lineTracking) return base;
+    const lineIndex = { lineStarts: [0] };
+    if (pos > 0) recordLineRange(lineIndex, input, 0, pos);
+    return { ...base, trackLines: true, _lineStarts: lineIndex.lineStarts, _lineScannedTo: pos };
+  };
   const derivedSrcs = ctx.mapFnSrcs.length === ctx.mapFns.length && ctx.mapFnSrcs.every((s) => s !== null) ? ctx.mapFnSrcs : void 0;
   const effectiveSources = mapFnSources ?? derivedSrcs;
   const buildCovered = ctx.buildFns.length === 0 || ctx.buildSrcs.every((s) => s !== null);
@@ -9642,17 +9957,46 @@ function compile(combinator, mapFnSources, opts) {
   const mfCovered = ctx.mapFns.length === 0 || effectiveSources !== void 0 && effectiveSources.length === ctx.mapFns.length;
   const canInline = ctx.runtimeParsers.length === 0 && mfCovered && buildCovered;
   const inlineExpression = canInline ? buildInlineExpression(ctx, r, effectiveSources, buildSources, coverageRootRuleId) : null;
-  return {
+  const compiledMeta = {
     source,
     inlineExpression,
     ...ctx.coverage === void 0 ? {} : { coverageDefinitions: ctx.coverage.plan.definitions },
-    ...gatingReport === void 0 ? {} : { gating: gatingReport },
+    ...gatingReport === void 0 ? {} : { gating: gatingReport }
+  };
+  if (!ctx.lineTracking) {
+    return {
+      ...compiledMeta,
+      parse(input, pos = 0) {
+        return fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, defaultCtx);
+      },
+      parseWithContext(input, parseCtx, pos = 0) {
+        assertHostModeCompatible(ctx.hostMode ?? "ast", parseCtx.build, !!ctx.hostBranchElided);
+        return fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, parseCtx);
+      },
+      // Note: collects expect() errors via _errors. Unlike interpreter
+      // parse({recover:true}) it does NOT populate furthestFail — the compiled path
+      // inlines failures for throughput and deliberately skips _probe bookkeeping.
+      // Callers wanting a furthest-position diagnostic detect unconsumed input
+      // (span.end < input.length) instead, which is mode-agnostic.
+      parseWithErrors(input, pos = 0) {
+        const errors = [];
+        const result = fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, { ...defaultCtx, _errors: errors });
+        return { ...result, errors };
+      }
+    };
+  }
+  return {
+    ...compiledMeta,
     parse(input, pos = 0) {
-      return fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, defaultCtx);
+      const parseCtx = trackedCtx(defaultCtx, input, pos);
+      const result = fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, parseCtx);
+      return annotateWithTrackedLines(result, parseCtx._lineStarts);
     },
     parseWithContext(input, parseCtx, pos = 0) {
       assertHostModeCompatible(ctx.hostMode ?? "ast", parseCtx.build, !!ctx.hostBranchElided);
-      return fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, parseCtx);
+      const activeCtx = trackedCtx(parseCtx, input, pos);
+      const result = fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, activeCtx);
+      return activeCtx.trackLines ? annotateWithTrackedLines(result, activeCtx._lineStarts) : result;
     },
     // Note: collects expect() errors via _errors. Unlike interpreter
     // parse({recover:true}) it does NOT populate furthestFail — the compiled path
@@ -9661,8 +10005,9 @@ function compile(combinator, mapFnSources, opts) {
     // (span.end < input.length) instead, which is mode-agnostic.
     parseWithErrors(input, pos = 0) {
       const errors = [];
-      const result = fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, { ...defaultCtx, _errors: errors });
-      return { ...result, errors };
+      const parseCtx = trackedCtx({ ...defaultCtx, _errors: errors }, input, pos);
+      const result = { ...fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, parseCtx), errors };
+      return annotateWithTrackedLines(result, parseCtx._lineStarts);
     }
   };
 }
@@ -9674,8 +10019,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)} } })`;
 }
@@ -9844,7 +10189,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();
@@ -9949,12 +10294,16 @@ function buildInlineExpression(ctx, r, mapFnSources, buildSources, coverageRootR
   const buildDecl = buildSources?.length ? `  const _build = [${buildSources.join(", ")}]` : "";
   const emptyTlDecl = ctx.needsEmptyTl ? `  const _EMPTY_TL = Object.freeze([])` : "";
   const hostReadsDecl = ctx.needsHostReads ? `  ${HOST_READS_DECL}` : "";
-  const needsWrapper = ctx.regexDecls.length > 0 || ctx.expectedDecls.length > 0 || ctx.namedFnDecls.length > 0 || !!mfDecl || !!buildDecl || !!emptyTlDecl || !!hostReadsDecl;
+  const lineTrackDecl = ctx.needsLineTrack ? `  ${LINE_TRACK_DECL}` : "";
+  const lineSpanDecl = ctx.needsLineSpan ? `  ${LINE_SPAN_DECL}` : "";
+  const needsWrapper = ctx.regexDecls.length > 0 || ctx.expectedDecls.length > 0 || ctx.namedFnDecls.length > 0 || !!mfDecl || !!buildDecl || !!emptyTlDecl || !!hostReadsDecl || !!lineTrackDecl || !!lineSpanDecl;
   if (!needsWrapper) return innerFn;
   const namedPrelude = ctx.namedFnDecls.length > 0 ? namedFnPrelude() : [];
   const hoistedDecls = [
     emptyTlDecl,
     hostReadsDecl,
+    lineTrackDecl,
+    lineSpanDecl,
     ...ctx.regexDecls.map((d) => `  ${d}`),
     ...ctx.expectedDecls.map((d) => `  ${d}`),
     mfDecl,
@@ -10503,7 +10852,7 @@ function normalizeCstCollapse(collapse) {
   return typeof collapse === "function" ? collapse : void 0;
 }
 function buildCstNode(type, children2, _fields, span, _rawChildren, _triviaLog, state) {
-  return { _tag: "node", type, span: { start: span.start, end: span.end }, state: state ?? null, children: [...children2] };
+  return { _tag: "node", type, span: { ...span }, state: state ?? null, children: [...children2] };
 }
 function cstBuildHost(typeOrOptions, children2, _fields, span, rawChildren, triviaLog, state) {
   if (typeof typeOrOptions === "string") {
@@ -11362,8 +11711,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(
@@ -11376,6 +11875,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",
@@ -11387,7 +11887,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 } : {},
@@ -11410,6 +11910,8 @@ function runOnce(entry, input, options, phase, profileState) {
     expected: r.ok ? [] : r.expected ?? [],
     errors,
     triviaLog,
+    ...triviaKindLabels === void 0 ? {} : { triviaKindLabels },
+    triviaMap: buildRootTriviaIndex(triviaLog, triviaKindLabels),
     unconsumedFrom
   };
 }
@@ -11868,43 +12370,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) {