parseman 0.27.0 → 0.27.1

package/dist/plugin/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAuBA,OAAO,WAAW,MAAM,cAAc,CAAA;AAiBtC,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;;;AA4MD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;IAC3C,kFAAkF;IAClF,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,aAAa,cAA6B,EAC1C,kBAAkB,UAAQ,EAC1B,QAAQ,UAAQ,GACf,oBAAoB,GAAG,IAAI,CA8wB7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAuBA,OAAO,WAAW,MAAM,cAAc,CAAA;AAiBtC,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;;;AA4MD,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,CAAA;IAC3C,kFAAkF;IAClF,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,aAAa,cAA6B,EAC1C,kBAAkB,UAAQ,EAC1B,QAAQ,UAAQ,GACf,oBAAoB,GAAG,IAAI,CAqxB7B"}

package/dist/plugin/index.js

@@ -1,7 +1,7 @@
 // src/plugin/index.ts
 import * as fs from "node:fs";
 import { createUnplugin } from "unplugin";
-import { parseSync } from "oxc-parser";
+import { parseSync as parseSync2 } from "oxc-parser";
 import { ResolverFactory } from "oxc-resolver";
 import MagicString from "magic-string";
 
@@ -1474,6 +1474,12 @@ function scanTrivia(input, cur, ctx) {
   const tr = triviaP.parse(input, cur, { trackLines: ctx.trackLines, state: ctx.state });
   return { end: tr.ok ? tr.span.end : cur, commit: NOOP_COMMIT };
 }
+function consumeTrivia(input, cur, ctx) {
+  if (!needsDeferredTriviaCommit(ctx)) return advanceTrivia(input, cur, ctx);
+  const scan = scanTrivia(input, cur, ctx);
+  scan.commit();
+  return scan.end;
+}
 function fastTriviaScanner(trivia2) {
   const cached = fastTriviaCache.get(trivia2);
   if (cached !== void 0) return cached;
@@ -2266,6 +2272,49 @@ function parserHasTriviaSite(p, seen = /* @__PURE__ */ new Set()) {
       return true;
   }
 }
+function parserEnablesTriviaCapture(p, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(p)) return false;
+  seen.add(p);
+  const d = p._def;
+  switch (d.tag) {
+    case "grammar":
+      return d.captureTrivia === true || parserEnablesTriviaCapture(d.parser, seen);
+    case "node":
+      return false;
+    case "sequence":
+    case "choice":
+      return d.parsers.some((x) => parserEnablesTriviaCapture(x, seen));
+    case "sepBy":
+      return parserEnablesTriviaCapture(d.parser, seen) || parserEnablesTriviaCapture(d.separator, seen);
+    case "skip":
+      return parserEnablesTriviaCapture(d.main, seen) || parserEnablesTriviaCapture(d.skipped, seen);
+    case "scanTo":
+      return parserEnablesTriviaCapture(d.sentinel, seen) || d.skip.some((x) => parserEnablesTriviaCapture(x, seen));
+    case "recover":
+      return parserEnablesTriviaCapture(d.parser, seen) || parserEnablesTriviaCapture(d.sentinel, seen);
+    case "many":
+    case "oneOrMore":
+    case "optional":
+    case "transform":
+    case "trivia":
+    case "token":
+    case "label":
+    case "field":
+    case "expect":
+    case "withCtx":
+    case "not":
+      return parserEnablesTriviaCapture(d.parser, seen);
+    case "lazy": {
+      try {
+        return parserEnablesTriviaCapture(d.thunk(), seen);
+      } catch {
+        return false;
+      }
+    }
+    default:
+      return false;
+  }
+}
 function buildFieldMap(captures) {
   if (!captures?.length) return void 0;
   const out = {};
@@ -2303,11 +2352,13 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
   };
   const unwrap = opts?.unwrap === true;
   const collapse = opts?.collapse === true;
+  const captureTrivia = opts?.captureTrivia === true;
+  const trailingTrivia = opts?.trailingTrivia === true;
   if (unwrap && collapse) {
     throw new Error("node() options cannot set both unwrap and collapse");
   }
-  const def = unwrap || collapse ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {} } : baseDef;
-  const capturesTrivia = build ? buildReadsTrivia(def) : true;
+  const def = unwrap || collapse || captureTrivia || trailingTrivia ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {} } : baseDef;
+  const capturesTrivia = captureTrivia || trailingTrivia || (build ? buildReadsTrivia(def) : true);
   const clonesState = build ? buildReadsState(def) : true;
   const capturesFields = parserHasOwnFields(combinator) && (build ? buildReadsFields(def) : true);
   return {
@@ -2323,7 +2374,11 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
         ctx._triviaCaptureMask = ctx.build._parsemanTriviaKinds(def.type);
       }
       if (!capturesTrivia) ctx.captureTrivia = false;
