parseman 0.60.4 → 0.60.6

package/dist/plugin/evaluator.d.ts

@@ -7,7 +7,7 @@
  */
 import type { Expression, Node } from '@oxc-project/types';
 import type { Combinator } from '../types.ts';
-import { type RulesOptions } from '../combinators/parser.ts';
+import { type RulesOptions, type RulesRecipe } from '../combinators/parser.ts';
 import type { ReducerResolver } from './reducer-resolver.ts';
 /** Install (or clear, with `null`) the resolver for the module being transformed. */
 export declare function setReducerResolver(r: ReducerResolver | null, entrySource?: string | null): void;
@@ -143,6 +143,8 @@ out?: {
  * (`parser.ts:228-242`), which the macro's stamp-only copy never did.
  */
 options?: RulesOptions): Map<string, Combinator<unknown>> | null;
+/** The recipe an evaluated rule map came from, for a composition that links it. */
+export declare const ruleMapRecipes: WeakMap<ReadonlyMap<string, Combinator<unknown>>, readonly RulesRecipe[]>;
 /**
  * Every EXTERNAL name an evaluated factory read through `g`, keyed by the map
  * `evaluateParserFactory` returned. The map holds declared rules only, so a `g.X`

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

@@ -1 +1 @@
-{"version":3,"file":"evaluator.d.ts","sourceRoot":"","sources":["../../src/plugin/evaluator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"evaluator.d.ts","sourceRoot":"","sources":["../../src/plugin/evaluator.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAyBA,OAAO,WAAW,MAAM,cAAc,CAAA;AActC,OAAO,EAAsC,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAA;AA6BxF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACzE;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAA;CAAE,CAAA;AAChH,kDAAkD;AAClD,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;AACxD,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAQtD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGnD;AA+BD,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;8CAC0C;IAC1C,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wFAAwF;AACxF,MAAM,MAAM,eAAe,GAAG;IAC5B;qDACiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,sCAAsC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAClC,CAAA;;;AAskBD,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;AA0CD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,aAAa,cAA6B,EAC1C,kBAAkB,UAAQ,EAC1B,QAAQ,UAAQ,EAChB,eAAe,UAAQ,EACvB,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,SAA0B,EACxC,WAAW,CAAC,EAAE,WAAW,GACxB,oBAAoB,GAAG,IAAI,CAW7B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/plugin/index.ts"],"names":[],"mappings":"AAyBA,OAAO,WAAW,MAAM,cAAc,CAAA;AActC,OAAO,EAAsC,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAA;AA6BxF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,MAAM,kBAAkB,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAA;AACzE;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAA;CAAE,CAAA;AAChH,kDAAkD;AAClD,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAA;AACxD,eAAO,MAAM,sBAAsB,mBAAmB,CAAA;AAQtD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGnD;AA+BD,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;IACxB;;;;;;OAMG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;8CAC0C;IAC1C,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;;;;;OAQG;IACH,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,wFAAwF;AACxF,MAAM,MAAM,eAAe,GAAG;IAC5B;qDACiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,sCAAsC;IACtC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;CAClC,CAAA;;;AAgkBD,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;AA0CD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,aAAa,cAA6B,EAC1C,kBAAkB,UAAQ,EAC1B,QAAQ,UAAQ,EAChB,eAAe,UAAQ,EACvB,eAAe,CAAC,EAAE,eAAe,EACjC,cAAc,SAA0B,EACxC,WAAW,CAAC,EAAE,WAAW,GACxB,oBAAoB,GAAG,IAAI,CAW7B"}

package/dist/plugin/index.js

@@ -48,6 +48,12 @@ function hasOwnTriviaBoundary(p, depth = MAX_DEPTH) {
     case "oneOrMore":
     case "sepBy":
       return true;
+    // A scope that names or clears trivia keeps an outer install out of its body.
+    // Any other inherits, so it falls through at no cost in depth: line tracking
+    // wraps every rule in one, and must not change what this walk sees.
+    case "grammar":
+      if (d.triviaParser || d.clearTrivia) return false;
+      depth++;
     // Transparent wrappers — they add no position, so ask what they wrap.
     case "node":
     case "transform":
@@ -1782,7 +1788,7 @@ function parser(opts, root) {
         ctx.triviaKindLabels = void 0;
       } else if (scopeTrivia !== void 0) {
         ctx.trivia = scopeTrivia;
-        if (scopeLabels) ctx.triviaKindLabels = scopeLabels;
+        ctx.triviaKindLabels = scopeLabels;
       }
       if (forceCaptureTrivia || _ctx?.captureTrivia) ctx.captureTrivia = true;
       if (ownCaptureMask !== void 0) ctx._triviaCaptureMask = ownCaptureMask;
@@ -1926,11 +1932,16 @@ function tagRule(r, key) {
 function isDefinableRef(v) {
   return !!v && typeof v === "object" && "_def" in v && v._def.tag === "lazy" && typeof v.define === "function";
 }
+function priorNameOf(r) {
+  return r._priorOf;
+}
 function ruleNameOf(r) {
   return r._ruleName;
 }
 function isNamedRuleRefForAnotherRule(r, key) {
-  const name = r._def.tag === "lazy" ? ruleNameOf(r) : void 0;
+  if (r._def.tag !== "lazy") return false;
+  if (priorNameOf(r) !== void 0) return true;
+  const name = ruleNameOf(r);
   return name !== void 0 && name !== key;
 }
 var claimedRules = /* @__PURE__ */ new WeakSet();
