parseman 0.39.1 → 0.40.0

package/dist/plugin/index.js

@@ -2986,12 +2986,30 @@ function isCstChild(value) {
 function missingInferredType() {
   throw new Error('node(): inferred node type requires a rules() key; pass node("Type", parser) outside rules()');
 }
+function normalizeProject(project) {
+  if (project === void 0) return void 0;
+  if (!Number.isInteger(project) || project < 0) {
+    throw new Error("node() project child must be a non-negative integer");
+  }
+  return project;
+}
+function projectChild(children2, project, type) {
+  if (!(project in children2)) {
+    throw new Error(`node(${JSON.stringify(type)}) project child ${project} was not captured`);
+  }
+  return unwrapChild(children2[project]);
+}
 function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
   const hasExplicitType = typeof typeOrCombinator === "string";
   const type = hasExplicitType ? typeOrCombinator : void 0;
   const combinator = hasExplicitType ? combinatorOrBuild : typeOrCombinator;
-  const build = hasExplicitType ? buildOrOpts : combinatorOrBuild;
-  const opts = hasExplicitType ? maybeOpts : buildOrOpts;
+  const buildArg = hasExplicitType ? buildOrOpts : combinatorOrBuild;
+  const build = typeof buildArg === "function" ? buildArg : void 0;
+  const opts = typeof buildArg === "function" ? maybeOpts : buildArg ?? maybeOpts;
+  const project = normalizeProject(opts?.project);
+  if (project !== void 0 && build !== void 0) {
+    throw new Error("node() options cannot combine project with a build callback");
+  }
   const baseDef = { tag: "node", parser: combinator, ...type === void 0 ? {} : { type }, ...build === void 0 ? {} : { build } };
   const meta = {
     firstSet: combinator._meta.firstSet,
@@ -3005,11 +3023,14 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
   if (unwrap && collapse) {
     throw new Error("node() options cannot set both unwrap and collapse");
   }
-  const def = unwrap || collapse || captureTrivia || trailingTrivia ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {} } : baseDef;
-  const capturesTrivia = captureTrivia || trailingTrivia || (build ? buildReadsTrivia(def) : true);
-  const clonesState = build ? buildReadsState(def) : true;
+  if (project !== void 0 && (unwrap || collapse)) {
+    throw new Error("node() options cannot combine project with unwrap or collapse");
+  }
+  const def = unwrap || collapse || project !== void 0 || captureTrivia || trailingTrivia ? { ...baseDef, ...unwrap ? { unwrap: true } : {}, ...collapse ? { collapse: true } : {}, ...project !== void 0 ? { project } : {}, ...captureTrivia ? { captureTrivia: true } : {}, ...trailingTrivia ? { trailingTrivia: true } : {} } : baseDef;
+  const capturesTrivia = captureTrivia || trailingTrivia || (build ? buildReadsTrivia(def) : project === void 0);
+  const clonesState = build ? buildReadsState(def) : project === void 0;
   const hasOwnFields = parserHasOwnFields(combinator);
-  const capturesFields = hasOwnFields && (build ? buildReadsFields(def) : true);
+  const capturesFields = hasOwnFields && (build ? buildReadsFields(def) : project === void 0);
   const guardable = combinator._meta.firstSet.kind !== "any" && !matchesEmpty(combinator);
   let failExpected;
   return {
@@ -3024,14 +3045,15 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
         }
         return { ok: false, expected: failExpected, span: { start: pos, end: pos } };
       }
-      const hostCst = build !== void 0 && cstOutputHost(ctx.build);
+      const hasDirectValue = build !== void 0 || project !== void 0;
+      const hostCst = hasDirectValue && cstOutputHost(ctx.build);
       const effTrivia = capturesTrivia || hostCst;
       const effFields = capturesFields || hostCst && hasOwnFields;
       const saved = beginCstNodeCapture(ctx);
       const savedFields = ctx._fields;
       ctx._fields = effFields ? [] : void 0;
       const savedMask = ctx._triviaCaptureMask;