-      const r = combinator.parse(input, pos, ctx);
+      let r = combinator.parse(input, pos, ctx);
+      if (r.ok && trailingTrivia && ctx.trivia) {
+        const end = consumeTrivia(input, r.span.end, ctx);
+        r = { ...r, span: { start: r.span.start, end } };
+      }
       const fields = capturesFields ? buildFieldMap(ctx._fields) : void 0;
       ctx._fields = savedFields;
       ctx._triviaCaptureMask = savedMask;
@@ -2331,8 +2386,9 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       if (!r.ok) return r;
       const st = clonesState && ctx.state !== void 0 ? Object.assign({}, ctx.state) : void 0;
       const nodeType = def.type ?? missingInferredType();
-      const built = unwrap && children.length === 1 ? unwrapChild(children[0]) : collapse && children.length === 1 ? children[0] : !build && ctx.build?._parsemanCstCollapse && children.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children[0], children, rawChildren) ? children[0] : build ? build(children, fields, r.span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children, fields, r.span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: { start: r.span.start, end: r.span.end }, state: st ?? null, children };
-      const rawEntry = isCstChild(built) ? built : { _tag: "leaf", value: typeof built === "string" ? built : "", span: r.span };
+      const cstOutput = ctx.build?._parsemanCstOutput === true;
+      const built = unwrap && children.length === 1 ? unwrapChild(children[0]) : collapse && children.length === 1 ? children[0] : !build && ctx.build?._parsemanCstCollapse && children.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children[0], children, rawChildren) ? children[0] : build ? cstOutput && ctx.build ? ctx.build(nodeType, children, fields, r.span, rawChildren, triviaLog, st) : build(children, fields, r.span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children, fields, r.span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: { start: r.span.start, end: r.span.end }, state: st ?? null, children };
+      const rawEntry = isCstChild(built) ? built : { _tag: "leaf", value: typeof built === "string" ? built : typeof built === "object" && built !== null ? input.slice(r.span.start, r.span.end) : "", span: r.span };
       if (saved.buf !== void 0 || saved.ch !== void 0) {
         pushCstChild(ctx, built, rawEntry);
       }
