parseman 0.54.0 → 0.55.0

package/dist/analysis/diagnostics.js

@@ -7243,6 +7243,9 @@ var Encoder = class {
           this.expected([adjacencyExpected(d)])
         );
       case "withCtx": {
+        if (typeof d.extra === "function") {
+          return this.emit(OP_WITHCTX, ~this.fn(d.extra, d.extraSrc ?? null), this.node(d.parser).ip);
+        }
         if (!emittableConst(d.extra)) {
           this.runtimeOnly.add("withCtx(extra) \u2014 the state object is not serialisable");
         }
@@ -12586,8 +12589,21 @@ function assemble(t2, prog, cfg) {
         };
       }
       case OP_WITHCTX: {
-        const extra = k[code[ip + 1]];
+        const ki = code[ip + 1];
         const child = link(code[ip + 2]);
+        if (ki < 0) {
+          const derive2 = fns[~ki];
+          return (input, pos, ctx) => {
+            const saved = ctx.state;
+            ctx.state = derive2(saved);
+            try {
+              return child(input, pos, ctx);
+            } finally {
+              ctx.state = saved;
+            }
+          };
+        }
+        const extra = k[ki];
         return (input, pos, ctx) => {
           const saved = ctx.state;
           ctx.state = extra;