webpipe-js 2.0.71 → 2.0.97

package/dist/index.cjs

@@ -299,6 +299,32 @@ var Parser = class {
   skipWhitespaceOnly() {
     this.consumeWhile((ch) => ch === " " || ch === "	" || ch === "\r" || ch === "\n");
   }
+  skipStandaloneCommentsBeforeKeywords(keywords) {
+    while (true) {
+      this.skipWhitespaceOnly();
+      const commentStart = this.pos;
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (!comment) {
+        this.pos = commentStart;
+        return;
+      }
+      const afterComment = this.pos;
+      if (this.cur() === "\n") this.pos++;
+      while (true) {
+        this.skipWhitespaceOnly();
+        const nestedComment = this.tryParse(() => this.parseStandaloneComment());
+        if (!nestedComment) break;
+        if (this.cur() === "\n") this.pos++;
+      }
+      const followedByKeyword = keywords.some((keyword) => this.text.startsWith(keyword, this.pos));
+      this.pos = afterComment;
+      if (!followedByKeyword) {
+        this.pos = commentStart;
+        return;
+      }
+      if (this.cur() === "\n") this.pos++;
+    }
+  }
   skipInlineSpaces() {
     this.consumeWhile((ch) => ch === " " || ch === "	" || ch === "\r");
   }
@@ -526,35 +552,10 @@ var Parser = class {
   parsePipelineStep() {
     const result = this.tryParse(() => this.parseResultStep());
     if (result) return result;
-    const ifStep = this.tryParse(() => this.parseIfStep());
-    if (ifStep) return ifStep;
     const dispatchStep = this.tryParse(() => this.parseDispatchStep());
     if (dispatchStep) return dispatchStep;
-    const foreachStep = this.tryParse(() => this.parseForeachStep());
-    if (foreachStep) return foreachStep;
     return this.parseRegularStep();
   }
-  parseForeachStep() {
-    this.skipWhitespaceOnly();
-    const start = this.pos;
-    this.expect("|>");
-    this.skipInlineSpaces();
-    this.expect("foreach");
-    if (this.cur() !== " " && this.cur() !== "	") {
-      throw new ParseFailure("space after foreach", this.pos);
-    }
-    this.skipInlineSpaces();
-    const selector = this.consumeWhile((c) => c !== "\n" && c !== "#").trim();
-    if (selector.length === 0) {
-      throw new ParseFailure("foreach selector", this.pos);
-    }
-    this.skipSpaces();
-    const pipeline = this.parseIfPipeline("end");
-    this.skipSpaces();
-    this.expect("end");
-    const end = this.pos;
-    return { kind: "Foreach", selector, pipeline, start, end };
-  }
   parseRegularStep() {
     this.skipWhitespaceOnly();
     const start = this.pos;
@@ -563,7 +564,9 @@ var Parser = class {
     const nameStart = this.pos;
     const name = this.parseIdentifier();
     const nameEnd = this.pos;
-    const args = this.parseInlineArgs();
+    const inlineArgs = this.parseInlineArgs();
+    const args = inlineArgs.args;
+    const argSpans = inlineArgs.argSpans;
     this.skipInlineSpaces();
     let config = "";
     let configType = "quoted";
@@ -584,7 +587,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, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
+    return { kind: "Regular", name, nameStart, nameEnd, args, argSpans, config, configType, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -642,58 +645,58 @@ var Parser = class {
    * Split argument content by commas while respecting nesting depth and strings
    * Example: `"url", {a:1, b:2}` -> [`"url"`, `{a:1, b:2}`]
    */
-  splitBalancedArgs(content) {
+  splitBalancedArgs(content, baseOffset) {
     const args = [];
-    let current = "";
+    const argSpans = [];
+    let segmentStart = 0;
     let depth = 0;
     let inString = false;
     let stringChar = "";
     let escapeNext = false;
+    const pushArg = (segmentEnd) => {
+      let start = segmentStart;
+      let end = segmentEnd;
+      while (start < end && /\s/.test(content[start])) start++;
+      while (end > start && /\s/.test(content[end - 1])) end--;
+      if (start < end) {
+        args.push(content.slice(start, end));
+        argSpans.push({ start: baseOffset + start, end: baseOffset + end });
+      }
+    };
     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) {
+      if ((ch === '"' || 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;
+        pushArg(i);
+        segmentStart = i + 1;
       }
     }
-    if (current.trim().length > 0) {
-      args.push(current.trim());
-    }
-    return args;
+    pushArg(content.length);
+    return { args, argSpans };
   }
   /**
    * Parse inline arguments: middleware(arg1, arg2) or middleware[arg1, arg2]
@@ -705,7 +708,7 @@ var Parser = class {
     const ch = this.cur();
     if (ch !== "(" && ch !== "[") {
       this.pos = trimmedStart;
-      return [];
+      return { args: [], argSpans: [] };
     }
     const openChar = ch;
     const closeChar = openChar === "(" ? ")" : "]";
@@ -757,9 +760,9 @@ var Parser = class {
     const argsContent = this.text.slice(contentStart, this.pos);
     this.pos++;
     if (argsContent.trim().length === 0) {
-      return [];
+      return { args: [], argSpans: [] };
     }
-    return this.splitBalancedArgs(argsContent);
+    return this.splitBalancedArgs(argsContent, contentStart);
   }
   parseResultStep() {
     this.skipWhitespaceOnly();
@@ -802,32 +805,6 @@ var Parser = class {
     const end = this.pos;
     return { branchType, statusCode, pipeline, start, end };
   }
-  parseIfStep() {
-    this.skipWhitespaceOnly();
-    const start = this.pos;
-    this.expect("|>");
-    this.skipInlineSpaces();
-    this.expect("if");
-    this.skipSpaces();
-    const condition = this.parseIfPipeline("then:");
-    this.skipSpaces();
-    this.expect("then:");
-    this.skipWhitespaceOnly();
-    const thenBranch = this.parseIfPipeline("else:", "end");
-    this.skipWhitespaceOnly();
-    const elseBranch = this.tryParse(() => {
-      this.expect("else:");
-      this.skipWhitespaceOnly();
-      return this.parseIfPipeline("end");
-    });
-    this.skipWhitespaceOnly();
-    this.tryParse(() => {
-      this.expect("end");
-      return true;
-    });
-    const end = this.pos;
-    return { kind: "If", condition, thenBranch, elseBranch: elseBranch || void 0, start, end };
-  }
   parseDispatchStep() {
     this.skipWhitespaceOnly();
     const start = this.pos;
@@ -837,11 +814,13 @@ var Parser = class {
     this.skipWhitespaceOnly();
     const branches = [];
     while (true) {
+      this.skipStandaloneCommentsBeforeKeywords(["case", "default:", "end"]);
       const branch = this.tryParse(() => this.parseDispatchBranch());
       if (!branch) break;
       branches.push(branch);
       this.skipWhitespaceOnly();
     }
+    this.skipStandaloneCommentsBeforeKeywords(["default:", "end"]);
     const defaultBranch = this.tryParse(() => {
       this.expect("default:");
       this.skipWhitespaceOnly();
@@ -1041,18 +1020,6 @@ var Parser = class {
     if (inline && inline.steps.length > 0) {
       return { kind: "Inline", pipeline: inline, start: inline.start, end: inline.end };
     }
-    const named = this.tryParse(() => {
-      this.skipWhitespaceOnly();
-      const start = this.pos;
-      this.expect("|>");
-      this.skipInlineSpaces();
-      this.expect("pipeline:");
-      this.skipInlineSpaces();
-      const name = this.parseIdentifier();
-      const end = this.pos;
-      return { kind: "Named", name, start, end };
-    });
-    if (named) return named;
     throw new Error("pipeline-ref");
   }
   parseVariable() {
@@ -2088,61 +2055,6 @@ function formatPipelineStep(step, indent = "  ", isLastStep = false) {
       });
     });
     return lines.join("\n");
-  } else if (step.kind === "If") {
-    const lines = [`${indent}|> if`];
-    const conditionItems = [];
-    step.condition.steps.forEach((s) => {
-      conditionItems.push({ type: "step", item: s, position: s.start });
-    });
-    step.condition.comments.forEach((c) => {
-      conditionItems.push({ type: "comment", item: c, position: c.start || 0 });
-    });
-    conditionItems.sort((a, b) => a.position - b.position);
-    conditionItems.forEach((entry) => {
-      if (entry.type === "step") {
-        lines.push(formatPipelineStep(entry.item, indent + "  "));
-      } else {
-        lines.push(`${indent}  ${printComment(entry.item)}`);
-      }
-    });
-    lines.push(`${indent}  then:`);
-    const thenItems = [];
-    step.thenBranch.steps.forEach((s) => {
-      thenItems.push({ type: "step", item: s, position: s.start });
-    });
-    step.thenBranch.comments.forEach((c) => {
-      thenItems.push({ type: "comment", item: c, position: c.start || 0 });
-    });
-    thenItems.sort((a, b) => a.position - b.position);
-    thenItems.forEach((entry) => {
-      if (entry.type === "step") {
-        lines.push(formatPipelineStep(entry.item, indent + "    "));
-      } else {
-        lines.push(`${indent}    ${printComment(entry.item)}`);
-      }
-    });
-    if (step.elseBranch) {
-      lines.push(`${indent}  else:`);
-      const elseItems = [];
-      step.elseBranch.steps.forEach((s) => {
-        elseItems.push({ type: "step", item: s, position: s.start });
-      });
-      step.elseBranch.comments.forEach((c) => {
-        elseItems.push({ type: "comment", item: c, position: c.start || 0 });
-      });
-      elseItems.sort((a, b) => a.position - b.position);
-      elseItems.forEach((entry) => {
-        if (entry.type === "step") {
-          lines.push(formatPipelineStep(entry.item, indent + "    "));
-        } else {
-          lines.push(`${indent}    ${printComment(entry.item)}`);
-        }
-      });
-    }
-    if (!isLastStep) {
-      lines.push(`${indent}end`);
-    }
-    return lines.join("\n");
   } else if (step.kind === "Dispatch") {
     const lines = [`${indent}|> dispatch`];
     step.branches.forEach((branch) => {
@@ -2158,14 +2070,8 @@ function formatPipelineStep(step, indent = "  ", isLastStep = false) {
       });
     }
     return lines.join("\n");
-  } else {
-    const lines = [`${indent}|> foreach ${step.selector}`];
-    step.pipeline.steps.forEach((innerStep) => {
-      lines.push(formatPipelineStep(innerStep, indent + "  "));
-    });
-    lines.push(`${indent}end`);
-    return lines.join("\n");
   }
+  throw new Error(`Unsupported pipeline step: ${step.kind}`);
 }
 function formatStepConfig(config, configType) {
   switch (configType) {
@@ -2205,35 +2111,31 @@ function formatTagExpr(expr) {
   }
 }
 function formatPipelineRef(ref) {
-  if (ref.kind === "Named") {
-    return [`  |> pipeline: ${ref.name}`];
-  } else {
-    const lines = [];
-    const items = [];
-    ref.pipeline.steps.forEach((step) => {
-      items.push({ type: "step", item: step, position: step.start });
-    });
-    ref.pipeline.comments.forEach((comment) => {
-      items.push({ type: "comment", item: comment, position: comment.start || 0 });
-    });
-    items.sort((a, b) => a.position - b.position);
-    let lastStepIndex = -1;
-    for (let i = items.length - 1; i >= 0; i--) {
-      if (items[i].type === "step") {
-        lastStepIndex = i;
-        break;
-      }
+  const lines = [];
+  const items = [];
+  ref.pipeline.steps.forEach((step) => {
+    items.push({ type: "step", item: step, position: step.start });
+  });
+  ref.pipeline.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, position: comment.start || 0 });
+  });
+  items.sort((a, b) => a.position - b.position);
+  let lastStepIndex = -1;
+  for (let i = items.length - 1; i >= 0; i--) {
+    if (items[i].type === "step") {
+      lastStepIndex = i;
+      break;
     }
-    items.forEach((entry, index) => {
-      if (entry.type === "step") {
-        const isLastStep = index === lastStepIndex;
-        lines.push(formatPipelineStep(entry.item, "  ", isLastStep));
-      } else {
-        lines.push(`  ${printComment(entry.item)}`);
-      }
-    });
-    return lines;
   }
+  items.forEach((entry, index) => {
+    if (entry.type === "step") {
+      const isLastStep = index === lastStepIndex;
+      lines.push(formatPipelineStep(entry.item, "  ", isLastStep));
+    } else {
+      lines.push(`  ${printComment(entry.item)}`);
+    }
+  });
+  return lines;
 }
 function formatWhen(when) {
   switch (when.kind) {

package/dist/index.d.cts

@@ -116,11 +116,6 @@ type PipelineRef = {
     pipeline: Pipeline;
     start: number;
     end: number;
-} | {
-    kind: 'Named';
-    name: string;
-    start: number;
-    end: number;
 };
 interface Pipeline {
     steps: PipelineStep[];
@@ -129,6 +124,10 @@ interface Pipeline {
     end: number;
 }
 type ConfigType = 'backtick' | 'quoted' | 'identifier';
+interface SourceSpan {
+    start: number;
+    end: number;
+}
 type LetValueFormat = 'quoted' | 'backtick' | 'bare';
 interface LetVariable {
     name: string;
@@ -166,6 +165,7 @@ type PipelineStep = {
     nameStart: number;
     nameEnd: number;
     args: string[];
+    argSpans: SourceSpan[];
     config: string;
     configType: ConfigType;
     hasConfig: boolean;
@@ -180,25 +180,12 @@ type PipelineStep = {
     branches: ResultBranch[];
     start: number;
     end: number;
-} | {
-    kind: 'If';
-    condition: Pipeline;
-    thenBranch: Pipeline;
-    elseBranch?: Pipeline;
-    start: number;
-    end: number;
 } | {
     kind: 'Dispatch';
     branches: DispatchBranch[];
     default?: Pipeline;
     start: number;
     end: number;
-} | {
-    kind: 'Foreach';
-    selector: string;
-    pipeline: Pipeline;
-    start: number;
-    end: number;
 };
 interface DispatchBranch {
     condition: TagExpr;
@@ -357,4 +344,4 @@ declare function formatTagExpr(expr: TagExpr): string;
 declare function formatPipelineRef(ref: PipelineRef): string[];
 declare function formatWhen(when: When): string;
 
-export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type Import, type It, type LetValueFormat, type LetVariable, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type Import, type It, type LetValueFormat, type LetVariable, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type SourceSpan, type Tag, type TagExpr, type TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };

package/dist/index.d.ts

@@ -116,11 +116,6 @@ type PipelineRef = {
     pipeline: Pipeline;
     start: number;
     end: number;
-} | {
-    kind: 'Named';
-    name: string;
-    start: number;
-    end: number;
 };
 interface Pipeline {
     steps: PipelineStep[];
@@ -129,6 +124,10 @@ interface Pipeline {
     end: number;
 }
 type ConfigType = 'backtick' | 'quoted' | 'identifier';
+interface SourceSpan {
+    start: number;
+    end: number;
+}
 type LetValueFormat = 'quoted' | 'backtick' | 'bare';
 interface LetVariable {
     name: string;
@@ -166,6 +165,7 @@ type PipelineStep = {
     nameStart: number;
     nameEnd: number;
     args: string[];
+    argSpans: SourceSpan[];
     config: string;
     configType: ConfigType;
     hasConfig: boolean;
@@ -180,25 +180,12 @@ type PipelineStep = {
     branches: ResultBranch[];
     start: number;
     end: number;
-} | {
-    kind: 'If';
-    condition: Pipeline;
-    thenBranch: Pipeline;
-    elseBranch?: Pipeline;
-    start: number;
-    end: number;
 } | {
     kind: 'Dispatch';
     branches: DispatchBranch[];
     default?: Pipeline;
     start: number;
     end: number;
-} | {
-    kind: 'Foreach';
-    selector: string;
-    pipeline: Pipeline;
-    start: number;
-    end: number;
 };
 interface DispatchBranch {
     condition: TagExpr;
@@ -357,4 +344,4 @@ declare function formatTagExpr(expr: TagExpr): string;
 declare function formatPipelineRef(ref: PipelineRef): string[];
 declare function formatWhen(when: When): string;
 
-export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type Import, type It, type LetValueFormat, type LetVariable, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type Tag, type TagExpr, type TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type DomAssertType, type GraphQLSchema, type Import, type It, type LetValueFormat, type LetVariable, type Mock, type MutationResolver, type NamedPipeline, type ParseDiagnostic, type Pipeline, type PipelineRef, type PipelineStep, type Program, type QueryResolver, type ResultBranch, type ResultBranchType, type Route, type SourceSpan, type Tag, type TagExpr, type TestLetVariable, type TypeResolver, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getTestLetVariableRanges, getTestLetVariables, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printFeatureFlags, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printTypeResolver, printVariable };

package/dist/index.mjs

@@ -245,6 +245,32 @@ var Parser = class {
   skipWhitespaceOnly() {
     this.consumeWhile((ch) => ch === " " || ch === "	" || ch === "\r" || ch === "\n");
   }
+  skipStandaloneCommentsBeforeKeywords(keywords) {
+    while (true) {
+      this.skipWhitespaceOnly();
+      const commentStart = this.pos;
+      const comment = this.tryParse(() => this.parseStandaloneComment());
+      if (!comment) {
+        this.pos = commentStart;
+        return;
+      }
+      const afterComment = this.pos;
+      if (this.cur() === "\n") this.pos++;
+      while (true) {
+        this.skipWhitespaceOnly();
+        const nestedComment = this.tryParse(() => this.parseStandaloneComment());
+        if (!nestedComment) break;
+        if (this.cur() === "\n") this.pos++;
+      }
+      const followedByKeyword = keywords.some((keyword) => this.text.startsWith(keyword, this.pos));
+      this.pos = afterComment;
+      if (!followedByKeyword) {
+        this.pos = commentStart;
+        return;
+      }
+      if (this.cur() === "\n") this.pos++;
+    }
+  }
   skipInlineSpaces() {
     this.consumeWhile((ch) => ch === " " || ch === "	" || ch === "\r");
   }
@@ -472,35 +498,10 @@ var Parser = class {
   parsePipelineStep() {
     const result = this.tryParse(() => this.parseResultStep());
     if (result) return result;
-    const ifStep = this.tryParse(() => this.parseIfStep());
-    if (ifStep) return ifStep;
     const dispatchStep = this.tryParse(() => this.parseDispatchStep());
     if (dispatchStep) return dispatchStep;
-    const foreachStep = this.tryParse(() => this.parseForeachStep());
-    if (foreachStep) return foreachStep;
     return this.parseRegularStep();
   }
-  parseForeachStep() {
-    this.skipWhitespaceOnly();
-    const start = this.pos;
-    this.expect("|>");
-    this.skipInlineSpaces();
-    this.expect("foreach");
-    if (this.cur() !== " " && this.cur() !== "	") {
-      throw new ParseFailure("space after foreach", this.pos);
-    }
-    this.skipInlineSpaces();
-    const selector = this.consumeWhile((c) => c !== "\n" && c !== "#").trim();
-    if (selector.length === 0) {
-      throw new ParseFailure("foreach selector", this.pos);
-    }
-    this.skipSpaces();
-    const pipeline = this.parseIfPipeline("end");
-    this.skipSpaces();
-    this.expect("end");
-    const end = this.pos;
-    return { kind: "Foreach", selector, pipeline, start, end };
-  }
   parseRegularStep() {
     this.skipWhitespaceOnly();
     const start = this.pos;
@@ -509,7 +510,9 @@ var Parser = class {
     const nameStart = this.pos;
     const name = this.parseIdentifier();
     const nameEnd = this.pos;
-    const args = this.parseInlineArgs();
+    const inlineArgs = this.parseInlineArgs();
+    const args = inlineArgs.args;
+    const argSpans = inlineArgs.argSpans;
     this.skipInlineSpaces();
     let config = "";
     let configType = "quoted";
@@ -530,7 +533,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, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
+    return { kind: "Regular", name, nameStart, nameEnd, args, argSpans, config, configType, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -588,58 +591,58 @@ var Parser = class {
    * Split argument content by commas while respecting nesting depth and strings
    * Example: `"url", {a:1, b:2}` -> [`"url"`, `{a:1, b:2}`]
    */
-  splitBalancedArgs(content) {
+  splitBalancedArgs(content, baseOffset) {
     const args = [];
-    let current = "";
+    const argSpans = [];
+    let segmentStart = 0;
     let depth = 0;
     let inString = false;
     let stringChar = "";
     let escapeNext = false;
+    const pushArg = (segmentEnd) => {
+      let start = segmentStart;
+      let end = segmentEnd;
+      while (start < end && /\s/.test(content[start])) start++;
+      while (end > start && /\s/.test(content[end - 1])) end--;
+      if (start < end) {
+        args.push(content.slice(start, end));
+        argSpans.push({ start: baseOffset + start, end: baseOffset + end });
+      }
+    };
     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) {
+      if ((ch === '"' || 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;
+        pushArg(i);
+        segmentStart = i + 1;
       }
     }
-    if (current.trim().length > 0) {
-      args.push(current.trim());
-    }
-    return args;
+    pushArg(content.length);
+    return { args, argSpans };
   }
   /**
    * Parse inline arguments: middleware(arg1, arg2) or middleware[arg1, arg2]
@@ -651,7 +654,7 @@ var Parser = class {
     const ch = this.cur();
     if (ch !== "(" && ch !== "[") {
       this.pos = trimmedStart;
-      return [];
+      return { args: [], argSpans: [] };
     }
     const openChar = ch;
     const closeChar = openChar === "(" ? ")" : "]";
@@ -703,9 +706,9 @@ var Parser = class {
     const argsContent = this.text.slice(contentStart, this.pos);
     this.pos++;
     if (argsContent.trim().length === 0) {
-      return [];
+      return { args: [], argSpans: [] };
     }
-    return this.splitBalancedArgs(argsContent);
+    return this.splitBalancedArgs(argsContent, contentStart);
   }
   parseResultStep() {
     this.skipWhitespaceOnly();
@@ -748,32 +751,6 @@ var Parser = class {
     const end = this.pos;
     return { branchType, statusCode, pipeline, start, end };
   }
-  parseIfStep() {
-    this.skipWhitespaceOnly();
-    const start = this.pos;
-    this.expect("|>");
-    this.skipInlineSpaces();
-    this.expect("if");
-    this.skipSpaces();
-    const condition = this.parseIfPipeline("then:");
-    this.skipSpaces();
-    this.expect("then:");
-    this.skipWhitespaceOnly();
-    const thenBranch = this.parseIfPipeline("else:", "end");
-    this.skipWhitespaceOnly();
-    const elseBranch = this.tryParse(() => {
-      this.expect("else:");
-      this.skipWhitespaceOnly();
-      return this.parseIfPipeline("end");
-    });
-    this.skipWhitespaceOnly();
-    this.tryParse(() => {
-      this.expect("end");
-      return true;
-    });
-    const end = this.pos;
-    return { kind: "If", condition, thenBranch, elseBranch: elseBranch || void 0, start, end };
-  }
   parseDispatchStep() {
     this.skipWhitespaceOnly();
     const start = this.pos;
@@ -783,11 +760,13 @@ var Parser = class {
     this.skipWhitespaceOnly();
     const branches = [];
     while (true) {
+      this.skipStandaloneCommentsBeforeKeywords(["case", "default:", "end"]);
       const branch = this.tryParse(() => this.parseDispatchBranch());
       if (!branch) break;
       branches.push(branch);
       this.skipWhitespaceOnly();
     }
+    this.skipStandaloneCommentsBeforeKeywords(["default:", "end"]);
     const defaultBranch = this.tryParse(() => {
       this.expect("default:");
       this.skipWhitespaceOnly();
@@ -987,18 +966,6 @@ var Parser = class {
     if (inline && inline.steps.length > 0) {
       return { kind: "Inline", pipeline: inline, start: inline.start, end: inline.end };
     }
-    const named = this.tryParse(() => {
-      this.skipWhitespaceOnly();
-      const start = this.pos;
-      this.expect("|>");
-      this.skipInlineSpaces();
-      this.expect("pipeline:");
-      this.skipInlineSpaces();
-      const name = this.parseIdentifier();
-      const end = this.pos;
-      return { kind: "Named", name, start, end };
-    });
-    if (named) return named;
     throw new Error("pipeline-ref");
   }
   parseVariable() {
@@ -2034,61 +2001,6 @@ function formatPipelineStep(step, indent = "  ", isLastStep = false) {
       });
     });
     return lines.join("\n");
-  } else if (step.kind === "If") {
-    const lines = [`${indent}|> if`];
-    const conditionItems = [];
-    step.condition.steps.forEach((s) => {
-      conditionItems.push({ type: "step", item: s, position: s.start });
-    });
-    step.condition.comments.forEach((c) => {
-      conditionItems.push({ type: "comment", item: c, position: c.start || 0 });
-    });
-    conditionItems.sort((a, b) => a.position - b.position);
-    conditionItems.forEach((entry) => {
-      if (entry.type === "step") {
-        lines.push(formatPipelineStep(entry.item, indent + "  "));
-      } else {
-        lines.push(`${indent}  ${printComment(entry.item)}`);
-      }
-    });
-    lines.push(`${indent}  then:`);
-    const thenItems = [];
-    step.thenBranch.steps.forEach((s) => {
-      thenItems.push({ type: "step", item: s, position: s.start });
-    });
-    step.thenBranch.comments.forEach((c) => {
-      thenItems.push({ type: "comment", item: c, position: c.start || 0 });
-    });
-    thenItems.sort((a, b) => a.position - b.position);
-    thenItems.forEach((entry) => {
-      if (entry.type === "step") {
-        lines.push(formatPipelineStep(entry.item, indent + "    "));
-      } else {
-        lines.push(`${indent}    ${printComment(entry.item)}`);
-      }
-    });
-    if (step.elseBranch) {
-      lines.push(`${indent}  else:`);
-      const elseItems = [];
-      step.elseBranch.steps.forEach((s) => {
-        elseItems.push({ type: "step", item: s, position: s.start });
-      });
-      step.elseBranch.comments.forEach((c) => {
-        elseItems.push({ type: "comment", item: c, position: c.start || 0 });
-      });
-      elseItems.sort((a, b) => a.position - b.position);
-      elseItems.forEach((entry) => {
-        if (entry.type === "step") {
-          lines.push(formatPipelineStep(entry.item, indent + "    "));
-        } else {
-          lines.push(`${indent}    ${printComment(entry.item)}`);
-        }
-      });
-    }
-    if (!isLastStep) {
-      lines.push(`${indent}end`);
-    }
-    return lines.join("\n");
   } else if (step.kind === "Dispatch") {
     const lines = [`${indent}|> dispatch`];
     step.branches.forEach((branch) => {
@@ -2104,14 +2016,8 @@ function formatPipelineStep(step, indent = "  ", isLastStep = false) {
       });
     }
     return lines.join("\n");
-  } else {
-    const lines = [`${indent}|> foreach ${step.selector}`];
-    step.pipeline.steps.forEach((innerStep) => {
-      lines.push(formatPipelineStep(innerStep, indent + "  "));
-    });
-    lines.push(`${indent}end`);
-    return lines.join("\n");
   }
+  throw new Error(`Unsupported pipeline step: ${step.kind}`);
 }
 function formatStepConfig(config, configType) {
   switch (configType) {
@@ -2151,35 +2057,31 @@ function formatTagExpr(expr) {
   }
 }
 function formatPipelineRef(ref) {
-  if (ref.kind === "Named") {
-    return [`  |> pipeline: ${ref.name}`];
-  } else {
-    const lines = [];
-    const items = [];
-    ref.pipeline.steps.forEach((step) => {
-      items.push({ type: "step", item: step, position: step.start });
-    });
-    ref.pipeline.comments.forEach((comment) => {
-      items.push({ type: "comment", item: comment, position: comment.start || 0 });
-    });
-    items.sort((a, b) => a.position - b.position);
-    let lastStepIndex = -1;
-    for (let i = items.length - 1; i >= 0; i--) {
-      if (items[i].type === "step") {
-        lastStepIndex = i;
-        break;
-      }
+  const lines = [];
+  const items = [];
+  ref.pipeline.steps.forEach((step) => {
+    items.push({ type: "step", item: step, position: step.start });
+  });
+  ref.pipeline.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, position: comment.start || 0 });
+  });
+  items.sort((a, b) => a.position - b.position);
+  let lastStepIndex = -1;
+  for (let i = items.length - 1; i >= 0; i--) {
+    if (items[i].type === "step") {
+      lastStepIndex = i;
+      break;
     }
-    items.forEach((entry, index) => {
-      if (entry.type === "step") {
-        const isLastStep = index === lastStepIndex;
-        lines.push(formatPipelineStep(entry.item, "  ", isLastStep));
-      } else {
-        lines.push(`  ${printComment(entry.item)}`);
-      }
-    });
-    return lines;
   }
+  items.forEach((entry, index) => {
+    if (entry.type === "step") {
+      const isLastStep = index === lastStepIndex;
+      lines.push(formatPipelineStep(entry.item, "  ", isLastStep));
+    } else {
+      lines.push(`  ${printComment(entry.item)}`);
+    }
+  });
+  return lines;
 }
 function formatWhen(when) {
   switch (when.kind) {

package/package.json

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