gagen 0.2.4 → 0.2.6

package/README.md

@@ -20,28 +20,28 @@ const checkout = step({
   uses: "actions/checkout@v6",
 });
 
-const test = step({
+const test = step.dependsOn(checkout)({
   name: "Test",
   run: "cargo test",
-}).dependsOn(checkout);
+});
 
 const installDeno = step({
   uses: "denoland/setup-deno@v2",
 });
 
-const lint = step(
-  {
-    name: "Clippy",
-    run: "cargo clippy",
-  },
-  step({
-    name: "Deno Lint",
-    run: "deno lint",
-  }).dependsOn(installDeno),
-)
+const lint = step
   .dependsOn(checkout)
   // this condition gets propagated to installDeno, but not checkout
-  .if(conditions.isBranch("main").not());
+  .if(conditions.isBranch("main").not())(
+    {
+      name: "Clippy",
+      run: "cargo clippy",
+    },
+    step.dependsOn(installDeno)({
+      name: "Deno Lint",
+      run: "deno lint",
+    }),
+  );
 
 // only specify the leaf steps — the other steps are pulled in automatically
 createWorkflow({
@@ -95,11 +95,12 @@ os.equals("linux").and(ref.startsWith("refs/tags/"));
 // => matrix.os == 'linux' && startsWith(github.ref, 'refs/tags/')
 
 // use on steps
-const deploy = step({
+const deploy = step.dependsOn(build).if(
+  ref.equals("refs/heads/main").and(os.equals("linux")),
+)({
   name: "Deploy",
   run: "deploy.sh",
-  if: ref.equals("refs/heads/main").and(os.equals("linux")),
-}).dependsOn(build);
+});
 ```
 
 ## Common conditions
@@ -128,17 +129,15 @@ isEvent("push"); // github.event_name == 'push'
 isEvent("pull_request"); // github.event_name == 'pull_request'
 
 // compose freely with .and() / .or() / .not()
-const deploy = step({
+const deploy = step.dependsOn(build).if(isBranch("main").and(isEvent("push")))({
   name: "Deploy",
   run: "deploy.sh",
-  if: isBranch("main").and(isEvent("push")),
-}).dependsOn(build);
+});
 
-const cleanup = step({
+const cleanup = step.dependsOn(build).if(status.always())({
   name: "Cleanup",
   run: "rm -rf dist",
-  if: status.always(),
-}).dependsOn(build);
+});
 ```
 
 ## Ternary expressions
@@ -179,11 +178,10 @@ This avoids running expensive setup steps when they aren't needed:
 
 ```ts
 const checkout = step({ uses: "actions/checkout@v6" });
-const build = step({ run: "cargo build" }).dependsOn(checkout);
-const test = step({
+const build = step.dependsOn(checkout)({ run: "cargo build" });
+const test = step.dependsOn(build).if(expr("matrix.job").equals("test"))({
   run: "cargo test",
-  if: expr("matrix.job").equals("test"),
-}).dependsOn(build);
+});
 
 // only test is passed — checkout and build inherit its condition
 createWorkflow({
@@ -199,11 +197,12 @@ When multiple leaf steps have different conditions, dependencies get the OR of
 those conditions:
 
 ```ts
-const test = step({ run: "cargo test", if: jobExpr.equals("test") }).dependsOn(
-  checkout,
-);
-const bench = step({ run: "cargo bench", if: jobExpr.equals("bench") })
-  .dependsOn(checkout);
+const test = step.dependsOn(checkout).if(jobExpr.equals("test"))({
+  run: "cargo test",
+});
+const bench = step.dependsOn(checkout).if(jobExpr.equals("bench"))({
+  run: "cargo bench",
+});
 
 createWorkflow({
   ...,
@@ -218,12 +217,11 @@ To prevent propagation, pass the unconditional steps to `steps` as well. Leaf
 steps act as propagation barriers:
 
 ```ts
-const build = step({ run: "cargo build" }).dependsOn(checkout);
-const test = step({ run: "cargo test" }).dependsOn(build);
-const linuxOnly = step({
+const build = step.dependsOn(checkout)({ run: "cargo build" });
+const test = step.dependsOn(build)({ run: "cargo test" });
+const linuxOnly = step.dependsOn(build, test).if(os.equals("linux"))({
   run: "linux-specific",
-  if: os.equals("linux"),
-}).dependsOn(build, test);
+});
 
 // test is a leaf with no condition — blocks propagation to build and checkout
 createWorkflow({
@@ -280,12 +278,12 @@ topologically sorted:
 
 ```ts
 const checkout = step({ name: "Checkout", uses: "actions/checkout@v6" });
-const buildA = step({ name: "Build A", run: "make a" }).dependsOn(checkout);
-const buildB = step({ name: "Build B", run: "make b" }).dependsOn(checkout);
-const integrate = step({ name: "Integrate", run: "make all" }).dependsOn(
-  buildA,
-  buildB,
-);
+const buildA = step.dependsOn(checkout)({ name: "Build A", run: "make a" });
+const buildB = step.dependsOn(checkout)({ name: "Build B", run: "make b" });
+const integrate = step.dependsOn(buildA, buildB)({
+  name: "Integrate",
+  run: "make all",
+});
 
 createWorkflow({
   ...,
@@ -309,11 +307,10 @@ const setupDeno = step({
   with: { "deno-version": "canary" },
 });
 
-const checkout = step({ uses: "actions/checkout@v6" })
-  // ensure checkout runs after setupDeno, without making checkout depend on it
-  .comesAfter(setupDeno);
-const build = step({ run: "cargo build" }).dependsOn(checkout);
-const lint = step({ run: "deno lint" }).dependsOn(setupDeno, checkout);
+// ensure checkout runs after setupDeno, without making checkout depend on it
+const checkout = step.comesAfter(setupDeno)({ uses: "actions/checkout@v6" });
+const build = step.dependsOn(checkout)({ run: "cargo build" });
+const lint = step.dependsOn(setupDeno, checkout)({ run: "deno lint" });
 
 createWorkflow({
   ...,
@@ -493,9 +490,10 @@ const buildStep = step({ name: "Build", run: "make build" });
 const upload = artifact.upload({ path: "dist/", retentionDays: 5 });
 
 const download = artifact.download({ path: "dist/" });
-const deployStep = step({ name: "Deploy", run: "make deploy" }).dependsOn(
-  download,
-);
+const deployStep = step.dependsOn(download)({
+  name: "Deploy",
+  run: "make deploy",
+});
 
 const wf = createWorkflow({
   name: "CI",

package/esm/expression.d.ts

@@ -31,8 +31,8 @@ export declare class ExpressionValue {
 export declare abstract class Condition {
     readonly sources: ReadonlySet<ExpressionSource>;
     constructor(sources: ReadonlySet<ExpressionSource>);
-    and(other: Condition): Condition;
-    or(other: Condition): Condition;
+    and(other: Condition | boolean): Condition;
+    or(other: Condition | boolean): Condition;
     not(): Condition;
     /**
      * Starts a ternary expression: `condition && trueValue || falseValue`.
@@ -117,6 +117,59 @@ export declare const conditions: {
      * ```
      */
     readonly isEvent: (event: string) => Condition;
+    /**
+     * Check if the event is a pull request.
+     *
+     * ```ts
+     * conditions.isPr()  // github.event_name == 'pull_request'
+     * ```
+     */
+    readonly isPr: () => Condition;
+    /**
+     * Check the repository (owner/name).
+     *
+     * ```ts
+     * conditions.isRepository("denoland/deno")  // github.repository == 'denoland/deno'
+     * ```
+     */
+    readonly isRepository: (repo: string) => Condition;
+    /**
+     * Check if the pull request is a draft.
+     *
+     * ```ts
+     * conditions.isDraftPr()  // github.event.pull_request.draft == true
+     * ```
+     */
+    readonly isDraftPr: () => Condition;
+    /**
+     * Check if the pull request has a specific label.
+     *
+     * ```ts
+     * conditions.hasLabel("ci-full")  // contains(github.event.pull_request.labels.*.name, 'ci-full')
+     * ```
+     */
+    readonly hasPrLabel: (label: string) => Condition;
+    /**
+     * Check the runner operating system.
+     *
+     * ```ts
+     * conditions.isRunnerOs("Linux")    // runner.os == 'Linux'
+     * conditions.isRunnerOs("macOS")    // runner.os == 'macOS'
+     * conditions.isRunnerOs("Windows")  // runner.os == 'Windows'
+     * ```
+     */
+    readonly isRunnerOs: (os: "Linux" | "macOS" | "Windows") => Condition;
+    /**
+     * Check the runner architecture.
+     *
+     * ```ts
+     * conditions.isRunnerArch("X86")    // runner.arch == 'X86'
+     * conditions.isRunnerArch("X64")    // runner.arch == 'X64'
+     * conditions.isRunnerArch("ARM")    // runner.arch == 'ARM'
+     * conditions.isRunnerArch("ARM64")  // runner.arch == 'ARM64'
+     * ```
+     */
+    readonly isRunnerArch: (arch: "X86" | "X64" | "ARM" | "ARM64") => Condition;
 };
 export declare function formatLiteral(value: string | number | boolean): string;
 export declare function sourcesFrom(...sourceables: ({

package/esm/expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"expression.d.ts","sourceRoot":"","sources":["../src/expression.ts"],"names":[],"mappings":"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"}

package/esm/expression.js

@@ -81,9 +81,17 @@ export class Condition {
         this.sources = sources;
     }
     and(other) {
+        if (other === true)
+            return this;
+        if (other === false)
+            return new RawCondition("false", this.sources);
         return new LogicalCondition("&&", this, other, unionSources(this, other));
     }
     or(other) {
+        if (other === false)
+            return this;
+        if (other === true)
+            return new RawCondition("true", this.sources);
         return new LogicalCondition("||", this, other, unionSources(this, other));
     }
     not() {
@@ -245,6 +253,8 @@ _RawCondition_expression = new WeakMap();
 export function expr(expression) {
     return new ExpressionValue(expression);
 }
+const ref = expr("github.ref");
+const eventName = expr("github.event_name");
 /** Common condition helpers for GitHub Actions workflows. */
 export const conditions = {
     /** Status check functions for use in step/job `if` fields. */
@@ -267,9 +277,7 @@ export const conditions = {
      * conditions.isTag("v1.0.0")  // github.ref == 'refs/tags/v1.0.0'
      * ```
      */
-    isTag: (tag) => tag != null
-        ? new ComparisonCondition("github.ref", "==", `refs/tags/${tag}`, EMPTY_SOURCES)
-        : new FunctionCallCondition("startsWith", ["github.ref", "'refs/tags/'"], EMPTY_SOURCES),
+    isTag: (tag) => tag != null ? ref.equals(`refs/tags/${tag}`) : ref.startsWith("refs/tags/"),
     /**
      * Check if the ref is a specific branch.
      *
@@ -277,7 +285,7 @@ export const conditions = {
      * conditions.isBranch("main")  // github.ref == 'refs/heads/main'
      * ```
      */
-    isBranch: (branch) => new ComparisonCondition("github.ref", "==", `refs/heads/${branch}`, EMPTY_SOURCES),
+    isBranch: (branch) => ref.equals(`refs/heads/${branch}`),
     /**
      * Check the event that triggered the workflow.
      *
@@ -285,7 +293,60 @@ export const conditions = {
      * conditions.isEvent("pull_request")  // github.event_name == 'pull_request'
      * ```
      */
-    isEvent: (event) => new ComparisonCondition("github.event_name", "==", event, EMPTY_SOURCES),
+    isEvent: (event) => eventName.equals(event),
+    /**
+     * Check if the event is a pull request.
+     *
+     * ```ts
+     * conditions.isPr()  // github.event_name == 'pull_request'
+     * ```
+     */
+    isPr: () => eventName.equals("pull_request"),
+    /**
+     * Check the repository (owner/name).
+     *
+     * ```ts
+     * conditions.isRepository("denoland/deno")  // github.repository == 'denoland/deno'
+     * ```
+     */
+    isRepository: (repo) => expr("github.repository").equals(repo),
+    /**
+     * Check if the pull request is a draft.
+     *
+     * ```ts
+     * conditions.isDraftPr()  // github.event.pull_request.draft == true
+     * ```
+     */
+    isDraftPr: () => expr("github.event.pull_request.draft").equals(true),
+    /**
+     * Check if the pull request has a specific label.
+     *
+     * ```ts
+     * conditions.hasLabel("ci-full")  // contains(github.event.pull_request.labels.*.name, 'ci-full')
+     * ```
+     */
+    hasPrLabel: (label) => expr("github.event.pull_request.labels.*.name").contains(label),
+    /**
+     * Check the runner operating system.
+     *
+     * ```ts
+     * conditions.isRunnerOs("Linux")    // runner.os == 'Linux'
+     * conditions.isRunnerOs("macOS")    // runner.os == 'macOS'
+     * conditions.isRunnerOs("Windows")  // runner.os == 'Windows'
+     * ```
+     */
+    isRunnerOs: (os) => expr("runner.os").equals(os),
+    /**
+     * Check the runner architecture.
+     *
+     * ```ts
+     * conditions.isRunnerArch("X86")    // runner.arch == 'X86'
+     * conditions.isRunnerArch("X64")    // runner.arch == 'X64'
+     * conditions.isRunnerArch("ARM")    // runner.arch == 'ARM'
+     * conditions.isRunnerArch("ARM64")  // runner.arch == 'ARM64'
+     * ```
+     */
+    isRunnerArch: (arch) => expr("runner.arch").equals(arch),
 };
 // --- helpers ---
 export function formatLiteral(value) {

package/esm/job.js

@@ -395,9 +395,9 @@ export class Job {
             }
             if (config.strategy.failFast != null) {
                 const ff = config.strategy.failFast;
-                s["fail-fast"] = typeof ff === "boolean"
+                s["fail-fast"] = typeof ff === "boolean" || typeof ff === "string"
                     ? ff
-                    : serializeConditionLike(ff);
+                    : ff.toString();
             }
             if (config.strategy.maxParallel != null) {
                 s["max-parallel"] = config.strategy.maxParallel;

package/esm/matrix.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../src/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,KAAK,iBAAiB,CAAC,CAAC,IACpB,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC,GAChD,CAAC,CAAC,SAAS;IAAE,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;CAAE,GAAG,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;AAE7E,qBAAa,MAAM,CAAC,EAAE,SAAS,MAAM;;gBAGvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;IASxD,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAGlC;AAED,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,IACjC,MAAM,CAAC,CAAC,CAAC,GACT;IACA,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,eAAe;CACnC,CAAC;AAEJ,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClE,GAAG,EAAE,CAAC,GACL,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAkBvC"}
+{"version":3,"file":"matrix.d.ts","sourceRoot":"","sources":["../src/matrix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAE7D,KAAK,iBAAiB,CAAC,CAAC,IACpB,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC,GAChD,CAAC,CAAC,SAAS;IAAE,OAAO,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;CAAE,GAAG,MAAM,CAAC,GAAG,MAAM,GAAG,KAAK,CAAC,CAAC;AAoB7E,qBAAa,MAAM,CAAC,EAAE,SAAS,MAAM;;gBAGvB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE;IASxD,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAGlC;AAED,KAAK,eAAe,CAAC,CAAC,SAAS,MAAM,IACjC,MAAM,CAAC,CAAC,CAAC,GACT;IACA,QAAQ,EAAE,CAAC,IAAI,CAAC,GAAG,eAAe;CACnC,CAAC;AAEJ,wBAAgB,YAAY,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAClE,GAAG,EAAE,CAAC,GACL,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAkBvC"}

package/esm/matrix.js

@@ -10,7 +10,24 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _Matrix_def;
-import { ExpressionValue } from "./expression.js";
+import { Condition, ExpressionValue } from "./expression.js";
+/** Recursively serializes Condition/ExpressionValue objects to ${{ }} strings. */
+function serializeValue(value) {
+    if (value instanceof Condition || value instanceof ExpressionValue) {
+        return value.toString();
+    }
+    if (Array.isArray(value)) {
+        return value.map(serializeValue);
+    }
+    if (typeof value === "object" && value !== null) {
+        const result = {};
+        for (const [k, v] of Object.entries(value)) {
+            result[k] = serializeValue(v);
+        }
+        return result;
+    }
+    return value;
+}
 export class Matrix {
     constructor(def, keys) {
         _Matrix_def.set(this, void 0);
@@ -20,7 +37,7 @@ export class Matrix {
         }
     }
     toYaml() {
-        return __classPrivateFieldGet(this, _Matrix_def, "f");
+        return serializeValue(__classPrivateFieldGet(this, _Matrix_def, "f"));
     }
 }
 _Matrix_def = new WeakMap();

package/esm/mod.d.ts

@@ -1,6 +1,6 @@
 import "./_dnt.polyfills.js";
 export { Step, step, StepRef } from "./step.js";
-export type { ConditionLike, ConfigValue, StepConfig, StepLike, } from "./step.js";
+export type { ConditionLike, ConfigValue, StepBuilder, StepConfig, StepFunction, StepLike, } from "./step.js";
 export { Job, job } from "./job.js";
 export type { JobConfig, JobDef, ReusableJobConfig, ReusableJobDef, ServiceContainer, StepsJobConfig, StepsJobDef, } from "./job.js";
 export { createWorkflow, isLinting, Workflow } from "./workflow.js";

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAChD,YAAY,EACV,aAAa,EACb,WAAW,EACX,UAAU,EACV,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,YAAY,EACV,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,WAAW,GACZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACpE,YAAY,EACV,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,SAAS,EACT,UAAU,EACV,aAAa,EACb,IAAI,EACJ,eAAe,EACf,WAAW,GACZ,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EACV,eAAe,EACf,WAAW,EACX,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzD,YAAY,EACV,eAAe,EACf,cAAc,EACd,YAAY,GACb,MAAM,eAAe,CAAC"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AAAA,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAChD,YAAY,EACV,aAAa,EACb,WAAW,EACX,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,GACT,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AACpC,YAAY,EACV,SAAS,EACT,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,gBAAgB,EAChB,cAAc,EACd,WAAW,GACZ,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACpE,YAAY,EACV,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,mBAAmB,EACnB,cAAc,EACd,gBAAgB,GACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,SAAS,EACT,UAAU,EACV,aAAa,EACb,IAAI,EACJ,eAAe,EACf,WAAW,GACZ,MAAM,iBAAiB,CAAC;AACzB,YAAY,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACnD,YAAY,EACV,eAAe,EACf,WAAW,EACX,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AACzD,YAAY,EACV,eAAe,EACf,cAAc,EACd,YAAY,GACb,MAAM,eAAe,CAAC"}

package/esm/step.d.ts

@@ -33,8 +33,21 @@ export declare class Step<O extends string = never> implements ExpressionSource
     if(condition: ConditionLike): StepRef<O>;
     toYaml(effectiveIf?: Condition): Record<string, unknown>;
 }
-export declare function step<const O extends string = never>(config: StepConfig<O>): Step<O>;
-export declare function step(first: Step<string> | StepRef<string> | StepConfig, second: Step<string> | StepRef<string> | StepConfig, ...rest: (Step<string> | StepRef<string> | StepConfig)[]): Step<never>;
+export interface StepBuilder {
+    <const O extends string = never>(config: StepConfig<O>): StepRef<O>;
+    (first: Step<string> | StepRef<string> | StepConfig, second: Step<string> | StepRef<string> | StepConfig, ...rest: (Step<string> | StepRef<string> | StepConfig)[]): StepRef<never>;
+    if(condition: ConditionLike): StepBuilder;
+    dependsOn(...deps: StepLike[]): StepBuilder;
+    comesAfter(...deps: StepLike[]): StepBuilder;
+}
+export interface StepFunction {
+    <const O extends string = never>(config: StepConfig<O>): Step<O>;
+    (first: Step<string> | StepRef<string> | StepConfig, second: Step<string> | StepRef<string> | StepConfig, ...rest: (Step<string> | StepRef<string> | StepConfig)[]): Step<never>;
+    if(condition: ConditionLike): StepBuilder;
+    dependsOn(...deps: StepLike[]): StepBuilder;
+    comesAfter(...deps: StepLike[]): StepBuilder;
+}
+export declare const step: StepFunction;
 export declare class StepRef<O extends string = never> {
     readonly step: Step<O>;
     readonly condition?: ConditionLike;

package/esm/step.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"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"}

package/esm/step.js

@@ -129,7 +129,7 @@ export class Step {
     }
 }
 _Step_id = new WeakMap();
-export function step(...args) {
+function buildStepFromArgs(...args) {
     if (args.length === 1) {
         return new Step(args[0]);
     }
@@ -144,6 +144,49 @@ export function step(...args) {
     }
     return new Step(children);
 }
+function andConditions(existing, added) {
+    return existing != null
+        ? toCondition(existing).and(toCondition(added))
+        : added;
+}
+function createStepBuilder(init) {
+    const builder = function (...args) {
+        const s = buildStepFromArgs(...args);
+        // don't merge config.if here — it's already picked up by
+        // computeEffectiveConditions (for the step itself) and
+        // propagatableConfigIf (for dependency context propagation).
+        // Merging it here would cause it to be counted twice.
+        return new StepRef(s, {
+            condition: init.condition,
+            dependencies: init.dependencies ?? [],
+            afterDependencies: init.afterDependencies ?? [],
+        });
+    };
+    builder.if = (condition) => {
+        return createStepBuilder({
+            ...init,
+            condition: andConditions(init.condition, condition),
+        });
+    };
+    builder.dependsOn = (...deps) => {
+        return createStepBuilder({
+            ...init,
+            dependencies: [...(init.dependencies ?? []), ...deps],
+        });
+    };
+    builder.comesAfter = (...deps) => {
+        return createStepBuilder({
+            ...init,
+            afterDependencies: [...(init.afterDependencies ?? []), ...deps],
+        });
+    };
+    return builder;
+}
+export const step = Object.assign(buildStepFromArgs, {
+    if: (condition) => createStepBuilder({ condition }),
+    dependsOn: (...deps) => createStepBuilder({ dependencies: deps }),
+    comesAfter: (...deps) => createStepBuilder({ afterDependencies: deps }),
+});
 // --- StepRef: immutable wrapper for per-usage deps/conditions ---
 export class StepRef {
     constructor(step, init) {
@@ -200,11 +243,8 @@ export class StepRef {
         });
     }
     if(condition) {
-        const newCond = this.condition != null
-            ? toCondition(condition).and(toCondition(this.condition))
-            : condition;
         return new StepRef(this.step, {
-            condition: newCond,
+            condition: andConditions(this.condition, condition),
             dependencies: this.dependencies,
             afterDependencies: this.afterDependencies,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gagen",
-  "version": "0.2.4",
+  "version": "0.2.6",
   "description": "Generate complex GitHub Actions YAML files using a declarative API.",
   "repository": {
     "type": "git",