parseman 0.51.1 → 0.51.2

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

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

package/dist/plugin/index.js

@@ -5113,6 +5113,12 @@ function field(name, combinator) {
 }
 
 // src/combinators/token.ts
+function semanticLeafValue(_ctx, _input, _start, _end, value) {
+  return value;
+}
+function sourceLeafValue(ctx, input, start, end, value) {
+  return cstOutputHost(ctx.build) ? input.slice(start, end) : value;
+}
 function token(root) {
   const meta = {
     firstSet: root._meta.firstSet,
@@ -5165,7 +5171,8 @@ function token(root) {
     }
   };
 }
-function leaf(root, fn) {
+function makeLeaf(root, fn, sourceCstValue) {
+  const cstValue = sourceCstValue ? sourceLeafValue : semanticLeafValue;
   const meta = {
     firstSet: root._meta.firstSet,
     canMatchNewline: root._meta.canMatchNewline,
@@ -5174,7 +5181,12 @@ function leaf(root, fn) {
   return {
     _tag: "leaf",
     _meta: meta,
-    _def: { tag: "leaf", parser: root, fn },
+    _def: {
+      tag: "leaf",
+      parser: root,
+      fn,
+      ...sourceCstValue ? { cstValue: "source" } : {}
+    },
     parse(input, pos, ctx) {
       const savedBuf = ctx._cstBuf;
       const savedChildren = ctx._cstChildren;
@@ -5202,11 +5214,21 @@ function leaf(root, fn) {
       }
       if (!result.ok) return result;
       const value = fn(result.value, result.span);
-      if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value, span: result.span });
+      if (wasCapturing) pushCstLeaf(ctx, {
+        _tag: "leaf",
+        value: cstValue(ctx, input, pos, result.span.end, value),
+        span: result.span
+      });
       return { ok: true, value, span: result.span };
     }
   };
 }
+function leaf(root, fn) {
+  return makeLeaf(root, fn, false);
+}
+function sourceLeaf(root, fn) {
+  return makeLeaf(root, fn, true);
+}
 
 // src/analysis/gating.ts
 function childrenOf2(d) {
@@ -5698,6 +5720,7 @@ var OP_COV = 40;
 var OP_SCOPE_PLAIN = 41;
 var OP_LEX_BODY = 42;
 var OP_LEX_PROGRAM = 43;
+var OP_SOURCE_LEAF = 44;
 var OP_DISPATCH = 25;
 var OP_ROUTED = 26;
 var OP_NAMES = {
@@ -5716,6 +5739,7 @@ var OP_NAMES = {
   [OP_NOT]: "NOT",
   [OP_PEEK]: "PEEK",
   [OP_LEAF]: "LEAF",
+  [OP_SOURCE_LEAF]: "SOURCE_LEAF",
   [OP_EMPTY]: "EMPTY",
   [OP_LIT_TRACK]: "LIT_TRACK",
   [OP_RX_TRACK]: "RX_TRACK",
@@ -7668,7 +7692,7 @@ var Encoder = class {
       }
       case "leaf": {
         const child = this.node(d.parser).ip;
-        return this.emit(OP_LEAF, this.fn(d.fn, d.fnSrc ?? null), child);
+        return this.emit(d.cstValue === "source" ? OP_SOURCE_LEAF : OP_LEAF, this.fn(d.fn, d.fnSrc ?? null), child);
       }
       case "node": {
         if (d.type === void 0) missingInferredType();
@@ -7893,6 +7917,7 @@ var Encoder = class {
         case OP_WITHCTX:
         case OP_XFORM:
         case OP_LEAF:
+        case OP_SOURCE_LEAF:
         case OP_NODE:
         case OP_NODE_TRACK:
           return [ip + 2];
@@ -9102,6 +9127,7 @@ function childSlots(code, ip, out) {
     case OP_NODE_TRACK:
     case OP_FIELD:
     case OP_LEAF:
+    case OP_SOURCE_LEAF:
     case OP_ARMGATE:
       out.push(code[ip + 2]);
       return true;
@@ -9210,7 +9236,7 @@ function transfer(code, ip, at, hostCst) {
     if (at.tri === TRI_NONE && !at.buf) return at;
     return { tri: TRI_NONE, buf: false, raw: RAW_UNKNOWN, cap: at.cap };
   }
-  if (op === OP_LEAF) {
+  if (op === OP_LEAF || op === OP_SOURCE_LEAF) {
     if (!at.buf) return at;
     return { tri: at.tri, buf: false, raw: RAW_UNKNOWN, cap: at.cap };
   }
@@ -9297,7 +9323,7 @@ function leadingScalarTerminal(code, ip, minDepth = 2, throughAttempt = true, th
       depth++;
       continue;
     }
-    if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+    if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
       at = code[at + 2];
       depth++;
       continue;
@@ -9330,7 +9356,7 @@ function leadingScalarSequence(code, ip) {
         at2 = code[at2 + 1];
         continue;
       }
-      if (op === OP_GATE || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+      if (op === OP_GATE || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
         at2 = code[at2 + 2];
         continue;
       }
@@ -9363,7 +9389,7 @@ function leadingScalarSequence(code, ip) {
       at = code[at + 2];
       continue;
     }
-    if (op === OP_GATE || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+    if (op === OP_GATE || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
       at = code[at + 2];
       continue;
     }
@@ -9393,7 +9419,7 @@ function leadingLiteralFamily(code, constants, ip, minDepth = 2, limit = 4) {
       if (op === OP_RULE || op === OP_LABEL || op === OP_TOKEN || op === OP_ATTEMPT || op === OP_PEEK) {
         return walk(code[at + 1], depth + 1);
       }
-      if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || op === OP_LEAF) {
+      if (op === OP_GATE || op === OP_SCOPE || op === OP_SCOPE_CAP || op === OP_SCOPE_PLAIN || op === OP_XFORM || op === OP_NODE || op === OP_FIELD || (op === OP_LEAF || op === OP_SOURCE_LEAF)) {
         return walk(code[at + 2], depth + 1);
       }
       if (op === OP_SEQ || op === OP_SEQV) {
@@ -10279,8 +10305,10 @@ ${rootCap ? "ctx._rootTriviaCapture=sR\n" : ""}return v
       }
       /* ── boundaries ──────────────────────────────────────────────────────── */
       case OP_TOKEN:
-      case OP_LEAF: {
+      case OP_LEAF:
+      case OP_SOURCE_LEAF: {
         const isToken = op === OP_TOKEN;
+        const capturesSource = isToken || op === OP_SOURCE_LEAF && hostCst;
         const fn = isToken ? void 0 : fnRef(code[ip + 1]);
         const child = link(isToken ? code[ip + 1] : code[ip + 2]);
         const wasCap = L.buf ? "true" : "(ctx._cstBuf!==undefined||ctx._cstLeaves!==undefined)";
@@ -10313,7 +10341,7 @@ ctx._triviaLog=sOtl
 if(v===FAIL)return FAIL
 const e=EC.e
 const out=${isToken ? "input.slice(pos,e)" : `${fn}(v,{start:pos,end:e})`}
-if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:out,span:{start:pos,end:e}})
+if(wasCap)pushCstLeaf(ctx,{_tag:'leaf',value:${capturesSource ? "input.slice(pos,e)" : "out"},span:{start:pos,end:e}})
 EC.e=e
 return out
 }`;
@@ -12970,7 +12998,8 @@ function assemble(t, prog, cfg) {
           return value;
         };
       }
-      case OP_LEAF: {
+      case OP_LEAF:
+      case OP_SOURCE_LEAF: {
         const fn = fns[code[ip + 1]];
         const child = link(code[ip + 2]);
         return (input, pos, ctx) => {
@@ -12998,7 +13027,11 @@ function assemble(t, prog, cfg) {
           if (v === FAIL) return FAIL;
           const end = EC.e;
           const out = fn(v, { start: pos, end });
-          if (wasCapturing) pushCstLeaf(ctx, { _tag: "leaf", value: out, span: { start: pos, end } });
+          if (wasCapturing) pushCstLeaf(ctx, {
+            _tag: "leaf",
+            value: op === OP_SOURCE_LEAF && hostCst ? input.slice(pos, end) : out,
+            span: { start: pos, end }
+          });
           EC.e = end;
           return out;
         };
@@ -15039,7 +15072,7 @@ function payloadKey(p, d) {
     case "transform":
       return `transform\0${fnKey(d.fnSrc, d.fn)}\0${d.recognitionOnly === true}`;
     case "leaf":
-      return `leaf\0${fnKey(d.fnSrc, d.fn)}`;
+      return `leaf\0${d.cstValue ?? "value"}\0${fnKey(d.fnSrc, d.fn)}`;
     case "many":
     case "oneOrMore":
       return `${d.tag}\0${d.min}\0${d.max ?? ""}`;
@@ -16528,7 +16561,7 @@ function evalRuleMapIR(ir) {
     if (recognitionOnly) t._def.recognitionOnly = true;
     return t;
   };
-  const _lf = (child, src) => {
+  const _lf = (child, src, source = false) => {
     let fn2;
     try {
       fn2 = (0, eval)(`(${src})`);
@@ -16537,7 +16570,7 @@ function evalRuleMapIR(ir) {
         throw new Error("IR leaf fn not materialized");
       };
     }
-    const l = leaf(child, fn2);
+    const l = source ? sourceLeaf(child, fn2) : leaf(child, fn2);
     l._def.fnSrc = src;
     return l;
   };
@@ -16940,7 +16973,7 @@ ${outerDecls.map((d) => "  " + d).join("\n")}
         return `token(${kid(def.parser)})`;
       case "leaf": {
         if (def.fnSrc === void 0) throw new Unserializable("leaf without fnSrc");
-        return `_lf(${kid(def.parser)}, ${JSON.stringify(def.fnSrc)})`;
+        return `_lf(${kid(def.parser)}, ${JSON.stringify(def.fnSrc)}${def.cstValue === "source" ? ", true" : ""})`;
       }
       case "label":
         return `label(${JSON.stringify(def.label)}, ${kid(def.parser)})`;
@@ -17129,7 +17162,7 @@ function compileRuleMap(ruleMap, opts = {}) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.51.1";
+var PARSEMAN_VERSION = "0.51.2";
 
 // src/compiler/compile-linkable-table.ts
 function isLocal(rule) {
@@ -17852,7 +17885,7 @@ function exprToCombi(node2, scope, code, mfs) {
       return null;
     }
   }
-  if (callee.name === "leaf" && code !== void 0 && mfs !== void 0) {
+  if ((callee.name === "leaf" || callee.name === "sourceLeaf") && code !== void 0 && mfs !== void 0) {
     const [parserArg, fnArg] = node2.arguments;
     if (!parserArg || !fnArg || parserArg.type === "SpreadElement" || fnArg.type === "SpreadElement") return null;
     const inner = anyValue(parserArg, scope, code, mfs);
@@ -17860,7 +17893,7 @@ function exprToCombi(node2, scope, code, mfs) {
     const fnSrc = stripTsFromSource(fnArg, code);
     mfs.push(fnSrc);
     try {
-      const combi = leaf(inner, (v) => v);
+      const combi = callee.name === "sourceLeaf" ? sourceLeaf(inner, (v) => v) : leaf(inner, (v) => v);
       if (combi._def.tag === "leaf") combi._def.fnSrc = fnSrc;
       return combi;
     } catch {