parseman 0.26.1 → 0.26.3

package/dist/plugin/evaluator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"evaluator.d.ts","sourceRoot":"","sources":["../../src/plugin/evaluator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EACV,UAAU,EAAE,IAAI,EAMjB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAa7C,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB,CAAA;AACD,MAAM,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAM3C,KAAK,gBAAgB,GAAG;IAAE,GAAG,EAAE,aAAa,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AA4dhE,0EAA0E;AAC1E,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,gBAAgB,GAAG,IAAI,CAUzB;AAED,6EAA6E;AAC7E,wBAAgB,YAAY,CAC1B,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAM9B;AAiED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EACvB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EAAE,GACrB,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAqGzC;AAED,oEAAoE;AACpE,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG;IAAE,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,CAAA;AAQlF;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,YAAY,GAAG,IAAI,CAQrB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAoBT;AAED,kFAAkF;AAClF,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAcnF"}
+{"version":3,"file":"evaluator.d.ts","sourceRoot":"","sources":["../../src/plugin/evaluator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,KAAK,EACV,UAAU,EAAE,IAAI,EAMjB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AA2E7C,MAAM,MAAM,UAAU,GAAG;IACvB,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAA;IAC1B,MAAM,EAAE,MAAM,EAAE,CAAA;CACjB,CAAA;AACD,MAAM,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;AAM3C,KAAK,gBAAgB,GAAG;IAAE,GAAG,EAAE,aAAa,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAA;AA4dhE,0EAA0E;AAC1E,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,gBAAgB,GAAG,IAAI,CAUzB;AAED,6EAA6E;AAC7E,wBAAgB,YAAY,CAC1B,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAE5B;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,UAAU,EAChB,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,EAAE,MAAM,GACZ,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAM9B;AAiED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,qBAAqB,CACnC,WAAW,EAAE,UAAU,EACvB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,EAAE,GACrB,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,IAAI,CAqGzC;AAED,oEAAoE;AACpE,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG;IAAE,MAAM,CAAC,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;CAAE,CAAA;AAQlF;;;;;GAKG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,KAAK,GACX,YAAY,GAAG,IAAI,CAQrB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,UAAU,EACpB,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,MAAM,GACX,OAAO,CAoBT;AAED,kFAAkF;AAClF,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,CAcnF"}

package/dist/plugin/index.cjs

@@ -5565,7 +5565,7 @@ function emitDispatch(p, ctx, pos) {
         ctx.indent = 1;
         ctx.failLabel = "_pfail";
         ctx.recordFail = true;
-        const innerR = emit(innerParser, ctx, "_pos");
+        const innerR = emitDispatch(innerParser, ctx, "_pos");
         ctx.indent = savedIndent;
         ctx.failLabel = savedFailLabel;
         ctx.recordFail = savedRecord;
@@ -6282,6 +6282,23 @@ function escapeClassChar(ch) {
   return ch.replace(/[\\\]^-]/g, "\\$&");
 }
 
+// src/combinators/withCtx.ts
+function withCtx(extra, combinator) {
+  const meta = {
+    firstSet: combinator._meta.firstSet,
+    canMatchNewline: combinator._meta.canMatchNewline,
+    isTrivia: false
+  };
+  return {
+    _tag: "withCtx",
+    _meta: meta,
+    _def: { tag: "withCtx", extra, parser: combinator },
+    parse(input, pos, ctx) {
+      return combinator.parse(input, pos, { ...ctx, state: extra });
+    }
+  };
+}
+
 // src/compiler/ir-serialize.ts
 function childrenOf2(def) {
   switch (def.tag) {
@@ -6298,6 +6315,7 @@ function childrenOf2(def) {
     case "field":
     case "not":
     case "node":
+    case "withCtx":
     case "expect":
       return [def.parser];
     case "grammar":
@@ -6313,7 +6331,6 @@ function childrenOf2(def) {
     case "regex":
     case "keywords":
     case "guard":
-    case "withCtx":
     case "recover":
     case "unknown":
       return [];
@@ -6360,6 +6377,45 @@ 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 _wc = (src, inner) => {
+    let extra;
+    try {
+      extra = (0, eval)(`(${src})`);
+    } catch {
+      extra = void 0;
+    }
+    const w = withCtx(extra, inner);
+    w._def.extraSrc = src;
+    return w;
+  };
   const fn = new Function(
     "rules",
     "ref",
@@ -6385,6 +6441,8 @@ function evalRuleMapIR(ir) {
     "expect",
     "_tf",
     "_nd",
+    "_gch",
+    "_wc",
     `return (${ir})`
   );
   const map = fn(
@@ -6411,7 +6469,9 @@ function evalRuleMapIR(ir) {
     field,
     expect,
     _tf,
-    _nd
+    _nd,
+    _gch,
+    _wc
   );
   return Object.entries(map);
 }
@@ -6467,7 +6527,7 @@ ${body}
       this.analyze(target, active);
       return;
     }
-    if (def.tag === "guard" || def.tag === "withCtx" || def.tag === "recover" || def.tag === "unknown") {
+    if (def.tag === "guard" || def.tag === "recover" || def.tag === "unknown") {
       throw new Unserializable(`unsupported tag ${def.tag}`);
     }
     this.counts.set(c, (this.counts.get(c) ?? 0) + 1);
@@ -6523,8 +6583,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)})`;
@@ -6568,8 +6636,11 @@ ${body}
         const trivia2 = def.clearTrivia ? "null" : def.triviaParser ? kid(def.triviaParser) : "undefined";
         return `parser({ trivia: ${trivia2}${def.trackLines ? ", trackLines: true" : ""} }, ${kid(def.parser)})`;
       }
+      case "withCtx": {
+        if (def.extraSrc === void 0) throw new Unserializable("withCtx without extraSrc");
+        return `_wc(${JSON.stringify(def.extraSrc)}, ${kid(def.parser)})`;
+      }
       case "guard":
-      case "withCtx":
       case "recover":
       case "unknown":
         throw new Unserializable(`unsupported tag ${def.tag}`);
@@ -6681,23 +6752,6 @@ function guard(predicate) {
   };
 }
 
-// src/combinators/withCtx.ts
-function withCtx(extra, combinator) {
-  const meta = {
-    firstSet: combinator._meta.firstSet,
-    canMatchNewline: combinator._meta.canMatchNewline,
-    isTrivia: false
-  };
-  return {
-    _tag: "withCtx",
-    _meta: meta,
-    _def: { tag: "withCtx", extra, parser: combinator },
-    parse(input, pos, ctx) {
-      return combinator.parse(input, pos, { ...ctx, state: extra });
-    }
-  };
-}
-
 // src/cst/offset-model.ts
 var { isFinite } = Number;
 
@@ -6705,6 +6759,48 @@ var { isFinite } = Number;
 registerRegexAnalyzer(firstSetFromRegex);
 
 // src/plugin/evaluator.ts
+function stripTsFromSource(node2, code) {
+  const cuts = [];
+  const walk2 = (n) => {
+    if (!n || typeof n !== "object") return;
+    const rec = n;
+    if (typeof rec.type === "string" && rec.type.startsWith("TS") && typeof rec.start === "number" && typeof rec.end === "number") {
+      const ex = rec.expression;
+      if ((rec.type === "TSAsExpression" || rec.type === "TSSatisfiesExpression" || rec.type === "TSNonNullExpression" || rec.type === "TSInstantiationExpression") && ex && typeof ex.end === "number") {
+        cuts.push([ex.end, rec.end]);
+        walk2(rec.expression);
+        return;
+      }
+      if (rec.type === "TSTypeAssertion" && ex && typeof ex.start === "number") {
+        cuts.push([rec.start, ex.start]);
+        walk2(rec.expression);
+        return;
+      }
+      cuts.push([rec.start, rec.end]);
+      return;
+    }
+    for (const key of Object.keys(rec)) {
+      if (key === "type" || key === "start" || key === "end") continue;
+      const v2 = rec[key];
+      if (Array.isArray(v2)) {
+        for (const item of v2) walk2(item);
+      } else if (v2 && typeof v2 === "object") walk2(v2);
+    }
+  };
+  walk2(node2);
+  const start = node2.start;
+  const end = node2.end;
+  if (cuts.length === 0) return code.slice(start, end);
+  cuts.sort((a, b) => a[0] - b[0]);
+  let out = "";
+  let cur = start;
+  for (const [s, e] of cuts) {
+    if (s < cur) continue;
+    out += code.slice(cur, s);
+    cur = e;
+  }
+  return out + code.slice(cur, end);
+}
 function isWordFactory(v2) {
   return !!v2 && typeof v2 === "object" && v2.tag === "wordFactory";
 }
@@ -6980,7 +7076,7 @@ function exprToCombi(node2, scope, code, mfs) {
       if (isGatedArmExpr(argNode)) {
         const parts = gatedArmParts(argNode);
         if (!parts) return null;
-        const gateSrc = code.slice(parts.gate.start, parts.gate.end);
+        const gateSrc = stripTsFromSource(parts.gate, code);
         mfs.push(gateSrc);
         const combi = anyValue(parts.combinator, scope, code, mfs);
         if (!isCombinator(combi)) return null;