parseman 0.48.0 → 0.49.0

package/dist/combinators/choice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"choice.d.ts","sourceRoot":"","sources":["../../src/combinators/choice.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAC+B,QAAQ,EAClD,MAAM,aAAa,CAAA;AAKpB,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AACvH,KAAK,SAAS,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI;KACrE,CAAC,IAAI,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAChC,CAAC,MAAM,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEjD,wBAAgB,MAAM,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EACxH,GAAG,IAAI,EAAE,CAAC,GACT,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAqK1B;AAgID;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAWrF;AA6CD,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAKzE;AAED,qEAAqE;AACrE,wBAAgB,eAAe,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAMhG"}
+{"version":3,"file":"choice.d.ts","sourceRoot":"","sources":["../../src/combinators/choice.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAC+B,QAAQ,EAClD,MAAM,aAAa,CAAA;AAKpB,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAA;AACvH,KAAK,SAAS,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI;KACrE,CAAC,IAAI,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAChC,CAAC,MAAM,CAAC,SAAS,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;AAEjD,wBAAgB,MAAM,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EACxH,GAAG,IAAI,EAAE,CAAC,GACT,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CA8K1B;AAgID;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAWrF;AA6CD,uEAAuE;AACvE,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,IAAI,CAKzE;AAED,qEAAqE;AACrE,wBAAgB,eAAe,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAMhG"}

package/dist/compiler/ir-serialize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-serialize.d.ts","sourceRoot":"","sources":["../../src/compiler/ir-serialize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,UAAU,EAAkC,MAAM,aAAa,CAAA;AAuB7E,KAAK,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;AAiG/B,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAC/C,QAAQ,CAAC,EAAE,SAAS,IAAI,EAAE,GAAG,IAAI,GAChC,MAAM,GAAG,IAAI,CAUf;AAED;;oFAEoF;AACpF,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAyG/D"}
+{"version":3,"file":"ir-serialize.d.ts","sourceRoot":"","sources":["../../src/compiler/ir-serialize.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,UAAU,EAAkC,MAAM,aAAa,CAAA;AAuB7E,KAAK,IAAI,GAAG,UAAU,CAAC,OAAO,CAAC,CAAA;AAiG/B,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,aAAa,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,EAC/C,QAAQ,CAAC,EAAE,SAAS,IAAI,EAAE,GAAG,IAAI,GAChC,MAAM,GAAG,IAAI,CAUf;AAED;;oFAEoF;AACpF,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAiH/D"}

package/dist/compiler/linker.d.ts.map

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

package/dist/index.js

@@ -2950,6 +2950,7 @@ function choice(...args) {
     },
     parse(input, pos, ctx) {
       const expected = [];
+      let expectedAt = pos;
       if (disjoint) {
         const code = pos < input.length ? input.codePointAt(pos) : -1;
         let idx = code >= 0 && code < 128 ? asciiDispatch[code] : -1;
@@ -3007,7 +3008,12 @@ function choice(...args) {
         const result = parsers[i].parse(input, pos, ctx);
         if (!result.ok) {
           rollbackTrivia(ctx, mark);
-          expected.push(...result.expected);
+          const at = result.span.start;
+          if (at > expectedAt) {
+            expectedAt = at;
+            expected.length = 0;
+          }
+          if (at === expectedAt) expected.push(...result.expected);
           if (result.committed) return { ok: false, expected, span: result.span, committed: true };
           continue;
         }
@@ -3018,6 +3024,9 @@ function choice(...args) {
         }
         return result;
       }
+      if (expected.length === 0) {
+        for (const parser2 of parsers) expected.push(...deriveExpected(parser2));
+      }
       return { ok: false, expected, span: { start: pos, end: pos } };
     }
   };
@@ -5608,24 +5617,43 @@ function choiceNode(arms, classes, armExpected, choiceExpected) {
   };
   for (let i = arms.length - 1; i >= 0; i--) {
     const arm = arms[i], cls = classes[i], staticExpected = armExpected[i], next = tail;
-    tail = (input, pos, ctx, lead2, acc) => {
+    tail = (input, pos, ctx, lead2, acc, best) => {
       if (cls !== void 0 && !classHas(cls, lead2)) {
-        return next(input, pos, ctx, lead2, appendExpected(acc, staticExpected));
+        return next(
+          input,
+          pos,
+          ctx,
+          lead2,
+          best === pos ? appendExpected(acc, staticExpected) : acc,
+          best
+        );
       }
       ctx._fc = false;
       const end = arm.run(input, pos, ctx);
       if (end >= 0) return end;
-      const nextAcc = appendExpected(acc, ctx._fx);
+      const at = ctx._fe ?? pos;
+      if (at > best) {
+        best = at;
+        acc = void 0;
+      }
+      const nextAcc = at === best ? appendExpected(acc, ctx._fx) : acc;
       if (committed(ctx)) {
         if (nextAcc !== void 0) ctx._fx = nextAcc;
         return -1;
       }
-      return next(input, pos, ctx, lead2, nextAcc);
+      return next(input, pos, ctx, lead2, nextAcc, best);
     };
   }
   return {
     match: matchTail,
-    run: (input, pos, ctx) => tail(input, pos, ctx, pos < input.length ? input.codePointAt(pos) : -1, void 0)
+    run: (input, pos, ctx) => tail(
+      input,
+      pos,
+      ctx,
+      pos < input.length ? input.codePointAt(pos) : -1,
+      void 0,
+      pos
+    )
   };
 }
 function notNode(body, failure) {
@@ -9719,9 +9747,11 @@ ${catchCases}
 ctx._fc=false
 {const v=${arm}(input,pos,ctx)
 if(v!==FAIL)return v}
-acc=${catchName}(${i},prev,acc)
+if(best===pos)acc=${catchName}(${i},prev,acc)
 prev=${i + 1}
-acc=_accSet(ctx._fx,acc)
+{const at=ctx._fe??pos
+if(at>best){best=at;acc=undefined}
+if(at===best)acc=_accSet(ctx._fx,acc)}
 if(ctx._fc===true){if(acc!==undefined)ctx._fx=acc;return FAIL}
 ${emitRollback(p, L.buf, sinks)}
 }`;
@@ -9730,19 +9760,22 @@ ${emitRollback(p, L.buf, sinks)}
 ctx._fc=false
 {const v=${arm}(input,pos,ctx)
 if(v!==FAIL)return v}
-acc=_accSet(ctx._fx,acc)
+{const at=ctx._fe??pos
+if(at>best){best=at;acc=undefined}
+if(at===best)acc=_accSet(ctx._fx,acc)}
 if(ctx._fc===true){if(acc!==undefined)ctx._fx=acc;return FAIL}
 ${emitRollback(p, L.buf, sinks)}
-}else acc=_accSet(${expected[i]},acc)`).join("\n");
+}else if(best===pos)acc=_accSet(${expected[i]},acc)`).join("\n");
           return `${head}
 const c=lead(input,pos)
 ${emitMark(p, L.buf, sinks)}
 let acc
