webpipe-js 2.0.9 → 2.0.11

package/dist/index.cjs

@@ -461,41 +461,28 @@ var Parser = class {
     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();
   }
-  parseDispatchStep() {
+  parseForeachStep() {
     this.skipWhitespaceOnly();
     this.expect("|>");
     this.skipInlineSpaces();
-    this.expect("dispatch");
-    this.skipSpaces();
-    const cases = [];
-    while (true) {
-      const dispatchCase = this.tryParse(() => this.parseDispatchCase());
-      if (!dispatchCase) break;
-      cases.push(dispatchCase);
+    this.expect("foreach");
+    if (this.cur() !== " " && this.cur() !== "	") {
+      throw new ParseFailure("space after foreach", this.pos);
     }
-    const defaultBranch = this.tryParse(() => this.parseDispatchDefault());
-    return { kind: "Dispatch", cases, default: defaultBranch || void 0 };
-  }
-  parseDispatchCase() {
-    this.skipSpaces();
-    this.expect("case");
     this.skipInlineSpaces();
-    const condition = this.parseTag();
-    this.skipInlineSpaces();
-    this.expect(":");
+    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.parsePipeline();
-    return { condition, pipeline };
-  }
-  parseDispatchDefault() {
+    const pipeline = this.parseIfPipeline("end");
     this.skipSpaces();
-    this.expect("default");
-    this.skipInlineSpaces();
-    this.expect(":");
-    this.skipSpaces();
-    return this.parsePipeline();
+    this.expect("end");
+    return { kind: "Foreach", selector, pipeline };
   }
   parseRegularStep() {
     this.skipWhitespaceOnly();
@@ -593,6 +580,41 @@ var Parser = class {
     });
     return { kind: "If", condition, thenBranch, elseBranch: elseBranch || void 0 };
   }
+  parseDispatchStep() {
+    this.skipWhitespaceOnly();
+    this.expect("|>");
+    this.skipInlineSpaces();
+    this.expect("dispatch");
+    this.skipSpaces();
+    const branches = [];
+    while (true) {
+      const branch = this.tryParse(() => this.parseDispatchBranch());
+      if (!branch) break;
+      branches.push(branch);
+      this.skipSpaces();
+    }
+    const defaultBranch = this.tryParse(() => {
+      this.expect("default:");
+      this.skipSpaces();
+      return this.parseIfPipeline("end");
+    });
+    this.skipSpaces();
+    this.tryParse(() => {
+      this.expect("end");
+      return true;
+    });
+    return { kind: "Dispatch", branches, default: defaultBranch || void 0 };
+  }
+  parseDispatchBranch() {
+    this.skipSpaces();
+    this.expect("case");
+    this.skipInlineSpaces();
+    const tag = this.parseTag();
+    this.expect(":");
+    this.skipSpaces();
+    const pipeline = this.parseIfPipeline("case", "default:", "end");
+    return { tag, pipeline };
+  }
   parseIfPipeline(...stopKeywords) {
     const steps = [];
     while (true) {
@@ -1126,22 +1148,7 @@ function formatPipelineStep(step, indent = "  ") {
       });
     });
     return lines.join("\n");
