parseman 0.21.0 → 0.23.0

package/dist/plugin/index.cjs

@@ -1729,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) {
@@ -1757,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]);
   }
@@ -5351,6 +5359,7 @@ function ruleDependencies(ruleMap) {
 }
 function compile(combinator, mapFnSources) {
   markUnusedValues(combinator);
+  const grammarTrivia = combinator._meta.grammarTrivia;
   const ctx = {
     vars: 0,
     indent: 1,
@@ -5369,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(), ""] : [];
@@ -5445,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,
@@ -5465,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();
@@ -5477,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;
@@ -5521,9 +5539,10 @@ function compileRuleMap(ruleMap) {
   ].join("\n");
   return { keys: perEntry.map((e) => e.key), replacement };
 }
-function compileLinkable(ruleMapArg, ns) {
+function compileLinkable(ruleMapArg, ns, opts) {
   if (!ns) throw new Error("compileLinkable: ns must be a non-empty namespace");
   for (const [, rule] of ruleMapArg) markUnusedValues(rule);
+  const grammarTrivia = opts?.trivia ?? ruleMapArg.map(([, r]) => r._meta.grammarTrivia).find(Boolean);
   const ruleMap = ruleMapArg.filter(([, val]) => {
     const d = val._def;
     if (d.tag !== "lazy") return true;
@@ -5554,7 +5573,8 @@ function compileLinkable(ruleMapArg, ns) {
     capturing: ruleMap.some(([, rule]) => hasNodeDef(rule)),
     lazyUsage: analyzeLazyUsageMulti(ruleMap.map(([, rule]) => rule)),
     ns,
-    deferFirstSetRefs: true
+    deferFirstSetRefs: true,
+    ...grammarTrivia ? { activeTrivia: grammarTrivia, triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {}
   };
   const seen = /* @__PURE__ */ new Map();
   const ruleNames = /* @__PURE__ */ new Map();
@@ -5617,7 +5637,10 @@ function compileLinkable(ruleMapArg, ns) {
       ctx.indent = 1;
       ctx.failLabel = "_pfail";
       ctx.recordFail = true;
+      const savedTrivia = ctx.activeTrivia;
+      if (rule._meta.isTrivia) ctx.activeTrivia = void 0;
       const body = emit(resolved, ctx, "_pos");
+      ctx.activeTrivia = savedTrivia;
       ctx.indent = savedIndent;
       ctx.failLabel = savedFail;
       ctx.recordFail = savedRec;
@@ -6111,6 +6134,23 @@ ${body}
 };
 
 // src/compiler/linker.ts
+function pickPieces(pieces, names) {
+  const winner = /* @__PURE__ */ new Map();
+  for (const pc of pieces) for (const k of pc.keys) winner.set(k, pc);
+  for (const n of names) {
+    if (!winner.has(n)) throw new Error(`pick: rule "${n}" is not in this grammar (available: ${[...winner.keys()].join(", ")})`);
+  }
+  const keep = /* @__PURE__ */ new Set();
+  const visit = (n) => {
+    const w = winner.get(n);
+    if (keep.has(n) || !w) return;
+    keep.add(n);
+    for (const d of w.deps.get(n) ?? []) visit(d);
+  };
+  for (const n of names) visit(n);
+  const filt = (m, pc) => new Map([...m].filter(([k]) => keep.has(k) && winner.get(k) === pc));
+  return pieces.map((pc) => ({ ...pc, keys: pc.keys.filter((k) => keep.has(k) && winner.get(k) === pc), ruleFns: filt(pc.ruleFns, pc), wrappers: filt(pc.wrappers, pc), deps: filt(pc.deps, pc) })).filter((pc) => pc.keys.length > 0);
+}
 function fusedBody(pieces) {
   const winner = /* @__PURE__ */ new Map();
   for (const p of pieces) for (const k of p.keys) winner.set(k, p);
@@ -6130,7 +6170,7 @@ function fusedBody(pieces) {
     ...needsEmptyTl ? ["const _EMPTY_TL = Object.freeze([])"] : [],
     ...needsHostReads ? [HOST_READS_DECL] : [],
     // Each contributing artifact's namespaced private prelude (regexes, _pf, …).
-    ...[...new Set(contributingPieces.flatMap((p) => p.prelude))],
+    ...new Set(contributingPieces.flatMap((p) => p.prelude)),
     // The winning `_r_<Name>` function for each rule (one per name → no redeclare).
     ...[...winner].map(([k, p]) => p.ruleFns.get(k))
   ];
@@ -6171,9 +6211,9 @@ ${body}
 function isIRPiece(p) {
   return !!p && typeof p === "object" && typeof p.ir === "string" && typeof p.ns === "string" && !("ruleFns" in p);
 }
-function materializePiece(p) {
+function materializePiece(p, trivia2) {
   if (!isIRPiece(p)) return p;
-  const pieces = compileLinkable(evalRuleMapIR(p.ir), p.ns);
+  const pieces = compileLinkable(evalRuleMapIR(p.ir), p.ns, trivia2 ? { trivia: trivia2 } : void 0);
   if (!pieces) throw new Error(`compose: carried IR for ns "${p.ns}" could not be re-lowered`);
   return pieces;
 }
@@ -6856,7 +6896,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;
@@ -6866,16 +6909,23 @@ 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;
     }
-    return { replacement: compiled.replacement, ruleMap };
+    return { replacement: compiled.replacement, ruleMap, ...gTrivia ? { trivia: gTrivia } : {} };
   };
   const isRulesCall = (init) => init.type === "CallExpression" && init.callee.type === "Identifier" && init.callee.name === "rules";
   const isComposeCall = (init) => init.type === "CallExpression" && init.callee.type === "Identifier" && init.callee.name === "compose";
+  const isPickCall = (init) => init.type === "CallExpression" && init.callee.type === "Identifier" && init.callee.name === "pick";
   const localRuleMaps = /* @__PURE__ */ new Map();
+  const localGrammarTrivia = /* @__PURE__ */ new Map();
   const nsFor = (label2) => `_${(0, import_node_crypto.createHash)("sha1").update(`${id}#${label2}`).digest("hex").slice(0, 8)}_`;
   const stripIndent = (s) => s.replace(/\n[ \t]+/g, "\n");
   const serializePieces = (p) => {
@@ -6889,7 +6939,8 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
   const serializeItem = (it) => isSpread(it) ? `...(${it.__spreadLocal}[Symbol.for('parseman.composedPieces')] ?? [])` : isIR(it) ? `{ ns: ${JSON.stringify(it.ns)}, ir: ${JSON.stringify(it.ir)} }` : serializePieces(it);
   const serializeList = (list) => `[${list.map(serializeItem).join(", ")}]`;
   const withCarriedPieces = (grammarExpr, list) => `/* @__PURE__ */ Object.defineProperty(${grammarExpr}, Symbol.for('parseman.composedPieces'), { value: ${serializeList(list)}, enumerable: false })`;
-  const localComposedPieces = /* @__PURE__ */ new Map();
+  const localComposedCarried = /* @__PURE__ */ new Map();
+  const localComposedTrivia = /* @__PURE__ */ new Map();
   const importedPiecesCache = /* @__PURE__ */ new Map();
   const resolveModulePieces = (file, exportName, seen) => {
     const mod = parseModuleCached(file);
@@ -6923,7 +6974,7 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
     }
     try {
       const list = new Function(...stubNames, `return (${literal2})`)(...stubVals);
-      return list.map(materializePiece);
+      return list;
     } catch {
       return null;
     }
@@ -6943,32 +6994,108 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
     importedPiecesCache.set(localName, result2);
     return result2;
   };
-  const localArg = (rm, label2) => {
+  const materializeCarried = (items, composing) => {
+    const out = [];
+    for (const it of items) {
+      if (isSpread(it)) {
+        for (const p of importedPieces(it.__spreadLocal) ?? []) out.push(materializePiece(p, composing));
+      } else if (isIR(it)) {
+        out.push(materializePiece(it, composing));
+      } else {
+        out.push(it);
+      }
+    }
+    return out;
+  };
+  const localCarried = (rm, label2, composing) => {
     const entries = [...rm];
     const ns = nsFor(label2);
-    const p = compileLinkable(entries, ns);
-    if (!p) return null;
     const ir = serializeRuleMap(entries);
-    return ir ? { pieces: [p], ir: { ns, ir } } : { pieces: [p] };
+    if (ir) return { carried: [{ ns, ir }] };
+    const p = compileLinkable(entries, ns, composing ? { trivia: composing } : void 0);
+    return p ? { carried: [p] } : null;
   };
-  const argPieces = (arg, label2) => {
+  const argPieces = (arg, label2, composing) => {
+    if (isPickCall(arg)) {
+      const pargs = arg.arguments;
+      const inner = pargs[0];
+      const namesArg = pargs[1];
+      if (!inner || namesArg?.type !== "ArrayExpression") return null;
+      const names = [];
+      for (const el of namesArg.elements ?? []) {
+        const v2 = el?.value;
+        if ((el?.type === "Literal" || el?.type === "StringLiteral") && typeof v2 === "string") names.push(v2);
+        else return null;
+      }
+      const innerArg = argPieces(inner, `${label2}_pick`);
+      if (!innerArg) return null;
+      try {
+        return { carried: pickPieces(materializeCarried(innerArg.carried, ownTrivia(inner)), names) };
+      } catch (e) {
+        warn(arg.start, `pick(): ${e.message}`);
+        return null;
+      }
+    }
     if (isRulesCall(arg)) {
-      const factory = arg.arguments[0];
+      const rulesArgs = arg.arguments;
+      const a0 = rulesArgs[0];
+      const a1 = rulesArgs[1];
+      const optionsFirst = a0?.type === "ObjectExpression";
+      const factory = optionsFirst ? a1 : a0;
       const rm = factory ? evaluateParserFactory(factory, scope, code, []) : null;
-      return rm ? localArg(rm, label2) : null;
+      return rm ? localCarried(rm, label2, composing) : null;
     }
     if (arg.type === "Identifier") {
       const name = arg.name;
       const rm = localRuleMaps.get(name);
-      if (rm) return localArg(rm, label2);
-      const composed = localComposedPieces.get(name);
-      if (composed) return { pieces: composed };
+      if (rm) return localCarried(rm, label2, composing);
+      const composed = localComposedCarried.get(name);
+      if (composed) return { carried: composed };
       const pieces = importedPieces(name);
       if (!pieces) return null;
-      return importBindings.has(name) ? { pieces, spreadLocal: name } : { pieces };
+      return { carried: importBindings.has(name) ? [{ __spreadLocal: name }] : [...pieces] };
     }
     return null;
   };
+  const rulesCallTrivia = (el) => {
+    const rulesArgs = el.arguments;
+    const a0 = rulesArgs[0];
+    const a1 = rulesArgs[1];
+    const optExpr = a0?.type === "ObjectExpression" ? a0 : a1?.type === "ObjectExpression" ? a1 : void 0;
+    const triviaProp = (optExpr?.properties ?? []).find(
+      (p) => p.key?.name === "trivia"
+    );
+    if (!triviaProp?.value) return void 0;
+    return evaluateExpr(triviaProp.value, scope, code, []) ?? void 0;
+  };
+  const composingTrivia = (elements) => {
+    for (let i = elements.length - 1; i >= 0; i--) {
+      const el = elements[i];
+      if (!el) continue;
+      if (isRulesCall(el)) {
+        const t = rulesCallTrivia(el);
+        if (t) return t;
+        continue;
+      }
+      if (el.type === "Identifier") {
+        const t = localGrammarTrivia.get(el.name);
+        if (t) return t;
+      }
+    }
+    return void 0;
+  };
+  const ownTrivia = (arg) => {
+    if (isRulesCall(arg)) return rulesCallTrivia(arg);
+    if (isPickCall(arg)) {
+      const inner = arg.arguments[0];
+      return inner ? ownTrivia(inner) : void 0;
+    }
+    if (arg.type === "Identifier") {
+      const name = arg.name;
+      return localGrammarTrivia.get(name) ?? localComposedTrivia.get(name);
+    }
+    return void 0;
+  };
   const compileComposeCall = (init) => {
     const args = init.arguments;
     const arr = args[0];
@@ -6977,21 +7104,19 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
       return null;
     }
     const elements = arr.elements;
-    const pieces = [];
+    const composing = composingTrivia(elements);
     const carried = [];
     for (let i = 0; i < elements.length; i++) {
-      const r = argPieces(elements[i], `compose${init.start}_${i}`);
+      const r = argPieces(elements[i], `compose${init.start}_${i}`, composing);
       if (!r) {
         warn(init.start, `compose(): argument ${i} isn't a build-resolvable grammar; falling back to runtime`);
         return null;
       }
-      pieces.push(...r.pieces);
-      if (r.spreadLocal) carried.push({ __spreadLocal: r.spreadLocal });
-      else if (r.ir) carried.push(r.ir);
-      else carried.push(...r.pieces);
+      carried.push(...r.carried);
     }
+    const pieces = materializeCarried(carried, composing);
     try {
-      return { replacement: emitFusedSource(pieces), pieces, carried };
+      return { replacement: emitFusedSource(pieces), carried, ...composing ? { trivia: composing } : {} };
     } catch (e) {
       warn(init.start, `compose(): ${e.message}; falling back to runtime`);
       return null;
@@ -7076,6 +7201,7 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
           const compiledRules = compileRulesFactory(init, varName);
           if (!compiledRules) continue;
           localRuleMaps.set(varName, compiledRules.ruleMap);
+          if (compiledRules.trivia) localGrammarTrivia.set(varName, compiledRules.trivia);
           let replacement = compiledRules.replacement;
           if (exportPrefix) {
             const ns = nsFor(varName);
@@ -7091,7 +7217,8 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
         if (isComposeCall(init)) {
           const fused = compileComposeCall(init);
           if (!fused) continue;
-          localComposedPieces.set(varName, fused.pieces);
+          localComposedCarried.set(varName, fused.carried);
+          if (fused.trivia) localComposedTrivia.set(varName, fused.trivia);
           const replacement = exportPrefix ? withCarriedPieces(fused.replacement, fused.carried) : fused.replacement;
           replacements.push({ start: init.start, end: init.end, replacement });
           continue;