@@ -1943,6 +1954,20 @@ function ownRule(p, copies) {
   }
   return own;
 }
+var priorUnfilled = (key) => new Error(`compose: prior.${key} is read, but no grammar composed before it defines "${key}"`);
+function priorHole(key) {
+  const unfilled = priorUnfilled(key);
+  const fail = () => {
+    throw unfilled;
+  };
+  return {
+    _tag: "lazy",
+    _meta: { firstSet: any(), canMatchNewline: true, isTrivia: false },
+    _def: { tag: "lazy", thunk: fail },
+    parse: fail,
+    _priorOf: key
+  };
+}
 function rules(a, b) {
   const factory = typeof a === "function" ? a : b;
   const options = typeof a === "function" ? b : a;
@@ -1967,8 +1992,20 @@ function linkRules(recipes, link) {
     }
   });
   const winners = /* @__PURE__ */ new Map();
+  const priorHoles = /* @__PURE__ */ new Map();
+  const prior = new Proxy({}, {
+    get(_target, key) {
+      if (typeof key !== "string") return void 0;
+      const earlier = winners.get(key)?.parser;
+      if (earlier !== void 0) return earlier._def.tag === "node" ? earlier._def.parser : earlier;
+      if (link !== void 0) throw priorUnfilled(key);
+      let hole = priorHoles.get(key);
+      if (hole === void 0) priorHoles.set(key, hole = priorHole(key));
+      return hole;
+    }
+  });
   for (const recipe of recipes) {
-    const definitions = recipe.factory(proxy);
+    const definitions = recipe.factory(proxy, prior);
     for (const key of Object.keys(definitions)) {
       winners.set(key, { parser: definitions[key], options: recipe.options });
     }
@@ -6934,7 +6971,8 @@ function classifyRuleMap(ruleMap) {
         resolved = void 0;
       }
       if (resolved === void 0) {
-        if (p._ruleName) externalRefs.add(p);
+        const hole = p;
+        if (hole._ruleName !== void 0 || hole._priorOf !== void 0) externalRefs.add(p);
         return;
       }
       scanExternal(resolved);
@@ -7116,6 +7154,7 @@ var OP_LIT_CI = 27;
 var OP_LIT_CI_TRACK = 28;
 var OP_TOKEN = 29;
 var OP_SCOPE_CAP = 30;
+var SCOPE_INHERIT = -2;
 var OP_WITHCTX = 31;
 var OP_GUARD = 32;
 var OP_ADJ = 33;
@@ -9148,7 +9187,7 @@ var Encoder = class {
         this.triviaKnown = savedKnown;
         if (d.clearTrivia === true) return this.emit(op, -1, bodyIp, flags);
         if (d.triviaParser === void 0) {
-          return cap || flags !== 0 ? this.emit(op, -1, bodyIp, flags) : bodyIp;
+          return cap ? this.emit(op, SCOPE_INHERIT, bodyIp, flags) : bodyIp;
         }
         return this.emit(op, this.triviaSlot(d.triviaParser), bodyIp, flags);
       }
@@ -10540,7 +10579,7 @@ function transfer(code, ip, at, hostCst) {
   const op = code[ip];
   if (op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN) {
     const ki = code[ip + 1];
-    const tri = ki < 0 ? TRI_NONE : ki;
+    const tri = ki === SCOPE_INHERIT ? at.tri : ki < 0 ? TRI_NONE : ki;
     const cap = op === OP_SCOPE_CAP ? CAP_ON : at.cap;
     if (tri === at.tri && cap === at.cap) return at;
     return { tri, buf: at.buf, raw: at.raw, cap };
@@ -10614,7 +10653,7 @@ function scanHandoffNeeded(code, ip, labels) {
     if (l.tri === TRI_UNKNOWN) return true;
     const op = code[at];
     if (op === OP_SCAN) return true;
-    if (op === OP_TOKEN || op === OP_SCOPE_CAP) continue;
+    if (op === OP_TOKEN || op === OP_SCOPE_CAP && code[at + 1] !== SCOPE_INHERIT) continue;
     if ((op === OP_SCOPE_PLAIN || op === OP_SCOPE) && !(code[at + 1] >= 0 && l.tri === code[at + 1] && (op === OP_SCOPE_PLAIN || code[at + 3] === 0))) continue;
     kids.length = 0;
     if (!childSlots(code, at, kids)) return true;
@@ -11909,6 +11948,15 @@ return r.value
         const cap = op === OP_SCOPE_CAP;
         const flags = op === OP_SCOPE_PLAIN ? 0 : code[ip + 3];
         const child = link(code[ip + 2]);
+        if (ki === SCOPE_INHERIT) {
+          return `${head}
+const sC=ctx.captureTrivia
+ctx.captureTrivia=true
+const v=${child}(input,pos,ctx)
+ctx.captureTrivia=sC
+return v
+}`;
+        }
         const scanFor = swapLegal && ki >= 0 && !triviaLabelled[ki] ? hoist("ts", `TRIVIASCAN[${ki}]`) : "null";
         const tri = ki < 0 ? "undefined" : hoist("tv", `TRIVIA[${ki}]`);
         const lab = ki < 0 ? "undefined" : hoist("tl", `TRIVIA[${ki}]._meta.triviaKindLabels`);
@@ -13498,7 +13546,7 @@ function clearOf(ranges, input, from, to) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.60.4";
+var PARSEMAN_VERSION = "0.60.6";
 
 // src/table/assemble.ts
 import { PlainBuf as PlainBuf2, PlainField, PlainLeaf as PlainLeaf9, PlainNode as PlainNode2, PlainSpan as PlainSpan10 } from "../cst/plain.js";
@@ -15028,6 +15076,16 @@ function assemble(t, prog, cfg) {
       case OP_SCOPE_CAP:
       case OP_SCOPE_PLAIN: {
         const ki = code[ip + 1];
+        if (ki === SCOPE_INHERIT) {
+          const body = link(code[ip + 2]);
+          return (input, pos, ctx) => {
+            const savedCap = ctx.captureTrivia;
+            ctx.captureTrivia = true;
+            const v = body(input, pos, ctx);
+            ctx.captureTrivia = savedCap;
+            return v;
+          };
+        }
         const scopeTrivia = ki < 0 ? void 0 : trivia2[ki];
         const scopeLabels = scopeTrivia?._meta.triviaKindLabels;
         const scanFor = swapLegal && ki >= 0 && !triviaLabelled[ki] ? triviaScan[ki] : null;
@@ -17662,7 +17720,7 @@ function buildGrammarPlan(entry, winners) {
   const dispatches = /* @__PURE__ */ new Map();
   const attempts = /* @__PURE__ */ new Map();
   const labels = /* @__PURE__ */ new Map();
-  const rules2 = /* @__PURE__ */ new Map();
+  const rules3 = /* @__PURE__ */ new Map();
   const winnerNames = /* @__PURE__ */ new Map();
   if (winners) {
     for (const [name, winner] of Object.entries(winners)) {
@@ -17696,7 +17754,7 @@ function buildGrammarPlan(entry, winners) {
   const ownRule2 = (parser2, rule) => {
     const id = `rule:${rule}`;
     definitions.set(id, { id, kind: "rule" });
-    rules2.set(parser2, id);
+    rules3.set(parser2, id);
   };
   const seen = /* @__PURE__ */ new Set();
   const visit = (parser2, path3) => {
@@ -17736,7 +17794,7 @@ function buildGrammarPlan(entry, winners) {
     }
     visit(body ?? root, name);
   }
-  return { definitions: [...definitions.values()].sort((a, b) => a.id.localeCompare(b.id)), choices, dispatches, attempts, labels, rules: rules2 };
+  return { definitions: [...definitions.values()].sort((a, b) => a.id.localeCompare(b.id)), choices, dispatches, attempts, labels, rules: rules3 };
 }
 
 // src/analysis/duplication.ts
@@ -19532,6 +19590,8 @@ var Serializer = class {
   localRuleNames = /* @__PURE__ */ new Map();
   ruleMap;
   scanSkip;
+  /** Whether any rule reads a `prior.X` hole, so the factory takes `(g, prior)`. */
+  usesPrior = false;
   accessed;
   referenced = /* @__PURE__ */ new Set();
   constructor(ruleMap, scanSkip = [], accessed = []) {
@@ -19552,7 +19612,7 @@ var Serializer = class {
     if (seen.has(c)) return;
     seen.add(c);
     if (c._def.tag === "lazy") {
-      if (ruleNameOf3(c) !== void 0) throw new Unserializable("scanSkip unit references a grammar rule");
+      if (ruleNameOf3(c) !== void 0 || priorNameOf(c) !== void 0) throw new Unserializable("scanSkip unit references a grammar rule");
       const target = lazyTarget(c);
       if (target) this.assertNoRuleRef(target, seen);
       return;
@@ -19616,9 +19676,10 @@ var Serializer = class {
     for (const name of this.accessed) {
       if (!this.referenced.has(name)) innerDecls.push(`void g[${JSON.stringify(name)}]`);
     }
-    const factory = innerDecls.length === 0 ? `(g) => ({
+    const params = this.usesPrior ? "(g, prior)" : "(g)";
+    const factory = innerDecls.length === 0 ? `${params} => ({
 ${body}
-})` : `(g) => {
+})` : `${params} => {
 ${innerDecls.map((d) => "  " + d).join("\n")}
   return ({
 ${body}
@@ -19635,6 +19696,10 @@ ${outerDecls.map((d) => "  " + d).join("\n")}
   analyze(c, active) {
     const def = c._def;
     if (def.tag === "lazy") {
+      if (priorNameOf(c) !== void 0) {
+        this.usesPrior = true;
+        return;
+      }
       if (ruleNameOf3(c) !== void 0) return;
       const target = lazyTarget(c);
       if (!target) throw new Unserializable("unresolved unnamed ref");
@@ -19713,6 +19778,8 @@ ${outerDecls.map((d) => "  " + d).join("\n")}
     }
     switch (def.tag) {
       case "lazy": {
+        const prior = priorNameOf(c);
+        if (prior !== void 0) return `prior[${JSON.stringify(prior)}]`;
         const name = this.localRuleNames.get(c) ?? ruleNameOf3(c);
         if (name !== void 0) {
           this.referenced.add(name);
@@ -19893,7 +19960,8 @@ function externalNames(ruleMap) {
         resolved = void 0;
       }
       if (resolved === void 0) {
-        const name = p._ruleName;
+        const prior = priorNameOf(p);
+        const name = prior === void 0 ? p._ruleName : `prior.${prior}`;
         if (name !== void 0 && !out.includes(name)) out.push(name);
         return;
       }
@@ -21532,10 +21600,15 @@ function evaluateParserFactory(factoryNode, scope, code, mapFnSources, out, opti
   if (factoryNode.type !== "ArrowFunctionExpression" && factoryNode.type !== "FunctionDeclaration" && factoryNode.type !== "FunctionExpression") return null;
   const factory = factoryNode;
   const params = factory.params;
-  if (params.length !== 1) return null;
-  const param = params[0];
-  const proxyName = param.type === "Identifier" ? param.name ?? null : null;
+  if (params.length !== 1 && params.length !== 2) return null;
+  const paramName = (param) => {
+    const p = param;
+    return p.type === "Identifier" ? p.name ?? null : null;
+  };
+  const proxyName = paramName(params[0]);
   if (!proxyName) return null;
+  const priorName = params.length === 2 ? paramName(params[1]) : void 0;
+  if (priorName === null) return null;
   const body = factory.body;
   if (!body) return null;
   const statements = [];
@@ -21565,9 +21638,10 @@ function evaluateParserFactory(factoryNode, scope, code, mapFnSources, out, opti
   const ABORT = /* @__PURE__ */ Symbol("parseman: factory not statically evaluable");
   let built;
   try {
-    built = rules(options ?? {}, (g) => {
+    built = rules(options ?? {}, (g, prior) => {
       const localScope = scope instanceof ModuleScope ? scope.fork() : new Map(scope);
       localScope.set(proxyName, g);
+      if (priorName !== void 0) localScope.set(priorName, prior);
       if (!evalBodyStatements(statements, localScope, code, out)) throw ABORT;
       const entries = flattenRuleEntries(retObj, localScope, code);
       if (!entries) throw ABORT;
@@ -21590,8 +21664,10 @@ function evaluateParserFactory(factoryNode, scope, code, mapFnSources, out, opti
   for (const key of keys) map.set(key, built[key]);
   const declared = new Set(keys);
   externalAccesses.set(map, Object.keys(built).filter((name) => !declared.has(name)));
+  ruleMapRecipes.set(map, built[RULES_RECIPE]);
   return map;
 }
+var ruleMapRecipes = /* @__PURE__ */ new WeakMap();
 var externalAccesses = /* @__PURE__ */ new WeakMap();
 function isDefinableRef2(v) {
   return isCombinator3(v) && typeof v.define === "function" && v._def.tag === "lazy";
@@ -22935,15 +23011,6 @@ var PARSEMAN_MODULE = "parseman";
 var DEFAULT_ASSEMBLY_BUDGET = 0.25;
 var LinkRefusal = class extends Error {
 };
-function isResolved(rule) {
-  if (rule._def.tag !== "lazy") return true;
-  try {
-    rule._def.thunk();
-    return true;
-  } catch {
-    return false;
-  }
-}
 function reasonSuffix(runtimeOnly) {
   return runtimeOnly === void 0 || runtimeOnly.length === 0 ? "" : ` \u2014 ${runtimeOnly.join("; ")}`;
 }
@@ -24076,22 +24143,6 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
     }
     return { pieces, trackLines };
   };
-  const mergeRuleMaps = (maps) => {
-    const winners = /* @__PURE__ */ new Map();
-    for (const map of maps) {
-      for (const [name, rule] of map) {
-        if (rule._def.tag === "lazy") {
-          try {
-            rule._def.thunk();
-          } catch {
-            continue;
-          }
-        }
-        winners.set(name, rule);
-      }
-    }
-    return [...winners];
-  };
   const mergedCarriedRules = (items, link) => {
     const carriedMaps = carriedRuleMaps(items);
     if (carriedMaps === null) return null;
@@ -24099,12 +24150,6 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
     const dangling = danglingReference(linked);
     return { rules: Object.entries(linked), trackLines: carriedMaps.trackLines, dangling };
   };
-  const applyComposingTrivia = (ruleMap, composing) => {
-    for (const [, rule] of ruleMap) {
-      if (rule._meta.isTrivia) continue;
-      rule._meta.grammarTrivia = composing;
-    }
-  };
   const localCarried = (rm, label2, composing, scanSkip) => {
     const entries = [...rm];
     const ns = nsFor(label2);
@@ -24192,10 +24237,15 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
       carried.push(...r.carried);
       importedFactories.push(...r.importedFactories ?? []);
     }
-    const merged = mergedCarriedRules(carried, {
-      trivia: composing,
-      ...cHostMode ? { hostMode: cHostMode } : {}
-    });
+    let merged;
+    try {
+      merged = mergedCarriedRules(carried, {
+        trivia: composing,
+        ...cHostMode ? { hostMode: cHostMode } : {}
+      });
+    } catch (e) {
+      throw new Error(`${id}:${lineOf(init.start)} \u2014 ${e.message}`, { cause: e });
+    }
     if (merged?.dangling !== void 0) throw new Error(`${id}:${lineOf(init.start)} \u2014 compose: ${merged.dangling}`);
     if (merged !== null) {
       collectBuilderImports(merged.rules);
@@ -24256,8 +24306,8 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
       const type = fn?.[INERT_BUILDER];
       return type === void 0 ? fn : (children3, _fields, span) => ({ type, span, children: children3 });
     });
-    const counts = countSiteVisits(compiled.prog, (rules2) => {
-      const entry = rules2[assemblyProfile.entry];
+    const counts = countSiteVisits(compiled.prog, (rules3) => {
+      const entry = rules3[assemblyProfile.entry];
       for (const text of corpusTexts(assemblyProfile)) {
         try {
           if (run(entry, text).ok) parsed++;
@@ -24284,17 +24334,14 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
     }
     const localArg = elements[elements.length - 1];
     let localRules = null;
-    let localScanSkip;
     const importedFactories = [];
     if (isRulesCall(localArg)) {
       const evaluated = evaluateRulesFactory(localArg, `composeLeaf${init.start}`);
       localRules = evaluated?.ruleMap ?? null;
-      localScanSkip = evaluated?.scanSkip;
       if (evaluated?.importedFactory) importedFactories.push(evaluated.importedFactory);
     } else if (localArg.type === "Identifier") {
       const name = localArg.name;
       localRules = localRuleMaps.get(name) ?? null;
-      localScanSkip = localGrammarScanSkip.get(name);
     }
     if (!localRules) {
       const named = localArg.type === "Identifier" ? localArg.name : null;
@@ -24313,8 +24360,6 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
       importedFactories.push(...r.importedFactories ?? []);
     }
     try {
-      const localNs = nsFor(`composeLeaf${init.start}`);
-      const localEntries = [...localRules];
       const carriedMaps = carriedRuleMaps(carried);
       if (carriedMaps !== null) {
         const unproven = carriedMaps.pieces.find((p) => {
@@ -24325,24 +24370,20 @@ ${names.map((n) => `  - ${n}`).join("\n")}` : " (it is not a static combinator/v
           warn(init.start, "composeLeaf(): every pre-final grammar must explicitly prove recognition-only");
           return null;
         }
-        if (localScanSkip) {
-          for (const [, rule] of localEntries) {
-            if (rule._meta.isTrivia) continue;
-            const meta = rule._meta;
-            if (meta.grammarScanSkip === void 0) meta.grammarScanSkip = localScanSkip;
-          }
+        let linked;
+        try {
+          linked = linkRules(
+            [...carriedMaps.pieces.flatMap((p) => p.recipes), ...ruleMapRecipes.get(localRules)],
+            { trivia: composing }
+          );
+        } catch (e) {
+          throw new LinkRefusal(`${id}:${lineOf(init.start)} \u2014 composeLeaf: ${e.message.replace(/^compose: /, "")}`, { cause: e });
         }
-        const leafMerged = mergeRuleMaps([...carriedMaps.pieces.map((p) => p.rules), localEntries]);
-        const accessed = [
-          ...carriedMaps.pieces.flatMap((p) => p.rules).filter(([, rule]) => !isResolved(rule)).map(([name]) => name),
-          ...localRules instanceof Map ? externalAccesses.get(localRules) ?? [] : []
-        ];
-        const dangling = danglingReference(Object.fromEntries(leafMerged), accessed);
+        const dangling = danglingReference(linked);
         if (dangling !== void 0) throw new LinkRefusal(`${id}:${lineOf(init.start)} \u2014 composeLeaf: ${dangling}`);
-        if (composing) applyComposingTrivia(carriedMaps.pieces.flatMap((p) => p.rules), composing);
         const refusals = [];
         const compiled = compileRuleMap(
-          leafMerged,
+          Object.entries(linked),
           {
             ...composing ? { trivia: composing } : {},
             ...carriedMaps.trackLines ? { trackLines: true } : {},