parseman 0.58.3 → 0.59.1

package/dist/plugin/index.js

@@ -569,6 +569,7 @@ function markUnusedValues(root) {
 }
 
 // src/line-index.ts
+import { PlainLineSpan, PlainSpan } from "../cst/plain.js";
 function createLineIndex() {
   return { lineStarts: [0] };
 }
@@ -621,6 +622,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);
@@ -628,6 +650,7 @@ function annotateSpanFromLineContext(span, ctx) {
 }
 
 // src/cst/capture-buffer.ts
+import { PlainBuf, PlainLeaf } from "../cst/plain.js";
 var EMPTY = [];
 var EMPTY_TL = [];
 function cstCaptureActive(ctx) {
@@ -642,7 +665,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;
@@ -667,12 +690,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) {
@@ -2024,6 +2050,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++) {
@@ -2081,9 +2108,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);
@@ -2095,9 +2122,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);
@@ -2432,6 +2459,7 @@ function firstSetFromRegex(source, flags = "") {
 }
 
 // src/combinators/regex.ts
+import { PlainLeaf as PlainLeaf3, PlainSpan as PlainSpan3 } from "../cst/plain.js";
 var SCAN_BAIL_AT = 64;
 function inRanges2(cp, ranges) {
   for (let i = 0; i < ranges.length; i++) {
@@ -2544,9 +2572,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;
@@ -2554,9 +2582,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 };
     }
   };
@@ -2598,6 +2626,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;
@@ -2651,8 +2680,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 };
     }
   };
@@ -3277,6 +3306,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,
@@ -3353,7 +3383,7 @@ function firstSetSentinel(fs3) {
 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);
@@ -3433,17 +3463,18 @@ function notAdjacent(options) {
 }
 
 // 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;
@@ -4022,6 +4053,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);
@@ -4158,7 +4190,7 @@ function routed(fallback2) {
         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 };
     }
@@ -5108,6 +5140,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;
 }
@@ -5213,7 +5246,7 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const nodeType = def.type ?? missingInferredType();
       const cstOutput = cstOutputHost(ctx.build);
       const span = ctx.trackLines ? annotateSpanFromLineContext(r.span, ctx) : r.span;
-      const built = unwrap && children3.length === 1 ? unwrapChild(children3[0]) : collapse && children3.length === 1 ? children3[0] : (cstOutput || !build && project === void 0) && ctx.build?._parsemanCstCollapse && children3.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children3[0], children3, rawChildren) ? children3[0] : project !== void 0 ? cstOutput && ctx.build ? ctx.build(nodeType, children3, fields, span, rawChildren, triviaLog, ctx.state, tags) : projectChild(children3, project, nodeType) : build ? cstOutput && ctx.build ? ctx.build(nodeType, children3, fields, span, rawChildren, triviaLog, ctx.state, tags) : build(children3, fields, span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children3, 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: children3 };
+      const built = unwrap && children3.length === 1 ? unwrapChild(children3[0]) : collapse && children3.length === 1 ? children3[0] : (cstOutput || !build && project === void 0) && ctx.build?._parsemanCstCollapse && children3.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children3[0], children3, rawChildren) ? children3[0] : project !== void 0 ? cstOutput && ctx.build ? ctx.build(nodeType, children3, fields, span, rawChildren, triviaLog, ctx.state, tags) : projectChild(children3, project, nodeType) : build ? cstOutput && ctx.build ? ctx.build(nodeType, children3, fields, span, rawChildren, triviaLog, ctx.state, tags) : build(children3, fields, span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children3, fields, span, rawChildren, triviaLog, st, tags) : new PlainNode(nodeType, ctx.trackLines ? copySpan(span) : new PlainSpan7(r.span.start, r.span.end), st ?? null, [...children3]);
       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);
@@ -5369,6 +5402,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;
 }
@@ -5422,7 +5456,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 };
     }
   };
@@ -5470,11 +5504,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 };
     }
   };
@@ -5507,6 +5537,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;
@@ -5519,18 +5550,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;
@@ -5544,7 +5571,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;
 }
