webpipe-js 2.0.32 → 2.0.34

package/dist/index.cjs

@@ -512,14 +512,22 @@ var Parser = class {
     this.expect("|>");
     this.skipInlineSpaces();
     const name = this.parseIdentifier();
-    this.expect(":");
+    const args = this.parseInlineArgs();
     this.skipInlineSpaces();
-    const { config, configType } = this.parseStepConfig();
+    let config = "";
+    let configType = "quoted";
+    if (this.cur() === ":") {
+      this.pos++;
+      this.skipInlineSpaces();
+      const res = this.parseStepConfig();
+      config = res.config;
+      configType = res.configType;
+    }
     const condition = this.parseStepCondition();
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
     const end = this.pos;
-    return { kind: "Regular", name, config, configType, condition, parsedJoinTargets, start, end };
+    return { kind: "Regular", name, args, config, configType, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -573,6 +581,129 @@ var Parser = class {
     }
     return names;
   }
+  /**
+   * Split argument content by commas while respecting nesting depth and strings
+   * Example: `"url", {a:1, b:2}` -> [`"url"`, `{a:1, b:2}`]
+   */
+  splitBalancedArgs(content) {
+    const args = [];
+    let current = "";
+    let depth = 0;
+    let inString = false;
+    let stringChar = "";
+    let escapeNext = false;
+    for (let i = 0; i < content.length; i++) {
+      const ch = content[i];
+      if (escapeNext) {
+        current += ch;
+        escapeNext = false;
+        continue;
+      }
+      if (ch === "\\" && inString) {
+        current += ch;
+        escapeNext = true;
+        continue;
+      }
+      if ((ch === '"' || ch === "`") && !inString) {
+        inString = true;
+        stringChar = ch;
+        current += ch;
+        continue;
+      }
+      if (ch === stringChar && inString) {
+        inString = false;
+        stringChar = "";
+        current += ch;
+        continue;
+      }
+      if (inString) {
+        current += ch;
+        continue;
+      }
+      if (ch === "(" || ch === "[" || ch === "{") {
+        depth++;
+        current += ch;
+      } else if (ch === ")" || ch === "]" || ch === "}") {
+        depth--;
+        current += ch;
+      } else if (ch === "," && depth === 0) {
+        args.push(current.trim());
+        current = "";
+      } else {
+        current += ch;
+      }
+    }
+    if (current.trim().length > 0) {
+      args.push(current.trim());
+    }
+    return args;
+  }
+  /**
+   * Parse inline arguments: middleware(arg1, arg2) or middleware[arg1, arg2]
+   * Returns the array of argument strings and advances position past the closing bracket
+   */
+  parseInlineArgs() {
+    const trimmedStart = this.pos;
+    this.skipInlineSpaces();
+    const ch = this.cur();
+    if (ch !== "(" && ch !== "[") {
+      this.pos = trimmedStart;
+      return [];
+    }
+    const openChar = ch;
+    const closeChar = openChar === "(" ? ")" : "]";
+    this.pos++;
+    let depth = 1;
+    let inString = false;
+    let stringChar = "";
+    let escapeNext = false;
+    const contentStart = this.pos;
+    while (!this.eof() && depth > 0) {
+      const c = this.cur();
+      if (escapeNext) {
+        this.pos++;
+        escapeNext = false;
+        continue;
+      }
+      if (c === "\\" && inString) {
+        this.pos++;
+        escapeNext = true;
+        continue;
+      }
+      if ((c === '"' || c === "`") && !inString) {
+        inString = true;
+        stringChar = c;
+        this.pos++;
+        continue;
+      }
+      if (c === stringChar && inString) {
+        inString = false;
+        stringChar = "";
+        this.pos++;
+        continue;
+      }
+      if (!inString) {
+        if (c === openChar) {
+          depth++;
+        } else if (c === closeChar) {
+          depth--;
+          if (depth === 0) {
+            break;
+          }
+        }
+      }
+      this.pos++;
+    }
+    if (depth !== 0) {
+      throw new ParseFailure(`unclosed ${openChar}`, contentStart);
+    }
+    const argsContent = this.text.slice(contentStart, this.pos);
+    this.pos++;
+    if (argsContent.trim().length === 0) {
+      return [];
+    }
+    return this.splitBalancedArgs(argsContent);
+  }
   parseResultStep() {
     this.skipWhitespaceOnly();
     const start = this.pos;
@@ -1641,9 +1772,10 @@ function formatConfigValue(value) {
 }
 function formatPipelineStep(step, indent = "  ") {
   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}: ${configPart}${conditionPart}`;
+    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

@@ -143,6 +143,7 @@ type TagExpr = {
 type PipelineStep = {
     kind: 'Regular';
     name: string;
+    args: string[];
     config: string;
     configType: ConfigType;
     condition?: TagExpr;

package/dist/index.d.ts

@@ -143,6 +143,7 @@ type TagExpr = {
 type PipelineStep = {
     kind: 'Regular';
     name: string;
+    args: string[];
     config: string;
     configType: ConfigType;
     condition?: TagExpr;

package/dist/index.mjs

@@ -460,14 +460,22 @@ var Parser = class {
     this.expect("|>");
     this.skipInlineSpaces();
     const name = this.parseIdentifier();
-    this.expect(":");
+    const args = this.parseInlineArgs();
     this.skipInlineSpaces();
-    const { config, configType } = this.parseStepConfig();
+    let config = "";
+    let configType = "quoted";
+    if (this.cur() === ":") {
+      this.pos++;
+      this.skipInlineSpaces();
+      const res = this.parseStepConfig();
+      config = res.config;
+      configType = res.configType;
+    }
     const condition = this.parseStepCondition();
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
     const end = this.pos;
-    return { kind: "Regular", name, config, configType, condition, parsedJoinTargets, start, end };
+    return { kind: "Regular", name, args, config, configType, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -521,6 +529,129 @@ var Parser = class {
     }
     return names;
   }
+  /**
+   * Split argument content by commas while respecting nesting depth and strings
+   * Example: `"url", {a:1, b:2}` -> [`"url"`, `{a:1, b:2}`]
+   */
+  splitBalancedArgs(content) {
+    const args = [];
+    let current = "";
+    let depth = 0;
+    let inString = false;
+    let stringChar = "";
+    let escapeNext = false;
+    for (let i = 0; i < content.length; i++) {
+      const ch = content[i];
+      if (escapeNext) {
+        current += ch;
+        escapeNext = false;
+        continue;
+      }
+      if (ch === "\\" && inString) {
+        current += ch;
+        escapeNext = true;
+        continue;
+      }
+      if ((ch === '"' || ch === "`") && !inString) {
+        inString = true;
+        stringChar = ch;
+        current += ch;
+        continue;
+      }
+      if (ch === stringChar && inString) {
+        inString = false;
+        stringChar = "";
+        current += ch;
+        continue;
+      }
+      if (inString) {
+        current += ch;
+        continue;
+      }
+      if (ch === "(" || ch === "[" || ch === "{") {
+        depth++;
+        current += ch;
+      } else if (ch === ")" || ch === "]" || ch === "}") {
+        depth--;
+        current += ch;
+      } else if (ch === "," && depth === 0) {
+        args.push(current.trim());
+        current = "";
+      } else {
+        current += ch;
+      }
+    }
+    if (current.trim().length > 0) {
+      args.push(current.trim());
+    }
+    return args;
+  }
+  /**
+   * Parse inline arguments: middleware(arg1, arg2) or middleware[arg1, arg2]
+   * Returns the array of argument strings and advances position past the closing bracket
+   */
+  parseInlineArgs() {
+    const trimmedStart = this.pos;
+    this.skipInlineSpaces();
+    const ch = this.cur();
+    if (ch !== "(" && ch !== "[") {
+      this.pos = trimmedStart;
+      return [];
+    }
+    const openChar = ch;
+    const closeChar = openChar === "(" ? ")" : "]";
+    this.pos++;
+    let depth = 1;
+    let inString = false;
+    let stringChar = "";
+    let escapeNext = false;
+    const contentStart = this.pos;
+    while (!this.eof() && depth > 0) {
+      const c = this.cur();
+      if (escapeNext) {
+        this.pos++;
+        escapeNext = false;
+        continue;
+      }
+      if (c === "\\" && inString) {
+        this.pos++;
+        escapeNext = true;
+        continue;
+      }
+      if ((c === '"' || c === "`") && !inString) {
+        inString = true;
+        stringChar = c;
+        this.pos++;
+        continue;
+      }
+      if (c === stringChar && inString) {
+        inString = false;
+        stringChar = "";
+        this.pos++;
+        continue;
+      }
+      if (!inString) {
+        if (c === openChar) {
+          depth++;
+        } else if (c === closeChar) {
+          depth--;
+          if (depth === 0) {
+            break;
+          }
+        }
+      }
+      this.pos++;
+    }
+    if (depth !== 0) {
+      throw new ParseFailure(`unclosed ${openChar}`, contentStart);
+    }
+    const argsContent = this.text.slice(contentStart, this.pos);
+    this.pos++;
+    if (argsContent.trim().length === 0) {
+      return [];
+    }
+    return this.splitBalancedArgs(argsContent);
+  }
   parseResultStep() {
     this.skipWhitespaceOnly();
     const start = this.pos;
@@ -1589,9 +1720,10 @@ function formatConfigValue(value) {
 }
 function formatPipelineStep(step, indent = "  ") {
   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}: ${configPart}${conditionPart}`;
+    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.32",
+  "version": "2.0.34",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",