@@ -2449,6 +2505,7 @@ function parser(opts, root) {
       parser: root,
       triviaParser: clearTrivia ? void 0 : opts.trivia ?? void 0,
       clearTrivia,
+      ...opts.captureTrivia ? { captureTrivia: true } : {},
       trackLines: opts.trackLines ?? false
     },
     parse(input, pos, _ctx) {
@@ -3585,7 +3642,7 @@ function scanBranchLabeled(shape, kindIndex, mint) {
     `    if (${m.end} > _e) {`,
     `      if (_cap) {`,
     `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, ${m.end}, ${kindIndex})`,
-    `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << kindIndex}))) _ctx._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${kindIndex})`,
+    `        if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << kindIndex}))) _ctx._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${kindIndex})`,
     `      }`,
     `      _e = ${m.end}`,
     `      continue`,
@@ -3641,7 +3698,7 @@ function analyzeTriviaFastPath(trivia2) {
 var CAP_RECORD = [
   `  if (_cap && _e > _pos) {`,
   `    if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_pos, _e)`,
-  `    if (_ctx._cstTriviaLog !== undefined) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
+  `    if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
   `  }`
 ].join("\n");
 function composeFastLoop(shapes) {
@@ -3701,7 +3758,7 @@ function buildLabeledRegexTriviaFnDecl(fnName, spec, reNames) {
       `      const _ce = _e + _m${i}[0].length`,
       `      if (_cap) {`,
       `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, _ce, ${k})`,
-      `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -3739,7 +3796,7 @@ function buildLabeledRuntimeTriviaFnDecl(fnName, spec, rpStartIndex) {
       `      const _ce = _r${i}.span.end`,
       `      if (_cap) {`,
       `        if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_e, _ce, ${k})`,
-      `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -4090,7 +4147,7 @@ function ensureTriviaFn(ctx) {
     `  }`,
     `  if (_cap && _e > _pos) {`,
     `    if (_ctx._triviaLog !== undefined) _ctx._triviaLog.push(_pos, _e)`,
-    `    if (_ctx._cstTriviaLog !== undefined) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
+    `    if (_ctx._cstTriviaLog !== undefined && _ctx.captureTrivia) _ctx._cstTriviaLog.push(_pos, _e, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0)`,
     `  }`,
     `  return _e`,
     `}`
@@ -5225,17 +5282,18 @@ function emitNode(def, ctx, pos) {
     ctx.buildSrcs.push(def.buildSrc ?? null);
   }
   const i = ind(ctx);
-  const capturesTrivia = mkType !== null || !structural && buildReadsTrivia(def);
+  const capturesTrivia = mkType !== null || def.captureTrivia === true || def.trailingTrivia === true || !structural && buildReadsTrivia(def);
   const clonesState = !structural && buildReadsState(def);
   const hasFields = parserHasOwnFields(def.parser);
   const capturesFields = hasFields && !structural && buildReadsFields(def);
+  const innerEnablesTriviaCapture = parserEnablesTriviaCapture(def.parser);
   const chV = v(ctx, "_ch");
   const rawV = v(ctx, "_raw");
-  const capTLv = structural ? v(ctx, "_ctl") : null;
+  const capTLv = structural || capturesTrivia ? v(ctx, "_ctl") : null;
   const capSTv = structural ? v(ctx, "_cst") : null;
   const capFv = structural && hasFields ? v(ctx, "_cf") : null;
   const tlV = capturesTrivia || structural ? v(ctx, "_tl") : "_EMPTY_TL";
-  if (!capturesTrivia) ctx.needsEmptyTl = true;
+  if (!capturesTrivia || structural) ctx.needsEmptyTl = true;
   const sc = v(ctx, "_sc"), sl = v(ctx, "_sl"), sr = v(ctx, "_sr"), st = v(ctx, "_st"), stl = v(ctx, "_stl");
   const smk = structural ? v(ctx, "_smk") : null;
   if (structural) ctx.needsHostReads = true;
@@ -5244,16 +5302,17 @@ function emitNode(def, ctx, pos) {
   const profHoist = `${i}const ${pmV} = _ctx._pmProfile, ${recV} = ${pmV}?.phase === 'recognizer', ${capV} = ${pmV}?.phase === 'capture'`;
   const profileRecognizer = recV;
   const profileCapture = capV;
-  const allocStmt = structural ? `${i}const ${capTLv} = !(${profileRecognizer}) && (${profileCapture} || ${hostTriviaGate}), ${capSTv} = !(${profileRecognizer} || ${profileCapture}) && (_ctx._pmCapST ??= (_ctx.build === undefined || _hostReads(_ctx.build, 6)))${capFv ? `, ${capFv} = !(${profileRecognizer}) && (${profileCapture} || (_ctx.build !== undefined && _hostReads(_ctx.build, 2)))` : ""}
-${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRecognizer} ? undefined : [], ${tlV} = ${capTLv} ? [] : _EMPTY_TL` : capturesTrivia ? `${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRecognizer} ? undefined : [], ${tlV} = ${profileRecognizer} ? undefined : []` : `${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRecognizer} ? undefined : []`;
-  const innerTl = structural ? `${capTLv} ? ${tlV} : undefined` : capturesTrivia ? tlV : "undefined";
+  const structuralCapturesTrivia = structural && (def.captureTrivia === true || def.trailingTrivia === true);
+  const allocStmt = structural ? `${i}const ${capTLv} = !(${profileRecognizer}) && (${profileCapture} || ${structuralCapturesTrivia ? "true" : hostTriviaGate}), ${capSTv} = !(${profileRecognizer} || ${profileCapture}) && (_ctx._pmCapST ??= (_ctx.build === undefined || _hostReads(_ctx.build, 6)))${capFv ? `, ${capFv} = !(${profileRecognizer}) && (${profileCapture} || (_ctx.build !== undefined && _hostReads(_ctx.build, 2)))` : ""}
+${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRecognizer} ? undefined : [], ${tlV} = ${profileRecognizer} ? undefined : ${innerEnablesTriviaCapture ? "[]" : `${capTLv} ? [] : _EMPTY_TL`}` : capturesTrivia ? `${i}const ${capTLv} = !(${profileRecognizer}), ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRecognizer} ? undefined : [], ${tlV} = ${profileRecognizer} ? undefined : []` : `${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRecognizer} ? undefined : []`;
+  const innerTl = structural || capturesTrivia ? structural && !innerEnablesTriviaCapture ? `${capTLv} ? ${tlV} : undefined` : tlV : "undefined";
   const fieldsOn = structural ? capFv ?? "false" : `${profileRecognizer} ? false : ${capturesFields ? "true" : "false"}`;
   const sf = hasFields ? v(ctx, "_sf") : null;
   const fArr = hasFields ? v(ctx, "_fa") : null;
   const fObj = hasFields ? v(ctx, "_fields") : "undefined";
-  const needsTriviaFrame = parserHasTriviaSite(def.parser);
+  const needsTriviaFrame = def.trailingTrivia === true || parserHasTriviaSite(def.parser);
   const saveTrivia = needsTriviaFrame ? `, ${st} = _ctx.captureTrivia, ${stl} = _ctx._cstTriviaLog${smk ? `, ${smk} = _ctx._triviaCaptureMask` : ""}` : "";
-  const installTrivia = needsTriviaFrame ? `; _ctx.captureTrivia = true; _ctx._cstTriviaLog = ${innerTl}${smk ? `; _ctx._triviaCaptureMask = ${capTLv} && _ctx.build._parsemanTriviaKinds !== undefined ? _ctx.build._parsemanTriviaKinds(${JSON.stringify(def.type)}) : ${smk}` : ""}` : "";
+  const installTrivia = needsTriviaFrame ? `; _ctx.captureTrivia = ${capTLv ?? "false"}; _ctx._cstTriviaLog = ${innerTl}${smk ? `; _ctx._triviaCaptureMask = ${capTLv} && _ctx.build !== undefined && _ctx.build._parsemanTriviaKinds !== undefined ? _ctx.build._parsemanTriviaKinds(${JSON.stringify(def.type)}) : ${smk}` : ""}` : "";
   const restoreTrivia = needsTriviaFrame ? `; _ctx.captureTrivia = ${st}; _ctx._cstTriviaLog = ${stl}${smk ? `; _ctx._triviaCaptureMask = ${smk}` : ""}` : "";
   const stmts = [
     profHoist,
@@ -5261,8 +5320,13 @@ ${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRec
     `${i}const ${sc} = _ctx._cstChildren, ${sl} = _ctx._cstLeaves, ${sr} = _ctx._cstRawChildren${saveTrivia}${sf ? `, ${sf} = _ctx._fields` : ""}`,
     `${i}_ctx._cstChildren = ${chV}; _ctx._cstLeaves = ${chV}; _ctx._cstRawChildren = ${rawV}${installTrivia}${sf ? `; _ctx._fields = ${fieldsOn} ? [] : undefined` : ""}`
   ];
-  const { stmts: innerStmts, okVar, endVar } = emitFallible(def.parser, ctx, pos);
+  const { stmts: innerStmts, okVar, endVar: innerEndVar } = emitFallible(def.parser, ctx, pos);
+  const endVar = def.trailingTrivia === true && ctx.activeTrivia ? v(ctx, "_trailend") : innerEndVar;
   stmts.push(...innerStmts);
+  if (def.trailingTrivia === true && ctx.activeTrivia) {
+    const triviaFn = ensureTriviaFn(ctx);
+    stmts.push(`${i}const ${endVar} = ${okVar} ? ${triviaFn}(input, ${innerEndVar}, _ctx, 1) : ${innerEndVar}`);
+  }
   if (sf && fArr) {
     stmts.push(`${i}const ${fArr} = _ctx._fields`);
   }
@@ -5302,8 +5366,9 @@ ${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRec
   }
   const ndV = v(ctx, "_nd");
   const buildExpr = structural ? `{ _tag: 'node', type: ${JSON.stringify(def.type)}, span: { start: ${pos}, end: ${endVar} }, state: ${stV} ?? null, children: ${chV} }` : mkType ? emitInlineMkNodeExpr(mkType, chV, rawV, pos, endVar, tlV) : `${buildRef(ctx)}[${buildIdx}](${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
-  const ndExpr = ctx.ns || structural ? `_ctx.build !== undefined ? (_ctx._pmProfile?.phase === 'host' && _ctx._pmProfile.hostCalls++, _ctx.build(${JSON.stringify(def.type)}, ${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})) : (${buildExpr})` : buildExpr;
-  const hostCollapseExpr = ctx.ns || structural ? `_ctx.build !== undefined && _ctx.build._parsemanCstCollapse !== undefined && ${chV}.length === 1 && ${rawV}.length === 1 && _ctx.build._parsemanCstCollapse(${JSON.stringify(def.type)}, ${chV}[0], ${chV}, ${rawV}) ? ${chV}[0] : (${ndExpr})` : ndExpr;
+  const hostBuildExpr = `_ctx._pmProfile?.phase === 'host' && _ctx._pmProfile.hostCalls++, _ctx.build(${JSON.stringify(def.type)}, ${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
+  const ndExpr = structural ? `_ctx.build !== undefined ? (${hostBuildExpr}) : (${buildExpr})` : `_ctx.build?._parsemanCstOutput === true ? (${hostBuildExpr}) : (${buildExpr})`;
+  const hostCollapseExpr = structural ? `_ctx.build !== undefined && _ctx.build._parsemanCstCollapse !== undefined && ${chV}.length === 1 && ${rawV}.length === 1 && _ctx.build._parsemanCstCollapse(${JSON.stringify(def.type)}, ${chV}[0], ${chV}, ${rawV}) ? ${chV}[0] : (${ndExpr})` : ndExpr;
   const unwrapExpr = `${chV}.length === 1 ? (${chV}[0] !== null && typeof ${chV}[0] === 'object' && ${chV}[0]._tag === 'leaf' ? ${chV}[0].value : ${chV}[0]) : (${ndExpr})`;
   const collapseExpr = `${chV}.length === 1 ? ${chV}[0] : (${ndExpr})`;
   const finalExpr = def.unwrap ? unwrapExpr : def.collapse ? collapseExpr : hostCollapseExpr;
@@ -5311,7 +5376,7 @@ ${i}const ${chV} = ${profileRecognizer} ? undefined : [], ${rawV} = ${profileRec
     `${i}const ${ndV} = (${profileRecognizer} || ${profileCapture}) ? undefined : (${finalExpr})`,
     `${i}if (!(${profileRecognizer})) {`,
     `${i}  if (${sc}) ${sc}.push(${ndV})`,
-    `${i}  if (${sr}) ${sr}.push((typeof ${ndV} === 'object' && ${ndV} !== null && (${ndV}._tag === 'node' || ${ndV}._tag === 'leaf' || ${ndV}._tag === 'parseError')) ? ${ndV} : { _tag: 'leaf', value: typeof ${ndV} === 'string' ? ${ndV} : '', span: { start: ${pos}, end: ${endVar} } })`,
+    `${i}  if (${sr}) ${sr}.push((typeof ${ndV} === 'object' && ${ndV} !== null && (${ndV}._tag === 'node' || ${ndV}._tag === 'leaf' || ${ndV}._tag === 'parseError')) ? ${ndV} : { _tag: 'leaf', value: typeof ${ndV} === 'string' ? ${ndV} : (typeof ${ndV} === 'object' && ${ndV} !== null ? input.slice(${pos}, ${endVar}) : ''), span: { start: ${pos}, end: ${endVar} } })`,
     `${i}}`
   );
   return { stmts, valueVar: ndV, endVar };
@@ -5554,10 +5619,19 @@ function emitDispatch(p, ctx, pos) {
           ctx.triviaKindLabels = def.triviaParser._meta.triviaKindLabels;
         }
       }
+      const savedCapture = def.captureTrivia ? v(ctx, "_gcap") : null;
       const r = emit(def.parser, ctx, pos);
       ctx.activeTrivia = savedTrivia;
       ctx.triviaKindLabels = savedKindLabels;
-      return r;
+      if (!savedCapture) return r;
+      return {
+        ...r,
+        stmts: [
+          `${ind(ctx)}const ${savedCapture} = _ctx.captureTrivia; _ctx.captureTrivia = true`,
+          ...r.stmts,
+          `${ind(ctx)}_ctx.captureTrivia = ${savedCapture}`
+        ]
+      };
     }
     case "not":
       return emitNot(def, ctx, pos);
@@ -6405,9 +6479,15 @@ function evalRuleMapIR(ir) {
     t._def.fnSrc = src;
     return t;
   };
-  const _nd = (type, child, src, opts) => {
-    const n = node(type, child, void 0, opts);
+  const _nd = (type, child, src, opts, staticError) => {
+    if (staticError !== void 0 && staticError.length > 0) {
+      throw new Error(`IR direct node builder for ${type} must be macro-static and self-contained; unsupported binding(s): ${staticError.join(", ")}`);
+    }
+    const n = node(type, child, (() => {
+      throw new Error("IR node build requires static re-lowering");
+    }), opts);
     n._def.buildSrc = src;
+    if (staticError !== void 0) n._def.buildStaticError = staticError;
     return n;
   };
   const _gch = (items) => {
@@ -6657,17 +6737,26 @@ ${body}
       }
       case "node": {
         if (def.build !== void 0 && def.buildSrc === void 0) throw new Unserializable("node build without buildSrc");
-        const opts = def.unwrap || def.collapse ? `, { ${def.unwrap ? "unwrap: true" : "collapse: true"} }` : "";
+        const optEntries = [
+          ...def.unwrap ? ["unwrap: true"] : [],
+          ...def.collapse ? ["collapse: true"] : [],
+          ...def.captureTrivia ? ["captureTrivia: true"] : [],
+          ...def.trailingTrivia ? ["trailingTrivia: true"] : []
+        ];
+        const opts = optEntries.length > 0 ? `, { ${optEntries.join(", ")} }` : "";
         if (def.type === void 0) {
           if (def.buildSrc !== void 0) throw new Unserializable("inferred node build without inferred type");
           return opts ? `node(${kid(def.parser)}, undefined${opts})` : `node(${kid(def.parser)})`;
         }
-        if (def.buildSrc !== void 0) return `_nd(${JSON.stringify(def.type)}, ${kid(def.parser)}, ${JSON.stringify(def.buildSrc)}${opts})`;
+        if (def.buildSrc !== void 0) {
+          const staticError = def.buildStaticError === void 0 ? "" : `${opts ? "" : ", undefined"}, ${JSON.stringify(def.buildStaticError)}`;
+          return `_nd(${JSON.stringify(def.type)}, ${kid(def.parser)}, ${JSON.stringify(def.buildSrc)}${opts}${staticError})`;
+        }
         return opts ? `node(${JSON.stringify(def.type)}, ${kid(def.parser)}, undefined${opts})` : `node(${JSON.stringify(def.type)}, ${kid(def.parser)})`;
       }
       case "grammar": {
         const trivia2 = def.clearTrivia ? "null" : def.triviaParser ? kid(def.triviaParser) : "undefined";
-        return `parser({ trivia: ${trivia2}${def.trackLines ? ", trackLines: true" : ""} }, ${kid(def.parser)})`;
+        return `parser({ trivia: ${trivia2}${def.captureTrivia ? ", captureTrivia: true" : ""}${def.trackLines ? ", trackLines: true" : ""} }, ${kid(def.parser)})`;
       }
       case "withCtx": {
         if (def.extraSrc === void 0) throw new Unserializable("withCtx without extraSrc");
@@ -6682,6 +6771,28 @@ ${body}
 };
 
 // src/compiler/linker.ts
+function normalizeCstCollapse(collapse) {
+  if (collapse === true) return () => true;
+  if (Array.isArray(collapse)) {
+    const types = new Set(collapse);
+    return (type) => types.has(type);
+  }
+  return typeof collapse === "function" ? collapse : void 0;
+}
+function buildCstNode(type, children, _fields, span, _rawChildren, _triviaLog, state) {
+  return { _tag: "node", type, span: { start: span.start, end: span.end }, state: state ?? null, children: [...children] };
+}
+function cstBuildHost(typeOrOptions, children, _fields, span, rawChildren, triviaLog, state) {
+  if (typeof typeOrOptions === "string") {
+    return buildCstNode(typeOrOptions, children ?? [], _fields, span ?? { start: 0, end: 0 }, rawChildren, triviaLog, state);
+  }
+  const collapse = normalizeCstCollapse(typeOrOptions?.collapse);
+  const host = (type, children2, fields, span2, rawChildren2, triviaLog2, state2) => buildCstNode(type, children2, fields, span2, rawChildren2, triviaLog2, state2);
+  host._parsemanCstOutput = true;
+  if (collapse) host._parsemanCstCollapse = collapse;
+  return host;
+}
+cstBuildHost._parsemanCstOutput = true;
 function pickPieces(pieces, names) {
   const winner = /* @__PURE__ */ new Map();
   for (const pc of pieces) for (const k of pc.keys) winner.set(k, pc);
@@ -6791,6 +6902,152 @@ var { isFinite } = Number;
 // src/index.ts
 registerRegexAnalyzer(firstSetFromRegex);
 
+// src/plugin/direct-builder-static.ts
+import { parseSync } from "oxc-parser";
+var STATIC_BUILDER_GLOBALS = /* @__PURE__ */ new Set([
+  "Array",
+  "Boolean",
+  "Date",
+  "JSON",
+  "Math",
+  "NaN",
+  "Number",
+  "Object",
+  "String",
+  "Infinity",
+  "parseFloat",
+  "parseInt",
+  "undefined"
+]);
+function astArray(value) {
+  return Array.isArray(value) ? value : [];
+}
+function astChild(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function unwrapCallbackExpression(node2) {
+  let current = node2;
+  while (current?.type === "ParenthesizedExpression") current = astChild(current.expression) ?? void 0;
+  return current;
+}
+function directBuilderUnsupportedBindings(src) {
+  let init;
+  try {
+    const parsed = parseSync("parseman-direct-builder.ts", `const _direct = (${src})`);
+    if (parsed.errors.length > 0) return ["invalid callback source"];
+    const program = parsed.program;
+    const statement = program.body?.[0];
+    const declaration = statement?.declarations?.[0];
+    init = unwrapCallbackExpression(declaration?.init);
+  } catch {
+    return ["invalid callback source"];
+  }
+  if (init?.type !== "ArrowFunctionExpression" || !Array.isArray(init.params)) return ["unsupported callback shape"];
+  const allowed = new Set(STATIC_BUILDER_GLOBALS);
+  for (const param of init.params) {
+    if (param.type !== "Identifier" || typeof param.name !== "string") return ["unsupported parameter pattern"];
+    allowed.add(param.name);
+  }
+  const unsupported = /* @__PURE__ */ new Set();
+  const reportUnsupportedNode = (ast) => {
+    unsupported.add(`unsupported ${ast.type}`);
+  };
+  const read = (ast, allowedNames) => {
+    if (typeof ast.name === "string" && allowedNames.has(ast.name)) return;
+    unsupported.add(typeof ast.name === "string" ? ast.name : "identifier");
+  };
+  const expression = (node2, allowedNames) => {
+    const ast = astChild(node2);
+    if (!ast) return;
+    switch (ast.type) {
+      case "Literal":
+        return;
+      case "Identifier":
+        read(ast, allowedNames);
+        return;
+      case "ParenthesizedExpression":
+      case "ChainExpression":
+      case "TSAsExpression":
+      case "TSTypeAssertion":
+      case "TSNonNullExpression":
+        expression(ast.expression, allowedNames);
+        return;
+      case "ArrayExpression":
+        for (const element of astArray(ast.elements)) expression(element, allowedNames);
+        return;
+      case "ObjectExpression":
+        for (const property of astArray(ast.properties)) {
+          if (property.type === "SpreadElement") {
+            expression(property.argument, allowedNames);
+            continue;
+          }
+          if (property.type !== "Property" || property.method === true || property.kind !== "init") {
+            reportUnsupportedNode(property);
+            continue;
+          }
+          if (property.computed === true) expression(property.key, allowedNames);
+          expression(property.value, allowedNames);
+        }
+        return;
+      case "MemberExpression":
+        expression(ast.object, allowedNames);
+        if (ast.computed === true) expression(ast.property, allowedNames);
+        return;
+      case "CallExpression":
+      case "NewExpression":
+        expression(ast.callee, allowedNames);
+        for (const argument of astArray(ast.arguments)) expression(argument, allowedNames);
+        return;
+      case "UnaryExpression":
+      case "UpdateExpression":
+        expression(ast.argument, allowedNames);
+        return;
+      case "BinaryExpression":
+      case "LogicalExpression":
+      case "AssignmentExpression":
+        expression(ast.left, allowedNames);
+        expression(ast.right, allowedNames);
+        return;
+      case "ConditionalExpression":
+        expression(ast.test, allowedNames);
+        expression(ast.consequent, allowedNames);
+        expression(ast.alternate, allowedNames);
+        return;
+      case "SequenceExpression":
+        for (const value of astArray(ast.expressions)) expression(value, allowedNames);
+        return;
+      case "TemplateLiteral":
+        for (const value of astArray(ast.expressions)) expression(value, allowedNames);
+        return;
+      case "SpreadElement":
+        expression(ast.argument, allowedNames);
+        return;
+      case "ArrowFunctionExpression": {
+        const nested = new Set(allowedNames);
+        for (const param of astArray(ast.params)) {
+          if (param.type !== "Identifier" || typeof param.name !== "string") {
+            reportUnsupportedNode(param);
+            continue;
+          }
+          nested.add(param.name);
+        }
+        if (astChild(ast.body)?.type === "BlockStatement") {
+          reportUnsupportedNode(astChild(ast.body));
+          return;
+        }
+        expression(ast.body, nested);
+        return;
+      }
+      default:
+        reportUnsupportedNode(ast);
+        return;
+    }
+  };
+  if (astChild(init.body)?.type === "BlockStatement") unsupported.add("unsupported BlockStatement");
+  else expression(init.body, allowed);
+  return [...unsupported];
+}
+
 // src/plugin/evaluator.ts
 function stripTsFromSource(node2, code) {
   const cuts = [];
@@ -6847,6 +7104,7 @@ var SUPPORTED = {
   many: (...a) => many(a[0]),
   oneOrMore: (...a) => oneOrMore(a[0]),
   optional: (...a) => optional(a[0]),
+  skip: (...a) => skip(a[0], a[1]),
   sepBy: (...a) => sepBy(a[0], a[1]),
   trivia: (...a) => trivia(a[0]),
   label: (...a) => label(a[0], a[1]),
@@ -6908,12 +7166,12 @@ function staticNodeOptions(expr) {
     if (p.computed) continue;
     const key = p.key;
     const name = key.type === "Identifier" ? key.name : key.type === "Literal" ? String(key.value) : void 0;
-    if (name === "unwrap" || name === "collapse") {
+    if (name === "unwrap" || name === "collapse" || name === "captureTrivia" || name === "trailingTrivia") {
       const val = p.value;
       if ((val.type === "Literal" || val.type === "BooleanLiteral") && val.value === true) opts[name] = true;
     }
   }
-  return opts.unwrap || opts.collapse ? opts : void 0;
+  return opts.unwrap || opts.collapse || opts.captureTrivia || opts.trailingTrivia ? opts : void 0;
 }
 function exprToCombi(node2, scope, code, mfs) {
   if (node2.type === "Identifier") return scopeGet(scope, node2.name, mfs);
@@ -6975,11 +7233,15 @@ function exprToCombi(node2, scope, code, mfs) {
     if (!isCombinator(inner)) return null;
     const be = buildArg;
     const hasBuild = be !== void 0 && be.type !== "SpreadElement" && !(be.type === "Identifier" && be.name === "undefined");
-    const buildSrc = hasBuild ? code.slice(be.start, be.end) : void 0;
+    const buildSrc = hasBuild ? stripTsFromSource(be, code) : void 0;
     const opts = optsArg !== void 0 && optsArg.type !== "SpreadElement" ? staticNodeOptions(optsArg) : void 0;
     try {
       const combi = explicitType !== void 0 ? node(explicitType, inner, hasBuild ? () => null : void 0, opts) : node(inner, hasBuild ? () => null : void 0, opts);
-      if (combi._def.tag === "node" && buildSrc !== void 0) combi._def.buildSrc = buildSrc;
+      if (combi._def.tag === "node" && buildSrc !== void 0) {
+        combi._def.buildSrc = buildSrc;
+        const staticError = directBuilderUnsupportedBindings(buildSrc);
+        if (staticError.length > 0) combi._def.buildStaticError = staticError;
+      }
       return combi;
     } catch {
       return null;
@@ -7072,7 +7334,7 @@ function exprToCombi(node2, scope, code, mfs) {
     if (code === void 0 || mfs === void 0) return null;
     const [predArg] = node2.arguments;
     if (!predArg || predArg.type === "SpreadElement") return null;
-    const predSrc = code.slice(predArg.start, predArg.end);
+    const predSrc = stripTsFromSource(predArg, code);
     mfs.push(predSrc);
     try {
       const combi = guard(() => true);
@@ -7087,7 +7349,7 @@ function exprToCombi(node2, scope, code, mfs) {
     if (code === void 0 || mfs === void 0) return null;
     const [extraArg, innerArg] = node2.arguments;
     if (!extraArg || !innerArg || extraArg.type === "SpreadElement" || innerArg.type === "SpreadElement") return null;
-    const extraSrc = code.slice(extraArg.start, extraArg.end);
+    const extraSrc = stripTsFromSource(extraArg, code);
     mfs.push(extraSrc);
     const inner = anyValue(innerArg, scope, code, mfs);
     if (!isCombinator(inner)) return null;
@@ -7423,7 +7685,7 @@ function parseModuleCached(filePath) {
   let parsed = null;
   try {
     const src = fs.readFileSync(filePath, "utf8");
-    const r = parseSync(filePath, src);
+    const r = parseSync2(filePath, src);
     if (r.errors.length === 0) parsed = { body: r.program.body, src };
   } catch {
   }
@@ -7550,7 +7812,7 @@ function extractImportBindings(body) {
 function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSEMAN_MODULE]), warnUnloweredRegex = false, recovery = false) {
   let result;
   try {
-    result = parseSync(id, code);
+    result = parseSync2(id, code);
   } catch {
     return null;
   }
@@ -7588,6 +7850,7 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
   const warnings = [];
   beginLoweringCapture();
   let anyUnresolved = false;
+  let runtimeComposeFallback = false;
   let ruleMapHolderCounter = 0;
   const lineOf = (pos) => {
     let line = 1;
@@ -7920,7 +8183,10 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
         }
         if (isComposeCall(init)) {
           const fused = compileComposeCall(init);
-          if (!fused) continue;
+          if (!fused) {
+            runtimeComposeFallback = true;
+            continue;
+          }
           localComposedCarried.set(varName, fused.carried);
           if (fused.trivia) localComposedTrivia.set(varName, fused.trivia);
           const replacement = exportPrefix ? withCarriedPieces(fused.replacement, fused.carried) : fused.replacement;
@@ -8020,7 +8286,7 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
       ms.overwrite(imp.start, imp.end, stripped);
     }
   }
-  for (const { start, end, replacement } of [...replacements].sort((a, b) => b.start - a.start)) {
+  for (const { start, end, replacement } of (runtimeComposeFallback ? [] : replacements).sort((a, b) => b.start - a.start)) {
     ms.overwrite(start, end, replacement);
   }
   const unlowered = endLoweringCapture();