@@ -7768,18 +7795,10 @@ var Encoder = class {
   /** TOKEN bodies are an all-program decision. A complete occurrence inside an
    * otherwise incomplete final graph stays on CHARACTER with every sibling. */
   selectLexicalBodies;
-  /**
-   * Decides the extra operands laid down below. ALWAYS TRUE — see
-   * `TableSettings.recovery`. Kept as a field rather than folded away because it
-   * is what every emit site reads, and the emit sites are where the shape of the
-   * row is stated.
-   */
-  rec;
   constructor(settings, selectLexicalBodies) {
     this.settings = settings;
     this.track = settings.trackLines === true;
     this.selectLexicalBodies = selectLexicalBodies;
-    this.rec = true;
     this.plan = settings.coverage;
     this.cov = settings.coverage === void 0 ? void 0 : settings.coverage.definitions.map((d) => [d.id, covKindCode(d.kind)]);
     this.covIndex = new Map((this.cov ?? []).map((d, i) => [d[0], i]));
@@ -8281,12 +8300,10 @@ var Encoder = class {
       }
       case "sequence": {
         const kids = d.parsers.map((c) => this.node(c).ip);
-        const head = this.emitHead(d.valueUnused ? OP_SEQV : OP_SEQ, 1 + kids.length + (this.rec ? kids.length : 0));
+        const head = this.emitHead(d.valueUnused ? OP_SEQV : OP_SEQ, 1 + 2 * kids.length);
         this.code[head + 1] = kids.length;
         for (let i = 0; i < kids.length; i++) this.code[head + 2 + i] = kids[i];
-        if (this.rec) {
-          for (let i = 0; i < kids.length; i++) this.code[head + 2 + kids.length + i] = this.followClass(d.parsers, i);
-        }
+        for (let i = 0; i < kids.length; i++) this.code[head + 2 + kids.length + i] = this.followClass(d.parsers, i);
         return head;
       }
       case "choice": {
@@ -8388,25 +8405,22 @@ var Encoder = class {
         const itemClass = matchesEmpty(d.parser, /* @__PURE__ */ new Set(), rr) ? -1 : this.charClass(firstSetOf(d.parser, /* @__PURE__ */ new Set(), rr, this.activeTrivia));
         const op = d.valueUnused ? OP_REPV : OP_REP;
         const min = d.tag === "many" ? 0 : d.min;
-        return this.rec ? this.emit(op, child, min, d.max ?? -1, -1, 0, this.expected(deriveExpected(d.parser)), itemClass) : this.emit(op, child, min, d.max ?? -1, -1, 0);
+        return this.emit(op, child, min, d.max ?? -1, -1, 0, this.expected(deriveExpected(d.parser)), itemClass);
       }
       case "sepBy": {
         const child = this.node(d.parser).ip;
         const sep2 = this.node(d.separator).ip;
         const flags = (d.trailing === "allow" ? 1 : 0) | (d.keepSeparators === true ? 2 : 0) | (d.min >= 2 ? 4 : 0);
-        if (this.rec) {
-          return this.emit(
-            OP_REP,
-            child,
-            d.min,
-            d.max ?? -1,
-            sep2,
-            flags,
-            this.expected(deriveExpected(d.parser)),
-            this.charClass(firstSetOf(d.separator, /* @__PURE__ */ new Set(), this.refResolver(), this.activeTrivia))
-          );
-        }
-        return d.min >= 2 ? this.emit(OP_REP, child, d.min, d.max ?? -1, sep2, flags, this.expected(deriveExpected(d.parser))) : this.emit(OP_REP, child, d.min, d.max ?? -1, sep2, flags);
+        return this.emit(
+          OP_REP,
+          child,
+          d.min,
+          d.max ?? -1,
+          sep2,
+          flags,
+          this.expected(deriveExpected(d.parser)),
+          this.charClass(firstSetOf(d.separator, /* @__PURE__ */ new Set(), this.refResolver(), this.activeTrivia))
+        );
       }
       case "optional": {
         const head = this.emit(OP_OPT, this.lookaheadGate(d.parser, this.node(d.parser).ip));
@@ -8417,14 +8431,12 @@ var Encoder = class {
         const inner = d.parser._def;
         if (inner.tag === "sequence" && !this.memo.has(d.parser) && !this.pending.has(d.parser)) {
           const kids = inner.parsers.map((c) => this.node(c).ip);
-          const head = this.emitHead(OP_SEQX, 2 + kids.length + (this.rec ? kids.length : 0));
+          const head = this.emitHead(OP_SEQX, 2 + 2 * kids.length);
           const projection = directArrayProjection(d.fn, d.fnSrc, kids.length);
           this.code[head + 1] = projection === null ? this.fn(d.fn, d.fnSrc ?? null) : ~projection;
           this.code[head + 2] = kids.length;
           for (let i = 0; i < kids.length; i++) this.code[head + 3 + i] = kids[i];
-          if (this.rec) {
-            for (let i = 0; i < kids.length; i++) this.code[head + 3 + kids.length + i] = this.followClass(inner.parsers, i);
-          }
+          for (let i = 0; i < kids.length; i++) this.code[head + 3 + kids.length + i] = this.followClass(inner.parsers, i);
           return head;
         }
         const child = this.node(d.parser).ip;
@@ -8747,7 +8759,7 @@ var Encoder = class {
       ...this.settings.hostMode === void 0 ? {} : { hostMode: this.settings.hostMode },
       ...this.runtimeOnly.size === 0 ? {} : { runtimeOnly: [...this.runtimeOnly].sort() },
       ...this.triviaSpecs.length === 0 ? {} : { triviaSpecs: this.triviaSpecs },
-      ...this.rec ? { rec: 1 } : {},
+      rec: 1,
       ...this.cov === void 0 ? {} : { cov: this.cov },
       lines: this.track ? 1 : 0
     }, void 0, {
@@ -9511,7 +9523,6 @@ function caseFoldLiteralOrAlt(source) {
   }
   return { kind: "alt", arms: litArms, disjoint: false, firsts: litArms.map(() => null) };
 }
-var scanToIndexOfEnabled = () => process.env.PARSEMAN_SCANTO === "indexof";
 var classCond = (cVar, ranges) => ranges.map(([lo, hi]) => lo === hi ? `${cVar} === ${lo}` : `(${cVar} >= ${lo} && ${cVar} <= ${hi})`).join(" || ");
 var litCond = (base, cps, firstVar) => cps.map(
   (cp, k) => k === 0 && firstVar ? `${firstVar} === ${cp}` : `input.charCodeAt(${base}${k ? ` + ${k}` : ""}) === ${cp}`
@@ -9741,13 +9752,7 @@ function emitShapeMatch(shape, start, mint, ind, firstChar) {
     const j2 = mint("_j");
     const openLen2 = shape.open.length;
     const openChk2 = openLen2 === 1 ? `${codeAt(start, firstChar)} === ${shape.open[0]}` : litCond(start, shape.open, firstChar);
-    const stopCp = shape.stop.length === 1 && shape.stop[0][0] === shape.stop[0][1] ? shape.stop[0][0] : null;
-    const scanLine = stopCp !== null && stopCp <= 65535 && scanToIndexOfEnabled() ? (
-      // No temp is minted: a temp would renumber every later variable in the
-      // function and show up as an artifact-size delta that is counter
-      // renumbering rather than this change (the §9.1.4 / §9.2 effect).
-      `${ind}  ${j2} = input.indexOf(${JSON.stringify(String.fromCharCode(stopCp))}, ${j2}); if (${j2} < 0) ${j2} = input.length`
-    ) : `${ind}  while (${j2} < input.length && !(${classCond(`input.charCodeAt(${j2})`, shape.stop)})) ${j2}++`;
+    const scanLine = `${ind}  while (${j2} < input.length && !(${classCond(`input.charCodeAt(${j2})`, shape.stop)})) ${j2}++`;
     return {
       setup: [
         `${ind}let ${j2} = ${start}`,
@@ -9805,11 +9810,7 @@ function emitShapeMatch(shape, start, mint, ind, firstChar) {
   const closeLen = shape.close.length;
   const openChk = openLen === 1 ? `${codeAt(start, firstChar)} === ${shape.open[0]}` : litCond(start, shape.open, firstChar);
   const closeChk = litCond(j, shape.close);
-  const closeStr = String.fromCharCode(...shape.close);
-  const scanLines = scanToIndexOfEnabled() ? [
-    `${ind}  ${j} = input.indexOf(${JSON.stringify(closeStr)}, ${j}); if (${j} < 0) ${j} = input.length`,
-    `${ind}  if (${j} + ${closeLen} <= input.length) ${endV} = ${j} + ${closeLen}`
-  ] : [
+  const scanLines = [
     `${ind}  while (${j} + ${closeLen - 1} < input.length && !(${closeChk})) ${j}++`,
     `${ind}  if (${j} + ${closeLen} <= input.length && (${closeChk})) ${endV} = ${j} + ${closeLen}`
   ];
@@ -10445,7 +10446,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
@@ -10469,9 +10477,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}
@@ -10529,7 +10537,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}
@@ -11206,7 +11214,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: {
@@ -11227,7 +11235,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
 }`;
         }
@@ -11252,7 +11260,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
@@ -11263,7 +11271,7 @@ return err
       case OP_ROUTED: {
         const fb = code[ip + 1];
         const fallback2 = 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){
@@ -11344,8 +11352,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
 }`;
@@ -11369,7 +11377,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
 }`;
@@ -11408,7 +11416,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
 }`;
@@ -11416,7 +11424,7 @@ return v
 const e=${run2}(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
 }`;
@@ -11530,7 +11538,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");
@@ -11556,7 +11564,7 @@ return v
           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: {
@@ -11815,7 +11823,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`;
@@ -12010,8 +12018,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))"}
@@ -12110,7 +12118,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
@@ -12133,20 +12141,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
@@ -12184,7 +12192,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]
@@ -12471,6 +12479,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;
@@ -12508,7 +12517,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);
         }
       };
@@ -12787,6 +12796,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]) {
@@ -13114,7 +13126,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) {
@@ -13147,7 +13159,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));
@@ -13192,7 +13204,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);
       }
