webpipe-js 2.0.69 → 2.0.81

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");
   }
@@ -563,13 +589,17 @@ 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";
+    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 +612,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, argSpans, config, configType, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -640,58 +670,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]
@@ -703,7 +733,7 @@ var Parser = class {
     const ch = this.cur();
     if (ch !== "(" && ch !== "[") {
       this.pos = trimmedStart;
-      return [];
+      return { args: [], argSpans: [] };
     }
     const openChar = ch;
     const closeChar = openChar === "(" ? ")" : "]";
@@ -755,9 +785,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();
@@ -835,11 +865,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();
@@ -2073,9 +2105,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

@@ -129,6 +129,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,8 +170,10 @@ type PipelineStep = {
     nameStart: number;
     nameEnd: number;
     args: string[];
+    argSpans: SourceSpan[];
     config: string;
     configType: ConfigType;
+    hasConfig: boolean;
     configStart?: number;
     configEnd?: number;
     condition?: TagExpr;
@@ -356,4 +362,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

@@ -129,6 +129,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,8 +170,10 @@ type PipelineStep = {
     nameStart: number;
     nameEnd: number;
     args: string[];
+    argSpans: SourceSpan[];
     config: string;
     configType: ConfigType;
+    hasConfig: boolean;
     configStart?: number;
     configEnd?: number;
     condition?: TagExpr;
@@ -356,4 +362,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");
   }
@@ -509,13 +535,17 @@ 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";
+    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 +558,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, argSpans, config, configType, hasConfig, configStart, configEnd, condition, parsedJoinTargets, start, end };
   }
   /**
    * Parse optional step condition (tag expression after the config)
@@ -586,58 +616,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]
@@ -649,7 +679,7 @@ var Parser = class {
     const ch = this.cur();
     if (ch !== "(" && ch !== "[") {
       this.pos = trimmedStart;
-      return [];
+      return { args: [], argSpans: [] };
     }
     const openChar = ch;
     const closeChar = openChar === "(" ? ")" : "]";
@@ -701,9 +731,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();
@@ -781,11 +811,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();
@@ -2019,9 +2051,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.69",
+  "version": "2.0.81",
   "description": "Web Pipe parser",
   "license": "ISC",
   "author": "William Cotton",