webpipe-js 2.0.12 → 2.0.13

package/dist/index.cjs

@@ -493,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.
@@ -1195,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) => {

package/dist/index.d.cts

@@ -111,7 +111,7 @@ type PipelineStep = {
     name: string;
     config: string;
     configType: ConfigType;
-    tags: Tag[];
+    condition?: TagExpr;
     parsedJoinTargets?: string[];
 } | {
     kind: 'Result';

package/dist/index.d.ts

@@ -111,7 +111,7 @@ type PipelineStep = {
     name: string;
     config: string;
     configType: ConfigType;
-    tags: Tag[];
+    condition?: TagExpr;
     parsedJoinTargets?: string[];
 } | {
     kind: 'Result';

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.
@@ -1145,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) => {

package/package.json

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