-  } else if (step.kind === "Dispatch") {
-    const lines = [`${indent}|> dispatch`];
-    step.cases.forEach((dispatchCase) => {
-      lines.push(`${indent}  case ${formatTag(dispatchCase.condition)}:`);
-      dispatchCase.pipeline.steps.forEach((caseStep) => {
-        lines.push(formatPipelineStep(caseStep, indent + "    "));
-      });
-    });
-    if (step.default) {
-      lines.push(`${indent}  default:`);
-      step.default.steps.forEach((defaultStep) => {
-        lines.push(formatPipelineStep(defaultStep, indent + "    "));
-      });
-    }
-    return lines.join("\n");
-  } else {
+  } else if (step.kind === "If") {
     const lines = [`${indent}|> if`];
     step.condition.steps.forEach((condStep) => {
       lines.push(formatPipelineStep(condStep, indent + "  "));
@@ -1157,6 +1164,28 @@ function formatPipelineStep(step, indent = "  ") {
       });
     }
     return lines.join("\n");
+  } else if (step.kind === "Dispatch") {
+    const lines = [`${indent}|> dispatch`];
+    step.branches.forEach((branch) => {
+      lines.push(`${indent}  case ${formatTag(branch.tag)}:`);
+      branch.pipeline.steps.forEach((branchStep) => {
+        lines.push(formatPipelineStep(branchStep, indent + "    "));
+      });
+    });
+    if (step.default) {
+      lines.push(`${indent}  default:`);
+      step.default.steps.forEach((defaultStep) => {
+        lines.push(formatPipelineStep(defaultStep, indent + "    "));
+      });
+    }
+    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");
   }
 }
 function formatStepConfig(config, configType) {

package/dist/index.d.cts

@@ -110,11 +110,15 @@ type PipelineStep = {
     elseBranch?: Pipeline;
 } | {
     kind: 'Dispatch';
-    cases: DispatchCase[];
+    branches: DispatchBranch[];
     default?: Pipeline;
+} | {
+    kind: 'Foreach';
+    selector: string;
+    pipeline: Pipeline;
 };
-interface DispatchCase {
-    condition: Tag;
+interface DispatchBranch {
+    tag: Tag;
     pipeline: Pipeline;
 }
 interface ResultBranch {
@@ -208,4 +212,4 @@ declare function formatTag(tag: Tag): 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 DispatchCase, type GraphQLSchema, type It, 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 Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type GraphQLSchema, type It, 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 Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -110,11 +110,15 @@ type PipelineStep = {
     elseBranch?: Pipeline;
 } | {
     kind: 'Dispatch';
-    cases: DispatchCase[];
+    branches: DispatchBranch[];
     default?: Pipeline;
+} | {
+    kind: 'Foreach';
+    selector: string;
+    pipeline: Pipeline;
 };
-interface DispatchCase {
-    condition: Tag;
+interface DispatchBranch {
+    tag: Tag;
     pipeline: Pipeline;
 }
 interface ResultBranch {
@@ -208,4 +212,4 @@ declare function formatTag(tag: Tag): 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 DispatchCase, type GraphQLSchema, type It, 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 Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };
+export { type Comment, type Condition, type Config, type ConfigProperty, type ConfigType, type ConfigValue, type Describe, type DiagnosticSeverity, type DispatchBranch, type GraphQLSchema, type It, 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 Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -412,41 +412,28 @@ var Parser = class {
     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();
   }
-  parseDispatchStep() {
+  parseForeachStep() {
     this.skipWhitespaceOnly();
     this.expect("|>");
     this.skipInlineSpaces();
-    this.expect("dispatch");
-    this.skipSpaces();
-    const cases = [];
-    while (true) {
-      const dispatchCase = this.tryParse(() => this.parseDispatchCase());
-      if (!dispatchCase) break;
-      cases.push(dispatchCase);
+    this.expect("foreach");
+    if (this.cur() !== " " && this.cur() !== "	") {
+      throw new ParseFailure("space after foreach", this.pos);
     }
-    const defaultBranch = this.tryParse(() => this.parseDispatchDefault());
-    return { kind: "Dispatch", cases, default: defaultBranch || void 0 };
-  }
-  parseDispatchCase() {
-    this.skipSpaces();
-    this.expect("case");
     this.skipInlineSpaces();
-    const condition = this.parseTag();
-    this.skipInlineSpaces();
-    this.expect(":");
+    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.parsePipeline();
-    return { condition, pipeline };
-  }
-  parseDispatchDefault() {
+    const pipeline = this.parseIfPipeline("end");
     this.skipSpaces();
-    this.expect("default");
-    this.skipInlineSpaces();
-    this.expect(":");
-    this.skipSpaces();
-    return this.parsePipeline();
+    this.expect("end");
+    return { kind: "Foreach", selector, pipeline };
   }
   parseRegularStep() {
     this.skipWhitespaceOnly();
@@ -544,6 +531,41 @@ var Parser = class {
     });
     return { kind: "If", condition, thenBranch, elseBranch: elseBranch || void 0 };
   }
+  parseDispatchStep() {
+    this.skipWhitespaceOnly();
+    this.expect("|>");
+    this.skipInlineSpaces();
+    this.expect("dispatch");
+    this.skipSpaces();
+    const branches = [];
+    while (true) {
+      const branch = this.tryParse(() => this.parseDispatchBranch());
+      if (!branch) break;
+      branches.push(branch);
+      this.skipSpaces();
+    }
+    const defaultBranch = this.tryParse(() => {
+      this.expect("default:");
+      this.skipSpaces();
+      return this.parseIfPipeline("end");
+    });
+    this.skipSpaces();
+    this.tryParse(() => {
+      this.expect("end");
+      return true;
+    });
+    return { kind: "Dispatch", branches, default: defaultBranch || void 0 };
+  }
+  parseDispatchBranch() {
+    this.skipSpaces();
+    this.expect("case");
+    this.skipInlineSpaces();
+    const tag = this.parseTag();
+    this.expect(":");
+    this.skipSpaces();
+    const pipeline = this.parseIfPipeline("case", "default:", "end");
+    return { tag, pipeline };
+  }
   parseIfPipeline(...stopKeywords) {
     const steps = [];
     while (true) {
@@ -1077,22 +1099,7 @@ function formatPipelineStep(step, indent = "  ") {
       });
     });
     return lines.join("\n");
-  } else if (step.kind === "Dispatch") {
-    const lines = [`${indent}|> dispatch`];
-    step.cases.forEach((dispatchCase) => {
-      lines.push(`${indent}  case ${formatTag(dispatchCase.condition)}:`);
-      dispatchCase.pipeline.steps.forEach((caseStep) => {
-        lines.push(formatPipelineStep(caseStep, indent + "    "));
-      });
-    });
-    if (step.default) {
-      lines.push(`${indent}  default:`);
-      step.default.steps.forEach((defaultStep) => {
-        lines.push(formatPipelineStep(defaultStep, indent + "    "));
-      });
-    }
-    return lines.join("\n");
-  } else {
+  } else if (step.kind === "If") {
     const lines = [`${indent}|> if`];
     step.condition.steps.forEach((condStep) => {
       lines.push(formatPipelineStep(condStep, indent + "  "));
@@ -1108,6 +1115,28 @@ function formatPipelineStep(step, indent = "  ") {
       });
     }
     return lines.join("\n");
+  } else if (step.kind === "Dispatch") {
+    const lines = [`${indent}|> dispatch`];
+    step.branches.forEach((branch) => {
+      lines.push(`${indent}  case ${formatTag(branch.tag)}:`);
+      branch.pipeline.steps.forEach((branchStep) => {
+        lines.push(formatPipelineStep(branchStep, indent + "    "));
+      });
+    });
+    if (step.default) {
+      lines.push(`${indent}  default:`);
+      step.default.steps.forEach((defaultStep) => {
+        lines.push(formatPipelineStep(defaultStep, indent + "    "));
+      });
+    }
+    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");
   }
 }
 function formatStepConfig(config, configType) {

package/package.json

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