parseman 0.20.0 → 0.22.0

package/dist/plugin/index.cjs

@@ -1254,13 +1254,25 @@ function tryFastLabeledScan(input, cur, trivia2) {
 }
 function recordTriviaChunks(ctx, chunks) {
   const kinds = ctx.triviaKindLabels;
+  const mask = ctx._triviaCaptureMask;
   for (const ch of chunks) {
     pushTriviaLogEntry(ctx, ch.start, ch.end, kinds ? ch.kindIndex : void 0);
     if (ctx.captureTrivia && (ctx._cstBuf !== void 0 || ctx._cstTriviaLog !== void 0)) {
-      pushCstTriviaEntry(ctx, ch.start, ch.end, kinds ? ch.kindIndex : void 0);
+      if (mask === void 0 || kinds === void 0 || (mask & 1 << ch.kindIndex) !== 0) {
+        pushCstTriviaEntry(ctx, ch.start, ch.end, kinds ? ch.kindIndex : void 0);
+      }
     }
   }
 }
+function triviaKindMask(labels, keep) {
+  if (!labels) return void 0;
+  let mask = 0;
+  for (const name of keep) {
+    const idx = labels.indexOf(name);
+    if (idx >= 0) mask |= 1 << idx;
+  }
+  return mask;
+}
 
 // src/combinators/trivia-skip.ts
 var NOOP_COMMIT = () => {
@@ -1717,7 +1729,9 @@ function tagRule(r, key) {
   r._ruleName = key;
   if (r._def.tag === "node" && r._def.type === void 0) r._def.type = key;
 }
-function rules(factory) {
+function rules(a, b) {
+  const factory = typeof a === "function" ? a : b;
+  const options = typeof a === "function" ? b : a;
   const cache = {};
   const proxy = new Proxy(cache, {
     get(target, key) {
@@ -1745,6 +1759,12 @@ function rules(factory) {
       cache[key] = parser2;
     }
   }
+  if (options?.trivia !== void 0) {
+    for (const key of Object.keys(definitions)) {
+      const rule = cache[key];
+      if (rule && !rule._meta.isTrivia) rule._meta.grammarTrivia = options.trivia;
+    }
+  }
   for (const key of Object.keys(definitions)) {
     markUnusedValues(cache[key]);
   }
@@ -1912,10 +1932,15 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const saved = beginCstNodeCapture(ctx);
       const savedFields = ctx._fields;
       ctx._fields = capturesFields ? [] : void 0;
+      const savedMask = ctx._triviaCaptureMask;
+      if (build === void 0 && ctx.build?._parsemanTriviaKinds !== void 0 && def.type !== void 0) {
+        ctx._triviaCaptureMask = ctx.build._parsemanTriviaKinds(def.type);
+      }
       if (!capturesTrivia) ctx.captureTrivia = false;
       const r = combinator.parse(input, pos, ctx);
       const fields = capturesFields ? buildFieldMap(ctx._fields) : void 0;
       ctx._fields = savedFields;
+      ctx._triviaCaptureMask = savedMask;
       const { children, rawChildren, triviaLog } = endCstNodeCapture(ctx, saved);
       if (!r.ok) return r;
       const st = clonesState && ctx.state !== void 0 ? Object.assign({}, ctx.state) : void 0;
@@ -2053,7 +2078,13 @@ function parser(opts, root) {
           trivia: opts.trivia,
           ...opts.trivia._meta.triviaKindLabels ? { triviaKindLabels: opts.trivia._meta.triviaKindLabels } : {}
         } : {},
-        ...opts.captureTrivia || _ctx?.captureTrivia ? { captureTrivia: true } : {}
+        ...opts.captureTrivia || _ctx?.captureTrivia ? { captureTrivia: true } : {},
+        // Kind-filter for per-node capture. Resolve against this scope's trivia
+        // labels — this parser's own trivia if it declares one, else the INHERITED
+        // labels (`_ctx.triviaKindLabels`), so captureTriviaKinds still applies when
+        // trivia is inherited rather than re-declared here. No labels → undefined
+        // (capture all).
+        ...opts.captureTriviaKinds && !clearTrivia ? { _triviaCaptureMask: triviaKindMask(opts.trivia?._meta.triviaKindLabels ?? _ctx?.triviaKindLabels, opts.captureTriviaKinds) } : {}
       };
       const result = root.parse(input, pos ?? 0, ctx);
       if (trackLines) {
@@ -3203,7 +3234,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._cstTriviaLog.push(_e, ${m.end}, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${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})`,
     `      }`,
     `      _e = ${m.end}`,
     `      continue`,
@@ -3319,7 +3350,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._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -3357,7 +3388,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._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
+      `        if (_ctx._cstTriviaLog !== undefined && (_ctx._triviaCaptureMask === undefined || (_ctx._triviaCaptureMask & ${1 << k}))) _ctx._cstTriviaLog.push(_e, _ce, _ctx._cstRawChildren ? _ctx._cstRawChildren.length : 0, ${k})`,
       `      }`,
       `      _e = _ce`,
       `      _matched = true`,
@@ -4755,6 +4786,7 @@ function emitNode(def, ctx, pos) {
   const tlV = capturesTrivia || structural ? v(ctx, "_tl") : "_EMPTY_TL";
   if (!capturesTrivia) 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;
   const hostTriviaGate = `_ctx.build !== undefined && (_ctx.build._parsemanCaptureTrivia !== undefined ? _ctx.build._parsemanCaptureTrivia(${JSON.stringify(def.type)}) : (_ctx._pmCapTL ??= _hostReads(_ctx.build, 5)))`;
   const allocStmt = structural ? `${i}const ${capTLv} = ${hostTriviaGate}, ${capSTv} = _ctx._pmCapST ??= (_ctx.build === undefined || _hostReads(_ctx.build, 6))${capFv ? `, ${capFv} = _ctx.build !== undefined && _hostReads(_ctx.build, 2)` : ""}
@@ -4766,15 +4798,15 @@ ${i}const ${chV} = [], ${rawV} = [], ${tlV} = ${capTLv} ? [] : _EMPTY_TL` : capt
   const fObj = hasFields ? v(ctx, "_fields") : "undefined";
   const stmts = [
     allocStmt,
-    `${i}const ${sc} = _ctx._cstChildren, ${sl} = _ctx._cstLeaves, ${sr} = _ctx._cstRawChildren, ${st} = _ctx.captureTrivia, ${stl} = _ctx._cstTriviaLog${sf ? `, ${sf} = _ctx._fields` : ""}`,
-    `${i}_ctx._cstChildren = ${chV}; _ctx._cstLeaves = ${chV}; _ctx._cstRawChildren = ${rawV}; _ctx.captureTrivia = true; _ctx._cstTriviaLog = ${innerTl}${sf ? `; _ctx._fields = ${fieldsOn} ? [] : undefined` : ""}`
+    `${i}const ${sc} = _ctx._cstChildren, ${sl} = _ctx._cstLeaves, ${sr} = _ctx._cstRawChildren, ${st} = _ctx.captureTrivia, ${stl} = _ctx._cstTriviaLog${smk ? `, ${smk} = _ctx._triviaCaptureMask` : ""}${sf ? `, ${sf} = _ctx._fields` : ""}`,
+    `${i}_ctx._cstChildren = ${chV}; _ctx._cstLeaves = ${chV}; _ctx._cstRawChildren = ${rawV}; _ctx.captureTrivia = true; _ctx._cstTriviaLog = ${innerTl}${smk ? `; _ctx._triviaCaptureMask = ${capTLv} && _ctx.build._parsemanTriviaKinds !== undefined ? _ctx.build._parsemanTriviaKinds(${JSON.stringify(def.type)}) : ${smk}` : ""}${sf ? `; _ctx._fields = ${fieldsOn} ? [] : undefined` : ""}`
   ];
   const { stmts: innerStmts, okVar, endVar } = emitFallible(def.parser, ctx, pos);
   stmts.push(...innerStmts);
   if (sf && fArr) {
     stmts.push(`${i}const ${fArr} = _ctx._fields`);
   }
-  stmts.push(`${i}_ctx._cstChildren = ${sc}; _ctx._cstLeaves = ${sl}; _ctx._cstRawChildren = ${sr}; _ctx.captureTrivia = ${st}; _ctx._cstTriviaLog = ${stl}${sf ? `; _ctx._fields = ${sf}` : ""}`);
+  stmts.push(`${i}_ctx._cstChildren = ${sc}; _ctx._cstLeaves = ${sl}; _ctx._cstRawChildren = ${sr}; _ctx.captureTrivia = ${st}; _ctx._cstTriviaLog = ${stl}${smk ? `; _ctx._triviaCaptureMask = ${smk}` : ""}${sf ? `; _ctx._fields = ${sf}` : ""}`);
   stmts.push(...emitIfFail(ctx, `!${okVar}`, propagateFailBody(ctx)));
   let stV = "undefined";
   if (structural) {
@@ -5327,6 +5359,7 @@ function ruleDependencies(ruleMap) {
 }
 function compile(combinator, mapFnSources) {
   markUnusedValues(combinator);
+  const grammarTrivia = combinator._meta.grammarTrivia;
   const ctx = {
     vars: 0,
     indent: 1,
@@ -5345,7 +5378,8 @@ function compile(combinator, mapFnSources) {
     triviaFnNames: /* @__PURE__ */ new Map(),
     namedFnDecls: [],
     capturing: hasNodeDef(combinator),
-    lazyUsage: analyzeLazyUsage(combinator)
+    lazyUsage: analyzeLazyUsage(combinator),
+    ...grammarTrivia ? { activeTrivia: grammarTrivia, triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {}
   };
   const r = emit(combinator, ctx, "_pos");
   const namedPrelude = ctx.namedFnDecls.length > 0 ? [...namedFnPrelude(), ""] : [];
@@ -5421,8 +5455,9 @@ function publicRuleWrapperSource(rule, fnSource) {
   if (labels === void 0) return fnSource;
   return `Object.assign(${fnSource}, { _meta: { triviaKindLabels: ${JSON.stringify(labels)} } })`;
 }
-function compileRuleMap(ruleMap) {
+function compileRuleMap(ruleMap, opts) {
   for (const [, rule] of ruleMap) markUnusedValues(rule);
+  const grammarTrivia = opts?.trivia;
   const ctx = {
     vars: 0,
     indent: 1,
@@ -5441,7 +5476,8 @@ function compileRuleMap(ruleMap) {
     triviaFnNames: /* @__PURE__ */ new Map(),
     namedFnDecls: [],
     capturing: ruleMap.some(([, rule]) => hasNodeDef(rule)),
-    lazyUsage: analyzeLazyUsageMulti(ruleMap.map(([, rule]) => rule))
+    lazyUsage: analyzeLazyUsageMulti(ruleMap.map(([, rule]) => rule)),
+    ...grammarTrivia ? { activeTrivia: grammarTrivia, triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {}
   };
   const seenNames = /* @__PURE__ */ new Map();
   const ruleNames = /* @__PURE__ */ new Map();
@@ -5453,7 +5489,13 @@ function compileRuleMap(ruleMap) {
     ruleNames.set(rule, n === 0 ? base : `${base}$${n}`);
   }
   ctx.ruleNames = ruleNames;
-  const perEntry = ruleMap.map(([key, rule]) => ({ key, rule, r: emit(rule, ctx, "_pos") }));
+  const perEntry = ruleMap.map(([key, rule]) => {
+    const savedTrivia = ctx.activeTrivia;
+    if (rule._meta.isTrivia) ctx.activeTrivia = void 0;
+    const r = emit(rule, ctx, "_pos");
+    ctx.activeTrivia = savedTrivia;
+    return { key, rule, r };
+  });
   const derivedSrcs = ctx.mapFnSrcs.length === ctx.mapFns.length && ctx.mapFnSrcs.every((s) => s !== null) ? ctx.mapFnSrcs : void 0;
   const buildCovered = ctx.buildFns.length === 0 || ctx.buildSrcs.every((s) => s !== null);
   const buildSources = ctx.buildFns.length === 0 ? void 0 : ctx.buildSrcs;
@@ -6832,7 +6874,10 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
   };
   const compileRulesFactory = (init, label2) => {
     const args = init.arguments;
-    const factoryArg = args[0];
+    const arg0 = args[0];
+    const arg1 = args[1];
+    const optionsFirst = arg0?.type === "ObjectExpression";
+    const factoryArg = optionsFirst ? arg1 : arg0;
     if (!factoryArg) {
       warn(init.start, `${label2}: rules() needs a factory argument`);
       return null;
@@ -6842,7 +6887,12 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
       warn(init.start, `${label2}: rules(...) factory isn't statically evaluable`);
       return null;
     }
-    const compiled = compileRuleMap([...ruleMap]);
+    const optionsArg = optionsFirst ? arg0 : arg1;
+    const triviaValue = optionsArg?.type === "ObjectExpression" ? (optionsArg.properties ?? []).find(
+      (p) => p.key?.name === "trivia"
+    )?.value : void 0;
+    const gTrivia = triviaValue ? evaluateExpr(triviaValue, scope, code, []) : void 0;
+    const compiled = compileRuleMap([...ruleMap], gTrivia ? { trivia: gTrivia } : void 0);
     if (!compiled) {
       warn(init.start, `${label2}: rule map couldn't be inlined`);
       return null;