@@ -13229,7 +13241,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);
       }
@@ -13266,7 +13278,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));
@@ -13303,7 +13315,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);
       }
@@ -13736,7 +13748,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);
@@ -14169,7 +14181,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);
@@ -14201,7 +14213,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;
           };
         }
@@ -14225,7 +14237,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: {
@@ -14329,7 +14341,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;
         };
@@ -14515,7 +14527,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;
         };
@@ -14549,7 +14561,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;
         };
@@ -14592,7 +14604,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;
           };
@@ -14601,7 +14613,7 @@ function assemble(t, prog, cfg) {
           const end = run2(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;
         };
@@ -14634,12 +14646,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;
         };
@@ -14774,7 +14782,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) {
@@ -14868,7 +14876,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) {
@@ -14893,7 +14901,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) {
@@ -14918,7 +14926,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) {
@@ -14952,7 +14960,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) {
@@ -15049,7 +15057,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) {
@@ -15947,10 +15955,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) {
@@ -16032,7 +16040,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;
@@ -16054,7 +16062,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) {
@@ -16078,7 +16086,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));
@@ -16104,7 +16112,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) };
       }
     };
   }
@@ -16219,7 +16227,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;
@@ -16306,7 +16319,12 @@ function assemble(t, prog, cfg) {
         LEAD,
         triviaFieldCapture,
         skipDeferredTrivia,
-        collapseEmpty
+        collapseEmpty,
+        PlainSpan10,
+        PlainLeaf9,
+        PlainNode2,
+        PlainField,
+        PlainBuf2
       );
       emitReached = em.reached;
     } catch (e) {
@@ -16575,7 +16593,11 @@ function tableRules(source, metadataOrEntry = {}) {
   return map[entry];
 }
 
+// src/version.ts
+var PARSEMAN_VERSION = "0.59.1";
+
 // 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);
 }
