webpipe-js 2.0.63 → 2.0.65

package/dist/index.cjs

@@ -39,6 +39,7 @@ __export(index_exports, {
   printCondition: () => printCondition,
   printConfig: () => printConfig,
   printDescribe: () => printDescribe,
+  printFeatureFlags: () => printFeatureFlags,
   printGraphQLSchema: () => printGraphQLSchema,
   printMock: () => printMock,
   printMutationResolver: () => printMutationResolver,
@@ -131,7 +132,8 @@ var Parser = class {
         type: "standalone",
         text: restOfLine,
         style: "#",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start
       };
     }
     if (this.text.startsWith("//", this.pos)) {
@@ -141,7 +143,8 @@ var Parser = class {
         type: "standalone",
         text,
         style: "//",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start
       };
     }
     return null;
@@ -773,15 +776,15 @@ var Parser = class {
     const condition = this.parseIfPipeline("then:");
     this.skipSpaces();
     this.expect("then:");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const thenBranch = this.parseIfPipeline("else:", "end");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const elseBranch = this.tryParse(() => {
       this.expect("else:");
-      this.skipSpaces();
+      this.skipWhitespaceOnly();
       return this.parseIfPipeline("end");
     });
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     this.tryParse(() => {
       this.expect("end");
       return true;
@@ -908,8 +911,15 @@ var Parser = class {
           break;
         }
         const hasFollowingStep = this.text.startsWith("|>", this.pos);
+        let hasStopKeyword = false;
+        for (const keyword of stopKeywords) {
+          if (this.text.startsWith(keyword, this.pos)) {
+            hasStopKeyword = true;
+            break;
+          }
+        }
         this.pos = lookAheadPos;
-        if (hasFollowingStep || steps.length === 0) {
+        if (hasFollowingStep || hasStopKeyword || steps.length === 0) {
           comments.push(comment);
           if (this.cur() === "\n") this.pos++;
           continue;
@@ -1659,7 +1669,7 @@ function printPipeline(pipeline) {
     items.push({ type: "step", item: step, position: step.start });
   });
   pipeline.pipeline.comments.forEach((comment) => {
-    items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+    items.push({ type: "comment", item: comment, position: comment.start || 0 });
   });
   items.sort((a, b) => a.position - b.position);
   items.forEach((entry) => {
@@ -1721,6 +1731,26 @@ function printTypeResolver(resolver) {
   });
   return lines.join("\n");
 }
+function printFeatureFlags(pipeline) {
+  const lines = [];
+  lines.push("featureFlags =");
+  const items = [];
+  pipeline.steps.forEach((step) => {
+    items.push({ type: "step", item: step, position: step.start });
+  });
+  pipeline.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, position: comment.start || 0 });
+  });
+  items.sort((a, b) => a.position - b.position);
+  items.forEach((entry) => {
+    if (entry.type === "step") {
+      lines.push(formatPipelineStep(entry.item));
+    } else {
+      lines.push(`  ${printComment(entry.item)}`);
+    }
+  });
+  return lines.join("\n");
+}
 function printMock(mock, indent = "  ") {
   const target = mock.target.replace(/^(query|mutation)\.(.*)$/, "$1 $2");
   return `${indent}with mock ${target} returning \`${mock.returnValue}\``;
@@ -1898,6 +1928,9 @@ function prettyPrint(program) {
   program.variables.forEach((variable) => {
     allItems.push({ type: "variable", item: variable, lineNumber: variable.lineNumber || 0 });
   });
+  if (program.featureFlags) {
+    allItems.push({ type: "featureFlags", item: program.featureFlags, lineNumber: program.featureFlags.start || 0 });
+  }
   program.describes.forEach((describe) => {
     allItems.push({ type: "describe", item: describe, lineNumber: describe.lineNumber || 0 });
   });
@@ -1951,6 +1984,9 @@ function prettyPrint(program) {
       case "variable":
         lines.push(printVariable(entry.item));
         break;
+      case "featureFlags":
+        lines.push(printFeatureFlags(entry.item));
+        break;
       case "describe":
         lines.push(printDescribe(entry.item));
         break;
@@ -1973,7 +2009,7 @@ function formatConfigValue(value) {
       return value.value.toString();
   }
 }
-function formatPipelineStep(step, indent = "  ") {
+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);
@@ -1991,19 +2027,58 @@ function formatPipelineStep(step, indent = "  ") {
     return lines.join("\n");
   } else if (step.kind === "If") {
     const lines = [`${indent}|> if`];
-    step.condition.steps.forEach((condStep) => {
-      lines.push(formatPipelineStep(condStep, indent + "  "));
+    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:`);
-    step.thenBranch.steps.forEach((thenStep) => {
-      lines.push(formatPipelineStep(thenStep, indent + "    "));
+    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:`);
-      step.elseBranch.steps.forEach((elseStep) => {
-        lines.push(formatPipelineStep(elseStep, indent + "    "));
+      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`];
@@ -2082,12 +2157,20 @@ function formatPipelineRef(ref) {
       items.push({ type: "step", item: step, position: step.start });
     });
     ref.pipeline.comments.forEach((comment) => {
-      items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+      items.push({ type: "comment", item: comment, position: comment.start || 0 });
     });
     items.sort((a, b) => a.position - b.position);
-    items.forEach((entry) => {
+    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") {
-        lines.push(formatPipelineStep(entry.item));
+        const isLastStep = index === lastStepIndex;
+        lines.push(formatPipelineStep(entry.item, "  ", isLastStep));
       } else {
         lines.push(`  ${printComment(entry.item)}`);
       }
@@ -2126,6 +2209,7 @@ function formatWhen(when) {
   printCondition,
   printConfig,
   printDescribe,
+  printFeatureFlags,
   printGraphQLSchema,
   printMock,
   printMutationResolver,

package/dist/index.d.cts

@@ -16,6 +16,7 @@ interface Comment {
     text: string;
     style: '#' | '//';
     lineNumber?: number;
+    start?: number;
 }
 interface Config {
     name: string;
@@ -331,6 +332,7 @@ declare function printGraphQLSchema(schema: GraphQLSchema): string;
 declare function printQueryResolver(query: QueryResolver): string;
 declare function printMutationResolver(mutation: MutationResolver): string;
 declare function printTypeResolver(resolver: TypeResolver): string;
+declare function printFeatureFlags(pipeline: Pipeline): string;
 declare function printMock(mock: Mock, indent?: string): string;
 declare function printCondition(condition: Condition, indent?: string): string;
 declare function printTest(test: It): string;
@@ -338,7 +340,7 @@ declare function printComment(comment: Comment): string;
 declare function printDescribe(describe: Describe): string;
 declare function prettyPrint(program: Program): string;
 declare function formatConfigValue(value: ConfigValue): string;
-declare function formatPipelineStep(step: PipelineStep, indent?: string): string;
+declare function formatPipelineStep(step: PipelineStep, indent?: string, isLastStep?: boolean): string;
 declare function formatStepConfig(config: string, configType: ConfigType): string;
 declare function formatTags(tags: Tag[]): string;
 declare function formatTag(tag: Tag): string;
@@ -346,4 +348,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 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, 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 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 };

package/dist/index.d.ts

@@ -16,6 +16,7 @@ interface Comment {
     text: string;
     style: '#' | '//';
     lineNumber?: number;
+    start?: number;
 }
 interface Config {
     name: string;
@@ -331,6 +332,7 @@ declare function printGraphQLSchema(schema: GraphQLSchema): string;
 declare function printQueryResolver(query: QueryResolver): string;
 declare function printMutationResolver(mutation: MutationResolver): string;
 declare function printTypeResolver(resolver: TypeResolver): string;
+declare function printFeatureFlags(pipeline: Pipeline): string;
 declare function printMock(mock: Mock, indent?: string): string;
 declare function printCondition(condition: Condition, indent?: string): string;
 declare function printTest(test: It): string;
@@ -338,7 +340,7 @@ declare function printComment(comment: Comment): string;
 declare function printDescribe(describe: Describe): string;
 declare function prettyPrint(program: Program): string;
 declare function formatConfigValue(value: ConfigValue): string;
-declare function formatPipelineStep(step: PipelineStep, indent?: string): string;
+declare function formatPipelineStep(step: PipelineStep, indent?: string, isLastStep?: boolean): string;
 declare function formatStepConfig(config: string, configType: ConfigType): string;
 declare function formatTags(tags: Tag[]): string;
 declare function formatTag(tag: Tag): string;
@@ -346,4 +348,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 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, 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 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 };

package/dist/index.mjs

@@ -78,7 +78,8 @@ var Parser = class {
         type: "standalone",
         text: restOfLine,
         style: "#",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start
       };
     }
     if (this.text.startsWith("//", this.pos)) {
@@ -88,7 +89,8 @@ var Parser = class {
         type: "standalone",
         text,
         style: "//",
-        lineNumber: this.getLineNumber(start)
+        lineNumber: this.getLineNumber(start),
+        start
       };
     }
     return null;
@@ -720,15 +722,15 @@ var Parser = class {
     const condition = this.parseIfPipeline("then:");
     this.skipSpaces();
     this.expect("then:");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const thenBranch = this.parseIfPipeline("else:", "end");
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     const elseBranch = this.tryParse(() => {
       this.expect("else:");
-      this.skipSpaces();
+      this.skipWhitespaceOnly();
       return this.parseIfPipeline("end");
     });
-    this.skipSpaces();
+    this.skipWhitespaceOnly();
     this.tryParse(() => {
       this.expect("end");
       return true;
@@ -855,8 +857,15 @@ var Parser = class {
           break;
         }
         const hasFollowingStep = this.text.startsWith("|>", this.pos);
+        let hasStopKeyword = false;
+        for (const keyword of stopKeywords) {
+          if (this.text.startsWith(keyword, this.pos)) {
+            hasStopKeyword = true;
+            break;
+          }
+        }
         this.pos = lookAheadPos;
-        if (hasFollowingStep || steps.length === 0) {
+        if (hasFollowingStep || hasStopKeyword || steps.length === 0) {
           comments.push(comment);
           if (this.cur() === "\n") this.pos++;
           continue;
@@ -1606,7 +1615,7 @@ function printPipeline(pipeline) {
     items.push({ type: "step", item: step, position: step.start });
   });
   pipeline.pipeline.comments.forEach((comment) => {
-    items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+    items.push({ type: "comment", item: comment, position: comment.start || 0 });
   });
   items.sort((a, b) => a.position - b.position);
   items.forEach((entry) => {
@@ -1668,6 +1677,26 @@ function printTypeResolver(resolver) {
   });
   return lines.join("\n");
 }
+function printFeatureFlags(pipeline) {
+  const lines = [];
+  lines.push("featureFlags =");
+  const items = [];
+  pipeline.steps.forEach((step) => {
+    items.push({ type: "step", item: step, position: step.start });
+  });
+  pipeline.comments.forEach((comment) => {
+    items.push({ type: "comment", item: comment, position: comment.start || 0 });
+  });
+  items.sort((a, b) => a.position - b.position);
+  items.forEach((entry) => {
+    if (entry.type === "step") {
+      lines.push(formatPipelineStep(entry.item));
+    } else {
+      lines.push(`  ${printComment(entry.item)}`);
+    }
+  });
+  return lines.join("\n");
+}
 function printMock(mock, indent = "  ") {
   const target = mock.target.replace(/^(query|mutation)\.(.*)$/, "$1 $2");
   return `${indent}with mock ${target} returning \`${mock.returnValue}\``;
@@ -1845,6 +1874,9 @@ function prettyPrint(program) {
   program.variables.forEach((variable) => {
     allItems.push({ type: "variable", item: variable, lineNumber: variable.lineNumber || 0 });
   });
+  if (program.featureFlags) {
+    allItems.push({ type: "featureFlags", item: program.featureFlags, lineNumber: program.featureFlags.start || 0 });
+  }
   program.describes.forEach((describe) => {
     allItems.push({ type: "describe", item: describe, lineNumber: describe.lineNumber || 0 });
   });
@@ -1898,6 +1930,9 @@ function prettyPrint(program) {
       case "variable":
         lines.push(printVariable(entry.item));
         break;
+      case "featureFlags":
+        lines.push(printFeatureFlags(entry.item));
+        break;
       case "describe":
         lines.push(printDescribe(entry.item));
         break;
@@ -1920,7 +1955,7 @@ function formatConfigValue(value) {
       return value.value.toString();
   }
 }
-function formatPipelineStep(step, indent = "  ") {
+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);
@@ -1938,19 +1973,58 @@ function formatPipelineStep(step, indent = "  ") {
     return lines.join("\n");
   } else if (step.kind === "If") {
     const lines = [`${indent}|> if`];
-    step.condition.steps.forEach((condStep) => {
-      lines.push(formatPipelineStep(condStep, indent + "  "));
+    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:`);
-    step.thenBranch.steps.forEach((thenStep) => {
-      lines.push(formatPipelineStep(thenStep, indent + "    "));
+    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:`);
-      step.elseBranch.steps.forEach((elseStep) => {
-        lines.push(formatPipelineStep(elseStep, indent + "    "));
+      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`];
@@ -2029,12 +2103,20 @@ function formatPipelineRef(ref) {
       items.push({ type: "step", item: step, position: step.start });
     });
     ref.pipeline.comments.forEach((comment) => {
-      items.push({ type: "comment", item: comment, position: comment.lineNumber || 0 });
+      items.push({ type: "comment", item: comment, position: comment.start || 0 });
     });
     items.sort((a, b) => a.position - b.position);
-    items.forEach((entry) => {
+    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") {
-        lines.push(formatPipelineStep(entry.item));
+        const isLastStep = index === lastStepIndex;
+        lines.push(formatPipelineStep(entry.item, "  ", isLastStep));
       } else {
         lines.push(`  ${printComment(entry.item)}`);
       }
@@ -2072,6 +2154,7 @@ export {
   printCondition,
   printConfig,
   printDescribe,
+  printFeatureFlags,
   printGraphQLSchema,
   printMock,
   printMutationResolver,

package/package.json

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