+let best=pos
 ${maskable ? `if(c<128){
 const bits=${maskName}[c<0?128:c]
 let prev=0
 ${maskArms}
-acc=${catchName}(${n},prev,acc)
+if(best===pos)acc=${catchName}(${n},prev,acc)
 ctx._fe=pos;ctx._fx=acc??${choiceFx}
 return FAIL
 }
@@ -10874,14 +10907,19 @@ function assemble(t, prog, cfg) {
     };
   }
   function maskedChoiceBlock(start, a0, a1, a2, a3, through, next, total, choiceFx) {
-    return (input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev) => {
+    return (input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best) => {
       if ((bits & 1 << start) !== 0) {
         ctx._fc = false;
         const v = a0(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start, prev, acc);
+        if (best === pos) acc = through(start, prev, acc);
         prev = start + 1;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10892,9 +10930,14 @@ function assemble(t, prog, cfg) {
         ctx._fc = false;
         const v = a1(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 1, prev, acc);
+        if (best === pos) acc = through(start + 1, prev, acc);
         prev = start + 2;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10905,9 +10948,14 @@ function assemble(t, prog, cfg) {
         ctx._fc = false;
         const v = a2(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 2, prev, acc);
+        if (best === pos) acc = through(start + 2, prev, acc);
         prev = start + 3;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10918,9 +10966,14 @@ function assemble(t, prog, cfg) {
         ctx._fc = false;
         const v = a3(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 3, prev, acc);
+        if (best === pos) acc = through(start + 3, prev, acc);
         prev = start + 4;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10928,23 +10981,28 @@ function assemble(t, prog, cfg) {
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
       }
       if (next !== void 0) {
-        return next(input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev);
+        return next(input, pos, ctx, bits, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best);
       }
-      acc = through(total, prev, acc);
+      if (best === pos) acc = through(total, prev, acc);
       ctx._fe = pos;
       ctx._fx = acc ?? choiceFx;
       return FAIL;
     };
   }
   function generalChoiceBlock(start, a0, a1, a2, a3, g0, g1, g2, g3, through, next, total, choiceFx) {
-    return (input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev) => {
+    return (input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best) => {
       if (g0 === null || classHas2(g0, c)) {
         ctx._fc = false;
         const v = a0(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start, prev, acc);
+        if (best === pos) acc = through(start, prev, acc);
         prev = start + 1;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10955,9 +11013,14 @@ function assemble(t, prog, cfg) {
         ctx._fc = false;
         const v = a1(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 1, prev, acc);
+        if (best === pos) acc = through(start + 1, prev, acc);
         prev = start + 2;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10968,9 +11031,14 @@ function assemble(t, prog, cfg) {
         ctx._fc = false;
         const v = a2(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 2, prev, acc);
+        if (best === pos) acc = through(start + 2, prev, acc);
         prev = start + 3;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10981,9 +11049,14 @@ function assemble(t, prog, cfg) {
         ctx._fc = false;
         const v = a3(input, pos, ctx);
         if (v !== FAIL) return v;
-        acc = through(start + 3, prev, acc);
+        if (best === pos) acc = through(start + 3, prev, acc);
         prev = start + 4;
-        acc = accSet(ctx._fx, acc);
+        const at = ctx._fe ?? pos;
+        if (at > best) {
+          best = at;
+          acc = void 0;
+        }
+        if (at === best) acc = accSet(ctx._fx, acc);
         if (committed3(ctx)) {
           if (acc !== void 0) ctx._fx = acc;
           return FAIL;
@@ -10991,9 +11064,9 @@ function assemble(t, prog, cfg) {
         if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
       }
       if (next !== void 0) {
-        return next(input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev);
+        return next(input, pos, ctx, c, need, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot, acc, prev, best);
       }
-      acc = through(total, prev, acc);
+      if (best === pos) acc = through(total, prev, acc);
       ctx._fe = pos;
       ctx._fx = acc ?? choiceFx;
       return FAIL;
@@ -12349,6 +12422,7 @@ function assemble(t, prog, cfg) {
             const mLog = need ? ctx._triviaLog?.length ?? 0 : 0;
             const mRoot = need ? ctx._rootTriviaLog?.length ?? 0 : 0;
             let acc;
+            let best = pos;
             if (c < 128) {
               const bits = mask[c < 0 ? 128 : c];
               let prev = 0;
@@ -12357,7 +12431,12 @@ function assemble(t, prog, cfg) {
                 const v = a0(input, pos, ctx);
                 if (v !== FAIL) return v;
                 prev = 1;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
@@ -12368,9 +12447,14 @@ function assemble(t, prog, cfg) {
                 ctx._fc = false;
                 const v = a1(input, pos, ctx);
                 if (v !== FAIL) return v;
-                if (prev < 1) acc = accSet(e0, acc);
+                if (best === pos && prev < 1) acc = accSet(e0, acc);
                 prev = 2;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
@@ -12381,19 +12465,24 @@ function assemble(t, prog, cfg) {
                 ctx._fc = false;
                 const v = a2(input, pos, ctx);
                 if (v !== FAIL) return v;
-                if (prev < 1) acc = accSet(e0, acc);
-                if (prev < 2) acc = accSet(e1, acc);
+                if (best === pos && prev < 1) acc = accSet(e0, acc);
+                if (best === pos && prev < 2) acc = accSet(e1, acc);
                 prev = 3;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
                 }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
               }
-              if (prev < 1) acc = accSet(e0, acc);
-              if (prev < 2) acc = accSet(e1, acc);
-              if (n === 3 && prev < 3) acc = accSet(e2, acc);
+              if (best === pos && prev < 1) acc = accSet(e0, acc);
+              if (best === pos && prev < 2) acc = accSet(e1, acc);
+              if (best === pos && n === 3 && prev < 3) acc = accSet(e2, acc);
               ctx._fe = pos;
               ctx._fx = acc ?? choiceFx;
               return FAIL;
@@ -12402,36 +12491,51 @@ function assemble(t, prog, cfg) {
               ctx._fc = false;
               const v = a0(input, pos, ctx);
               if (v !== FAIL) return v;
-              acc = accSet(ctx._fx, acc);
+              const at = ctx._fe ?? pos;
+              if (at > best) {
+                best = at;
+                acc = void 0;
+              }
+              if (at === best) acc = accSet(ctx._fx, acc);
               if (committed3(ctx)) {
                 if (acc !== void 0) ctx._fx = acc;
                 return FAIL;
               }
               if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-            } else acc = accSet(e0, acc);
+            } else if (best === pos) acc = accSet(e0, acc);
             if (g1 === null || classHas2(g1, c)) {
               ctx._fc = false;
               const v = a1(input, pos, ctx);
               if (v !== FAIL) return v;
-              acc = accSet(ctx._fx, acc);
+              const at = ctx._fe ?? pos;
+              if (at > best) {
+                best = at;
+                acc = void 0;
+              }
+              if (at === best) acc = accSet(ctx._fx, acc);
               if (committed3(ctx)) {
                 if (acc !== void 0) ctx._fx = acc;
                 return FAIL;
               }
               if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-            } else acc = accSet(e1, acc);
+            } else if (best === pos) acc = accSet(e1, acc);
             if (n === 3) {
               if (g2 === null || classHas2(g2, c)) {
                 ctx._fc = false;
                 const v = a2(input, pos, ctx);
                 if (v !== FAIL) return v;
-                acc = accSet(ctx._fx, acc);
+                const at = ctx._fe ?? pos;
+                if (at > best) {
+                  best = at;
+                  acc = void 0;
+                }
+                if (at === best) acc = accSet(ctx._fx, acc);
                 if (committed3(ctx)) {
                   if (acc !== void 0) ctx._fx = acc;
                   return FAIL;
                 }
                 if (need) rollbackTriviaAt(ctx, mRaw, mTl, mLv, mFl, mEr, mLog, mRoot);
-              } else acc = accSet(e2, acc);
+              } else if (best === pos) acc = accSet(e2, acc);
             }
             ctx._fe = pos;
             ctx._fx = acc ?? choiceFx;
@@ -12529,7 +12633,8 @@ function assemble(t, prog, cfg) {
                 mLog,
                 mRoot,
                 void 0,
-                0
+                0,
+                pos
               );
             }
             return general(
@@ -12546,7 +12651,8 @@ function assemble(t, prog, cfg) {
               mLog,
               mRoot,
               void 0,
-              0
+              0,
+              pos
             );
           };
         }
@@ -12574,7 +12680,8 @@ function assemble(t, prog, cfg) {
             mLog,
             mRoot,
             void 0,
-            0
+            0,
+            pos
           );
         };
       }
@@ -15359,7 +15466,7 @@ function evalRuleMapIR(ir) {
     l._def.fnSrc = src;
     return l;
   };
-  const _nd = (type, child, src, opts, staticError, sigSrc) => {
+  const _nd = (type, child, src, opts, staticError, sigSrc, buildImports) => {
     if (staticError !== void 0 && staticError.length > 0) {
       throw new Error(`IR direct node builder for ${type} must be macro-static and self-contained; unsupported binding(s): ${staticError.join(", ")}`);
     }
@@ -15369,6 +15476,7 @@ function evalRuleMapIR(ir) {
     n._def.buildSrc = src;
     if (staticError !== void 0) n._def.buildStaticError = staticError;
     if (sigSrc !== void 0) n._def.buildSigSrc = sigSrc;
+    if (buildImports !== void 0) n._def.buildImports = buildImports;
     return n;
   };
   const _gch = (items) => {
@@ -15760,11 +15868,12 @@ ${outerDecls.map((d) => "  " + d).join("\n")}
         }
         if (def.buildSrc !== void 0) {
           const tail = [];
-          if (def.buildStaticError !== void 0 || def.buildSigSrc !== void 0) {
+          if (def.buildStaticError !== void 0 || def.buildSigSrc !== void 0 || def.buildImports !== void 0) {
             if (!opts) tail.push("undefined");
             tail.push(def.buildStaticError === void 0 ? "undefined" : JSON.stringify(def.buildStaticError));
           }
-          if (def.buildSigSrc !== void 0) tail.push(JSON.stringify(def.buildSigSrc));
+          if (def.buildSigSrc !== void 0 || def.buildImports !== void 0) tail.push(def.buildSigSrc === void 0 ? "undefined" : JSON.stringify(def.buildSigSrc));
+          if (def.buildImports !== void 0) tail.push(JSON.stringify(def.buildImports));
           const trailing = tail.length > 0 ? `, ${tail.join(", ")}` : "";
           return `_nd(${JSON.stringify(def.type)}, ${kid(def.parser)}, ${JSON.stringify(def.buildSrc)}${opts}${trailing})`;
         }
@@ -15911,7 +16020,7 @@ function compileRuleMap(ruleMap, opts = {}) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.48.0";
+var PARSEMAN_VERSION = "0.49.0";
 
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {
@@ -16067,6 +16176,11 @@ function materializeDirectBuilders(ruleMap) {
     seen.add(p);
     const d = p._def;
     if (d.tag === "node" && typeof d.buildSrc === "string") {
+      if (d.buildImports !== void 0 && d.buildImports.length > 0) {
+        throw new Error(
+          `IR direct node builder for ${d.type ?? "<anonymous>"} references module import(s) ${d.buildImports.map((bi) => bi.local).join(", ")} that a runtime compose() cannot supply; compose at build time via the parseman macro plugin, which re-emits the imports.`
+        );
+      }
       try {
         const fn = (0, eval)(`(${d.buildSrc})`);
         if (typeof fn === "function") d.build = fn;