webpipe-js 2.0.11 → 2.0.13

package/dist/index.cjs

@@ -25,6 +25,7 @@ __export(index_exports, {
   formatPipelineStep: () => formatPipelineStep,
   formatStepConfig: () => formatStepConfig,
   formatTag: () => formatTag,
+  formatTagExpr: () => formatTagExpr,
   formatTags: () => formatTags,
   formatWhen: () => formatWhen,
   getPipelineRanges: () => getPipelineRanges,
@@ -492,10 +493,39 @@ var Parser = class {
     this.expect(":");
     this.skipInlineSpaces();
     const { config, configType } = this.parseStepConfig();
-    const tags = this.parseTags();
+    const condition = this.parseStepCondition();
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
-    return { kind: "Regular", name, config, configType, tags, parsedJoinTargets };
+    return { kind: "Regular", name, config, configType, condition, parsedJoinTargets };
+  }
+  /**
+   * Parse optional step condition (tag expression after the config)
+   * Supports:
+   *   - @tag (single tag)
+   *   - @tag @tag2 (implicit AND for backwards compatibility)
+   *   - @tag and @tag2 (explicit AND)
+   *   - @tag or @tag2 (explicit OR)
+   *   - (@tag or @tag2) and @tag3 (grouping)
+   */
+  parseStepCondition() {
+    this.skipInlineSpaces();
+    if (this.cur() !== "@") {
+      return void 0;
+    }
+    let expr = this.parseTagExpr();
+    while (true) {
+      this.skipInlineSpaces();
+      const ch = this.cur();
+      if (ch === "\n" || ch === "\r" || ch === "#" || this.text.startsWith("//", this.pos)) {
+        break;
+      }
+      if (ch !== "@") {
+        break;
+      }
+      const nextTag = this.parseTag();
+      expr = { kind: "And", left: expr, right: { kind: "Tag", tag: nextTag } };
+    }
+    return expr;
   }
   /**
    * Pre-parse join config into task names at parse time.
@@ -609,11 +639,69 @@ var Parser = class {
     this.skipSpaces();
     this.expect("case");
     this.skipInlineSpaces();
-    const tag = this.parseTag();
+    const condition = this.parseTagExpr();
+    this.skipInlineSpaces();
     this.expect(":");
     this.skipSpaces();
     const pipeline = this.parseIfPipeline("case", "default:", "end");
-    return { tag, pipeline };
+    return { condition, pipeline };
+  }
+  /**
+   * Parse a tag expression with boolean operators (and, or) and grouping
+   * Grammar (precedence: AND > OR):
+   *   tag_expr := or_expr
+   *   or_expr  := and_expr ("or" and_expr)*
+   *   and_expr := primary ("and" primary)*
+   *   primary  := tag | "(" tag_expr ")"
+   */
+  parseTagExpr() {
+    return this.parseOrExpr();
+  }
+  parseOrExpr() {
+    let left = this.parseAndExpr();
+    while (true) {
+      const saved = this.pos;
+      this.skipInlineSpaces();
+      if (this.text.startsWith("or", this.pos) && !this.isIdentCont(this.text[this.pos + 2] || "")) {
+        this.pos += 2;
+        this.skipInlineSpaces();
+        const right = this.parseAndExpr();
+        left = { kind: "Or", left, right };
+      } else {
+        this.pos = saved;
+        break;
+      }
+    }
+    return left;
+  }
+  parseAndExpr() {
+    let left = this.parseTagPrimary();
+    while (true) {
+      const saved = this.pos;
+      this.skipInlineSpaces();
+      if (this.text.startsWith("and", this.pos) && !this.isIdentCont(this.text[this.pos + 3] || "")) {
+        this.pos += 3;
+        this.skipInlineSpaces();
+        const right = this.parseTagPrimary();
+        left = { kind: "And", left, right };
+      } else {
+        this.pos = saved;
+        break;
+      }
+    }
+    return left;
+  }
+  parseTagPrimary() {
+    if (this.cur() === "(") {
+      this.pos++;
+      this.skipInlineSpaces();
+      const expr = this.parseTagExpr();
+      this.skipInlineSpaces();
+      this.expect(")");
+      return expr;
+    }
+    const tag = this.parseTag();
+    return { kind: "Tag", tag };
   }
   parseIfPipeline(...stopKeywords) {
     const steps = [];
@@ -1136,8 +1224,8 @@ function formatConfigValue(value) {
 function formatPipelineStep(step, indent = "  ") {
   if (step.kind === "Regular") {
     const configPart = formatStepConfig(step.config, step.configType);
-    const tagsPart = step.tags.length > 0 ? " " + formatTags(step.tags) : "";
-    return `${indent}|> ${step.name}: ${configPart}${tagsPart}`;
+    const conditionPart = step.condition ? " " + formatTagExpr(step.condition) : "";
+    return `${indent}|> ${step.name}: ${configPart}${conditionPart}`;
   } else if (step.kind === "Result") {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
@@ -1167,7 +1255,7 @@ function formatPipelineStep(step, indent = "  ") {
   } else if (step.kind === "Dispatch") {
     const lines = [`${indent}|> dispatch`];
     step.branches.forEach((branch) => {
-      lines.push(`${indent}  case ${formatTag(branch.tag)}:`);
+      lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:`);
       branch.pipeline.steps.forEach((branchStep) => {
         lines.push(formatPipelineStep(branchStep, indent + "    "));
       });
@@ -1206,6 +1294,19 @@ function formatTag(tag) {
   const args = tag.args.length > 0 ? `(${tag.args.join(",")})` : "";
   return `@${negation}${tag.name}${args}`;
 }
+function formatTagExpr(expr) {
+  switch (expr.kind) {
+    case "Tag":
+      return formatTag(expr.tag);
+    case "And": {
+      const leftStr = expr.left.kind === "Or" ? `(${formatTagExpr(expr.left)})` : formatTagExpr(expr.left);
+      const rightStr = expr.right.kind === "Or" ? `(${formatTagExpr(expr.right)})` : formatTagExpr(expr.right);
+      return `${leftStr} and ${rightStr}`;
+    }
+    case "Or":
+      return `${formatTagExpr(expr.left)} or ${formatTagExpr(expr.right)}`;
+  }
+}
 function formatPipelineRef(ref) {
   if (ref.kind === "Named") {
     return [`  |> pipeline: ${ref.name}`];
@@ -1234,6 +1335,7 @@ function formatWhen(when) {
   formatPipelineStep,
   formatStepConfig,
   formatTag,
+  formatTagExpr,
   formatTags,
   formatWhen,
   getPipelineRanges,

package/dist/index.d.cts

@@ -93,12 +93,25 @@ interface Tag {
     negated: boolean;
     args: string[];
 }
+/** A boolean expression of tags for dispatch routing */
+type TagExpr = {
+    kind: 'Tag';
+    tag: Tag;
+} | {
+    kind: 'And';
+    left: TagExpr;
+    right: TagExpr;
+} | {
+    kind: 'Or';
+    left: TagExpr;
+    right: TagExpr;
+};
 type PipelineStep = {
     kind: 'Regular';
     name: string;
     config: string;
     configType: ConfigType;
-    tags: Tag[];
+    condition?: TagExpr;
     parsedJoinTargets?: string[];
 } | {
     kind: 'Result';
@@ -118,7 +131,7 @@ type PipelineStep = {
     pipeline: Pipeline;
 };
 interface DispatchBranch {
-    tag: Tag;
+    condition: TagExpr;
     pipeline: Pipeline;
 }
 interface ResultBranch {
@@ -209,7 +222,8 @@ declare function formatPipelineStep(step: PipelineStep, indent?: string): string
 declare function formatStepConfig(config: string, configType: ConfigType): string;
 declare function formatTags(tags: Tag[]): string;
 declare function formatTag(tag: Tag): string;
+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 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 TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.d.ts

@@ -93,12 +93,25 @@ interface Tag {
     negated: boolean;
     args: string[];
 }
+/** A boolean expression of tags for dispatch routing */
+type TagExpr = {
+    kind: 'Tag';
+    tag: Tag;
+} | {
+    kind: 'And';
+    left: TagExpr;
+    right: TagExpr;
+} | {
+    kind: 'Or';
+    left: TagExpr;
+    right: TagExpr;
+};
 type PipelineStep = {
     kind: 'Regular';
     name: string;
     config: string;
     configType: ConfigType;
-    tags: Tag[];
+    condition?: TagExpr;
     parsedJoinTargets?: string[];
 } | {
     kind: 'Result';
@@ -118,7 +131,7 @@ type PipelineStep = {
     pipeline: Pipeline;
 };
 interface DispatchBranch {
-    tag: Tag;
+    condition: TagExpr;
     pipeline: Pipeline;
 }
 interface ResultBranch {
@@ -209,7 +222,8 @@ declare function formatPipelineStep(step: PipelineStep, indent?: string): string
 declare function formatStepConfig(config: string, configType: ConfigType): string;
 declare function formatTags(tags: Tag[]): string;
 declare function formatTag(tag: Tag): string;
+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 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 TagExpr, type Variable, type When, formatConfigValue, formatPipelineRef, formatPipelineStep, formatStepConfig, formatTag, formatTagExpr, formatTags, formatWhen, getPipelineRanges, getVariableRanges, parseProgram, parseProgramWithDiagnostics, prettyPrint, printComment, printCondition, printConfig, printDescribe, printGraphQLSchema, printMock, printMutationResolver, printPipeline, printQueryResolver, printRoute, printTest, printVariable };

package/dist/index.mjs

@@ -443,10 +443,39 @@ var Parser = class {
     this.expect(":");
     this.skipInlineSpaces();
     const { config, configType } = this.parseStepConfig();
-    const tags = this.parseTags();
+    const condition = this.parseStepCondition();
     const parsedJoinTargets = name === "join" ? this.parseJoinTaskNames(config) : void 0;
     this.skipWhitespaceOnly();
-    return { kind: "Regular", name, config, configType, tags, parsedJoinTargets };
+    return { kind: "Regular", name, config, configType, condition, parsedJoinTargets };
+  }
+  /**
+   * Parse optional step condition (tag expression after the config)
+   * Supports:
+   *   - @tag (single tag)
+   *   - @tag @tag2 (implicit AND for backwards compatibility)
+   *   - @tag and @tag2 (explicit AND)
+   *   - @tag or @tag2 (explicit OR)
+   *   - (@tag or @tag2) and @tag3 (grouping)
+   */
+  parseStepCondition() {
+    this.skipInlineSpaces();
+    if (this.cur() !== "@") {
+      return void 0;
+    }
+    let expr = this.parseTagExpr();
+    while (true) {
+      this.skipInlineSpaces();
+      const ch = this.cur();
+      if (ch === "\n" || ch === "\r" || ch === "#" || this.text.startsWith("//", this.pos)) {
+        break;
+      }
+      if (ch !== "@") {
+        break;
+      }
+      const nextTag = this.parseTag();
+      expr = { kind: "And", left: expr, right: { kind: "Tag", tag: nextTag } };
+    }
+    return expr;
   }
   /**
    * Pre-parse join config into task names at parse time.
@@ -560,11 +589,69 @@ var Parser = class {
     this.skipSpaces();
     this.expect("case");
     this.skipInlineSpaces();
-    const tag = this.parseTag();
+    const condition = this.parseTagExpr();
+    this.skipInlineSpaces();
     this.expect(":");
     this.skipSpaces();
     const pipeline = this.parseIfPipeline("case", "default:", "end");
-    return { tag, pipeline };
+    return { condition, pipeline };
+  }
+  /**
+   * Parse a tag expression with boolean operators (and, or) and grouping
+   * Grammar (precedence: AND > OR):
+   *   tag_expr := or_expr
+   *   or_expr  := and_expr ("or" and_expr)*
+   *   and_expr := primary ("and" primary)*
+   *   primary  := tag | "(" tag_expr ")"
+   */
+  parseTagExpr() {
+    return this.parseOrExpr();
+  }
+  parseOrExpr() {
+    let left = this.parseAndExpr();
+    while (true) {
+      const saved = this.pos;
+      this.skipInlineSpaces();
+      if (this.text.startsWith("or", this.pos) && !this.isIdentCont(this.text[this.pos + 2] || "")) {
+        this.pos += 2;
+        this.skipInlineSpaces();
+        const right = this.parseAndExpr();
+        left = { kind: "Or", left, right };
+      } else {
+        this.pos = saved;
+        break;
+      }
+    }
+    return left;
+  }
+  parseAndExpr() {
+    let left = this.parseTagPrimary();
+    while (true) {
+      const saved = this.pos;
+      this.skipInlineSpaces();
+      if (this.text.startsWith("and", this.pos) && !this.isIdentCont(this.text[this.pos + 3] || "")) {
+        this.pos += 3;
+        this.skipInlineSpaces();
+        const right = this.parseTagPrimary();
+        left = { kind: "And", left, right };
+      } else {
+        this.pos = saved;
+        break;
+      }
+    }
+    return left;
+  }
+  parseTagPrimary() {
+    if (this.cur() === "(") {
+      this.pos++;
+      this.skipInlineSpaces();
+      const expr = this.parseTagExpr();
+      this.skipInlineSpaces();
+      this.expect(")");
+      return expr;
+    }
+    const tag = this.parseTag();
+    return { kind: "Tag", tag };
   }
   parseIfPipeline(...stopKeywords) {
     const steps = [];
@@ -1087,8 +1174,8 @@ function formatConfigValue(value) {
 function formatPipelineStep(step, indent = "  ") {
   if (step.kind === "Regular") {
     const configPart = formatStepConfig(step.config, step.configType);
-    const tagsPart = step.tags.length > 0 ? " " + formatTags(step.tags) : "";
-    return `${indent}|> ${step.name}: ${configPart}${tagsPart}`;
+    const conditionPart = step.condition ? " " + formatTagExpr(step.condition) : "";
+    return `${indent}|> ${step.name}: ${configPart}${conditionPart}`;
   } else if (step.kind === "Result") {
     const lines = [`${indent}|> result`];
     step.branches.forEach((branch) => {
@@ -1118,7 +1205,7 @@ function formatPipelineStep(step, indent = "  ") {
   } else if (step.kind === "Dispatch") {
     const lines = [`${indent}|> dispatch`];
     step.branches.forEach((branch) => {
-      lines.push(`${indent}  case ${formatTag(branch.tag)}:`);
+      lines.push(`${indent}  case ${formatTagExpr(branch.condition)}:`);
       branch.pipeline.steps.forEach((branchStep) => {
         lines.push(formatPipelineStep(branchStep, indent + "    "));
       });
@@ -1157,6 +1244,19 @@ function formatTag(tag) {
   const args = tag.args.length > 0 ? `(${tag.args.join(",")})` : "";
   return `@${negation}${tag.name}${args}`;
 }
+function formatTagExpr(expr) {
+  switch (expr.kind) {
+    case "Tag":
+      return formatTag(expr.tag);
+    case "And": {
+      const leftStr = expr.left.kind === "Or" ? `(${formatTagExpr(expr.left)})` : formatTagExpr(expr.left);
+      const rightStr = expr.right.kind === "Or" ? `(${formatTagExpr(expr.right)})` : formatTagExpr(expr.right);
+      return `${leftStr} and ${rightStr}`;
+    }
+    case "Or":
+      return `${formatTagExpr(expr.left)} or ${formatTagExpr(expr.right)}`;
+  }
+}
 function formatPipelineRef(ref) {
   if (ref.kind === "Named") {
     return [`  |> pipeline: ${ref.name}`];
@@ -1184,6 +1284,7 @@ export {
   formatPipelineStep,
   formatStepConfig,
   formatTag,
+  formatTagExpr,
   formatTags,
   formatWhen,
   getPipelineRanges,

package/package.json

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