parseman 0.26.1 → 0.26.2

package/dist/index.js

@@ -6257,6 +6257,34 @@ function evalRuleMapIR(ir) {
     n._def.buildSrc = src;
     return n;
   };
+  const _gch = (items) => {
+    const gateSrcs = [];
+    const arms = items.map((it) => {
+      if (Array.isArray(it)) {
+        const [src, comb] = it;
+        gateSrcs.push(src);
+        let gate;
+        try {
+          gate = (0, eval)(`(${src})`);
+        } catch {
+          gate = () => {
+            throw new Error("IR gate fn not materialized");
+          };
+        }
+        return { gate, combinator: comb };
+      }
+      gateSrcs.push(null);
+      return it;
+    });
+    const c = choice(...arms);
+    const gates = c._def.gates;
+    if (gates && gates.length !== gateSrcs.length) {
+      throw new Error(`_gch: gateSrcs length ${gateSrcs.length} != choice gates length ${gates.length}`);
+    }
+    ;
+    c._def.gateSrcs = gateSrcs;
+    return c;
+  };
   const fn = new Function(
     "rules",
     "ref",
@@ -6282,6 +6310,7 @@ function evalRuleMapIR(ir) {
     "expect",
     "_tf",
     "_nd",
+    "_gch",
     `return (${ir})`
   );
   const map = fn(
@@ -6308,7 +6337,8 @@ function evalRuleMapIR(ir) {
     field,
     expect,
     _tf,
-    _nd
+    _nd,
+    _gch
   );
   return Object.entries(map);
 }
@@ -6420,8 +6450,16 @@ ${body}
       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(", ")})`;
+        const gates = def.gates;
+        if (gates.every((g) => g === null)) return `choice(${def.parsers.map(kid).join(", ")})`;
+        const gateSrcs = def.gateSrcs;
+        const items = def.parsers.map((p, i) => {
+          if (gates[i] === null) return kid(p);
+          const src = gateSrcs?.[i];
+          if (src == null) throw new Unserializable("choice gate() has no captured source");
+          return `[${JSON.stringify(src)}, ${kid(p)}]`;
+        });
+        return `_gch([${items.join(", ")}])`;
       }
       case "many":
         return `many(${kid(def.parser)})`;