@@ -16661,7 +16683,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(",")}],`];
@@ -18673,7 +18695,7 @@ function serializeRuleMap(ruleMap, scanSkip) {
     return new Serializer(ruleMap, scanSkip ?? []).run();
   } catch (e) {
     if (e instanceof Unserializable) {
-      if (process.env.PARSEMAN_IR_DEBUG) console.error(`[ir] fallback: ${e.message}`);
+      if (typeof process !== "undefined" && process.env?.PARSEMAN_IR_DEBUG) console.error(`[ir] fallback: ${e.message}`);
       return null;
     }
     throw e;
@@ -19021,9 +19043,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.3";
-
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {
   const d = rule._def;
@@ -19090,6 +19109,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)) {
@@ -19099,7 +19119,7 @@ function normalizeCstCollapse(collapse) {
   return typeof collapse === "function" ? collapse : void 0;
 }
 function buildCstNode(type, children3, _fields, span, _rawChildren, _triviaLog, state, tags) {
-  return tags !== void 0 && tags.length > 0 ? { _tag: "node", type, tags, span: { ...span }, state: state ?? null, children: [...children3] } : { _tag: "node", type, span: { ...span }, state: state ?? null, children: [...children3] };
+  return tags !== void 0 && tags.length > 0 ? new PlainTaggedNode(type, tags, copySpan(span), state ?? null, [...children3]) : new PlainNode3(type, copySpan(span), state ?? null, [...children3]);
 }
 function cstBuildHost(typeOrOptions, children3, _fields, span, rawChildren, triviaLog, state, _tags) {
   if (typeof typeOrOptions === "string") {
@@ -21554,8 +21574,8 @@ function supercompileRuleMapReplacement(prog, replacement, select) {
   if (typeof body.start !== "number" || typeof body.end !== "number") return replacement;
   const start = body.start - prefix.length + 1;
   const end = body.end - prefix.length - 1;
-  if (replacement.slice(start, end) !== canonical2.source + "\n") return replacement;
-  const transformed = replacement.slice(0, start) + candidate.source + "\n" + replacement.slice(end);
+  if (replacement.slice(start, end) !== FACTORY_ARITY_GUARD + canonical2.source + "\n") return replacement;
+  const transformed = replacement.slice(0, start) + FACTORY_ARITY_GUARD + candidate.source + "\n" + replacement.slice(end);
   const checked = parseSync4("parseman-entry-supercompile-replacement-result.js", prefix + transformed);
   return checked.errors.length === 0 ? transformed : replacement;
 }