parseman 0.21.0 → 0.22.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;
@@ -6856,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;
@@ -6866,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;