-      if (build === void 0 && ctx.build?._parsemanTriviaKinds !== void 0 && def.type !== void 0) {
+      if (build === void 0 && project === void 0 && ctx.build?._parsemanTriviaKinds !== void 0 && def.type !== void 0) {
         ctx._triviaCaptureMask = ctx.build._parsemanTriviaKinds(def.type);
       }
       if (!effTrivia) ctx.captureTrivia = false;
@@ -3049,7 +3071,7 @@ function node(typeOrCombinator, combinatorOrBuild, buildOrOpts, maybeOpts) {
       const nodeType = def.type ?? missingInferredType();
       const cstOutput = cstOutputHost(ctx.build);
       const hostState = clonesState ? st : ctx.state !== void 0 ? Object.assign({}, ctx.state) : void 0;
-      const built = unwrap && children2.length === 1 ? unwrapChild(children2[0]) : collapse && children2.length === 1 ? children2[0] : !build && ctx.build?._parsemanCstCollapse && children2.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children2[0], children2, rawChildren) ? children2[0] : build ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, hostState) : build(children2, fields, r.span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: { start: r.span.start, end: r.span.end }, state: st ?? null, children: children2 };
+      const built = unwrap && children2.length === 1 ? unwrapChild(children2[0]) : collapse && children2.length === 1 ? children2[0] : !build && project === void 0 && ctx.build?._parsemanCstCollapse && children2.length === 1 && rawChildren.length === 1 && ctx.build._parsemanCstCollapse(nodeType, children2[0], children2, rawChildren) ? children2[0] : project !== void 0 ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, hostState) : projectChild(children2, project, nodeType) : build ? cstOutput && ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, hostState) : build(children2, fields, r.span, rawChildren, triviaLog, st) : ctx.build ? ctx.build(nodeType, children2, fields, r.span, rawChildren, triviaLog, st) : { _tag: "node", type: nodeType, span: { start: r.span.start, end: r.span.end }, state: st ?? null, children: children2 };
       const rawEntry = isCstChild(built) ? built : { _tag: "leaf", value: typeof built === "string" ? built : typeof built === "object" && built !== null ? input.slice(r.span.start, r.span.end) : "", span: r.span };
       if (saved.buf !== void 0 || saved.ch !== void 0) {
         pushCstChild(ctx, built, rawEntry);
@@ -3300,7 +3322,7 @@ function leaf(root, fn) {
 }
 
 // src/version.ts
-var PARSEMAN_VERSION = "0.39.1";
+var PARSEMAN_VERSION = "0.40.0";
 
 // src/cst/host-mode.ts
 var FUSED_HOST_MODE = /* @__PURE__ */ Symbol.for("parseman.fusedHostMode");
@@ -8471,14 +8493,20 @@ function emitLeaf(def, ctx, pos) {
     endVar: inner.endVar
   };
 }
