parseman 0.58.2 → 0.59.0

package/dist/index.js

@@ -1,3 +1,32 @@
+// src/lead-ranges.ts
+function rangesHaveLead(ranges, code) {
+  for (const r of ranges) if (code >= r.lo && code <= r.hi) return true;
+  if (code <= 65535) return false;
+  const high = 55296 + (code - 65536 >> 10);
+  for (const r of ranges) if (high >= r.lo && high <= r.hi) return true;
+  return false;
+}
+function leadRanges(ranges) {
+  let out;
+  for (const r of ranges) {
+    const lo = Math.max(r.lo, 55296), hi = Math.min(r.hi, 56319);
+    if (lo <= hi) (out ??= [...ranges]).push({ lo: 65536 + (lo - 55296 << 10), hi: 65536 + (hi - 55296 << 10) + 1023 });
+  }
+  return out ?? ranges;
+}
+function implicitLeadsDropped(ranges) {
+  const implied = leadRanges(ranges.filter((r) => r.lo <= 65535)).filter((r) => r.lo > 65535);
+  const out = [];
+  for (const r of ranges) {
+    let pieces = [{ lo: r.lo, hi: r.hi }];
+    if (r.hi > 65535) for (const c of implied) {
+      pieces = pieces.flatMap((q2) => q2.hi < c.lo || q2.lo > c.hi ? [q2] : [...q2.lo < c.lo ? [{ lo: q2.lo, hi: c.lo - 1 }] : [], ...q2.hi > c.hi ? [{ lo: c.hi + 1, hi: q2.hi }] : []]);
+    }
+    out.push(...pieces);
+  }
+  return out;
+}
+
 // src/combinators/first-set.ts
 function classifyFinalChoice(arms, resolve, activeTrivia) {
   const firstSets = [];
@@ -59,8 +88,9 @@ function union(a, b) {
 function intersects(a, b) {
   if (a.kind === "any" || b.kind === "any") return true;
   if (a.kind === "empty" || b.kind === "empty") return false;
-  for (const ra of a.ranges) {
-    for (const rb of b.ranges) {
+  const bs = leadRanges(b.ranges);
+  for (const ra of leadRanges(a.ranges)) {
+    for (const rb of bs) {
       if (ra.lo <= rb.hi && rb.lo <= ra.hi) return true;
     }
   }
@@ -76,6 +106,9 @@ function startsFirstSet(combinator, input, pos) {
   const code = input.codePointAt(pos);
   if (code === void 0) return false;
   for (const r of fs.ranges) if (code >= r.lo && code <= r.hi) return true;
+  if (code <= 65535) return false;
+  const high = 55296 + (code - 65536 >> 10);
+  for (const r of fs.ranges) if (high >= r.lo && high <= r.hi) return true;
   return false;
 }
 function fromRange(lo, hi) {
@@ -176,12 +209,13 @@ function narrowBy(acc, constraint) {
   if (acc.kind === "any") return constraint;
   if (acc.kind === "empty" || constraint.kind === "empty") return { kind: "empty" };
   const ranges = [];
-  for (const a of acc.ranges) for (const b of constraint.ranges) {
+  const bs = leadRanges(constraint.ranges);
+  for (const a of leadRanges(acc.ranges)) for (const b of bs) {
     const lo = Math.max(a.lo, b.lo);
     const hi = Math.min(a.hi, b.hi);
     if (lo <= hi) ranges.push({ lo, hi });
   }
-  return ranges.length === 0 ? { kind: "empty" } : { kind: "ranges", ranges };
+  return ranges.length === 0 ? { kind: "empty" } : { kind: "ranges", ranges: implicitLeadsDropped(ranges) };
 }
 function applyAssertion(fs, assertion) {
   return assertion === null ? fs : fs.kind === "empty" ? assertion : narrowBy(fs, assertion);
@@ -315,6 +349,7 @@ function failAt(ctx, expected, pos) {
 }
 
 // src/line-index.ts
+import { PlainLineSpan, PlainSpan } from "./cst/plain.js";
 function createLineIndex() {
   return { lineStarts: [0] };
 }
@@ -374,6 +409,27 @@ function annotateSpan(span, index) {
     endColumn: e.col
   };
 }
+var SPAN_KEYS = ["start", "end", "startLine", "startColumn", "endLine", "endColumn"];
+function copySpan(span) {
+  let n = 0;
+  for (const key in span) {
+    if (key !== SPAN_KEYS[n]) return { ...span };
+    n++;
+  }
+  if (n === 2) return new PlainSpan(span.start, span.end);
+  if (n === 6 && span.startLine !== void 0 && span.startColumn !== void 0 && span.endLine !== void 0 && span.endColumn !== void 0) {
+    return new PlainLineSpan(span.start, span.end, span.startLine, span.startColumn, span.endLine, span.endColumn);
+  }
+  return { ...span };
+}
+function lineSpanFromContext(span, ctx) {
+  if (!ctx.trackLines) return span;
+  const index = ctx._lineIndex ?? (ctx._lineStarts ? { lineStarts: ctx._lineStarts } : void 0);
+  if (!index) return span;
+  const s = offsetToLineCol(index, span.start);
+  const e = offsetToLineCol(index, span.end);
+  return new PlainLineSpan(span.start, span.end, s.line, s.col, e.line, e.col);
+}
 function annotateSpanFromLineContext(span, ctx) {
   if (!ctx.trackLines) return span;
   const index = ctx._lineIndex ?? (ctx._lineStarts ? { lineStarts: ctx._lineStarts } : void 0);
@@ -396,6 +452,7 @@ function annotateTreeSpans(value, index, seen = /* @__PURE__ */ new WeakSet()) {
 }
 
 // src/cst/capture-buffer.ts
+import { PlainBuf, PlainLeaf } from "./cst/plain.js";
 var EMPTY = [];
 var EMPTY_TL = [];
 function cstCaptureActive(ctx) {
@@ -410,7 +467,7 @@ function beginCstNodeCapture(ctx) {
     cap: ctx.captureTrivia,
     buf: ctx._cstBuf
   };
-  ctx._cstBuf = {};
+  ctx._cstBuf = new PlainBuf(void 0, void 0, 0);
   ctx._cstChildren = void 0;
   ctx._cstLeaves = void 0;
   ctx._cstRawChildren = void 0;
@@ -435,12 +492,15 @@ function endCstNodeCapture(ctx, saved) {
   ctx.captureTrivia = saved.cap;
   return materialized;
 }
+function isLeaf(v) {
+  return typeof v === "object" && v !== null && v._tag === "leaf";
+}
 function pushCstLeaf(ctx, leaf2) {
   if (!ctx.trackLines) {
     pushCstChild(ctx, leaf2, leaf2);
     return;
   }
-  const annotated = leaf2 && typeof leaf2 === "object" && leaf2.span ? { ...leaf2, span: annotateSpanFromLineContext(leaf2.span, ctx) } : leaf2;
+  const annotated = isLeaf(leaf2) ? new PlainLeaf(leaf2.value, lineSpanFromContext(leaf2.span, ctx)) : leaf2 && typeof leaf2 === "object" && leaf2.span ? { ...leaf2, span: annotateSpanFromLineContext(leaf2.span, ctx) } : leaf2;
   pushCstChild(ctx, annotated, annotated);
 }
 function pushCstChild(ctx, built, rawEntry2) {
@@ -629,6 +689,7 @@ function assertionFailureExpected(positive, childTag) {
 }
 
 // src/combinators/literal.ts
+import { PlainLeaf as PlainLeaf2, PlainSpan as PlainSpan2 } from "./cst/plain.js";
 function asciiFoldEq(a, b) {
   if (a.length !== b.length) return false;
   for (let i = 0; i < a.length; i++) {
@@ -686,9 +747,9 @@ function literal(value, opts = {}) {
     const code = value.charCodeAt(0);
     return function parse3(input, pos, ctx) {
       if (input.charCodeAt(pos) === code) {
-        const span = { start: pos, end: pos + 1 };
+        const span = new PlainSpan2(pos, pos + 1);
         if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, span.end);
-        if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span });
+        if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf2(value, span));
         return { ok: true, value, span };
       }
       return failAt(ctx, expected, pos);
@@ -700,9 +761,9 @@ 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 };
+      const span = new PlainSpan2(pos, end);
       if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, end);
-      if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value: matchedValue, span });
+      if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf2(matchedValue, span));
       return { ok: true, value: matchedValue, span };
     }
     return failAt(ctx, expected, pos);
@@ -736,11 +797,17 @@ function shorthandRanges(ch2) {
   if (ch2 === "s") return SPACE_RANGES;
   return [[48, 57], [65, 90], [97, 122], [95, 95]];
 }
-function readUnicodeEscape(body, i) {
+function readUnicodeEscape(body, i, unicode = false) {
   if (body[i] !== "\\" || body[i + 1] !== "u") return null;
   const hex = body.slice(i + 2, i + 6);
   if (!/^[0-9a-fA-F]{4}$/.test(hex)) return null;
-  return { cp: Number.parseInt(hex, 16), next: i + 6 };
+  const cp = Number.parseInt(hex, 16);
+  if (unicode && cp >= 55296 && cp <= 56319 && body[i + 6] === "\\" && body[i + 7] === "u") {
+    const lowHex = body.slice(i + 8, i + 12);
+    const low = /^[0-9a-fA-F]{4}$/.test(lowHex) ? Number.parseInt(lowHex, 16) : -1;
+    if (low >= 56320 && low <= 57343) return { cp: 65536 + (cp - 55296 << 10) + (low - 56320), next: i + 12 };
+  }
+  return { cp, next: i + 6 };
 }
 var META = new Set("()[]{}*+?|^$.".split(""));
 function literalCodePoints(frag) {
@@ -752,6 +819,7 @@ function literalCodePoints(frag) {
       const e = frag[i + 1];
       if (e === void 0) return null;
       if (!(e in CLASS_ESCAPES) && /\w/.test(e)) return null;
+      if (e === "0" && frag[i + 2] !== void 0 && frag[i + 2] >= "0" && frag[i + 2] <= "9") return null;
       out.push(e in CLASS_ESCAPES ? CLASS_ESCAPES[e] : e.codePointAt(0));
       i += 2;
       continue;
@@ -792,14 +860,14 @@ function parseClassOperand(body) {
   if (cps && cps.length === 1) return { ranges: [[cps[0], cps[0]]], negated: false };
   return null;
 }
-function parseClassRanges(body) {
+function parseClassRanges(body, unicode = false) {
   const ranges = [];
   let i = 0;
   const readAtom = () => {
     const ch2 = body[i];
     if (ch2 === void 0) return null;
     if (ch2 === "\\") {
-      const uni = readUnicodeEscape(body, i);
+      const uni = readUnicodeEscape(body, i, unicode);
       if (uni) {
         i = uni.next;
         return { cp: uni.cp };
@@ -807,13 +875,15 @@ function parseClassRanges(body) {
       const e = body[i + 1];
       if (e === void 0) return null;
       i += 2;
+      if (e === "0" && body[i] !== void 0 && body[i] >= "0" && body[i] <= "9" || e >= "1" && e <= "9") return null;
       if (e in CLASS_ESCAPES) return { cp: CLASS_ESCAPES[e] };
       if (e === "d" || e === "w" || e === "s") return { set: shorthandRanges(e) };
       if (e >= "a" && e <= "z" || e >= "A" && e <= "Z") return null;
       return { cp: e.codePointAt(0) };
     }
-    i += ch2.length;
-    return { cp: ch2.codePointAt(0) };
+    const cp = unicode ? body.codePointAt(i) : body.charCodeAt(i);
+    i += cp > 65535 ? 2 : 1;
+    return { cp };
   };
   while (i < body.length) {
     const lo = readAtom();
@@ -849,7 +919,7 @@ function rangesHaveNewline(ranges) {
   return ranges.some(([lo, hi]) => lo <= 10 && 10 <= hi);
 }
 var BAIL = /* @__PURE__ */ Symbol("regex-bail");
-function parseRegex(src) {
+function parseRegex(src, unicode = false, sets = false) {
   let i = 0;
   const parseAlt = () => {
     const arms = [parseSeq()];
@@ -919,9 +989,11 @@ function parseRegex(src) {
         i++;
         return charNode(fromRange(123, 123), false);
       // a `{` with nothing to quantify is a literal brace
-      default:
-        i += ch2.length;
-        return charNode(fromRange(ch2.codePointAt(0), ch2.codePointAt(0)), ch2 === "\n");
+      default: {
+        const cp = unicode ? src.codePointAt(i) : src.charCodeAt(i);
+        i += cp > 65535 ? 2 : 1;
+        return charNode(fromRange(cp, cp), ch2 === "\n");
+      }
     }
   };
   const parseGroup = () => {
@@ -954,6 +1026,32 @@ function parseRegex(src) {
     let k = i + 1;
     const negated = src[k] === "^";
     if (negated) k++;
+    if (sets) {
+      let depth = 1;
+      let nested = false;
+      while (k < src.length && depth > 0) {
+        const c = src[k];
+        if (c === "\\") {
+          if (src[k + 1] === "q") nested = true;
+          k += 2;
+          continue;
+        }
+        if (c === "[") {
+          depth++;
+          nested = true;
+        } else if (c === "]") {
+          depth--;
+          if (depth === 0) break;
+        } else if ((c === "-" || c === "&") && src[k + 1] === c) nested = true;
+        k++;
+      }
+      if (src[k] !== "]") throw BAIL;
+      if (nested) {
+        i = k + 1;
+        return charNode(any(), true);
+      }
+      k = i + 1 + (negated ? 1 : 0);
+    }
     let body = "";
     while (k < src.length && src[k] !== "]") {
       if (src[k] === "\\") {
@@ -966,7 +1064,7 @@ function parseRegex(src) {
     }
     if (src[k] !== "]") throw BAIL;
     i = k + 1;
-    const ranges = parseClassRanges(body);
+    const ranges = parseClassRanges(body, unicode);
     if (negated) return charNode(any(), !ranges || !rangesHaveNewline(ranges));
     if (!ranges) return charNode(any(), true);
     return charNode(rangesToSet(ranges), rangesHaveNewline(ranges));
@@ -974,9 +1072,20 @@ function parseRegex(src) {
   const parseEscape = () => {
     const e = src[i + 1];
     if (e === void 0) throw BAIL;
-    if (e === "u" && /^[0-9a-fA-F]{4}$/.test(src.slice(i + 2, i + 6))) {
-      const cp = Number.parseInt(src.slice(i + 2, i + 6), 16);
-      i += 6;
+    const uni = readUnicodeEscape(src, i, unicode);
+    if (uni !== null) {
+      i = uni.next;
+      return charNode(fromRange(uni.cp, uni.cp), uni.cp === 10);
+    }
+    if (e === "u" && src[i + 2] === "{") {
+      const close = src.indexOf("}", i + 3);
+      const hex = close < 0 ? "" : src.slice(i + 3, close);
+      if (!unicode || !/^[0-9a-fA-F]{1,6}$/.test(hex)) {
+        i += 2;
+        return ANY;
+      }
+      const cp = Number.parseInt(hex, 16);
+      i = close + 1;
       return charNode(fromRange(cp, cp), cp === 10);
     }
     if (e === "x" && /^[0-9a-fA-F]{2}$/.test(src.slice(i + 2, i + 4))) {
@@ -984,6 +1093,16 @@ function parseRegex(src) {
       i += 4;
       return charNode(fromRange(cp, cp), cp === 10);
     }
+    if (e === "c") {
+      const x = src[i + 2];
+      if (x !== void 0 && /^[A-Za-z]$/.test(x)) {
+        const cp = x.charCodeAt(0) % 32;
+        i += 3;
+        return charNode(fromRange(cp, cp), cp === 10);
+      }
+      i += 2;
+      return ANY;
+    }
     i += 2;
     switch (e) {
       case "d":
@@ -1011,8 +1130,16 @@ function parseRegex(src) {
         return charNode(fromRange(12, 12), false);
       case "v":
         return charNode(fromRange(11, 11), false);
+      // `\0` then a digit is a legacy octal escape (`\012` is a newline), not NUL.
       case "0":
-        return charNode(fromRange(0, 0), false);
+        return src[i] !== void 0 && src[i] >= "0" && src[i] <= "9" ? ANY : charNode(fromRange(0, 0), false);
+      // A property escape (`\p{…}`/`\P{…}`) matches one character of a class this
+      // analyzer does not enumerate; `\k<name>` is a backreference, which may match empty.
+      case "p":
+      case "P":
+        return charNode(any(), true);
+      case "k":
+        return ANY;
       default:
         if (e >= "1" && e <= "9") return ANY;
         return charNode(fromRange(e.codePointAt(0), e.codePointAt(0)), e === "\n");
@@ -1086,10 +1213,10 @@ function regexCanMatchEmpty(source) {
     return true;
   }
 }
-function firstSetFromRegex(source) {
+function firstSetFromRegex(source, flags = "") {
   let ast;
   try {
-    ast = parseRegex(source);
+    ast = parseRegex(source, flags.includes("u") || flags.includes("v"), flags.includes("v"));
   } catch {
     return { firstSet: any(), canMatchNewline: true };
   }
@@ -1098,6 +1225,7 @@ function firstSetFromRegex(source) {
 }
 
 // src/combinators/regex.ts
+import { PlainLeaf as PlainLeaf3, PlainSpan as PlainSpan3 } from "./cst/plain.js";
 var SCAN_BAIL_AT = 64;
 function inRanges(cp, ranges) {
   for (let i = 0; i < ranges.length; i++) {
@@ -1138,8 +1266,18 @@ function shortScanner(source, flags) {
     return minOne && end === pos ? null : end;
   };
 }
+function coversNonAscii(ranges) {
+  let next = 128;
+  for (const r of [...ranges].sort((a, b) => a.lo - b.lo)) {
+    if (r.lo > next) return false;
+    if (r.hi >= next) next = r.hi + 1;
+    if (next > 65535) return true;
+  }
+  return false;
+}
 function asciiCaseFold(fs) {
   if (fs.kind !== "ranges") return fs;
+  if (fs.ranges.some((r) => r.hi >= 128) && !coversNonAscii(fs.ranges)) return any();
   const ranges = fs.ranges.map((r) => ({ lo: r.lo, hi: r.hi }));
   const add = (lo, hi) => {
     if (lo <= hi) ranges.push({ lo, hi });
@@ -1164,7 +1302,7 @@ function regex(pattern, flags = "") {
   const resolvedFlags = typeof pattern === "string" ? flags : pattern.flags;
   const anchored = new RegExp(source, "y" + resolvedFlags.replace(/[gy]/g, ""));
   const scan = shortScanner(source, resolvedFlags);
-  const raw = firstSetFromRegex(source);
+  const raw = firstSetFromRegex(source, resolvedFlags);
   const firstSet2 = !resolvedFlags.includes("i") ? raw.firstSet : resolvedFlags.includes("u") || resolvedFlags.includes("v") ? any() : asciiCaseFold(raw.firstSet);
   const canMatchNewline = raw.canMatchNewline;
   const meta = { firstSet: firstSet2, canMatchNewline, isTrivia: false };
@@ -1200,9 +1338,9 @@ function regex(pattern, flags = "") {
       if (scanEnd !== void 0) {
         if (scanEnd === null) return failAt(ctx, directTerminalFailureExpected(def), pos);
         const value = input.slice(pos, scanEnd);
-        const span2 = { start: pos, end: scanEnd };
+        const span2 = new PlainSpan3(pos, scanEnd);
         if (canMatchNewline && ctx.trackLines) recordLineRangeFromContext(ctx, input, pos, scanEnd);
-        if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span: span2 });
+        if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf3(value, span2));
         return { ok: true, value, span: span2 };
       }
       anchored.lastIndex = pos;
@@ -1210,9 +1348,9 @@ function regex(pattern, flags = "") {
       if (m === null) {
         return failAt(ctx, directTerminalFailureExpected(def), pos);
       }
-      const span = { start: pos, end: pos + m[0].length };
+      const span = new PlainSpan3(pos, 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 });
+      if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf3(m[0], span));
       return { ok: true, value: m[0], span };
     }
   };
@@ -1254,6 +1392,7 @@ function caseFoldVariants(cp) {
 }
 
 // src/combinators/keywords.ts
+import { PlainLeaf as PlainLeaf4, PlainSpan as PlainSpan4 } from "./cst/plain.js";
 function word(str, boundaryOrOpts, opts) {
   const boundary = typeof boundaryOrOpts === "string" ? boundaryOrOpts : "_0-9A-Za-z";
   const rest = typeof boundaryOrOpts === "object" && boundaryOrOpts !== null ? boundaryOrOpts : opts;
@@ -1312,8 +1451,8 @@ function keywords(words, opts = {}) {
       const m = re.exec(input);
       if (m === null) return failAt(ctx, directTerminalFailureExpected(def), pos);
       const value = m[0];
-      const span = { start: pos, end: pos + value.length };
-      if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span });
+      const span = new PlainSpan4(pos, pos + value.length);
+      if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf4(value, span));
       return { ok: true, value, span };
     }
   };
@@ -2601,6 +2740,7 @@ function altStarSource(source) {
 }
 
 // src/recovery/scan.ts
+import { PlainSpan as PlainSpan5 } from "./cst/plain.js";
 function probeAt(sentinel, input, pos, ctx) {
   const s = {
     _probe: ctx._probe,
@@ -2668,9 +2808,7 @@ function firstSetSentinel(fs) {
     parse(input, pos) {
       const code = pos < input.length ? input.codePointAt(pos) : void 0;
       if (code !== void 0) {
-        for (const r of ranges) {
-          if (code >= r.lo && code <= r.hi) return { ok: true, value: null, span: { start: pos, end: pos } };
-        }
+        if (rangesHaveLead(ranges, code)) return { ok: true, value: null, span: { start: pos, end: pos } };
       }
       return { ok: false, expected: [], span: { start: pos, end: pos } };
     }
@@ -2679,7 +2817,7 @@ function firstSetSentinel(fs) {
 function recoverScan(input, from, ctx, sync, expected) {
   let scanPos = from;
   while (scanPos < input.length && !probeAt(sync, input, scanPos, ctx)) scanPos++;
-  const span = { start: from, end: scanPos };
+  const span = new PlainSpan5(from, 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);
@@ -2781,17 +2919,18 @@ function scalarRootOf(combinator) {
 }
 
 // src/combinators/field-trivia.ts
+import { PlainSpan as PlainSpan6, PlainTriviaField } from "./cst/plain.js";
 var LEAD = { at: -1 };
 var FIELD_LEADING_TRIVIA = 1;
 var FIELD_TRAILING_TRIVIA = 2;
 function triviaFieldCapture(name, value, input, start, end, leadFrom, trailEnd) {
-  return {
+  return new PlainTriviaField(
     name,
     value,
-    span: { start, end },
-    leading: leadFrom >= 0 && leadFrom < start ? input.slice(leadFrom, start) : "",
-    trailing: trailEnd > end ? input.slice(end, trailEnd) : ""
-  };
+    new PlainSpan6(start, end),
+    leadFrom >= 0 && leadFrom < start ? input.slice(leadFrom, start) : "",
+    trailEnd > end ? input.slice(end, trailEnd) : ""
+  );
 }
 function leadsTrivia(p) {
   return p._def.tag === "field" && p._def.leadingTrivia === true;
@@ -3346,6 +3485,9 @@ function inFirstSet(code, fs) {
   if (fs.kind === "any") return true;
   if (fs.kind === "empty") return false;
   for (const r of fs.ranges) if (code >= r.lo && code <= r.hi) return true;
+  if (code <= 65535) return false;
+  const high = 55296 + (code - 65536 >> 10);
+  for (const r of fs.ranges) if (high >= r.lo && high <= r.hi) return true;
   return false;
 }
 function areDisjoint(sets) {
@@ -3370,6 +3512,7 @@ function buildAsciiDispatch(parsers) {
 }
 
 // src/combinators/dispatch.ts
+import { PlainLeaf as PlainLeaf5 } from "./cst/plain.js";
 function parserUsesRouted(parser2, seen = /* @__PURE__ */ new Set()) {
   if (seen.has(parser2)) return false;
   seen.add(parser2);
@@ -3509,7 +3652,7 @@ function routed(fallback) {
         return { ok: false, expected: ["routed()"], span: { start: pos, end: pos } };
       }
       if (cstCaptureActive(ctx)) {
-        pushCstLeaf(ctx, { _tag: "leaf", value: item.value, span: item.span });
+        pushCstLeaf(ctx, new PlainLeaf5(item.value, item.span));
       }
       return { ok: true, value: item.value, span: item.span };
     }
@@ -5021,6 +5164,7 @@ function buildFieldMap(captures) {
 }
 
 // src/combinators/node.ts
+import { PlainNode, PlainSpan as PlainSpan7 } from "./cst/plain.js";
 function unwrapChild(child) {
   return child !== null && typeof child === "object" && child._tag === "leaf" ? child.value : child;
 }
@@ -5126,7 +5270,7 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const nodeType = def.type ?? missingInferredType();
       const cstOutput2 = cstOutputHost(ctx.build);
       const span = ctx.trackLines ? annotateSpanFromLineContext(r.span, ctx) : r.span;
-      const built = unwrap && children2.length === 1 ? unwrapChild(children2[0]) : collapse && children2.length === 1 ? children2[0] : (cstOutput2 || !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 ? cstOutput2 && ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, ctx.state, tags) : projectChild(children2, project, nodeType) : build ? cstOutput2 && ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, ctx.state, tags) : build(children2, fields, span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, st, tags) : { _tag: "node", type: nodeType, span: ctx.trackLines ? { ...span } : { start: r.span.start, end: r.span.end }, state: st ?? null, children: children2 };
+      const built = unwrap && children2.length === 1 ? unwrapChild(children2[0]) : collapse && children2.length === 1 ? children2[0] : (cstOutput2 || !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 ? cstOutput2 && ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, ctx.state, tags) : projectChild(children2, project, nodeType) : build ? cstOutput2 && ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, ctx.state, tags) : build(children2, fields, span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, span, rawChildren, triviaLog, st, tags) : new PlainNode(nodeType, ctx.trackLines ? copySpan(span) : new PlainSpan7(r.span.start, r.span.end), st ?? null, [...children2]);
       const rawEntry2 = 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, rawEntry2);
@@ -5282,6 +5426,7 @@ function field(name, combinator, opts) {
 }
 
 // src/combinators/token.ts
+import { PlainLeaf as PlainLeaf6 } from "./cst/plain.js";
 function semanticLeafValue(_ctx, _input, _start, _end, value) {
   return value;
 }
@@ -5335,7 +5480,7 @@ function token(root) {
       if (!result.ok) return result;
       const span = result.span;
       const value = input.slice(pos, span.end);
-      if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value, span });
+      if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf6(value, span));
       return { ok: true, value, span };
     }
   };
@@ -5383,11 +5528,7 @@ function makeLeaf(root, fn, sourceCstValue) {
       }
       if (!result.ok) return result;
       const value = fn(result.value, result.span);
-      if (wasCapturing) pushCstLeaf(ctx, {
-        _tag: "leaf",
-        value: cstValue(ctx, input, pos, result.span.end, value),
-        span: result.span
-      });
+      if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf6(cstValue(ctx, input, pos, result.span.end, value), result.span));
       return { ok: true, value, span: result.span };
     }
   };
@@ -5420,6 +5561,7 @@ function buildLexBodyRecognizer(spec, constants) {
 }
 
 // src/table/run-support.ts
+import { PlainLeaf as PlainLeaf7, PlainLineSpan as PlainLineSpan2, PlainSpan as PlainSpan8 } from "./cst/plain.js";
 function lineCol(ctx, offset) {
   const starts = ctx._lineStarts ?? [0];
   let lo = 0, hi = starts.length - 1;
@@ -5432,18 +5574,14 @@ function lineCol(ctx, offset) {
 }
 function 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] };
+  return new PlainLineSpan2(start, end, s[0], s[1], e[0], e[1]);
 }
 function rawEntry(v, input, s, e) {
   if (typeof v === "object" && v !== null) {
     const tg = v._tag;
     if (tg === "node" || tg === "leaf" || tg === "parseError") return v;
   }
-  return {
-    _tag: "leaf",
-    value: typeof v === "string" ? v : typeof v === "object" && v !== null ? input.slice(s, e) : "",
-    span: { start: s, end: e }
-  };
+  return new PlainLeaf7(typeof v === "string" ? v : typeof v === "object" && v !== null ? input.slice(s, e) : "", new PlainSpan8(s, e));
 }
 function lead(input, pos) {
   if (pos >= input.length) return -1;
@@ -5457,7 +5595,7 @@ function collapseEmpty(ctx, build, input, pos, end, readsRaw) {
   const collected = ctx._cstBuf !== void 0 || ctx._cstChildren !== void 0;
   if (collected) popCstChild(ctx);
   const raw = readsRaw ? [rawEntry(void 0, input, pos, end)] : EMPTY_KIDS;
-  const nd = build(EMPTY_KIDS, void 0, { start: pos, end }, raw, EMPTY_TRIVIA, void 0);
+  const nd = build(EMPTY_KIDS, void 0, new PlainSpan8(pos, end), raw, EMPTY_TRIVIA, void 0);
   if (collected) pushCstChild(ctx, nd, ctx._cstBuf?.noRaw === true ? void 0 : rawEntry(nd, input, pos, end));
   return nd;
 }
@@ -6127,7 +6265,7 @@ function decodeClassSpec(spec) {
 function resolveClass(spec) {
   const ascii = new Uint8Array(128);
   const hi = [];
-  for (const { lo, hi: up } of decodeClassSpec(spec)) {
+  for (const { lo, hi: up } of leadRanges(decodeClassSpec(spec))) {
     if (lo < 128) for (let c = lo; c <= Math.min(up, 127); c++) ascii[c] = 1;
     if (up >= 128) hi.push(Math.max(lo, 128), up);
   }
@@ -9227,6 +9365,7 @@ function parseSeqParts(source) {
         cp2 = uni.cp;
         i = uni.next;
       } else if (e === void 0) return null;
+      else if (e >= "0" && e <= "9" && (e !== "0" || source[i + 2] !== void 0 && source[i + 2] >= "0" && source[i + 2] <= "9")) return null;
       else if (e in CLASS_ESCAPES) {
         cp2 = CLASS_ESCAPES[e];
         i += 2;
@@ -9776,7 +9915,7 @@ function parseScanShapeCore(source) {
   return null;
 }
 function scanShapeFromRegex(source, flags) {
-  if (/[msu]/.test(flags)) return null;
+  if (/[msuv]/.test(flags)) return null;
   if (/i/.test(flags)) return caseFoldShape(source);
   return parseScanShape(source);
 }
@@ -10381,7 +10520,7 @@ function triviaLeadRanges(tri, trivia2) {
   const fs = trivia2[tri]?._meta.firstSet;
   if (fs === void 0) return void 0;
   if (fs.kind === "empty") return [];
-  return fs.kind === "ranges" && fs.ranges !== void 0 ? fs.ranges : void 0;
+  return fs.kind === "ranges" && fs.ranges !== void 0 ? leadRanges(fs.ranges) : void 0;
 }
 
 // src/table/scalar-terminal.ts
@@ -10739,7 +10878,14 @@ var EMITTED_PARAMS = [
   "skipDeferredTrivia",
   // Appended for the pass-through collapse (`run-support.ts`); old factories
   // ignore it.
-  "collapseEmpty"
+  "collapseEmpty",
+  // Appended for constructor-built tree objects (`cst/plain.d.ts`): a `new` call has
+  // no allocation site, so V8 cannot pretenure them. Old factories ignore them.
+  "_SP",
+  "_LF",
+  "_ND",
+  "_FC",
+  "_BUF"
 ];
 var RUNTIME_PRELUDE = `
 let _pfScan=null
@@ -10763,9 +10909,9 @@ if(s!==null)return skipTriviaScanned(s,input,cur,ctx)
 if(needsDeferredTriviaCommit(ctx))return skipDeferredTrivia(input,cur,ctx)
 return advanceTrivia(input,cur,ctx)
 }
-function _pushLeaf(ctx,value,s,e){pushCstLeaf(ctx,{_tag:'leaf',value,span:{start:s,end:e}})}
+function _pushLeaf(ctx,value,s,e){pushCstLeaf(ctx,new _LF(value,new _SP(s,e)))}
 function _pushLeafBuf(ctx,value,s,e){
-const l={_tag:'leaf',value,span:{start:s,end:e}}
+const l=new _LF(value,new _SP(s,e))
 const b=ctx._cstBuf
 if(b.ch!==undefined)b.ch.push(l)
 else if(b.single!==undefined){b.ch=[b.single,l];b.single=undefined}
@@ -10823,7 +10969,7 @@ if(ctx._rootTriviaLog!==undefined&&ctx._rootTriviaLog.length!==rt)ctx._rootTrivi
 `;
 var NO_RAW_RUNTIME_PRELUDE = `
 function _pushLeafNoRawBuf(ctx,value,s,e){
-const l={_tag:'leaf',value,span:{start:s,end:e}}
+const l=new _LF(value,new _SP(s,e))
 const b=ctx._cstBuf
 if(b.ch!==undefined)b.ch.push(l)
 else if(b.single!==undefined){b.ch=[b.single,l];b.single=undefined}
@@ -10911,7 +11057,7 @@ if(ctx._errors!==undefined&&ctx._errors.length!==${t}er)ctx._errors.length=${t}e
   if (!s.fd && !s.er) return `if(${t}n)rollbackTriviaAt(ctx,${t}raw,${t}tl,${t}lv,undefined,undefined,${t}lg,${t}rt)`;
   return `if(${t}n){rollbackTriviaAt(ctx,${t}raw,${t}tl,${t}lv,${s.fd ? `${t}fd` : "undefined"},${s.er ? `${t}er` : "undefined"},${t}lg,${t}rt)}`;
 }
-function emitTerm(callee, dst, t, l, skip) {
+function emitTerm(callee, dst, t, l, skip, miss) {
   const fast = `const ${t}v=${callee}(input,cur,ctx)
 if(${t}v===FAIL)return FAIL
 ${dst}=${t}v
@@ -10929,7 +11075,12 @@ if(${t}v===FAIL)return FAIL
 ${dst}=${t}v
 if(EC.e>${t}s)cur=EC.e
 else{rollbackScannedTriviaAt(ctx,${t}tl,${t}stl,${t}lg,${t}slg,${t}rt,${t}srt)}`;
-  if (l.tri !== TRI_UNKNOWN) return scanned;
+  if (l.tri !== TRI_UNKNOWN) return miss === void 0 ? scanned : `const ${t}c=input.charCodeAt(cur)
+if(${miss(`${t}c`)}){
+${fast}
+}else{
+${scanned}
+}`;
   return `if(ctx.trivia===undefined){
 ${fast}
 }else{
@@ -10985,7 +11136,7 @@ function rebuildPools(cc, fx, disp, plan) {
     })
   };
 }
-function emitAssemblySource(t, prog, cfg, extraIps = [], staticBuild = false, select) {
+function emitAssemblySource(t, prog, cfg, extraIps = [], staticBuild = false, select, scanSinkNeutral = false) {
   const { code, k, fx, disp, dsp, triviaLabelled } = t;
   const swapLegal = !cfg.trackLines;
   const hostCst = cfg.hostCst;
@@ -11061,7 +11212,7 @@ function emitAssemblySource(t, prog, cfg, extraIps = [], staticBuild = false, se
     const op = code[ip];
     sinkBits.set(
       ip,
-      op === OP_SCAN ? 3 : (op === OP_FIELD ? 1 : 0) | (op === OP_EXPECT || REC2 && (op === OP_REP || op === OP_REPV) ? 2 : 0)
+      op === OP_SCAN || !scanSinkNeutral && op === OP_LEX_PROGRAM && t.lexPrograms[code[ip + 1]].scan !== void 0 ? 3 : (op === OP_FIELD ? 1 : 0) | (op === OP_EXPECT || REC2 && (op === OP_REP || op === OP_REPV) ? 2 : 0)
     );
   }
   const sinkKids = [];
@@ -11234,6 +11385,12 @@ return 1
     return `if(${gateMissTest(child)}){${miss}}
 `;
   }
+  function triviaMiss(ki) {
+    const leads = triviaLeadRanges(ki, t.trivia);
+    if (leads === void 0 || leads.length > 16) return void 0;
+    if (leads.length === 0) return (c) => `${c}<55296`;
+    return (c) => `${c}<55296&&!(${leads.map((r) => r.lo === r.hi ? `${c}===${r.lo}` : `(${c}>=${r.lo}&&${c}<=${r.hi})`).join("||")})`;
+  }
   function skipFor(l) {
     if (l.tri < 0) return "_skipTrivia";
     const ki = l.tri;
@@ -11244,8 +11401,13 @@ return 1
     const nm = `_sk${skipPool.size}`;
     skipPool.set(key, nm);
     if (!hasScan) {
-      skipDefs.push(l.buf ? `function ${nm}(input,cur,ctx){return skipDeferredTrivia(input,cur,ctx)}` : `function ${nm}(input,cur,ctx){
-if(needsDeferredTriviaCommit(ctx))return skipDeferredTrivia(input,cur,ctx)
+      const miss = triviaMiss(ki);
+      const pre = miss === void 0 ? "" : `const c=input.charCodeAt(cur)
+if(${miss("c")})return cur
+`;
+      skipDefs.push(l.buf ? `function ${nm}(input,cur,ctx){${pre === "" ? "" : `
+${pre}`}return skipDeferredTrivia(input,cur,ctx)}` : `function ${nm}(input,cur,ctx){
+${pre}if(needsDeferredTriviaCommit(ctx))return skipDeferredTrivia(input,cur,ctx)
 return advanceTrivia(input,cur,ctx)}`);
       return nm;
     }
@@ -11484,7 +11646,7 @@ try{return ${child}(input,pos,ctx)}finally{ctx.state=saved}
         return `${head}
 const v=${child}(input,pos,ctx)
 if(v===FAIL)return FAIL
-return ${fn}(v,{start:pos,end:EC.e})
+return ${fn}(v,new _SP(pos,EC.e))
 }`;
       }
       case OP_LABEL: {
@@ -11505,7 +11667,7 @@ return v
 const v=${child}(input,pos,ctx)
 if(v===FAIL)return FAIL
 const f=ctx._fields
-if(f!==undefined)f.push({name:${name},value:v,span:{start:pos,end:EC.e}})
+if(f!==undefined)f.push(new _FC(${name},v,new _SP(pos,EC.e)))
 return v
 }`;
         }
@@ -11530,7 +11692,7 @@ return v
         return `${head}
 const v=${child}(input,pos,ctx)
 if(v!==FAIL)return v
-const err={_tag:'parseError',span:${prog.lines === 1 ? "spanLines(ctx,pos,pos)" : "{start:pos,end:pos}"},expected:${xf}}
+const err={_tag:'parseError',span:${prog.lines === 1 ? "spanLines(ctx,pos,pos)" : "new _SP(pos,pos)"},expected:${xf}}
 const es=ctx._errors
 if(es!==undefined)es.push(err)
 ${REC2 ? "if(ctx._tolerant===true)captureError(ctx,err)\n" : ""}ctx._fc=false
@@ -11541,7 +11703,7 @@ return err
       case OP_ROUTED: {
         const fb = code[ip + 1];
         const fallback = fb >= 0 ? link(fb) : void 0;
-        const push = `pushCstLeaf(ctx,{_tag:'leaf',value:it.value,span:it.span})`;
+        const push = `pushCstLeaf(ctx,new _LF(it.value,it.span))`;
         return `${head}
 const it=ctx._routed
 if(it===undefined||pos!==it.span.start){
@@ -11622,8 +11784,8 @@ ctx._triviaLog=sOtl
 }
 if(v===FAIL)return FAIL
 const e=EC.e
-const out=${isToken ? "input.slice(pos,e)" : `${fn}(v,{start:pos,end:e})`}
-if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:${capturesSource ? "input.slice(pos,e)" : "out"},span:{start:pos,end:e}})
+const out=${isToken ? "input.slice(pos,e)" : `${fn}(v,new _SP(pos,e))`}
+if(wasCap)pushCstLeaf(ctx,new _LF(${capturesSource ? "input.slice(pos,e)" : "out"},new _SP(pos,e)))
 EC.e=e
 return out
 }`;
@@ -11647,7 +11809,7 @@ ${hasSuffix && (lineFlags & 2) !== 0 ? "if(sm)_trackLines(ctx,input,e)" : ""}
 ${hasSuffix ? `if(!sm){ctx._fe=e;ctx._fx=${suffixExpected};if(ctx._probe!==undefined)failAt(ctx,${suffixExpected},e)}` : ""}
 const v=${pending ? "tp?_pfTokValue:" : ""}input.slice(pos,e)
 ${pending ? "if(tp){_pfTokBody=-1;_pfTokValue=undefined}" : ""}
-if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,{_tag:'leaf',value:v,span:{start:pos,end:e}})
+if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,new _LF(v,new _SP(pos,e)))
 EC.e=e
 return v
 }`;
@@ -11686,7 +11848,7 @@ ctx._rootTriviaLog=sRtl
 }
 if(e<0)return FAIL
 const v=input.slice(pos,e)
-if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:v,span:{start:pos,end:e}})
+if(wasCap)pushCstLeaf(ctx,new _LF(v,new _SP(pos,e)))
 EC.e=e
 return v
 }`;
@@ -11694,7 +11856,7 @@ return v
 const e=${run3}(input,pos,ctx)
 if(e<0)return FAIL
 const v=input.slice(pos,e)
-if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,{_tag:'leaf',value:v,span:{start:pos,end:e}})
+if(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)pushCstLeaf(ctx,new _LF(v,new _SP(pos,e)))
 EC.e=e
 return v
 }`;
@@ -11808,7 +11970,7 @@ return v
 }` : `${parts.join("\n")}
 }`;
         if (n === 1) {
-          parts.push(fused ? projection === 0 ? "return v0" : `return ${fn}([v0],{start:pos,end:EC.e})` : wantValues ? "return [v0]" : "return undefined");
+          parts.push(fused ? projection === 0 ? "return v0" : `return ${fn}([v0],new _SP(pos,EC.e))` : wantValues ? "return [v0]" : "return undefined");
           return close();
         }
         parts.push("let cur=EC.e");
@@ -11829,12 +11991,12 @@ return v
             );
           } else {
             const callee = leadingTriviaFieldAt(code, k, childIp) ? `(LEAD.at=cur,${kids[i]})` : kids[i];
-            parts.push(holdsGap(code, k, base, n, i, nullable2) ? emitHoldTerm(callee, vn, tmp(), L, skipFor(L)) : emitTerm(callee, vn, tmp(), L, skipFor(L)));
+            parts.push(holdsGap(code, k, base, n, i, nullable2) ? emitHoldTerm(callee, vn, tmp(), L, skipFor(L)) : emitTerm(callee, vn, tmp(), L, skipFor(L), L.tri >= 0 ? triviaMiss(L.tri) : void 0));
           }
           names.push(vn);
         }
         parts.push("EC.e=cur");
-        parts.push(fused ? projection >= 0 ? `return ${names[projection]}` : `return ${fn}([${names.join(",")}],{start:pos,end:cur})` : wantValues ? `return [${names.join(",")}]` : "return undefined");
+        parts.push(fused ? projection >= 0 ? `return ${names[projection]}` : `return ${fn}([${names.join(",")}],new _SP(pos,cur))` : wantValues ? `return [${names.join(",")}]` : "return undefined");
         return close();
       }
       case OP_CHOICE: {
@@ -12093,7 +12255,7 @@ ${spec.match.map((m, i) => `${i === 0 ? "" : "else "}if(${dispatchClaim(m)})arm=
         const routedCall = (target) => `{const savedRouted=ctx._routed
 ${emitRollback(m1, L.buf, L.raw, sinks)}
 ${emitMark(m2, L.buf, L.raw, sinks, false)}
-ctx._routed={value:key,span:{start:pos,end:selEnd}}
+ctx._routed={value:key,span:new _SP(pos,selEnd)}
 try{v=${target}(input,pos,ctx)}finally{ctx._routed=savedRouted}
 break}`;
         const plainCall = (target) => `v=${target}(input,selEnd,ctx);break`;
@@ -12288,8 +12450,8 @@ return out
 const end=${recognize}(input,pos)
 if(end<0){ctx._fe=pos;ctx._fx=${xf};return FAIL}
 const value=${value2}
-const leaf={_tag:'leaf',value,span:{start:pos,end}}
-const kids=[leaf],rawKids=[leaf],span={start:pos,end}
+const leaf=new _LF(value,new _SP(pos,end))
+const kids=[leaf],rawKids=[leaf],span=new _SP(pos,end)
 EC.e=end
 const nd=${build2}(kids,undefined,span,rawKids,EMPTY_TL,undefined)
 ${L.buf && L.raw === RAW_OMIT ? "_pushNodeNoRawBuf(ctx,nd)" : L.buf && L.raw === RAW_CAPTURE ? "pushCstChild(ctx,nd,rawEntry(nd,input,pos,end))" : staticBuild ? "if(ctx._cstBuf!==undefined||ctx._cstChildren!==undefined)pushCstChild(ctx,nd,ctx._cstBuf!==undefined&&ctx._cstBuf.noRaw===true?undefined:ctx._cstBuf!==undefined||ctx._cstRawChildren!==undefined?rawEntry(nd,input,pos,end):undefined)" : "if(ctx._cstBuf!==undefined||ctx._cstChildren!==undefined)pushCstChild(ctx,nd,rawEntry(nd,input,pos,end))"}
@@ -12388,7 +12550,7 @@ ctx._cstTriviaLog=sTl
 ctx.captureTrivia=sCap
 if(v===FAIL)return FAIL
 const end=EC.e
-${collapseChildren ? `const nd=captured.length===1?captured[0]:${build}(captured,undefined,{start:pos,end},EMPTY_CH,EMPTY_TL,undefined)` : `const nd=${build}(captured,${fields ? "fieldMap" : "undefined"},{start:pos,end},EMPTY_CH,EMPTY_TL,undefined)`}
+${collapseChildren ? `const nd=captured.length===1?captured[0]:${build}(captured,undefined,new _SP(pos,end),EMPTY_CH,EMPTY_TL,undefined)` : `const nd=${build}(captured,${fields ? "fieldMap" : "undefined"},new _SP(pos,end),EMPTY_CH,EMPTY_TL,undefined)`}
 ${publish}
 EC.e=end
 return nd
@@ -12411,20 +12573,20 @@ return nd
           const direct = `${build}(kids,fieldMap,span,rawKids,${captureWide ? "tlog" : "EMPTY_TL"},st)`;
           value = hostCst ? `nd=_pfHost!==undefined?${hostCall}:${direct}` : `nd=${direct}`;
         } else {
-          value = `nd=_pfHost!==undefined?_pfHost(${ty},hostKids,fieldMap,span,rawKids,tlog,st,${tags}):{_tag:'node',type:${ty},span,state:st??null,children:kids}`;
+          value = `nd=_pfHost!==undefined?_pfHost(${ty},hostKids,fieldMap,span,rawKids,tlog,st,${tags}):new _ND(${ty},span,st??null,kids===EMPTY_CH?kids:[...kids])`;
         }
         const collapsible = keepChildren && (hostCst || build === void 0 && proj < 0);
-        const openCapture = omitsRaw ? `const buf={noRaw:true,rawLen:0}
+        const openCapture = omitsRaw ? `const buf=new _BUF(undefined,true,0)
 ctx._cstBuf=buf
 ctx._cstChildren=undefined
 ctx._cstLeaves=undefined
 ctx._cstRawChildren=undefined
-ctx._cstTriviaLog=undefined` : keepChildren ? `const buf={}
+ctx._cstTriviaLog=undefined` : keepChildren ? `const buf=new _BUF(undefined,undefined,0)
 ctx._cstBuf=buf
 ctx._cstChildren=undefined
 ctx._cstLeaves=undefined
 ctx._cstRawChildren=undefined
-ctx._cstTriviaLog=undefined` : `const buf={rawOnly:true}
+ctx._cstTriviaLog=undefined` : `const buf=new _BUF(true,undefined,0)
 ctx._cstBuf=buf
 ctx._cstChildren=undefined
 ctx._cstLeaves=undefined
@@ -12462,7 +12624,7 @@ ctx._cstTriviaLog=sTl
 ctx.captureTrivia=sCap
 if(v===FAIL)return FAIL
 const end=EC.e
-const span=${tracked ? "spanLines(ctx,pos,end)" : "{start:pos,end}"}
+const span=${tracked ? "spanLines(ctx,pos,end)" : "new _SP(pos,end)"}
 const st=${readsState ? "ctx.state" : "undefined"}
 let nd
 ${unwrap ? "if(kids.length===1)nd=unwrapChild(kids[0])\nelse " : ""}${collapse ? "if(kids.length===1)nd=kids[0]\nelse " : ""}${collapsible ? `if(_pfHost!==undefined&&_pfHost._parsemanCstCollapse!==undefined&&kids.length===1&&rawKids.length===1&&_pfHost._parsemanCstCollapse(${ty},kids[0],kids,rawKids))nd=kids[0]
@@ -12749,6 +12911,7 @@ function rebuildLineScan(s, subtree) {
 }
 
 // src/combinators/scanTo.ts
+import { PlainLeaf as PlainLeaf8, PlainSpan as PlainSpan9 } from "./cst/plain.js";
 function resolveScanSkip(explicitSkip, raw, ctx) {
   if (raw) return [];
   const trivia2 = ctx.trivia;
@@ -12786,7 +12949,7 @@ function scanTo(sentinel, { skip, raw = false, orEOF = false, recoverAt, stopAt
       probeCtx._errors = ctx._errors;
       const emit = (end) => {
         if (end > pos && cstCaptureActive(ctx)) {
-          const leaf2 = { _tag: "leaf", value: input.slice(pos, end), span: { start: pos, end } };
+          const leaf2 = new PlainLeaf8(input.slice(pos, end), new PlainSpan9(pos, end));
           pushCstLeaf(ctx, leaf2);
         }
       };
@@ -13008,6 +13171,15 @@ function skipDeferredTrivia(input, cur, ctx) {
   if (plain) remember(cur, scan, ctx, input, triviaP);
   return scan;
 }
+function triviaLeadTable(triviaP) {
+  const fs = triviaP._meta.firstSet;
+  if (fs.kind === "any") return null;
+  const table = new Uint8Array(128);
+  if (fs.kind === "ranges") {
+    for (const r of fs.ranges) for (let c = Math.max(0, r.lo); c <= Math.min(127, r.hi); c++) table[c] = 1;
+  }
+  return table;
+}
 function clearRunEnd(input, cur, ctx, triviaP, plain) {
   const rootKinds = ctx._rootTriviaKindIndex;
   const spec = triviaP?._meta.labeledTriviaSpec;
@@ -13056,6 +13228,9 @@ function clearOf(ranges, input, from, to) {
   return true;
 }
 
+// src/table/assemble.ts
+import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "./cst/plain.js";
+
 // src/table/fail-clean.ts
 function passChild(code, ip) {
   switch (code[ip]) {
@@ -13383,7 +13558,7 @@ function assemble(t, prog, cfg) {
   const NULLABLE = /* @__PURE__ */ new Map();
   const CLEAN = REC2 ? () => false : failCleanAnalysis(code);
   function pushLeaf(ctx, value, s, e) {
-    const lf = { _tag: "leaf", value, span: { start: s, end: e } };
+    const lf = new PlainLeaf9(value, new PlainSpan10(s, e));
     pushCstLeaf(ctx, lf);
   }
   function plainBuildNode(child, build, trailing) {
@@ -13416,7 +13591,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = sCap;
       if (value === FAIL) return FAIL;
       const end = EC.e;
-      const span = { start: pos, end };
+      const span = new PlainSpan10(pos, end);
       const node2 = build(kids, void 0, span, rawKids, EMPTY_TL2, void 0);
       if (sBuf !== void 0 || sCh !== void 0) {
         pushCstChild(ctx, node2, rawEntry(node2, input, pos, end));
@@ -13461,7 +13636,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = sCap;
       if (value === FAIL) return FAIL;
       const end = EC.e;
-      const node2 = build(captured, void 0, { start: pos, end }, EMPTY_CH, EMPTY_TL2, void 0);
+      const node2 = build(captured, void 0, new PlainSpan10(pos, end), EMPTY_CH, EMPTY_TL2, void 0);
       if (sBuf !== void 0 || sCh !== void 0) {
         pushCstChild(ctx, node2, sBuf !== void 0 || sRaw !== void 0 ? rawEntry(node2, input, pos, end) : void 0);
       }
@@ -13498,7 +13673,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = sCap;
       if (value === FAIL) return FAIL;
       const end = EC.e;
-      const node2 = build(captured, fieldMap, { start: pos, end }, EMPTY_CH, EMPTY_TL2, void 0);
+      const node2 = build(captured, fieldMap, new PlainSpan10(pos, end), EMPTY_CH, EMPTY_TL2, void 0);
       if (sBuf !== void 0 || sCh !== void 0) {
         pushCstChild(ctx, node2, sBuf !== void 0 || sRaw !== void 0 ? rawEntry(node2, input, pos, end) : void 0);
       }
@@ -13535,7 +13710,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = sCap;
       if (value === FAIL) return FAIL;
       const end = EC.e;
-      const span = { start: pos, end };
+      const span = new PlainSpan10(pos, end);
       const node2 = kids.length === 1 ? kids[0] : build(kids, void 0, span, rawKids, EMPTY_TL2, void 0);
       if (sBuf !== void 0 || sCh !== void 0) {
         pushCstChild(ctx, node2, rawEntry(node2, input, pos, end));
@@ -13572,7 +13747,7 @@ function assemble(t, prog, cfg) {
       ctx.captureTrivia = sCap;
       if (value === FAIL) return FAIL;
       const end = EC.e;
-      const node2 = captured.length === 1 ? captured[0] : build(captured, void 0, { start: pos, end }, EMPTY_CH, EMPTY_TL2, void 0);
+      const node2 = captured.length === 1 ? captured[0] : build(captured, void 0, new PlainSpan10(pos, end), EMPTY_CH, EMPTY_TL2, void 0);
       if (sBuf !== void 0 || sCh !== void 0) {
         pushCstChild(ctx, node2, sBuf !== void 0 || sRaw !== void 0 ? rawEntry(node2, input, pos, end) : void 0);
       }
@@ -13681,7 +13856,23 @@ function assemble(t, prog, cfg) {
     }
     return out;
   }
+  const LEAD_TABLES = trivia2.map((tp) => tp === void 0 ? null : triviaLeadTable(tp));
+  let LEAD_OF;
+  let LEAD_TABLE = null;
+  function cannotStartTrivia(input, cur, triviaP) {
+    if (triviaP !== LEAD_OF) {
+      LEAD_OF = triviaP;
+      const slot = trivia2.indexOf(triviaP);
+      LEAD_TABLE = slot >= 0 ? LEAD_TABLES[slot] : triviaLeadTable(triviaP);
+    }
+    const table = LEAD_TABLE;
+    if (table === null) return false;
+    const c = input.charCodeAt(cur);
+    return c < 128 && table[c] === 0;
+  }
   function skipTrivia(input, cur, ctx) {
+    const t2 = ctx.trivia;
+    if (t2 !== void 0 && cannotStartTrivia(input, cur, t2)) return cur;
     const s = SCAN;
     if (s !== null && ctx._triviaLog === void 0 && !(ctx.captureTrivia === true && (ctx._cstBuf !== void 0 || ctx._cstTriviaLog !== void 0))) {
       return s(input, cur);
@@ -13696,7 +13887,8 @@ function assemble(t, prog, cfg) {
   const frames = [];
   let depth = 0;
   function nextTerm(child, input, cur, ctx) {
-    if (ctx.trivia === void 0) {
+    const t2 = ctx.trivia;
+    if (t2 === void 0 || cannotStartTrivia(input, cur, t2)) {
       const v2 = child(input, cur, ctx);
       if (v2 === FAIL) return -1;
       TERMV = v2;
@@ -13725,7 +13917,8 @@ function assemble(t, prog, cfg) {
     return cur;
   }
   function nextTermBuffered(child, input, cur, ctx) {
-    if (ctx.trivia === void 0) {
+    const t2 = ctx.trivia;
+    if (t2 === void 0 || cannotStartTrivia(input, cur, t2)) {
       const v2 = child(input, cur, ctx);
       if (v2 === FAIL) return -1;
       TERMV = v2;
@@ -13987,7 +14180,7 @@ function assemble(t, prog, cfg) {
     return (input, pos, selEnd, key, ctx, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot) => {
       const savedRouted = ctx._routed;
       if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-      ctx._routed = { value: key, span: { start: pos, end: selEnd } };
+      ctx._routed = { value: key, span: new PlainSpan10(pos, selEnd) };
       let v;
       try {
         v = child(input, pos, ctx);
@@ -14420,7 +14613,7 @@ function assemble(t, prog, cfg) {
       case OP_EXPECT: {
         const child = link(code[ip + 1]);
         const xf = fx[code[ip + 2]];
-        const expectSpan = (ctx, pos) => prog.lines === 1 ? spanLines(ctx, pos, pos) : { start: pos, end: pos };
+        const expectSpan = (ctx, pos) => prog.lines === 1 ? spanLines(ctx, pos, pos) : new PlainSpan10(pos, pos);
         if (REC2) {
           return (input, pos, ctx) => {
             const v = child(input, pos, ctx);
@@ -14452,7 +14645,7 @@ function assemble(t, prog, cfg) {
           return (input, pos, ctx) => {
             const v = child(input, pos, ctx);
             if (v === FAIL) return FAIL;
-            ctx._fields?.push({ name, value: v, span: { start: pos, end: EC.e } });
+            ctx._fields?.push(new PlainField(name, v, new PlainSpan10(pos, EC.e)));
             return v;
           };
         }
@@ -14476,7 +14669,7 @@ function assemble(t, prog, cfg) {
         return (input, pos, ctx) => {
           const v = child(input, pos, ctx);
           if (v === FAIL) return FAIL;
-          return fn(v, { start: pos, end: EC.e });
+          return fn(v, new PlainSpan10(pos, EC.e));
         };
       }
       case OP_SCAN: {
@@ -14527,6 +14720,7 @@ function assemble(t, prog, cfg) {
         const scopeTrivia = ki < 0 ? void 0 : trivia2[ki];
         const scopeLabels = scopeTrivia?._meta.triviaKindLabels;
         const scanFor = swapLegal && ki >= 0 && !triviaLabelled[ki] ? triviaScan[ki] : null;
+        const scopeLead = ki < 0 ? null : LEAD_TABLES[ki];
         const child = link(code[ip + 2]);
         const scopePiece = code[ip] === OP_SCOPE_CAP ? (input, pos, ctx) => {
           const saved = ctx.trivia;
@@ -14534,6 +14728,9 @@ function assemble(t, prog, cfg) {
           const savedScan = SCAN;
           const savedCap = ctx.captureTrivia;
           SCAN = scanFor;
+          const savedLeadOf = LEAD_OF, savedLead = LEAD_TABLE;
+          LEAD_OF = scopeTrivia;
+          LEAD_TABLE = scopeLead;
           ctx.trivia = scopeTrivia;
           ctx.triviaKindLabels = scopeLabels;
           ctx.captureTrivia = true;
@@ -14542,18 +14739,25 @@ function assemble(t, prog, cfg) {
           ctx.trivia = saved;
           ctx.triviaKindLabels = savedLabels;
           SCAN = savedScan;
+          LEAD_OF = savedLeadOf;
+          LEAD_TABLE = savedLead;
           return v;
         } : (input, pos, ctx) => {
           const saved = ctx.trivia;
           const savedLabels = ctx.triviaKindLabels;
           const savedScan = SCAN;
           SCAN = scanFor;
+          const savedLeadOf = LEAD_OF, savedLead = LEAD_TABLE;
+          LEAD_OF = scopeTrivia;
+          LEAD_TABLE = scopeLead;
           ctx.trivia = scopeTrivia;
           ctx.triviaKindLabels = scopeLabels;
           const v = child(input, pos, ctx);
           ctx.trivia = saved;
           ctx.triviaKindLabels = savedLabels;
           SCAN = savedScan;
+          LEAD_OF = savedLeadOf;
+          LEAD_TABLE = savedLead;
           return v;
         };
         return scopeRootPolicy(scopePiece, code[ip] === OP_SCOPE_PLAIN ? 0 : code[ip + 3]);
@@ -14569,7 +14773,7 @@ function assemble(t, prog, cfg) {
             ctx._fx = ROUTED_FX;
             return FAIL;
           }
-          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value: item.value, span: item.span });
+          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf9(item.value, item.span));
           EC.e = item.span.end;
           return item.value;
         };
@@ -14755,7 +14959,7 @@ function assemble(t, prog, cfg) {
           if (v === FAIL) return FAIL;
           const end = EC.e;
           const value = input.slice(pos, end);
-          if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value, span: { start: pos, end } });
+          if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf9(value, new PlainSpan10(pos, end)));
           EC.e = end;
           return value;
         };
@@ -14789,7 +14993,7 @@ function assemble(t, prog, cfg) {
             if (ctx._probe !== void 0) failAt(ctx, suffixExpected, end);
           }
           const value = input.slice(pos, end);
-          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span: { start: pos, end } });
+          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf9(value, new PlainSpan10(pos, end)));
           EC.e = end;
           return value;
         };
@@ -14832,7 +15036,7 @@ function assemble(t, prog, cfg) {
             }
             if (end < 0) return FAIL;
             const value = input.slice(pos, end);
-            if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value, span: { start: pos, end } });
+            if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf9(value, new PlainSpan10(pos, end)));
             EC.e = end;
             return value;
           };
@@ -14841,7 +15045,7 @@ function assemble(t, prog, cfg) {
           const end = run3(input, pos, ctx);
           if (end < 0) return FAIL;
           const value = input.slice(pos, end);
-          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, { _tag: "leaf", value, span: { start: pos, end } });
+          if (cstCaptureActive(ctx)) pushCstLeaf(ctx, new PlainLeaf9(value, new PlainSpan10(pos, end)));
           EC.e = end;
           return value;
         };
@@ -14874,12 +15078,8 @@ function assemble(t, prog, cfg) {
           }
           if (v === FAIL) return FAIL;
           const end = EC.e;
-          const out = fn(v, { start: pos, end });
-          if (wasCapturing) pushCstLeaf(ctx, {
-            _tag: "leaf",
-            value: op === OP_SOURCE_LEAF && hostCst ? input.slice(pos, end) : out,
-            span: { start: pos, end }
-          });
+          const out = fn(v, new PlainSpan10(pos, end));
+          if (wasCapturing) pushCstLeaf(ctx, new PlainLeaf9(op === OP_SOURCE_LEAF && hostCst ? input.slice(pos, end) : out, new PlainSpan10(pos, end)));
           EC.e = end;
           return out;
         };
@@ -15014,7 +15214,7 @@ function assemble(t, prog, cfg) {
               const cur = runSyncTerms(input, pos, ctx, values);
               if (cur < 0) return FAIL;
               EC.e = cur;
-              return projection >= 0 ? values[projection] : fn(values, { start: pos, end: cur });
+              return projection >= 0 ? values[projection] : fn(values, new PlainSpan10(pos, cur));
             };
           }
           if (wantValues) {
@@ -15108,7 +15308,7 @@ function assemble(t, prog, cfg) {
               const cur = runAdjTerms(input, pos, ctx, values);
               if (cur < 0) return FAIL;
               EC.e = cur;
-              return projection >= 0 ? values[projection] : fn(values, { start: pos, end: cur });
+              return projection >= 0 ? values[projection] : fn(values, new PlainSpan10(pos, cur));
             };
           }
           if (wantValues) {
@@ -15133,7 +15333,7 @@ function assemble(t, prog, cfg) {
             return (input, pos, ctx) => {
               const v = k0(input, pos, ctx);
               if (v === FAIL) return FAIL;
-              return projection === 0 ? v : fn([v], { start: pos, end: EC.e });
+              return projection === 0 ? v : fn([v], new PlainSpan10(pos, EC.e));
             };
           }
           if (wantValues) {
@@ -15158,7 +15358,7 @@ function assemble(t, prog, cfg) {
               const cur = step(k1, input, EC.e, ctx);
               if (cur < 0) return FAIL;
               EC.e = cur;
-              return projection === 0 ? v0 : projection === 1 ? TERMV : fn([v0, TERMV], { start: pos, end: cur });
+              return projection === 0 ? v0 : projection === 1 ? TERMV : fn([v0, TERMV], new PlainSpan10(pos, cur));
             };
           }
           if (wantValues) {
@@ -15192,7 +15392,7 @@ function assemble(t, prog, cfg) {
               cur = step(k2, input, cur, ctx);
               if (cur < 0) return FAIL;
               EC.e = cur;
-              return projection === 0 ? v0 : projection === 1 ? v1 : projection === 2 ? TERMV : fn([v0, v1, TERMV], { start: pos, end: cur });
+              return projection === 0 ? v0 : projection === 1 ? v1 : projection === 2 ? TERMV : fn([v0, v1, TERMV], new PlainSpan10(pos, cur));
             };
           }
           if (wantValues) {
@@ -15289,7 +15489,7 @@ function assemble(t, prog, cfg) {
             const cur = runDirectTerms(input, pos, ctx, values);
             if (cur < 0) return FAIL;
             EC.e = cur;
-            return projection >= 0 ? values[projection] : fn(values, { start: pos, end: cur });
+            return projection >= 0 ? values[projection] : fn(values, new PlainSpan10(pos, cur));
           };
         }
         if (wantValues) {
@@ -16187,10 +16387,10 @@ function assemble(t, prog, cfg) {
               return FAIL;
             }
             const value = regexValue ? input.slice(pos, end) : spec;
-            const leaf2 = { _tag: "leaf", value, span: { start: pos, end } };
+            const leaf2 = new PlainLeaf9(value, new PlainSpan10(pos, end));
             const kids = [leaf2];
             const rawKids = [leaf2];
-            const span = { start: pos, end };
+            const span = new PlainSpan10(pos, end);
             EC.e = end;
             const nd = build2(kids, void 0, span, rawKids, EMPTY_TL2, void 0);
             if (ctx._cstBuf !== void 0 || ctx._cstChildren !== void 0) {
@@ -16272,7 +16472,7 @@ function assemble(t, prog, cfg) {
           const sCh = ctx._cstChildren;
           const sCap = ctx.captureTrivia;
           const sBuf = ctx._cstBuf;
-          const buf = rawOnly ? { rawOnly: true } : omitsRaw ? { noRaw: true, rawLen: 0 } : {};
+          const buf = rawOnly ? new PlainBuf2(true, void 0, 0) : omitsRaw ? new PlainBuf2(void 0, true, 0) : new PlainBuf2(void 0, void 0, 0);
           ctx._cstBuf = buf;
           ctx.captureTrivia = captureWide;
           const savedFields = ctx._fields;
@@ -16294,7 +16494,7 @@ function assemble(t, prog, cfg) {
           ctx.captureTrivia = sCap;
           if (v === FAIL) return FAIL;
           const end = EC.e;
-          const span = tracked ? spanLines(ctx, pos, end) : { start: pos, end };
+          const span = tracked ? spanLines(ctx, pos, end) : new PlainSpan10(pos, end);
           const st = readsState ? ctx.state : void 0;
           let nd;
           if (unwrap && kids.length === 1) {
@@ -16318,7 +16518,7 @@ function assemble(t, prog, cfg) {
           } else if (host !== void 0) {
             nd = host(type, hostKids, fieldMap, span, rawKids, tlog, st, tags);
           } else {
-            nd = { _tag: "node", type, span, state: st ?? null, children: kids };
+            nd = new PlainNode2(type, span, st ?? null, kids === EMPTY_CH ? kids : [...kids]);
           }
           if (sBuf !== void 0 || sCh !== void 0) {
             pushCstChild(ctx, nd, rawEntry(nd, input, pos, end));
@@ -16344,7 +16544,7 @@ function assemble(t, prog, cfg) {
           const at = fe === void 0 || fe < 0 ? pos : fe;
           return { ok: false, expected: ctx._fx ?? EMPTY_FX2, span: { start: at, end: at } };
         }
-        return { ok: true, value: v, span: { start: pos, end: EC.e } };
+        return { ok: true, value: v, span: new PlainSpan10(pos, EC.e) };
       }
     };
   }
@@ -16459,7 +16659,12 @@ function assemble(t, prog, cfg) {
         LEAD,
         triviaFieldCapture,
         skipDeferredTrivia,
-        collapseEmpty
+        collapseEmpty,
+        PlainSpan10,
+        PlainLeaf9,
+        PlainNode2,
+        PlainField,
+        PlainBuf2
       );
       emitReached = new Set(pre.reached);
       if (emitted.ext !== void 0) HYBRID = emitted;
@@ -16546,7 +16751,12 @@ function assemble(t, prog, cfg) {
         LEAD,
         triviaFieldCapture,
         skipDeferredTrivia,
-        collapseEmpty
+        collapseEmpty,
+        PlainSpan10,
+        PlainLeaf9,
+        PlainNode2,
+        PlainField,
+        PlainBuf2
       );
       emitReached = em.reached;
     } catch (e) {
@@ -16804,7 +17014,11 @@ function tableRules(source, metadataOrEntry = {}) {
   return map[entry];
 }
 
+// src/version.ts
+var PARSEMAN_VERSION = "0.59.0";
+
 // src/table/emit.ts
+var FACTORY_ARITY_GUARD = `if(arguments.length<${EMITTED_PARAMS.length})throw new Error(${JSON.stringify(`parseman: this parser was printed by parseman ${PARSEMAN_VERSION}; upgrade the parseman runtime to at least that version`)});`;
 function jsString(s) {
   return JSON.stringify(s);
 }
@@ -16890,7 +17104,7 @@ function emitAssemblies(prog, cfgs) {
       throw e;
     }
     const plan = em.plan;
-    out.push(`{key:${key},factory:function(${EMITTED_PARAMS.join(",")}){${em.source}
+    out.push(`{key:${key},factory:function(${EMITTED_PARAMS.join(",")}){${FACTORY_ARITY_GUARD}${em.source}
 },plan:{classes:[${plan.classes.map((r) => `[${r.join(",")}]`).join(",")}],armExpected:[${plan.armExpected.map((r) => `[${r.join(",")}]`).join(",")}],masks:[${plan.masks.join(",")}]},reached:[${[...em.reached].join(",")}]}`);
   }
   return [`a:[${out.join(",")}],`];
@@ -18589,8 +18803,8 @@ function compileRuleMap(ruleMap, opts = {}) {
     const roots = assemblyExtraIps(artifact);
     let siteBytes, fixed;
     try {
-      siteBytes = emitAssemblySource(table, artifact, cfg, roots, true).siteBytes;
-      fixed = emitAssemblySource(table, artifact, cfg, roots, true, /* @__PURE__ */ new Set()).source.length;
+      siteBytes = emitAssemblySource(table, artifact, cfg, roots, true, void 0, true).siteBytes;
+      fixed = emitAssemblySource(table, artifact, cfg, roots, true, /* @__PURE__ */ new Set(), true).source.length;
     } catch (e) {
       if (e instanceof Unemittable) return { ...none, refusal: e.construct };
       throw e;
@@ -18606,7 +18820,7 @@ function compileRuleMap(ruleMap, opts = {}) {
           refusal: `a site within its ${Math.floor(ceiling)} B selection ceiling (the prelude alone is ${fixed} B)`
         };
       }
-      const bytes2 = emitAssemblySource(table, artifact, cfg, roots, true, sites).source.length;
+      const bytes2 = emitAssemblySource(table, artifact, cfg, roots, true, sites, true).source.length;
       if (bytes2 <= ceiling) return { sites, bytes: Math.ceil(bytes2 * SUPERCOMPILE_GROWTH) };
       target *= Math.min(ceiling / bytes2, 0.99);
     }
@@ -19247,9 +19461,6 @@ function fieldOptionsSrc(def) {
   return `, { ${[def.leadingTrivia === true ? "leadingTrivia: true" : "", def.trailingTrivia === true ? "trailingTrivia: true" : ""].filter(Boolean).join(", ")} }`;
 }
 
-// src/version.ts
-var PARSEMAN_VERSION = "0.58.2";
-
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {
   const d = rule._def;
@@ -19316,6 +19527,7 @@ function compileLinkableTable(ruleMapArg, ns, opts = {}) {
 }
 
 // src/compiler/linker.ts
+import { PlainNode as PlainNode3, PlainTaggedNode } from "./cst/plain.js";
 function normalizeCstCollapse(collapse) {
   if (collapse === true) return () => true;
   if (Array.isArray(collapse)) {
@@ -19325,7 +19537,7 @@ function normalizeCstCollapse(collapse) {
   return typeof collapse === "function" ? collapse : void 0;
 }
 function buildCstNode(type, children2, _fields, span, _rawChildren, _triviaLog, state, tags) {
-  return tags !== void 0 && tags.length > 0 ? { _tag: "node", type, tags, span: { ...span }, state: state ?? null, children: [...children2] } : { _tag: "node", type, span: { ...span }, state: state ?? null, children: [...children2] };
+  return tags !== void 0 && tags.length > 0 ? new PlainTaggedNode(type, tags, copySpan(span), state ?? null, [...children2]) : new PlainNode3(type, copySpan(span), state ?? null, [...children2]);
 }
 function cstBuildHost(typeOrOptions, children2, _fields, span, rawChildren, triviaLog, state, _tags) {
   if (typeof typeOrOptions === "string") {