parseman 0.21.0 → 0.22.0

package/dist/index.js

@@ -1690,7 +1690,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) {
@@ -1718,6 +1720,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]);
   }
@@ -2060,8 +2068,10 @@ function parse(combinator, input, opts = {}) {
   const trackLines = opts.trackLines ?? false;
   const _errors = opts.recover ? [] : void 0;
   const _probe = opts.recover ? { offset: input.length, best: null } : void 0;
+  const grammarTrivia = combinator._meta.grammarTrivia;
   const ctx = {
     trackLines,
+    ...grammarTrivia !== void 0 ? { trivia: grammarTrivia, ...grammarTrivia._meta.triviaKindLabels ? { triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {} } : {},
     ..._errors !== void 0 ? { _errors } : {},
     ..._probe !== void 0 ? { _probe } : {}
   };
@@ -5327,6 +5337,7 @@ function ruleDependencies(ruleMap) {
 }
 function compile(combinator, mapFnSources) {
   markUnusedValues(combinator);
+  const grammarTrivia = combinator._meta.grammarTrivia;
   const ctx = {
     vars: 0,
     indent: 1,
@@ -5345,7 +5356,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(), ""] : [];
@@ -6203,12 +6215,14 @@ function run(entry, input, options = {}) {
   }
   const triviaLog = [];
   const errors = [];
+  const grammarTrivia = typeof entry !== "function" ? entry._meta.grammarTrivia : void 0;
   const ctx = {
     trackLines: false,
     _triviaLog: triviaLog,
     _errors: errors,
     build: options.build,
     state: options.state,
+    ...grammarTrivia !== void 0 ? { trivia: grammarTrivia, ...grammarTrivia._meta.triviaKindLabels ? { triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {} } : {},
     ...options.triviaCaptureMask !== void 0 ? { _triviaCaptureMask: options.triviaCaptureMask } : {}
   };
   const r = invoke(entry, input, 0, ctx);