+function emitNodeProjectExpr(type, project, chV) {
+  const child = `${chV}[${project}]`;
+  const missing = `(() => { throw new Error(${JSON.stringify(`node(${JSON.stringify(type)}) project child ${project} was not captured`)}) })()`;
+  const value = `(${child} !== null && typeof ${child} === 'object' && ${child}._tag === 'leaf' ? ${child}.value : ${child})`;
+  return `(${project} in ${chV} ? ${value} : ${missing})`;
+}
 function emitNode(def, ctx, pos) {
   if (def.type === void 0) {
     throw new Error('node(): inferred node type requires a rules() key; pass node("Type", parser) outside rules()');
   }
-  const structural = def.build === void 0;
-  const mkType = structural ? null : analyzeMkInlineBuild(def);
+  const structural = def.build === void 0 && def.project === void 0;
+  const mkType = structural || def.project !== void 0 ? null : analyzeMkInlineBuild(def);
   let buildIdx = null;
-  if (!mkType && !structural) {
+  if (!mkType && !structural && def.project === void 0) {
     buildIdx = ctx.buildFns.length;
     ctx.buildFns.push(def.build);
     ctx.buildSrcs.push(def.buildSrc ?? null);
@@ -8486,12 +8514,13 @@ function emitNode(def, ctx, pos) {
   const i = ind(ctx);
   const cstOut = ctx.hostMode === "cst" && !structural;
   if (!structural && !cstOut) ctx.hostBranchElided = true;
-  const capturesTrivia = cstOut || mkType !== null || def.captureTrivia === true || def.trailingTrivia === true || !structural && buildReadsTrivia(def);
-  const clonesState = !structural && (cstOut || buildReadsState(def));
-  const capturesChildren = !structural && (cstOut || mkType !== null || def.unwrap || def.collapse || buildReadsChildren(def));
-  const capturesRaw = !structural && (cstOut || mkType !== null || buildReadsRaw(def));
+  const hasProject = def.project !== void 0;
+  const capturesTrivia = cstOut || mkType !== null || def.captureTrivia === true || def.trailingTrivia === true || !structural && !hasProject && buildReadsTrivia(def);
+  const clonesState = !structural && (cstOut || !hasProject && buildReadsState(def));
+  const capturesChildren = !structural && (cstOut || mkType !== null || def.unwrap || def.collapse || def.project !== void 0 || buildReadsChildren(def));
+  const capturesRaw = !structural && (cstOut || mkType !== null || def.project === void 0 && buildReadsRaw(def));
   const hasFields = parserHasOwnFields(def.parser);
-  const capturesFields = hasFields && !structural && (cstOut || buildReadsFields(def));
+  const capturesFields = hasFields && !structural && (cstOut || !hasProject && buildReadsFields(def));
   const innerEnablesTriviaCapture = parserEnablesTriviaCapture(def.parser);
   const chV = v(ctx, "_ch");
   const rawV = v(ctx, "_raw");
@@ -8589,7 +8618,7 @@ ${i}const ${chV} = ${chAlloc}, ${rawV} = ${profileRecognizer} ? undefined : [],
     );
   }
   const ndV = v(ctx, "_nd");
-  const buildExpr = structural ? `{ _tag: 'node', type: ${JSON.stringify(def.type)}, span: { start: ${pos}, end: ${endVar} }, state: ${stV} ?? null, children: ${chV} }` : mkType ? emitInlineMkNodeExpr(mkType, chV, rawV, pos, endVar, tlV) : `${buildRef(ctx)}[${buildIdx}](${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
+  const buildExpr = structural ? `{ _tag: 'node', type: ${JSON.stringify(def.type)}, span: { start: ${pos}, end: ${endVar} }, state: ${stV} ?? null, children: ${chV} }` : mkType ? emitInlineMkNodeExpr(mkType, chV, rawV, pos, endVar, tlV) : def.project !== void 0 ? emitNodeProjectExpr(def.type, def.project, chV) : `${buildRef(ctx)}[${buildIdx}](${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
   const hostBuildExpr = `_ctx._pmProfile?.phase === 'host' && _ctx._pmProfile.hostCalls++, _ctx.build(${JSON.stringify(def.type)}, ${chV}, ${fObj}, { start: ${pos}, end: ${endVar} }, ${rawV}, ${tlV}, ${stV})`;
   const ndExpr = structural ? `_ctx.build !== undefined ? (${hostBuildExpr}) : (${buildExpr})` : cstOut ? hostBuildExpr : buildExpr;
   const hostCollapseExpr = structural ? `_ctx.build !== undefined && _ctx.build._parsemanCstCollapse !== undefined && ${chV}.length === 1 && ${rawV}.length === 1 && _ctx.build._parsemanCstCollapse(${JSON.stringify(def.type)}, ${chV}[0], ${chV}, ${rawV}) ? ${chV}[0] : (${ndExpr})` : ndExpr;
@@ -10000,6 +10029,10 @@ function repeatOpts(min, max, trailing) {
   if (trailing !== void 0) parts.push(`trailing: ${JSON.stringify(trailing)}`);
   return parts.length === 0 ? "" : `, { ${parts.join(", ")} }`;
 }
+function projectOpt(project) {
+  if (project === void 0) return void 0;
+  return `project: ${project}`;
+}
 function matcherExpr(entry) {
   switch (entry.kind) {
     case "startsWith":
@@ -10393,9 +10426,11 @@ ${outerDecls.map((d) => "  " + d).join("\n")}
       }
       case "node": {
         if (def.build !== void 0 && def.buildSrc === void 0) throw new Unserializable("node build without buildSrc");
+        const projectEntry = projectOpt(def.project);
         const optEntries = [
           ...def.unwrap ? ["unwrap: true"] : [],
           ...def.collapse ? ["collapse: true"] : [],
+          ...projectEntry === void 0 ? [] : [projectEntry],
           ...def.captureTrivia ? ["captureTrivia: true"] : [],
           ...def.trailingTrivia ? ["trailingTrivia: true"] : []
         ];
@@ -11000,6 +11035,18 @@ function scopeGet(scope, name, mfs) {
   if (isCombinator(entry)) return entry;
   return null;
 }
+function staticLiteralValue(expr) {
+  const val = expr;
+  return val.type === "Literal" || val.type === "BooleanLiteral" || val.type === "NumericLiteral" ? val.value : void 0;
+}
+function staticNodeProject(expr) {
+  const literalValue = staticLiteralValue(expr);
+  if (typeof literalValue === "number" && Number.isInteger(literalValue) && literalValue >= 0) {
+    return { ok: true, value: literalValue };
+  }
+  if (typeof literalValue === "number" || literalValue !== void 0) return { ok: false };
+  return { ok: false };
+}
 function staticNodeOptions(expr) {
   if (expr.type !== "ObjectExpression") return void 0;
   const opts = {};
@@ -11009,11 +11056,14 @@ function staticNodeOptions(expr) {
     const key = p.key;
     const name = key.type === "Identifier" ? key.name : key.type === "Literal" ? String(key.value) : void 0;
     if (name === "unwrap" || name === "collapse" || name === "captureTrivia" || name === "trailingTrivia") {
-      const val = p.value;
-      if ((val.type === "Literal" || val.type === "BooleanLiteral") && val.value === true) opts[name] = true;
+      if (staticLiteralValue(p.value) === true) opts[name] = true;
+    } else if (name === "project") {
+      const project = staticNodeProject(p.value);
+      if (project?.ok === false) return { project: -1 };
+      if (project !== void 0) opts.project = project.value;
     }
   }
-  return opts.unwrap || opts.collapse || opts.captureTrivia || opts.trailingTrivia ? opts : void 0;
+  return opts.unwrap || opts.collapse || opts.project !== void 0 || opts.captureTrivia || opts.trailingTrivia ? opts : void 0;
 }
 function exprToCombi(node2, scope, code, mfs) {
   if (node2.type === "Identifier") return scopeGet(scope, node2.name, mfs);
@@ -11088,9 +11138,10 @@ function exprToCombi(node2, scope, code, mfs) {
     const inner = anyValue(parserArg, scope, code, mfs);
     if (!isCombinator(inner)) return null;
     const be = buildArg;
-    const hasBuild = be !== void 0 && be.type !== "SpreadElement" && !(be.type === "Identifier" && be.name === "undefined");
+    const hasBuild = be !== void 0 && be.type !== "SpreadElement" && be.type !== "ObjectExpression" && !(be.type === "Identifier" && be.name === "undefined");
     const buildSrc = hasBuild ? stripTsFromSource(be, code) : void 0;
-    const opts = optsArg !== void 0 && optsArg.type !== "SpreadElement" ? staticNodeOptions(optsArg) : void 0;
+    const optionsArg = hasBuild ? optsArg : be?.type === "ObjectExpression" ? buildArg : optsArg;
+    const opts = optionsArg !== void 0 && optionsArg.type !== "SpreadElement" ? staticNodeOptions(optionsArg) : void 0;
     try {
       const combi = explicitType !== void 0 ? node(explicitType, inner, hasBuild ? () => null : void 0, opts) : node(inner, hasBuild ? () => null : void 0, opts);
       if (combi._def.tag === "node" && buildSrc !== void 0) {