webpipe-js 2.0.2 → 2.0.4

package/dist/index.cjs

@@ -457,6 +457,8 @@ var Parser = class {
   parsePipelineStep() {
     const result = this.tryParse(() => this.parseResultStep());
     if (result) return result;
+    const ifStep = this.tryParse(() => this.parseIfStep());
+    if (ifStep) return ifStep;
     return this.parseRegularStep();
   }
   parseRegularStep() {
@@ -508,6 +510,43 @@ var Parser = class {
     const pipeline = this.parsePipeline();
     return { branchType, statusCode, pipeline };
   }
+  parseIfStep() {
+    this.skipWhitespaceOnly();
+    this.expect("|>");
+    this.skipInlineSpaces();
+    this.expect("if");
+    this.skipSpaces();
+    const condition = this.parseIfPipeline("then:");
+    this.skipSpaces();
+    this.expect("then:");
+    this.skipSpaces();
+    const thenBranch = this.parseIfPipeline("else:");
+    this.skipSpaces();
+    const elseBranch = this.tryParse(() => {
+      this.expect("else:");
+      this.skipSpaces();
+      return this.parsePipeline();
+    });
+    return { kind: "If", condition, thenBranch, elseBranch: elseBranch || void 0 };
+  }
+  parseIfPipeline(stopKeyword) {
+    const steps = [];
+    while (true) {
+      const save = this.pos;
+      this.skipWhitespaceOnly();
+      if (this.text.startsWith(stopKeyword, this.pos)) {
+        this.pos = save;
+        break;
+      }
+      if (!this.text.startsWith("|>", this.pos)) {
+        this.pos = save;
+        break;
+      }
+      const step = this.parsePipelineStep();
+      steps.push(step);
+    }
+    return { steps };
+  }
   parsePipeline() {
     const steps = [];
     while (true) {
@@ -569,9 +608,7 @@ var Parser = class {
     return { varType, name, value, inlineComment: inlineComment || void 0 };
   }
   parseGraphQLSchema() {
-    this.expect("graphql");
-    this.skipInlineSpaces();
-    this.expect("schema");
+    this.expect("graphqlSchema");
     this.skipInlineSpaces();
     this.expect("=");
     const inlineComment = this.parseInlineComment();
@@ -1013,7 +1050,7 @@ function formatPipelineStep(step, indent = "  ") {
     const configPart = formatStepConfig(step.config, step.configType);
     const tagsPart = step.tags.length > 0 ? " " + formatTags(step.tags) : "";
     return `${indent}|> ${step.name}: ${configPart}${tagsPart}`;
-  } else {
+  } else if (step.kind === "Result") {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
       const branchName = branch.branchType.kind === "Ok" ? "ok" : branch.branchType.kind === "Default" ? "default" : branch.branchType.name;
@@ -1023,6 +1060,22 @@ function formatPipelineStep(step, indent = "  ") {
       });
     });
     return lines.join("\n");
+  } else {
+    const lines = [`${indent}|> if`];
+    step.condition.steps.forEach((condStep) => {
+      lines.push(formatPipelineStep(condStep, indent + "  "));
+    });
+    lines.push(`${indent}  then:`);
+    step.thenBranch.steps.forEach((thenStep) => {
+      lines.push(formatPipelineStep(thenStep, indent + "    "));
+    });
+    if (step.elseBranch) {
+      lines.push(`${indent}  else:`);
+      step.elseBranch.steps.forEach((elseStep) => {
+        lines.push(formatPipelineStep(elseStep, indent + "    "));
+      });
+    }
+    return lines.join("\n");
   }
 }
 function formatStepConfig(config, configType) {

package/dist/index.d.cts

@@ -102,6 +102,11 @@ type PipelineStep = {
 } | {
     kind: 'Result';
     branches: ResultBranch[];
+} | {
+    kind: 'If';
+    condition: Pipeline;
+    thenBranch: Pipeline;
+    elseBranch?: Pipeline;
 };
 interface ResultBranch {
     branchType: ResultBranchType;

package/dist/index.d.ts

@@ -102,6 +102,11 @@ type PipelineStep = {
 } | {
     kind: 'Result';
     branches: ResultBranch[];
+} | {
+    kind: 'If';
+    condition: Pipeline;
+    thenBranch: Pipeline;
+    elseBranch?: Pipeline;
 };
 interface ResultBranch {
     branchType: ResultBranchType;

package/dist/index.mjs

@@ -408,6 +408,8 @@ var Parser = class {
   parsePipelineStep() {
     const result = this.tryParse(() => this.parseResultStep());
     if (result) return result;
+    const ifStep = this.tryParse(() => this.parseIfStep());
+    if (ifStep) return ifStep;
     return this.parseRegularStep();
   }
   parseRegularStep() {
@@ -459,6 +461,43 @@ var Parser = class {
     const pipeline = this.parsePipeline();
     return { branchType, statusCode, pipeline };
   }
+  parseIfStep() {
+    this.skipWhitespaceOnly();
+    this.expect("|>");
+    this.skipInlineSpaces();
+    this.expect("if");
+    this.skipSpaces();
+    const condition = this.parseIfPipeline("then:");
+    this.skipSpaces();
+    this.expect("then:");
+    this.skipSpaces();
+    const thenBranch = this.parseIfPipeline("else:");
+    this.skipSpaces();
+    const elseBranch = this.tryParse(() => {
+      this.expect("else:");
+      this.skipSpaces();
+      return this.parsePipeline();
+    });
+    return { kind: "If", condition, thenBranch, elseBranch: elseBranch || void 0 };
+  }
+  parseIfPipeline(stopKeyword) {
+    const steps = [];
+    while (true) {
+      const save = this.pos;
+      this.skipWhitespaceOnly();
+      if (this.text.startsWith(stopKeyword, this.pos)) {
+        this.pos = save;
+        break;
+      }
+      if (!this.text.startsWith("|>", this.pos)) {
+        this.pos = save;
+        break;
+      }
+      const step = this.parsePipelineStep();
+      steps.push(step);
+    }
+    return { steps };
+  }
   parsePipeline() {
     const steps = [];
     while (true) {
@@ -520,9 +559,7 @@ var Parser = class {
     return { varType, name, value, inlineComment: inlineComment || void 0 };
   }
   parseGraphQLSchema() {
-    this.expect("graphql");
-    this.skipInlineSpaces();
-    this.expect("schema");
+    this.expect("graphqlSchema");
     this.skipInlineSpaces();
     this.expect("=");
     const inlineComment = this.parseInlineComment();
@@ -964,7 +1001,7 @@ function formatPipelineStep(step, indent = "  ") {
     const configPart = formatStepConfig(step.config, step.configType);
     const tagsPart = step.tags.length > 0 ? " " + formatTags(step.tags) : "";
     return `${indent}|> ${step.name}: ${configPart}${tagsPart}`;
-  } else {
+  } else if (step.kind === "Result") {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
       const branchName = branch.branchType.kind === "Ok" ? "ok" : branch.branchType.kind === "Default" ? "default" : branch.branchType.name;
@@ -974,6 +1011,22 @@ function formatPipelineStep(step, indent = "  ") {
       });
     });
     return lines.join("\n");
+  } else {
+    const lines = [`${indent}|> if`];
+    step.condition.steps.forEach((condStep) => {
+      lines.push(formatPipelineStep(condStep, indent + "  "));
+    });
+    lines.push(`${indent}  then:`);
+    step.thenBranch.steps.forEach((thenStep) => {
+      lines.push(formatPipelineStep(thenStep, indent + "    "));
+    });
+    if (step.elseBranch) {
+      lines.push(`${indent}  else:`);
+      step.elseBranch.steps.forEach((elseStep) => {
+        lines.push(formatPipelineStep(elseStep, indent + "    "));
+      });
+    }
+    return lines.join("\n");
   }
 }
 function formatStepConfig(config, configType) {

package/package.json

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