parseman 0.54.0 → 0.55.0

package/dist/combinators/withCtx.d.ts

@@ -1,13 +1,28 @@
 import type { Combinator } from '../types.ts';
 /**
- * Runs `combinator` with `ctx.state` set to `extra` for the duration of the parse.
- * The outer user context is restored on exit (lexical scoping).
+ * Runs `combinator` under a scoped `ctx.state`, restored on exit (lexical scoping).
  *
- *   const functionBody = withCtx({ inFn: true },
- *     sequence(literal('{'), many(statement), literal('}'))
- *   )
+ * Two forms, told apart by whether the first argument is a function:
  *
- * Read back with guard() or from within a transform's span argument.
+ * - **Replace** — `withCtx(extra, c)`: the subtree's state IS `extra`.
+ *
+ *     const functionBody = withCtx({ inFn: true },
+ *       sequence(literal('{'), many(statement), literal('}'))
+ *     )
+ *
+ * - **Derive** — `withCtx(state => next, c)`: the subtree's state is computed
+ *   FROM the state in force at entry, once per entry. Use it to add or override
+ *   a field while every outer field (options, document-wide sinks) stays visible
+ *   to the gates and reducers inside:
+ *
+ *     const argument = withCtx(s => ({ ...s, stop: 'comparison' }), value)
+ *
+ * Because a function argument always selects the derive form, a state that is
+ * itself a function cannot be installed with the replace form; wrap it
+ * (`withCtx(() => fn, c)`).
+ *
+ * Read back with gate() or from within a transform's span argument.
  */
-export declare function withCtx<U, T>(extra: U, combinator: Combinator<T>): Combinator<T>;
+export declare function withCtx<S = Readonly<Record<string, unknown>> | undefined, U = unknown, T = unknown>(derive: (state: S) => U, combinator: Combinator<T>): Combinator<T>;
+export declare function withCtx<U, T>(extra: U extends (...args: never[]) => unknown ? never : U, combinator: Combinator<T>): Combinator<T>;
 //# sourceMappingURL=withCtx.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"withCtx.d.ts","sourceRoot":"","sources":["../../src/combinators/withCtx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAA;AAEpF;;;;;;;;;GASG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAgChF"}
+{"version":3,"file":"withCtx.d.ts","sourceRoot":"","sources":["../../src/combinators/withCtx.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAA;AAEpF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH,wBAAgB,OAAO,CAAC,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA;AAKvK,wBAAgB,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,GAAG,KAAK,GAAG,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAA"}

package/dist/index.js

@@ -8277,6 +8277,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");
         }
@@ -13233,8 +13236,21 @@ function assemble(t, 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;
@@ -17725,7 +17741,7 @@ function fieldOptionsSrc(def) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.54.0";
+var PARSEMAN_VERSION = "0.55.0";
 
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {
@@ -19313,19 +19329,28 @@ function withCtx(extra, combinator) {
     canMatchNewline: combinator._meta.canMatchNewline,
     isTrivia: false
   };
+  const parse2 = typeof extra === "function" ? (input, pos, ctx) => {
+    const saved = ctx.state;
+    ctx.state = extra(saved);
+    try {
+      return combinator.parse(input, pos, ctx);
+    } finally {
+      ctx.state = saved;
+    }
+  } : (input, pos, ctx) => {
+    const saved = ctx.state;
+    ctx.state = extra;
+    try {
+      return combinator.parse(input, pos, ctx);
+    } finally {
+      ctx.state = saved;
+    }
+  };
   return {
     _tag: "withCtx",
     _meta: meta,
     _def: { tag: "withCtx", extra, parser: combinator },
-    parse(input, pos, ctx) {
-      const saved = ctx.state;
-      ctx.state = extra;
-      try {
-        return combinator.parse(input, pos, ctx);
-      } finally {
-        ctx.state = saved;
-      }
-    }
+    parse: parse2
   };
 }