parseman 0.16.0 → 0.18.0

package/dist/plugin/index.cjs

@@ -100,6 +100,7 @@ function matchesEmpty(p, seen = /* @__PURE__ */ new Set()) {
     case "transform":
     case "label":
     case "trivia":
+    case "token":
     case "expect":
     case "withCtx":
     case "node":
@@ -126,6 +127,55 @@ function sequenceFirstSet(parsers) {
   }
   return fs2;
 }
+function firstSetOf(p, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(p)) return any();
+  seen.add(p);
+  const fs2 = (c) => firstSetOf(c, seen);
+  const d = p._def;
+  switch (d.tag) {
+    case "literal":
+    case "regex":
+    case "keywords":
+      return p._meta.firstSet;
+    // terminals: no refs, cached set is exact
+    case "lazy":
+      try {
+        return fs2(d.thunk());
+      } catch {
+        return any();
+      }
+    case "choice": {
+      let out = empty();
+      for (const arm of d.parsers) out = union(out, fs2(arm));
+      return out;
+    }
+    case "sequence": {
+      let out = empty();
+      for (const term of d.parsers) {
+        out = union(out, fs2(term));
+        if (!matchesEmpty(term)) return out;
+      }
+      return out;
+    }
+    case "oneOrMore":
+    case "many":
+    case "optional":
+    case "transform":
+    case "label":
+    case "trivia":
+    case "token":
+    case "node":
+    case "grammar":
+    case "expect":
+      return fs2(d.parser);
+    case "sepBy":
+      return fs2(d.parser);
+    case "skip":
+      return fs2(d.main);
+    default:
+      return p._meta.firstSet;
+  }
+}
 function mergeRanges(ranges) {
   if (ranges.length === 0) return [];
   const sorted = [...ranges].sort((a, b) => a.lo - b.lo);
@@ -1237,6 +1287,7 @@ function markUnusedValues(root) {
         return;
       case "label":
       case "trivia":
+      case "token":
       case "withCtx":
       case "expect":
         visit(def.parser, consumed);
@@ -1265,6 +1316,41 @@ function markUnusedValues(root) {
   visit(resolveRoot(root), true);
 }
 
+// src/combinators/parser.ts
+function rules(factory) {
+  const cache = {};
+  const proxy = new Proxy(cache, {
+    get(target, key) {
+      if (typeof key !== "string") return void 0;
+      const record = target;
+      if (!(key in record)) {
+        const r = ref();
+        r._ruleName = key;
+        record[key] = r;
+      }
+      return record[key];
+    }
+  });
+  const definitions = factory(proxy);
+  for (const key of Object.keys(definitions)) {
+    const placeholder = cache[key];
+    const parser2 = definitions[key];
+    if (placeholder !== void 0 && typeof placeholder.define === "function") {
+      ;
+      placeholder.define(parser2);
+      placeholder._meta.firstSet = parser2._meta.firstSet;
+      placeholder._meta.canMatchNewline = parser2._meta.canMatchNewline;
+    } else {
+      ;
+      cache[key] = parser2;
+    }
+  }
+  for (const key of Object.keys(definitions)) {
+    markUnusedValues(cache[key]);
+  }
+  return cache;
+}
+
 // src/combinators/not.ts
 function not(combinator) {
   const meta = {
@@ -1371,6 +1457,20 @@ function transform(combinator, fn) {
     }
   };
 }
+function skip(main, skipped) {
+  return {
+    _tag: "skip",
+    _meta: main._meta,
+    _def: { tag: "skip", main, skipped },
+    parse(input, pos, ctx) {
+      const result = main.parse(input, pos, ctx);
+      if (!result.ok) return result;
+      const s = skipped.parse(input, result.span.end, ctx);
+      if (!s.ok) return result;
+      return { ...result, span: { start: result.span.start, end: s.span.end } };
+    }
+  };
+}
 function trivia(combinator) {
   const kindLabels = analyzeLabeledTrivia(combinator)?.labels;
   return {
@@ -1465,8 +1565,60 @@ function noTrivia(root) {
   return parser({ trivia: null }, root);
 }
 
+// src/combinators/token.ts
+function token(root) {
+  const meta = {
+    firstSet: root._meta.firstSet,
+    canMatchNewline: root._meta.canMatchNewline,
+    isTrivia: false
+  };
+  return {
+    _tag: "token",
+    _meta: meta,
+    _def: { tag: "token", parser: root },
+    parse(input, pos, ctx) {
+      const savedTrivia = ctx.trivia;
+      const savedKinds = ctx.triviaKindLabels;
+      const savedBuf = ctx._cstBuf;
+      const savedChildren = ctx._cstChildren;
+      const savedLeaves = ctx._cstLeaves;
+      const savedRaw = ctx._cstRawChildren;
+      const savedTriviaLog = ctx._cstTriviaLog;
+      const savedOuterTriviaLog = ctx._triviaLog;
+      const wasCapturing = cstCaptureActive(ctx);
+      ctx.trivia = void 0;
+      ctx.triviaKindLabels = void 0;
+      ctx._cstBuf = void 0;
+      ctx._cstChildren = void 0;
+      ctx._cstLeaves = void 0;
+      ctx._cstRawChildren = void 0;
+      ctx._cstTriviaLog = void 0;
+      delete ctx._triviaLog;
+      let result;
+      try {
+        result = root.parse(input, pos, ctx);
+      } finally {
+        ctx.trivia = savedTrivia;
+        ctx.triviaKindLabels = savedKinds;
+        ctx._cstBuf = savedBuf;
+        ctx._cstChildren = savedChildren;
+        ctx._cstLeaves = savedLeaves;
+        ctx._cstRawChildren = savedRaw;
+        ctx._cstTriviaLog = savedTriviaLog;
+        if (savedOuterTriviaLog === void 0) delete ctx._triviaLog;
+        else ctx._triviaLog = savedOuterTriviaLog;
+      }
+      if (!result.ok) return result;
+      const span = result.span;
+      const value = input.slice(pos, span.end);
+      if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value, span });
+      return { ok: true, value, span };
+    }
+  };
+}
+
 // src/combinators/expect.ts
-function staticExpected(c) {
+function deriveExpected(c) {
   const def = c._def;
   switch (def.tag) {
     case "literal":
@@ -1478,22 +1630,23 @@ function staticExpected(c) {
     case "label":
       return [def.label];
     case "choice":
-      return def.parsers.flatMap(staticExpected);
+      return def.parsers.flatMap(deriveExpected);
     case "sequence":
-      return def.parsers.length > 0 ? staticExpected(def.parsers[0]) : [];
+      return def.parsers.length > 0 ? deriveExpected(def.parsers[0]) : [];
     case "node":
     case "grammar":
     case "trivia":
+    case "token":
     case "optional":
     case "many":
     case "oneOrMore":
     case "transform":
     case "not":
-      return staticExpected(def.parser);
+      return deriveExpected(def.parser);
     case "lazy": {
       const name = c._ruleName;
       try {
-        return staticExpected(def.thunk());
+        return deriveExpected(def.thunk());
       } catch {
         return name ? [name] : [];
       }
@@ -1503,7 +1656,7 @@ function staticExpected(c) {
   }
 }
 function expect(combinator, label2) {
-  const expected = label2 !== void 0 ? [label2] : staticExpected(combinator);
+  const expected = label2 !== void 0 ? [label2] : deriveExpected(combinator);
   const meta = {
     firstSet: combinator._meta.firstSet,
     canMatchNewline: combinator._meta.canMatchNewline,
@@ -2999,16 +3152,12 @@ function namedFnPrelude() {
 function pushNamedFnDecl(ctx, fnName, bodyStmts, valueVar, endVar) {
   ctx.namedFnDecls.push([
     `function ${fnName}(input, _pos, _ctx) {`,
-    `  let _pfok = false, _pfv, _pfe = _pos`,
     `  _pfail: {`,
     ...reindentStmts(bodyStmts, 2),
-    `    _pfv = ${valueVar}`,
-    `    _pfe = ${endVar}`,
-    `    _pfok = true`,
+    `    ${NAMED_FN_END} = ${endVar}`,
+    `    return ${valueVar}`,
     `  }`,
-    `  if (!_pfok) return ${NAMED_FN_FAIL}`,
-    `  ${NAMED_FN_END} = _pfe`,
-    `  return _pfv`,
+    `  return ${NAMED_FN_FAIL}`,
     `}`
   ].join("\n"));
 }
@@ -3167,6 +3316,7 @@ function mayLeavePartialCapture(p, seen = /* @__PURE__ */ new Set()) {
     case "guard":
     case "not":
     case "trivia":
+    case "token":
     case "scanTo":
     case "unknown":
       return false;
@@ -3228,6 +3378,7 @@ function capturesLeaf(p, seen = /* @__PURE__ */ new Set()) {
     case "regex":
     case "keywords":
     case "node":
+    case "token":
       return true;
     case "not":
     case "guard":
@@ -3506,9 +3657,9 @@ function emitSeq(def, ctx, pos) {
   stmts.push(`${ind(ctx)}const ${arrV} = [${valueVars.join(", ")}]`);
   return { stmts, valueVar: arrV, endVar };
 }
-function staticExpectedArr(parsers) {
+function deriveExpectedArr(parsers) {
   return JSON.stringify(parsers.flatMap((p) => {
-    const e = staticExpected(p);
+    const e = deriveExpected(p);
     return e.length > 0 ? e : [p._tag];
   }));
 }
@@ -3529,7 +3680,7 @@ function failsAtStart(p) {
   }
 }
 function armStaticExpected(ctx, p) {
-  return hoistExpected(ctx, staticExpectedArr([p]));
+  return hoistExpected(ctx, deriveExpectedArr([p]));
 }
 function canMatchEmptyAtStart(p) {
   const d = p._def;
@@ -3567,7 +3718,7 @@ function emitDisjointArm(p, ctx, pos, valV, endV) {
   ];
 }
 function emitChoice(def, ctx, pos) {
-  const allExpected = staticExpectedArr(def.parsers);
+  const allExpected = deriveExpectedArr(def.parsers);
   if (def.disjoint) {
     const codeV = v(ctx, "_code");
     const valV = v(ctx, "_chv");
@@ -3628,7 +3779,7 @@ function emitGreedyClassify(def, superIndex, ctx, pos) {
   const wordV = v(ctx, "_gw");
   const endV = v(ctx, "_ge");
   const valV = v(ctx, "_gcv");
-  const regexExpected = JSON.stringify(staticExpected(superParser));
+  const regexExpected = JSON.stringify(deriveExpected(superParser));
   const stmts = [
     `${ind(ctx)}${reVar}.lastIndex = ${pos}`,
     `${ind(ctx)}const ${matchV} = ${reVar}.exec(input)`,
@@ -3709,11 +3860,16 @@ function emitFirstMatch(def, ctx, pos) {
     const atStart = failsAtStart(p);
     const staticFx = armStaticExpected(ctx, p);
     const deferRuleName = ctx.deferFirstSetRefs ? p._ruleName : void 0;
-    const fsGuard = deferRuleName !== void 0 ? `/*@FS:${deferRuleName}:${codeV}@*/true` : needsFirstSetGuard(p) ? firstSetCond(codeV, p._meta.firstSet) : null;
+    const fsGuard = deferRuleName !== void 0 ? `/*@FS:${deferRuleName}:${codeV}@*/true` : needsFirstSetGuard(p) ? firstSetCond(codeV, p._meta.firstSet) : (() => {
+      if (p._meta.firstSet.kind !== "any" || matchesEmpty(p)) return null;
+      const deep = firstSetOf(p);
+      return deep.kind === "ranges" ? firstSetCond(codeV, deep) : null;
+    })();
     let gateCond = null;
     if (gate) {
       const gateIdx = ctx.mapFns.length;
       ctx.mapFns.push(gate);
+      ctx.mapFnSrcs.push(null);
       gateCond = `${mfRef(ctx)}[${gateIdx}](_ctx.state)`;
     }
     const skipCond = gateCond ? `!${resOkV} && ${gateCond}` : `!${resOkV}`;
@@ -3772,13 +3928,21 @@ function emitNonDisjoint(def, strategy, allExpected, ctx, pos) {
     return emitLiteralsLongestFirst(def, strategy.sortedIndices, allExpected, ctx, pos);
   return emitFirstMatch(def, ctx, pos);
 }
+function pushMapFn(ctx, fn, src) {
+  if (src !== null && ctx.mapFns.length === ctx.mapFnSrcs.length) {
+    const hit = ctx.mapFnSrcs.indexOf(src);
+    if (hit !== -1) return hit;
+  }
+  const idx = ctx.mapFns.length;
+  ctx.mapFns.push(fn);
+  ctx.mapFnSrcs.push(src);
+  return idx;
+}
 function emitTransformChain(p, baseValue, endV, startPos, ctx) {
   const def = p._def;
   if (def.tag === "transform") {
     const innerR = emitTransformChain(def.parser, baseValue, endV, startPos, ctx);
-    const fnIdx = ctx.mapFns.length;
-    ctx.mapFns.push(def.fn);
-    ctx.mapFnSrcs.push(def.fnSrc ?? null);
+    const fnIdx = pushMapFn(ctx, def.fn, def.fnSrc ?? null);
     const vv = v(ctx);
     return {
       stmts: [...innerR.stmts, `${ind(ctx)}const ${vv} = ${mfRef(ctx)}[${fnIdx}](${innerR.valueVar}, { start: ${startPos}, end: ${endV} })`],
@@ -3961,7 +4125,7 @@ function emitScanTo(def, ctx, pos) {
     `${ind(ctx)}while (${curV} < input.length) {`
   ];
   ctx.indent++;
-  const probeCtx = { ...ctx, capturing: false };
+  const probeCtx = { ...ctx, capturing: false, noHoist: true };
   const { stmts: sentStmts, okVar: sentOk } = emitFallible(def.sentinel, probeCtx, curV);
   stmts.push(...sentStmts, `${ind(ctx)}if (${sentOk}) { ${foundV} = true; break }`);
   if (def.skip.length > 0) {
@@ -4007,6 +4171,116 @@ function emitNot(def, ctx, pos) {
     endVar: pos
   };
 }
+function escapeTokenLiteral(value) {
+  return value.replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
+}
+function regexMatchesEmpty(source, flags) {
+  try {
+    return new RegExp(`^(?:${source})$`, flags).test("");
+  } catch {
+    return true;
+  }
+}
+function tokenTerminalSource(p) {
+  const def = p._def;
+  switch (def.tag) {
+    case "literal":
+      if (def.value.length === 0) return null;
+      return {
+        source: escapeTokenLiteral(def.value),
+        caseInsensitive: def.caseInsensitive,
+        rawCaseSensitive: def.caseInsensitive ? "" : def.value
+      };
+    case "regex": {
+      if (def.flags.replace(/i/g, "") !== "") return null;
+      if (regexMatchesEmpty(def.source, def.flags)) return null;
+      return {
+        source: `(?:${def.source})`,
+        caseInsensitive: def.flags.includes("i"),
+        rawCaseSensitive: def.flags.includes("i") ? "" : def.source
+      };
+    }
+    default:
+      return null;
+  }
+}
+function tokenSequenceSource(p) {
+  const def = p._def;
+  const parts = def.tag === "sequence" ? def.parsers.map(tokenTerminalSource) : [tokenTerminalSource(p)];
+  if (parts.some((part) => part === null)) return null;
+  const typed = parts;
+  const flags = typed.some((part) => part.caseInsensitive) ? "i" : "";
+  if (flags.includes("i") && typed.some((part) => /[A-Za-z]/.test(part.rawCaseSensitive))) return null;
+  return {
+    source: typed.map((part) => part.source).join(""),
+    flags,
+    hasCaseSensitiveLetters: typed.some((part) => /[A-Za-z]/.test(part.rawCaseSensitive))
+  };
+}
+function combineTokenRegexSources(parts) {
+  const flags = parts.some((part) => part.flags.includes("i")) ? "i" : "";
+  if (flags.includes("i") && parts.some((part) => part.flags === "" && part.hasCaseSensitiveLetters)) return null;
+  return { source: parts.map((part) => part.source).join(""), flags };
+}
+function tokenNullableRegex(def) {
+  const inner = def.parser._def;
+  if (inner.tag === "many") {
+    const seq = tokenSequenceSource(inner.parser);
+    if (!seq) return null;
+    return { tag: "regex", source: `(?:${seq.source})*`, flags: seq.flags };
+  }
+  if (inner.tag === "optional") {
+    const seq = tokenSequenceSource(inner.parser);
+    if (!seq) return null;
+    return { tag: "regex", source: `(?:${seq.source})?`, flags: seq.flags };
+  }
+  if (inner.tag === "sepBy") {
+    const item = tokenSequenceSource(inner.parser);
+    const sep = tokenSequenceSource(inner.separator);
+    if (!item || !sep) return null;
+    const combined = combineTokenRegexSources([item, sep]);
+    if (!combined) return null;
+    return { tag: "regex", source: `(?:${item.source}(?:${sep.source}${item.source})*)?`, flags: combined.flags };
+  }
+  return null;
+}
+function emitToken(def, ctx, pos) {
+  const lowered = tokenNullableRegex(def);
+  if (lowered) return emitRegex(lowered, ctx, pos);
+  const savedTrivia = ctx.activeTrivia;
+  const savedKindLabels = ctx.triviaKindLabels;
+  ctx.activeTrivia = void 0;
+  ctx.triviaKindLabels = void 0;
+  const inner = emitFallible(def.parser, ctx, pos);
+  ctx.activeTrivia = savedTrivia;
+  ctx.triviaKindLabels = savedKindLabels;
+  const i = ind(ctx);
+  const sc = v(ctx, "_tokCh");
+  const sl = v(ctx, "_tokLv");
+  const sr = v(ctx, "_tokRaw");
+  const sv = v(ctx, "_tokTr");
+  const sk = v(ctx, "_tokKinds");
+  const stl = v(ctx, "_tokTl");
+  const sol = v(ctx, "_tokLog");
+  const sb = v(ctx, "_tokBuf");
+  const valV = v(ctx, "_tok");
+  return {
+    stmts: [
+      `${i}const ${sc} = _ctx._cstChildren, ${sl} = _ctx._cstLeaves, ${sr} = _ctx._cstRawChildren, ${sv} = _ctx.trivia, ${sk} = _ctx.triviaKindLabels, ${stl} = _ctx._cstTriviaLog, ${sol} = _ctx._triviaLog, ${sb} = _ctx._cstBuf`,
+      `${i}_ctx.trivia = undefined; _ctx.triviaKindLabels = undefined; _ctx._cstChildren = undefined; _ctx._cstLeaves = undefined; _ctx._cstRawChildren = undefined; _ctx._cstTriviaLog = undefined; _ctx._triviaLog = undefined; _ctx._cstBuf = undefined`,
+      `${i}try {`,
+      ...reindentStmts(inner.stmts, ctx.indent + 1).map((stmt) => stmt.replace(/^(\s*)(?:const|let)\s+/, "$1var ")),
+      `${i}} finally {`,
+      `${i}  _ctx.trivia = ${sv}; _ctx.triviaKindLabels = ${sk}; _ctx._cstChildren = ${sc}; _ctx._cstLeaves = ${sl}; _ctx._cstRawChildren = ${sr}; _ctx._cstTriviaLog = ${stl}; _ctx._triviaLog = ${sol}; _ctx._cstBuf = ${sb}`,
+      `${i}}`,
+      ...emitIfFail(ctx, `!${inner.okVar}`, propagateFailBody(ctx)),
+      `${i}const ${valV} = input.slice(${pos}, ${inner.endVar})`,
+      ...emitLeafCapture(ctx, valV, pos, inner.endVar)
+    ],
+    valueVar: valV,
+    endVar: inner.endVar
+  };
+}
 function emitNode(def, ctx, pos) {
   const structural = def.build === void 0;
   const mkType = structural ? null : analyzeMkInlineBuild(def);
@@ -4126,7 +4400,7 @@ function emitRecover(def, ctx, pos) {
     `${ind0}    if (${sentOk}) break`,
     `${ind0}    ${scanV}++`,
     `${ind0}  }`,
-    `${ind0}  const ${errV} = { _tag: 'parseError', span: { start: ${pos}, end: ${scanV} }, expected: ${JSON.stringify(staticExpected(def.parser))} }`,
+    `${ind0}  const ${errV} = { _tag: 'parseError', span: { start: ${pos}, end: ${scanV} }, expected: ${JSON.stringify(deriveExpected(def.parser))} }`,
     `${ind0}  if (_ctx._errors) _ctx._errors.push(${errV})`,
     `${ind0}  ${valVar} = ${errV}`,
     `${ind0}  ${endVar} = ${scanV}`,
@@ -4152,6 +4426,32 @@ function emitExpect(def, ctx, pos) {
   return { stmts, valueVar: valVar, endVar };
 }
 function emit(p, ctx, pos) {
+  const usage = ctx.lazyUsage;
+  if (usage && !ctx.noHoist && !ctx.capAsTrivia && !ctx.ruleNames?.has(p) && isHoistableTag(p._def.tag) && (usage.counts.get(p) ?? 0) > 1 && // Only hoist subtrees big enough that de-duplicating them beats the call
+  // overhead. A tiny shared wrapper (e.g. `optional(literal(';'))`) inlines
+  // faster than it calls and barely moves the byte count; the size explosion
+  // is all in LARGE choices/sequences referenced from many positions.
+  (usage.sizes.get(p) ?? 0) >= HOIST_MIN_SUBTREE) {
+    const existing = ctx.namedParsers.get(p);
+    if (existing !== void 0) return emitNamedFnCall(ctx, existing, pos);
+    const fnName = `${nsp(ctx)}_pf${ctx.namedParsers.size}`;
+    ctx.namedParsers.set(p, fnName);
+    const savedIndent = ctx.indent;
+    const savedFailLabel = ctx.failLabel;
+    const savedRecord = ctx.recordFail;
+    ctx.indent = 1;
+    ctx.failLabel = "_pfail";
+    ctx.recordFail = true;
+    const r = emitDispatch(p, ctx, "_pos");
+    ctx.indent = savedIndent;
+    ctx.failLabel = savedFailLabel;
+    ctx.recordFail = savedRecord;
+    pushNamedFnDecl(ctx, fnName, r.stmts, r.valueVar, r.endVar);
+    return emitNamedFnCall(ctx, fnName, pos);
+  }
+  return emitDispatch(p, ctx, pos);
+}
+function emitDispatch(p, ctx, pos) {
   const def = p._def;
   switch (def.tag) {
     case "literal":
@@ -4197,9 +4497,7 @@ function emit(p, ctx, pos) {
           };
         }
       }
-      const fnIdx = ctx.mapFns.length;
-      ctx.mapFns.push(def.fn);
-      ctx.mapFnSrcs.push(def.fnSrc ?? null);
+      const fnIdx = pushMapFn(ctx, def.fn, def.fnSrc ?? null);
       const mv = v(ctx, "_mapped");
       return {
         stmts: [
@@ -4232,6 +4530,8 @@ function emit(p, ctx, pos) {
       return emitLazy(p, def, ctx, pos);
     case "trivia":
       return emit(def.parser, ctx, pos);
+    case "token":
+      return emitToken(def, ctx, pos);
     case "label":
       return emit(def.parser, ctx, pos);
     case "grammar": {
@@ -4264,6 +4564,7 @@ function emit(p, ctx, pos) {
     case "guard": {
       const fnIdx = ctx.mapFns.length;
       ctx.mapFns.push(def.predicate);
+      ctx.mapFnSrcs.push(null);
       const vv = v(ctx);
       return {
         stmts: [
@@ -4278,6 +4579,7 @@ function emit(p, ctx, pos) {
       const evIdx = ctx.mapFns.length;
       const extra = def.extra;
       ctx.mapFns.push((() => extra));
+      ctx.mapFnSrcs.push(null);
       const innerParser = def.parser;
       if (!ctx.namedParsers.has(innerParser)) {
         const fnName = `_wcf${ctx.namedParsers.size}`;
@@ -4331,6 +4633,7 @@ function hasNodeDef(p, seen = /* @__PURE__ */ new Set()) {
     }
     case "grammar":
     case "trivia":
+    case "token":
     case "label":
     case "optional":
     case "many":
@@ -4366,6 +4669,7 @@ function childrenOf(def) {
     case "optional":
     case "transform":
     case "trivia":
+    case "token":
     case "label":
     case "grammar":
     case "not":
@@ -4397,9 +4701,58 @@ function childrenOf(def) {
       return [];
   }
 }
+var HOISTABLE_TAGS = /* @__PURE__ */ new Set([
+  "sequence",
+  "choice",
+  "many",
+  "oneOrMore",
+  "optional",
+  "sepBy",
+  "transform",
+  "node",
+  "not"
+]);
+function isHoistableTag(tag) {
+  return HOISTABLE_TAGS.has(tag);
+}
+var HOIST_MIN_SUBTREE = 3;
 function analyzeLazyUsage(root) {
   return analyzeLazyUsageMulti([root]);
 }
+function subtreeSizes(roots) {
+  const sizes = /* @__PURE__ */ new Map();
+  const sz = (p) => {
+    const cached = sizes.get(p);
+    if (cached !== void 0) return cached;
+    const def = p._def;
+    let s = 1;
+    if (def.tag !== "lazy") {
+      for (const child of childrenOf(def)) s += child._def.tag === "lazy" ? 1 : sz(child);
+    }
+    sizes.set(p, s);
+    return s;
+  };
+  const visitedLazy = /* @__PURE__ */ new Set();
+  const visit = (p) => {
+    const def = p._def;
+    if (def.tag === "lazy") {
+      if (visitedLazy.has(p)) return;
+      visitedLazy.add(p);
+      let resolved;
+      try {
+        resolved = def.thunk();
+      } catch {
+        return;
+      }
+      visit(resolved);
+      return;
+    }
+    sz(p);
+    for (const child of childrenOf(def)) visit(child);
+  };
+  for (const root of roots) visit(root);
+  return sizes;
+}
 function analyzeLazyUsageMulti(roots) {
   const counts = /* @__PURE__ */ new Map();
   const recursive = /* @__PURE__ */ new Set();
@@ -4426,10 +4779,14 @@ function analyzeLazyUsageMulti(roots) {
       active.delete(p);
       return;
     }
+    if (isHoistableTag(def.tag)) {
+      counts.set(p, (counts.get(p) ?? 0) + 1);
+    }
     for (const child of childrenOf(def)) walk2(child);
   }
-  for (const root of roots) walk2(root);
-  return { counts, recursive };
+  const rootsArr = [...roots];
+  for (const root of rootsArr) walk2(root);
+  return { counts, recursive, sizes: subtreeSizes(rootsArr) };
 }
 function ruleDependencies(ruleMap) {
   const nameOf = /* @__PURE__ */ new Map();
@@ -4828,64 +5185,6 @@ function buildInlineExpression(ctx, r, mapFnSources, buildSources) {
   ].join("\n");
 }
 
-// src/compiler/linker.ts
-function fusedBody(pieces) {
-  const winner = /* @__PURE__ */ new Map();
-  for (const p of pieces) for (const k of p.keys) winner.set(k, p);
-  for (const [k, p] of winner) {
-    for (const d of p.deps.get(k) ?? []) {
-      if (!winner.has(d)) throw new Error(`compose: rule "${k}" references missing rule "${d}"`);
-    }
-  }
-  const contributing = new Set(winner.values());
-  const needsEmptyTl = [...contributing].some((p) => p.needsEmptyTl);
-  const needsHostReads = [...contributing].some((p) => p.needsHostReads);
-  const lines = [
-    // Shared sentinel protocol (must match NAMED_FN_FAIL / NAMED_FN_END in codegen).
-    "const _pfFail = {}",
-    "let _pfEnd",
-    ...needsEmptyTl ? ["const _EMPTY_TL = Object.freeze([])"] : [],
-    ...needsHostReads ? [HOST_READS_DECL] : [],
-    // Each contributing artifact's namespaced private prelude (regexes, _pf, …).
-    ...[...contributing].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))
-  ];
-  const wrapperEntries = [...winner].map(([k, p]) => `${JSON.stringify(k)}: ${p.wrappers.get(k)}`);
-  const rawBody = [...lines, "return {", wrapperEntries.join(",\n"), "}"].join("\n");
-  const finalFS = /* @__PURE__ */ new Map();
-  for (const [k, p] of winner) {
-    const fs2 = p.firstSets?.get(k);
-    if (fs2) finalFS.set(k, fs2);
-  }
-  const body = rawBody.replace(
-    // Rule name + code-point var are both JS identifiers (rule names are validated
-    // at compile time — see assertRuleName in codegen), so an identifier class
-    // matches every well-formed placeholder.
-    /\/\*@FS:([A-Za-z0-9_$]+):([A-Za-z0-9_$]+)@\*\/true/g,
-    (_m, name, codevar) => {
-      const fs2 = finalFS.get(name);
-      if (!fs2 || fs2.kind === "any" || fs2.kind === "empty") return "true";
-      return `(${firstSetCond(codevar, fs2)})`;
-    }
-  );
-  const env = {};
-  for (const p of contributing) {
-    if (p.mfFns.length) env[`${p.ns}mf`] = p.mfFns;
-    if (p.buildFns.length) env[`${p.ns}build`] = p.buildFns;
-  }
-  return { body, env };
-}
-function emitFusedSource(pieces) {
-  const { body, env } = fusedBody(pieces);
-  if (Object.keys(env).length > 0) {
-    throw new Error("emitFusedSource: artifact carries non-static callbacks (runtime-only); cannot emit static source");
-  }
-  return `/* @__PURE__ */ (() => {
-${body}
-})()`;
-}
-
 // src/combinators/scanTo.ts
 function scanTo(sentinel, { skip: skip2 = [], orEOF = false } = {}) {
   const meta = {
@@ -4954,7 +5253,7 @@ function balanced(open, close, options = {}) {
   const content = bounded ? regex(new RegExp(`[^${cls}]+`)) : regex(new RegExp(`[^${escapeClassChar(open)}${escapeClassChar(close)}]`));
   const inner = many(choice(self, ...skips, content));
   const combi = transform(
-    sequence(literal(open), inner, expect(literal(close), close)),
+    sequence(literal(open), inner, expect(literal(close))),
     // parts: strings (content/self) or arrays (a sequence-shaped skip) or a
     // ParseError (recovered close). `c` is the close string or a ParseError.
     ([o, parts, c]) => o + parts.map((p) => typeof p === "string" ? p : Array.isArray(p) ? p.join("") : "").join("") + (typeof c === "string" ? c : "")
@@ -4980,6 +5279,359 @@ function escapeClassChar(ch) {
   return ch.replace(/[\\\]^-]/g, "\\$&");
 }
 
+// src/compiler/ir-serialize.ts
+function childrenOf2(def) {
+  switch (def.tag) {
+    case "sequence":
+    case "choice":
+      return def.parsers;
+    case "many":
+    case "oneOrMore":
+    case "optional":
+    case "transform":
+    case "trivia":
+    case "token":
+    case "label":
+    case "not":
+    case "node":
+    case "expect":
+      return [def.parser];
+    case "grammar":
+      return def.triviaParser ? [def.parser, def.triviaParser] : [def.parser];
+    case "sepBy":
+      return [def.parser, def.separator];
+    case "skip":
+      return [def.main, def.skipped];
+    case "scanTo":
+      return [def.sentinel, ...def.skip];
+    case "lazy":
+    case "literal":
+    case "regex":
+    case "keywords":
+    case "guard":
+    case "withCtx":
+    case "recover":
+    case "unknown":
+      return [];
+  }
+}
+var ruleNameOf = (c) => c._ruleName;
+function lazyTarget(c) {
+  if (c._def.tag !== "lazy") return null;
+  try {
+    return c._def.thunk();
+  } catch {
+    return null;
+  }
+}
+var Unserializable = class extends Error {
+};
+function serializeRuleMap(ruleMap) {
+  try {
+    return new Serializer(ruleMap).run();
+  } catch (e) {
+    if (e instanceof Unserializable) {
+      if (process.env.PARSEMAN_IR_DEBUG) console.error(`[ir] fallback: ${e.message}`);
+      return null;
+    }
+    throw e;
+  }
+}
+function evalRuleMapIR(ir) {
+  const _tf = (child, src) => {
+    let fn2;
+    try {
+      fn2 = (0, eval)(`(${src})`);
+    } catch {
+      fn2 = () => {
+        throw new Error("IR transform fn not materialized");
+      };
+    }
+    const t = transform(child, fn2);
+    t._def.fnSrc = src;
+    return t;
+  };
+  const _nd = (type, child, src, opts) => {
+    const n = node(type, child, void 0, opts);
+    n._def.buildSrc = src;
+    return n;
+  };
+  const fn = new Function(
+    "rules",
+    "ref",
+    "regex",
+    "literal",
+    "keywords",
+    "sequence",
+    "choice",
+    "many",
+    "oneOrMore",
+    "optional",
+    "sepBy",
+    "not",
+    "node",
+    "parser",
+    "scanTo",
+    "token",
+    "transform",
+    "skip",
+    "trivia",
+    "label",
+    "expect",
+    "_tf",
+    "_nd",
+    `return (${ir})`
+  );
+  const map = fn(
+    rules,
+    ref,
+    regex,
+    literal,
+    keywords,
+    sequence,
+    choice,
+    many,
+    oneOrMore,
+    optional,
+    sepBy,
+    not,
+    node,
+    parser,
+    scanTo,
+    token,
+    transform,
+    skip,
+    trivia,
+    label,
+    expect,
+    _tf,
+    _nd
+  );
+  return Object.entries(map);
+}
+var Serializer = class {
+  counts = /* @__PURE__ */ new Map();
+  selfRef = /* @__PURE__ */ new Set();
+  // combinators reached by an unnamed lazy pointing back into their own subtree
+  constName = /* @__PURE__ */ new Map();
+  emitted = /* @__PURE__ */ new Set();
+  decls = [];
+  ruleValues = /* @__PURE__ */ new Set();
+  ruleMap;
+  constructor(ruleMap) {
+    this.ruleMap = ruleMap;
+    for (const [, c] of ruleMap) this.ruleValues.add(this.body(c));
+  }
+  /** A `rules()` map wraps each rule value in a named `lazy` proxy; the real body is
+   * its target (compileLinkable unwraps the same way). A ref INSIDE a body stays a
+   * `g[name]` ref — only the top-level entry is unwrapped. */
+  body(c) {
+    return c._def.tag === "lazy" && ruleNameOf(c) !== void 0 ? lazyTarget(c) ?? c : c;
+  }
+  run() {
+    for (const [, c] of this.ruleMap) this.analyze(this.body(c), /* @__PURE__ */ new Set());
+    let n = 0;
+    for (const [c, count] of this.counts) {
+      if (this.ruleValues.has(c)) continue;
+      if (count >= 2 || this.selfRef.has(c)) this.constName.set(c, `_s${n++}`);
+    }
+    const body = this.ruleMap.map(([name, c]) => `  ${JSON.stringify(name)}: ${this.wrap(this.body(c))}`).join(",\n");
+    if (this.decls.length === 0) return `rules((g) => ({
+${body}
+}))`;
+    return `rules((g) => {
+${this.decls.map((d) => "  " + d).join("\n")}
+  return ({
+${body}
+})
+})`;
+  }
+  /** Count identity references and flag self-referential subtrees. `active` is the
+   * set of combinators on the current DFS path (to detect a lazy pointing back). */
+  analyze(c, active) {
+    const def = c._def;
+    if (def.tag === "lazy") {
+      if (ruleNameOf(c) !== void 0) return;
+      const target = lazyTarget(c);
+      if (!target) throw new Unserializable("unresolved unnamed ref");
+      if (active.has(target)) {
+        this.selfRef.add(target);
+        return;
+      }
+      this.analyze(target, active);
+      return;
+    }
+    if (def.tag === "guard" || def.tag === "withCtx" || def.tag === "recover" || def.tag === "unknown") {
+      throw new Unserializable(`unsupported tag ${def.tag}`);
+    }
+    this.counts.set(c, (this.counts.get(c) ?? 0) + 1);
+    if ((this.counts.get(c) ?? 0) > 1) return;
+    active.add(c);
+    for (const child of childrenOf2(def)) this.analyze(child, active);
+    active.delete(c);
+  }
+  /** Reference `c`: a const var if it has one (emitting its decl first), else inline.
+   * `selfOf` is the const currently being wrapped in a ref()/define closure — an
+   * unnamed lazy back into it emits the local ref var instead of recursing. */
+  ref(c, selfOf) {
+    const cn = this.constName.get(c);
+    if (cn) {
+      this.emitDecl(c);
+      return cn;
+    }
+    return this.expr(c, selfOf);
+  }
+  emitDecl(c) {
+    const name = this.constName.get(c);
+    if (this.emitted.has(name)) return;
+    this.emitted.add(name);
+    this.decls.push(`const ${name} = ${this.wrap(c)}`);
+  }
+  selfN = 0;
+  /** Emit `c`'s own constructor call, wrapping it in a `ref()`+`.define()` closure
+   * if it is self-referential (an unnamed lazy in its subtree points back to it) —
+   * the shape `balanced()` and other recursive library combinators build. */
+  wrap(c) {
+    if (!this.selfRef.has(c)) return this.expr(c, null);
+    const rv = `_rr${this.selfN++}`;
+    const bodyExpr = this.expr(c, { comb: c, var: rv });
+    return `(() => { const ${rv} = ref(); const _b = ${bodyExpr}; ${rv}.define(_b); return _b })()`;
+  }
+  /** Emit the constructor-call source for `c` (never a const shortcut for `c` itself). */
+  expr(c, selfOf) {
+    const def = c._def;
+    const kid = (x) => this.ref(x, selfOf);
+    switch (def.tag) {
+      case "lazy": {
+        if (ruleNameOf(c) !== void 0) return `g[${JSON.stringify(ruleNameOf(c))}]`;
+        const target = lazyTarget(c);
+        if (selfOf && target === selfOf.comb) return selfOf.var;
+        return this.ref(target, selfOf);
+      }
+      case "literal":
+        return `literal(${JSON.stringify(def.value)}${def.caseInsensitive ? ", { caseInsensitive: true }" : ""})`;
+      case "regex":
+        return `regex(${JSON.stringify(def.source)}, ${JSON.stringify(def.flags)})`;
+      case "keywords":
+        return `keywords(${JSON.stringify(def.words)}, { caseInsensitive: ${def.caseInsensitive}${def.boundary !== void 0 ? `, boundary: ${JSON.stringify(def.boundary)}` : ""} })`;
+      case "sequence":
+        return `sequence(${def.parsers.map(kid).join(", ")})`;
+      case "choice": {
+        if (def.gates.some((g) => g !== null)) throw new Unserializable("choice with a gate() has no source");
+        return `choice(${def.parsers.map(kid).join(", ")})`;
+      }
+      case "many":
+        return `many(${kid(def.parser)})`;
+      case "oneOrMore":
+        return `oneOrMore(${kid(def.parser)})`;
+      case "optional":
+        return `optional(${kid(def.parser)})`;
+      case "sepBy":
+        return `sepBy(${kid(def.parser)}, ${kid(def.separator)})`;
+      case "not":
+        return `not(${kid(def.parser)})`;
+      case "trivia":
+        return `trivia(${kid(def.parser)})`;
+      case "token":
+        return `token(${kid(def.parser)})`;
+      case "label":
+        return `label(${JSON.stringify(def.label)}, ${kid(def.parser)})`;
+      case "expect":
+        return `expect(${kid(def.parser)}${def.label !== void 0 ? `, ${JSON.stringify(def.label)}` : ""})`;
+      case "skip":
+        return `skip(${kid(def.main)}, ${kid(def.skipped)})`;
+      case "scanTo":
+        return `scanTo(${kid(def.sentinel)}, { skip: [${def.skip.map(kid).join(", ")}], orEOF: ${def.orEOF} })`;
+      case "transform": {
+        if (def.fnSrc === void 0) throw new Unserializable("transform without fnSrc");
+        return `_tf(${kid(def.parser)}, ${JSON.stringify(def.fnSrc)})`;
+      }
+      case "node": {
+        if (def.build !== void 0 && def.buildSrc === void 0) throw new Unserializable("node build without buildSrc");
+        const opts = def.collapse ? `, { collapse: true }` : "";
+        if (def.buildSrc !== void 0) return `_nd(${JSON.stringify(def.type)}, ${kid(def.parser)}, ${JSON.stringify(def.buildSrc)}${opts})`;
+        return opts ? `node(${JSON.stringify(def.type)}, ${kid(def.parser)}, undefined${opts})` : `node(${JSON.stringify(def.type)}, ${kid(def.parser)})`;
+      }
+      case "grammar": {
+        const trivia2 = def.clearTrivia ? "null" : def.triviaParser ? kid(def.triviaParser) : "undefined";
+        return `parser({ trivia: ${trivia2}${def.trackLines ? ", trackLines: true" : ""} }, ${kid(def.parser)})`;
+      }
+      case "guard":
+      case "withCtx":
+      case "recover":
+      case "unknown":
+        throw new Unserializable(`unsupported tag ${def.tag}`);
+    }
+  }
+};
+
+// src/compiler/linker.ts
+function fusedBody(pieces) {
+  const winner = /* @__PURE__ */ new Map();
+  for (const p of pieces) for (const k of p.keys) winner.set(k, p);
+  for (const [k, p] of winner) {
+    for (const d of p.deps.get(k) ?? []) {
+      if (!winner.has(d)) throw new Error(`compose: rule "${k}" references missing rule "${d}"`);
+    }
+  }
+  const contributing = new Set(winner.values());
+  const needsEmptyTl = [...contributing].some((p) => p.needsEmptyTl);
+  const needsHostReads = [...contributing].some((p) => p.needsHostReads);
+  const lines = [
+    // Shared sentinel protocol (must match NAMED_FN_FAIL / NAMED_FN_END in codegen).
+    "const _pfFail = {}",
+    "let _pfEnd",
+    ...needsEmptyTl ? ["const _EMPTY_TL = Object.freeze([])"] : [],
+    ...needsHostReads ? [HOST_READS_DECL] : [],
+    // Each contributing artifact's namespaced private prelude (regexes, _pf, …).
+    ...[...contributing].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))
+  ];
+  const wrapperEntries = [...winner].map(([k, p]) => `${JSON.stringify(k)}: ${p.wrappers.get(k)}`);
+  const rawBody = [...lines, "return {", wrapperEntries.join(",\n"), "}"].join("\n");
+  const finalFS = /* @__PURE__ */ new Map();
+  for (const [k, p] of winner) {
+    const fs2 = p.firstSets?.get(k);
+    if (fs2) finalFS.set(k, fs2);
+  }
+  const body = rawBody.replace(
+    // Rule name + code-point var are both JS identifiers (rule names are validated
+    // at compile time — see assertRuleName in codegen), so an identifier class
+    // matches every well-formed placeholder.
+    /\/\*@FS:([A-Za-z0-9_$]+):([A-Za-z0-9_$]+)@\*\/true/g,
+    (_m, name, codevar) => {
+      const fs2 = finalFS.get(name);
+      if (!fs2 || fs2.kind === "any" || fs2.kind === "empty") return "true";
+      return `(${firstSetCond(codevar, fs2)})`;
+    }
+  );
+  const env = {};
+  for (const p of contributing) {
+    if (p.mfFns.length) env[`${p.ns}mf`] = p.mfFns;
+    if (p.buildFns.length) env[`${p.ns}build`] = p.buildFns;
+  }
+  return { body, env };
+}
+function emitFusedSource(pieces) {
+  const { body, env } = fusedBody(pieces);
+  if (Object.keys(env).length > 0) {
+    throw new Error("emitFusedSource: artifact carries non-static callbacks (runtime-only); cannot emit static source");
+  }
+  return `/* @__PURE__ */ (() => {
+${body}
+})()`;
+}
+function isIRPiece(p) {
+  return !!p && typeof p === "object" && typeof p.ir === "string" && typeof p.ns === "string" && !("ruleFns" in p);
+}
+function materializePiece(p) {
+  if (!isIRPiece(p)) return p;
+  const pieces = compileLinkable(evalRuleMapIR(p.ir), p.ns);
+  if (!pieces) throw new Error(`compose: carried IR for ns "${p.ns}" could not be re-lowered`);
+  return pieces;
+}
+
 // src/cst/offset-model.ts
 var { isFinite } = Number;
 
@@ -5004,6 +5656,7 @@ var SUPPORTED = {
   trivia: (...a) => trivia(a[0]),
   label: (...a) => label(a[0], a[1]),
   noTrivia: (...a) => noTrivia(a[0]),
+  token: (...a) => token(a[0]),
   expect: (...a) => expect(a[0], a[1])
 };
 function isScopeEntry(v2) {
@@ -5553,6 +6206,14 @@ function findCarriedPiecesLiteral(root) {
       const obj = callee?.object?.name;
       const prop = callee?.property?.name;
       const args = node2.arguments;
+      if (obj === "Object" && prop === "assign" && args && args[1]?.type === "ObjectExpression") {
+        for (const p of args[1].properties ?? []) {
+          if (p.computed && isComposedPiecesSymbol(p.key) && p.value) {
+            found = { start: p.value.start, end: p.value.end };
+            return;
+          }
+        }
+      }
       if (obj === "Object" && prop === "defineProperty" && args && isComposedPiecesSymbol(args[1])) {
         const descriptor = args[2];
         for (const p of descriptor?.properties ?? []) {
@@ -5573,6 +6234,20 @@ function findCarriedPiecesLiteral(root) {
   visit(root);
   return found;
 }
+function extractImportBindings(body) {
+  const out = /* @__PURE__ */ new Map();
+  for (const stmt of body) {
+    if (stmt.type !== "ImportDeclaration") continue;
+    const s = stmt;
+    for (const spec of s.specifiers) {
+      if (spec.type === "ImportSpecifier") {
+        const imported = spec.imported.name ?? spec.local.name;
+        out.set(spec.local.name, { source: s.source.value, imported });
+      }
+    }
+  }
+  return out;
+}
 function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSEMAN_MODULE]), warnUnloweredRegex = false) {
   let result;
   try {
@@ -5647,14 +6322,57 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
   const isComposeCall = (init) => init.type === "CallExpression" && init.callee.type === "Identifier" && init.callee.name === "compose";
   const localRuleMaps = /* @__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) => {
-    const mapLit = (m) => `new Map([${[...m].map(([k, v2]) => `[${JSON.stringify(k)}, ${JSON.stringify(v2)}]`).join(", ")}])`;
-    return `{ ns: ${JSON.stringify(p.ns)}, keys: ${JSON.stringify(p.keys)}, prelude: ${JSON.stringify(p.prelude)}, ruleFns: ${mapLit(p.ruleFns)}, wrappers: ${mapLit(p.wrappers)}, firstSets: ${mapLit(p.firstSets)}, deps: ${mapLit(p.deps)}, needsEmptyTl: ${p.needsEmptyTl}, needsHostReads: ${p.needsHostReads}, mfFns: [], buildFns: [] }`;
+    const mapLit = (m, stripVals = false) => `new Map([${[...m].map(
+      ([k, v2]) => `[${JSON.stringify(k)}, ${JSON.stringify(stripVals && typeof v2 === "string" ? stripIndent(v2) : v2)}]`
+    ).join(", ")}])`;
+    return `{ ns: ${JSON.stringify(p.ns)}, keys: ${JSON.stringify(p.keys)}, prelude: ${JSON.stringify(p.prelude.map(stripIndent))}, ruleFns: ${mapLit(p.ruleFns, true)}, wrappers: ${mapLit(p.wrappers, true)}, firstSets: ${mapLit(p.firstSets)}, deps: ${mapLit(p.deps)}, needsEmptyTl: ${p.needsEmptyTl}, needsHostReads: ${p.needsHostReads}, mfFns: [], buildFns: [] }`;
   };
-  const serializeList = (list) => `[${list.map(serializePieces).join(", ")}]`;
-  const withCarriedPieces = (grammarExpr, list) => `/* @__PURE__ */ (() => { const _g = ${grammarExpr}; Object.defineProperty(_g, Symbol.for('parseman.composedPieces'), { value: ${serializeList(list)} }); return _g })()`;
+  const isSpread = (it) => "__spreadLocal" in it;
+  const isIR = (it) => "ir" in it && !("ruleFns" in it);
+  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 importedPiecesCache = /* @__PURE__ */ new Map();
+  const resolveModulePieces = (file, exportName, seen) => {
+    const mod = parseModuleCached(file);
+    if (!mod) return null;
+    const localFor = exportLocalName(mod.body, exportName);
+    const initNode = localFor ? topLevelInit(mod.body, localFor) : null;
+    const literalRange = initNode ? findCarriedPiecesLiteral(initNode) : null;
+    if (!literalRange) return null;
+    const literal2 = mod.src.slice(literalRange.start, literalRange.end);
+    const imports = extractImportBindings(mod.body);
+    const stubNames = [];
+    const stubVals = [];
+    const spreadRe = /\.\.\.\s*\(?\s*([A-Za-z_$][\w$]*)\s*\[\s*Symbol\s*\.\s*for\s*\(\s*['"]parseman\.composedPieces['"]/g;
+    const done = /* @__PURE__ */ new Set();
+    for (let m; m = spreadRe.exec(literal2); ) {
+      const local = m[1];
+      if (done.has(local)) continue;
+      done.add(local);
+      const b = imports.get(local);
+      let subPieces = [];
+      if (b) {
+        let subFile = null;
+        try {
+          subFile = getCompiledResolver().resolveFileSync(file, b.source).path ?? null;
+        } catch {
+        }
+        if (subFile && !seen.has(subFile)) subPieces = resolveModulePieces(subFile, b.imported, new Set(seen).add(subFile)) ?? [];
+      }
+      stubNames.push(local);
+      stubVals.push({ [/* @__PURE__ */ Symbol.for("parseman.composedPieces")]: subPieces });
+    }
+    try {
+      const list = new Function(...stubNames, `return (${literal2})`)(...stubVals);
+      return list.map(materializePiece);
+    } catch {
+      return null;
+    }
+  };
   const importedPieces = (localName) => {
     if (importedPiecesCache.has(localName)) return importedPiecesCache.get(localName);
     let result2 = null;
@@ -5665,41 +6383,34 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
         file = getCompiledResolver().resolveFileSync(id, binding.source).path ?? null;
       } catch {
       }
-      const mod = file ? parseModuleCached(file) : null;
-      if (mod) {
-        const localFor = exportLocalName(mod.body, binding.imported);
-        const initNode = localFor ? topLevelInit(mod.body, localFor) : null;
-        const literalRange = initNode ? findCarriedPiecesLiteral(initNode) : null;
-        if (literalRange) {
-          const literal2 = mod.src.slice(literalRange.start, literalRange.end);
-          try {
-            result2 = new Function(`return (${literal2})`)();
-          } catch {
-            result2 = null;
-          }
-        }
-      }
+      result2 = file ? resolveModulePieces(file, binding.imported, /* @__PURE__ */ new Set([file])) : null;
     }
     importedPiecesCache.set(localName, result2);
     return result2;
   };
+  const localArg = (rm, label2) => {
+    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] };
+  };
   const argPieces = (arg, label2) => {
     if (isRulesCall(arg)) {
       const factory = arg.arguments[0];
       const rm = factory ? evaluateParserFactory(factory, scope, code, []) : null;
-      const p = rm ? compileLinkable([...rm], nsFor(label2)) : null;
-      return p ? [p] : null;
+      return rm ? localArg(rm, label2) : null;
     }
     if (arg.type === "Identifier") {
       const name = arg.name;
       const rm = localRuleMaps.get(name);
-      if (rm) {
-        const p = compileLinkable([...rm], nsFor(label2));
-        return p ? [p] : null;
-      }
+      if (rm) return localArg(rm, label2);
       const composed = localComposedPieces.get(name);
-      if (composed) return composed;
-      return importedPieces(name);
+      if (composed) return { pieces: composed };
+      const pieces = importedPieces(name);
+      if (!pieces) return null;
+      return importBindings.has(name) ? { pieces, spreadLocal: name } : { pieces };
     }
     return null;
   };
@@ -5712,16 +6423,20 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
     }
     const elements = arr.elements;
     const pieces = [];
+    const carried = [];
     for (let i = 0; i < elements.length; i++) {
-      const list = argPieces(elements[i], `compose${init.start}_${i}`);
-      if (!list) {
+      const r = argPieces(elements[i], `compose${init.start}_${i}`);
+      if (!r) {
         warn(init.start, `compose(): argument ${i} isn't a build-resolvable grammar; falling back to runtime`);
         return null;
       }
-      pieces.push(...list);
+      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);
     }
     try {
-      return { replacement: emitFusedSource(pieces), pieces };
+      return { replacement: emitFusedSource(pieces), pieces, carried };
     } catch (e) {
       warn(init.start, `compose(): ${e.message}; falling back to runtime`);
       return null;
@@ -5808,9 +6523,11 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
           localRuleMaps.set(varName, compiledRules.ruleMap);
           let replacement = compiledRules.replacement;
           if (exportPrefix) {
-            const pieces = compileLinkable([...compiledRules.ruleMap], nsFor(varName));
+            const ns = nsFor(varName);
+            const pieces = compileLinkable([...compiledRules.ruleMap], ns);
             if (pieces && !pieces.mfFns.length && !pieces.buildFns.length) {
-              replacement = withCarriedPieces(replacement, [pieces]);
+              const ir = serializeRuleMap([...compiledRules.ruleMap]);
+              replacement = withCarriedPieces(replacement, [ir ? { ns, ir } : pieces]);
             }
           }
           replacements.push({ start: init.start, end: init.end, replacement });
@@ -5820,7 +6537,7 @@ function transformMacro(code, id, moduleAliases = /* @__PURE__ */ new Set([PARSE
           const fused = compileComposeCall(init);
           if (!fused) continue;
           localComposedPieces.set(varName, fused.pieces);
-          const replacement = exportPrefix ? withCarriedPieces(fused.replacement, fused.pieces) : fused.replacement;
+          const replacement = exportPrefix ? withCarriedPieces(fused.replacement, fused.carried) : fused.replacement;
           replacements.push({ start: init.start, end: init.end, replacement });
           continue;
         }