webpipe-js 2.0.68 → 2.0.71

package/dist/index.cjs

@@ -567,9 +567,11 @@ var Parser = class {
     this.skipInlineSpaces();
     let config = "";
     let configType = "quoted";
+    let hasConfig = false;
     let configStart = void 0;
     let configEnd = void 0;
     if (this.cur() === ":") {
+      hasConfig = true;
       this.pos++;
       this.skipInlineSpaces();
       configStart = this.pos;
@@ -582,7 +584,7 @@ var Parser = class {
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
     const end = this.pos;
-    return { kind: "Regular", name, nameStart, nameEnd, args, config, configType, configStart, configEnd, condition, parsedJoinTargets, start, end };
+    return { kind: "Regular", name, nameStart, nameEnd, args, config, configType, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -1366,10 +1368,21 @@ var Parser = class {
     if (this.text.startsWith("query ", this.pos) || this.text.startsWith("mutation ", this.pos)) {
       const type = this.consumeWhile((c) => c !== " ");
       this.skipInlineSpaces();
-      const name = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const name = this.parseScopedIdentifier();
       target = `${type}.${name}`;
+    } else if (this.text.startsWith("pipeline ", this.pos)) {
+      this.pos += 9;
+      const name = this.parseScopedIdentifier();
+      target = `pipeline.${name}`;
     } else {
-      target = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const middlewareType = this.parseIdentifier();
+      if (this.cur() === ".") {
+        this.pos++;
+        const varName = this.parseScopedIdentifier();
+        target = `${middlewareType}.${varName}`;
+      } else {
+        target = middlewareType;
+      }
     }
     this.skipInlineSpaces();
     this.expect("returning");
@@ -2062,9 +2075,9 @@ function formatConfigValue(value) {
 function formatPipelineStep(step, indent = "  ", isLastStep = false) {
   if (step.kind === "Regular") {
     const argsPart = step.args.length > 0 ? `(${step.args.join(", ")})` : "";
-    const configPart = formatStepConfig(step.config, step.configType);
     const conditionPart = step.condition ? " " + formatTagExpr(step.condition) : "";
-    return `${indent}|> ${step.name}${argsPart}: ${configPart}${conditionPart}`;
+    const configPart = step.hasConfig ? `: ${formatStepConfig(step.config, step.configType)}` : "";
+    return `${indent}|> ${step.name}${argsPart}${configPart}${conditionPart}`;
   } else if (step.kind === "Result") {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {

package/dist/index.d.cts

@@ -168,6 +168,7 @@ type PipelineStep = {
     args: string[];
     config: string;
     configType: ConfigType;
+    hasConfig: boolean;
     configStart?: number;
     configEnd?: number;
     condition?: TagExpr;

package/dist/index.d.ts

@@ -168,6 +168,7 @@ type PipelineStep = {
     args: string[];
     config: string;
     configType: ConfigType;
+    hasConfig: boolean;
     configStart?: number;
     configEnd?: number;
     condition?: TagExpr;

package/dist/index.mjs

@@ -513,9 +513,11 @@ var Parser = class {
     this.skipInlineSpaces();
     let config = "";
     let configType = "quoted";
+    let hasConfig = false;
     let configStart = void 0;
     let configEnd = void 0;
     if (this.cur() === ":") {
+      hasConfig = true;
       this.pos++;
       this.skipInlineSpaces();
       configStart = this.pos;
@@ -528,7 +530,7 @@ var Parser = class {
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
     const end = this.pos;
-    return { kind: "Regular", name, nameStart, nameEnd, args, config, configType, configStart, configEnd, condition, parsedJoinTargets, start, end };
+    return { kind: "Regular", name, nameStart, nameEnd, args, config, configType, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -1312,10 +1314,21 @@ var Parser = class {
     if (this.text.startsWith("query ", this.pos) || this.text.startsWith("mutation ", this.pos)) {
       const type = this.consumeWhile((c) => c !== " ");
       this.skipInlineSpaces();
-      const name = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const name = this.parseScopedIdentifier();
       target = `${type}.${name}`;
+    } else if (this.text.startsWith("pipeline ", this.pos)) {
+      this.pos += 9;
+      const name = this.parseScopedIdentifier();
+      target = `pipeline.${name}`;
     } else {
-      target = this.consumeWhile((c) => c !== " " && c !== "\n");
+      const middlewareType = this.parseIdentifier();
+      if (this.cur() === ".") {
+        this.pos++;
+        const varName = this.parseScopedIdentifier();
+        target = `${middlewareType}.${varName}`;
+      } else {
+        target = middlewareType;
+      }
     }
     this.skipInlineSpaces();
     this.expect("returning");
@@ -2008,9 +2021,9 @@ function formatConfigValue(value) {
 function formatPipelineStep(step, indent = "  ", isLastStep = false) {
   if (step.kind === "Regular") {
     const argsPart = step.args.length > 0 ? `(${step.args.join(", ")})` : "";
-    const configPart = formatStepConfig(step.config, step.configType);
     const conditionPart = step.condition ? " " + formatTagExpr(step.condition) : "";
-    return `${indent}|> ${step.name}${argsPart}: ${configPart}${conditionPart}`;
+    const configPart = step.hasConfig ? `: ${formatStepConfig(step.config, step.configType)}` : "";
+    return `${indent}|> ${step.name}${argsPart}${configPart}${conditionPart}`;
   } else if (step.kind === "Result") {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpipe-js",
-  "version": "2.0.68",
+  "version": "2.0.71",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",