npm - gagen - Versions diffs - 0.2.1 → 0.2.3 - Mend

gagen 0.2.1 → 0.2.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/README.md CHANGED Viewed

@@ -18,7 +18,6 @@ import {
   conditions,
   createWorkflow,
   step,
-  steps,
 } from "gagen";
 const checkout = step({
@@ -34,7 +33,7 @@ const installDeno = step({
   uses: "denoland/setup-deno@v2",
 });
-const lint = steps(
+const lint = step(
   {
     name: "Clippy",
     run: "cargo clippy",

package/esm/artifact.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"artifact.d.ts","sourceRoot":"","sources":["../src/artifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,QAAQ;;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAIV,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe;IAKnD,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAgBlC,QAAQ,CAAC,MAAM,GAAE,cAAmB,GAAG,IAAI;~~CAgB5C~~;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,GACxB,QAAQ,CAEV"}
1	+ {"version":3,"file":"artifact.d.ts","sourceRoot":"","sources":["../src/artifact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,QAAQ;;IACnB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBAIV,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe;IAKnD,MAAM,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAgBlC,QAAQ,CAAC,MAAM,GAAE,cAAmB,GAAG,IAAI;CAe5C;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,eAAe,GACxB,QAAQ,CAEV"}

package/esm/artifact.js CHANGED Viewed

@@ -46,14 +46,10 @@ export class Artifact {
         if (config.path != null) {
             withObj.path = config.path;
         }
-        const s = new Step({
+        return new Step({
             uses: `actions/download-artifact@${__classPrivateFieldGet(this, _Artifact_version, "f")}`,
             with: withObj,
-        });
-        if (__classPrivateFieldGet(this, _Artifact_uploadStep, "f")) {
-            s._crossJobDeps.push(__classPrivateFieldGet(this, _Artifact_uploadStep, "f"));
-        }
-        return s;
+        }, __classPrivateFieldGet(this, _Artifact_uploadStep, "f") ? [__classPrivateFieldGet(this, _Artifact_uploadStep, "f")] : []);
     }
 }
 _Artifact_version = new WeakMap(), _Artifact_uploadStep = new WeakMap();

package/esm/expression.d.ts CHANGED Viewed

@@ -19,6 +19,7 @@ export declare class ExpressionValue {
     notEquals(value: string | number | boolean): Condition;
     startsWith(prefix: string): Condition;
     contains(substring: string): Condition;
+    not(): Condition;
     /** wrap in `${{ }}` for use in YAML */
     toString(): string;
 }

package/esm/expression.d.ts.map CHANGED Viewed

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

package/esm/expression.js CHANGED Viewed

@@ -56,6 +56,9 @@ export class ExpressionValue {
     contains(substring) {
         return new FunctionCallCondition("contains", [__classPrivateFieldGet(this, _ExpressionValue_expression, "f"), formatLiteral(substring)], sourcesFrom(this));
     }
+    not() {
+        return new RawCondition(`!(${__classPrivateFieldGet(this, _ExpressionValue_expression, "f")})`, sourcesFrom(this));
+    }
     /** wrap in `${{ }}` for use in YAML */
     toString() {
         return `\${{ ${__classPrivateFieldGet(this, _ExpressionValue_expression, "f")} }}`;

package/esm/job.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { type ExpressionSource, ExpressionValue } from "./expression.js";
 import type { Permissions } from "./permissions.js";
-import { type ConditionLike, type ConfigValue, Step, StepGroup, type StepLike } from "./step.js";
+import { type ConditionLike, type ConfigValue, Step, type StepLike } from "./step.js";
 interface CommonJobFields {
     name?: string | ExpressionValue;
     needs?: Job[];
@@ -51,7 +51,7 @@ export interface ReusableJobConfig extends CommonJobFields {
 export type JobConfig = StepsJobConfig | ReusableJobConfig;
 export interface StepsJobDef extends StepsJobConfig {
     id?: string;
-    steps: StepLike[] | StepGroup;
+    steps: StepLike | StepLike[];
     outputs?: Record<string, ExpressionValue>;
 }
 export interface ReusableJobDef extends ReusableJobConfig {
@@ -60,15 +60,15 @@ export interface ReusableJobDef extends ReusableJobConfig {
 export type JobDef = StepsJobDef | ReusableJobDef;
 export declare class Job implements ExpressionSource {
     #private;
-    readonly outputs: Record<string, ExpressionValue>;
+    readonly outputs: Readonly<Record<string, ExpressionValue>>;
     constructor(id: string, config: JobConfig, init?: {
         steps?: StepLike[];
         outputs?: Record<string, ExpressionValue>;
     });
     get id(): string;
     resolveSteps(): Step<string>[];
-    inferNeeds(): Job[];
-    toYaml(): Record<string, unknown>;
+    inferNeeds(stepOwners?: Map<Step<string>, Job[]>): Job[];
+    toYaml(stepOwners?: Map<Step<string>, Job[]>): Record<string, unknown>;
 }
 export declare function toKebabCase(input: string): string;
 export declare function resolveJobId(def: JobDef): string;

package/esm/job.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../src/job.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,gBAAgB,EACrB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EACL,KAAK,aAAa,EAClB,KAAK,WAAW,EAGhB,IAAI,EACJ,~~SAAS,EACT,~~KAAK,QAAQ,~~EAEd~~,MAAM,WAAW,CAAC;AAEnB,UAAU,eAAe;IACvB,IAAI,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IAChC,KAAK,CAAC,EAAE,GAAG,EAAE,CAAC;IACd,EAAE,CAAC,EAAE,aAAa,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAE,CAAC;CACtE;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAC;IACvE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,eAAe;IACrD,MAAM,EAAE,MAAM,GAAG,eAAe,CAAC;IACjC,QAAQ,CAAC,EAAE;QACT,MAAM,CAAC,EAAE,OAAO,CAAC;QACjB,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa,CAAC;QACnC,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE;YAAE,KAAK,CAAC,EAAE,MAAM,CAAC;YAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;IACnE,WAAW,CAAC,EACR;QAAE,IAAI,EAAE,MAAM,GAAG,eAAe,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,GAChD,MAAM,GACN,eAAe,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CACnD;AAED,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,iBAAiB,CAAC;AAE3D,MAAM,WAAW,WAAY,SAAQ,cAAc;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,QAAQ,~~EAAE,~~GAAG,~~SAAS~~,CAAC;~~IAC9B~~,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,cAAe,SAAQ,iBAAiB;IACvD,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,MAAM,GAAG,WAAW,GAAG,cAAc,CAAC;~~AAElD~~,qBAAa,GAAI,YAAW,gBAAgB;;IAK1C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAM;~~gBAGrD~~,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,SAAS,EACjB,IAAI,CAAC,EAAE;QACL,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;KAC3C;~~IA0BH~~,IAAI,EAAE,IAAI,MAAM,CAEf;~~IAED~~,YAAY,IAAI,IAAI,CAAC,MAAM,CAAC,EAAE;~~IAuD9B~~,UAAU,IAAI,GAAG,EAAE;~~IAiDnB~~,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;~~CAoJlC~~;~~AAqqBD~~,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKjD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAQhD;AAID,wBAAgB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,GAAG,CAUnD"}
1	+ {"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../src/job.ts"],"names":[],"mappings":"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"}

package/esm/job.js CHANGED Viewed

@@ -9,15 +9,211 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Job_id, _Job_config, _Job_leafSteps, _Job_outputDefs;
+var _Job_instances, _Job_id, _Job_config, _Job_leafItems, _Job_outputDefs, _Job_cachedGraph, _Job_cachedLeafSteps, _Job_buildGraph;
 import { Condition, ExpressionValue, } from "./expression.js";
 import { Matrix } from "./matrix.js";
-import { serializeConditionLike, serializeConfigValues, Step, StepGroup, toCondition, } from "./step.js";
+import { serializeConditionLike, serializeConfigValues, Step, StepRef, toCondition, unwrapSteps, } from "./step.js";
+function ensureEntry(graph, step) {
+    let entry = graph.get(step);
+    if (!entry) {
+        entry = { deps: new Set(), afterDeps: new Set(), contexts: [] };
+        graph.set(step, entry);
+    }
+    return entry;
+}
+/**
+ * Records a context condition for a graph entry. Contexts from multiple
+ * encounters are collected and combined later (via combineContexts) to
+ * properly factor out shared terms. An undefined context means
+ * unconditional and dominates any condition.
+ */
+function applyContextCondition(entry, context) {
+    if (entry.hasUnconditionalContext)
+        return;
+    if (context == null) {
+        entry.contexts = [];
+        entry.hasUnconditionalContext = true;
+        return;
+    }
+    entry.contexts.push(context);
+}
+/**
+ * Combines the collected context conditions for a graph entry into a single
+ * condition. Factors out common AND-terms so that shared conditions (like
+ * `!(matrix.skip)`) appear once rather than being duplicated in each OR branch.
+ */
+function combineContexts(entry) {
+    if (entry.hasUnconditionalContext || entry.contexts.length === 0) {
+        return undefined;
+    }
+    if (entry.contexts.length === 1) {
+        return toCondition(entry.contexts[0]);
+    }
+    const conditions = entry.contexts.map((c) => toCondition(c));
+    return simplifyOrConditions(conditions) ?? undefined;
+}
+/** ANDs two optional conditions together (for nesting StepRef conditions). */
+function combineAndConditions(a, b) {
+    if (a != null && b != null)
+        return toCondition(a).and(toCondition(b));
+    return a ?? b;
+}
+/**
+ * Returns a step's config.if as a ConditionLike suitable for passing down
+ * to dependencies, or undefined if it references step outputs (which would
+ * create circular condition dependencies).
+ */
+function propagatableConfigIf(step) {
+    const configIf = step.config.if;
+    if (configIf == null)
+        return undefined;
+    if (configIf instanceof Condition) {
+        for (const source of configIf.sources) {
+            if (source instanceof Step)
+                return undefined;
+        }
+    }
+    if (configIf instanceof ExpressionValue) {
+        for (const source of configIf.allSources) {
+            if (source instanceof Step)
+                return undefined;
+        }
+    }
+    return configIf;
+}
+/**
+ * Recursively flattens a StepLike tree into a flat graph of Steps with
+ * per-job dependencies and conditions. Returns the leaf-level Steps that
+ * were contributed, so parent composite steps can apply their modifiers.
+ *
+ * Context conditions are accumulated top-down via AND (nesting) and applied
+ * at leaf steps via OR (multiple encounters from different paths).
+ *
+ * afterDependencies (comesAfter) are NOT flattened into the graph — they are
+ * collected in `deferredAfterDeps` and resolved later, so that comesAfter
+ * only adds ordering edges for steps already present in the graph.
+ */
+function flattenStepLike(item, graph, isLeaf, leafSteps, deferredAfterDeps, contextCondition) {
+    if (item instanceof StepRef) {
+        const step = item.step;
+        // AND this StepRef's condition with the parent context
+        const newContext = combineAndConditions(contextCondition, item.condition);
+        if (step.children.length > 0) {
+            // StepRef wrapping composite step: recurse with combined context
+            const contributed = [];
+            for (const child of step.children) {
+                contributed.push(...flattenStepLike(child, graph, isLeaf, leafSteps, deferredAfterDeps, newContext));
+            }
+            // compute aggregate dep context: newContext AND (OR of children's
+            // config.ifs). If any child is unconditional, or the OR is a tautology,
+            // just use newContext.
+            let compositeDepsCtx = newContext;
+            if (item.dependencies.length > 0) {
+                const childIfs = [];
+                let allConditional = true;
+                for (const s of contributed) {
+                    const cif = propagatableConfigIf(s);
+                    if (cif == null) {
+                        allConditional = false;
+                        break;
+                    }
+                    childIfs.push(cif);
+                }
+                if (allConditional && childIfs.length > 0) {
+                    const orCond = simplifyOrConditions(childIfs.map((c) => toCondition(c)));
+                    if (orCond != null) {
+                        compositeDepsCtx = combineAndConditions(newContext, orCond);
+                    }
+                }
+            }
+            // apply deps once with aggregate context, add to all children's dep sets
+            for (const dep of item.dependencies) {
+                const depSteps = flattenStepLike(dep, graph, false, [], deferredAfterDeps, compositeDepsCtx);
+                for (const s of contributed) {
+                    const entry = graph.get(s);
+                    for (const ds of depSteps)
+                        entry.deps.add(ds);
+                }
+            }
+            for (const s of contributed) {
+                for (const dep of item.afterDependencies) {
+                    deferredAfterDeps.push({ step: s, target: dep });
+                }
+            }
+            return contributed;
+        }
+        // StepRef wrapping leaf step
+        const entry = ensureEntry(graph, step);
+        if (isLeaf)
+            leafSteps.push(step);
+        applyContextCondition(entry, newContext);
+        // include step's config.if in the dep context
+        const depContext = combineAndConditions(newContext, propagatableConfigIf(step));
+        for (const dep of item.dependencies) {
+            flattenDep(dep, entry.deps, graph, deferredAfterDeps, depContext);
+        }
+        for (const dep of item.afterDependencies) {
+            deferredAfterDeps.push({ step, target: dep });
+        }
+        return [step];
+    }
+    // Step (leaf or composite)
+    if (item.children.length > 0) {
+        // composite step: recurse into children with same context
+        const contributed = [];
+        for (const child of item.children) {
+            contributed.push(...flattenStepLike(child, graph, isLeaf, leafSteps, deferredAfterDeps, contextCondition));
+        }
+        return contributed;
+    }
+    // leaf step
+    const entry = ensureEntry(graph, item);
+    if (isLeaf)
+        leafSteps.push(item);
+    applyContextCondition(entry, contextCondition);
+    return [item];
+}
+/** Flattens a dependency target into the graph and adds it to a dep set. */
+function flattenDep(dep, targetSet, graph, deferredAfterDeps, contextCondition) {
+    const steps = flattenStepLike(dep, graph, false, [], deferredAfterDeps, contextCondition);
+    for (const s of steps) {
+        targetSet.add(s);
+    }
+}
+/**
+ * Adds condition-source steps as deps in the graph. Iterates until stable
+ * because condition sources may bring in new steps whose own conditions
+ * reference additional steps.
+ */
+function addConditionSourceDeps(graph) {
+    let changed = true;
+    while (changed) {
+        changed = false;
+        for (const [step, entry] of [...graph]) {
+            for (const cond of [step.config.if, ...entry.contexts]) {
+                if (!(cond instanceof Condition))
+                    continue;
+                for (const source of cond.sources) {
+                    if (!(source instanceof Step))
+                        continue;
+                    const srcStep = source;
+                    if (!graph.has(srcStep)) {
+                        ensureEntry(graph, srcStep);
+                        changed = true;
+                    }
+                    entry.deps.add(srcStep);
+                }
+            }
+        }
+    }
+}
+// --- Job class ---
 export class Job {
     constructor(id, config, init) {
+        _Job_instances.add(this);
         _Job_id.set(this, void 0);
         _Job_config.set(this, void 0);
-        _Job_leafSteps.set(this, []);
+        _Job_leafItems.set(this, []);
         _Job_outputDefs.set(this, {});
         Object.defineProperty(this, "outputs", {
             enumerable: true,
@@ -25,22 +221,21 @@ export class Job {
             writable: true,
             value: {}
         });
+        // cached graph — built lazily
+        _Job_cachedGraph.set(this, void 0);
+        _Job_cachedLeafSteps.set(this, void 0);
         __classPrivateFieldSet(this, _Job_id, id, "f");
         __classPrivateFieldSet(this, _Job_config, config, "f");
         if (init?.steps) {
             for (const s of init.steps) {
-                if (s instanceof StepGroup) {
-                    __classPrivateFieldGet(this, _Job_leafSteps, "f").push(...s.all);
-                }
-                else {
-                    __classPrivateFieldGet(this, _Job_leafSteps, "f").push(s);
-                }
+                __classPrivateFieldGet(this, _Job_leafItems, "f").push(s);
             }
         }
         if (init?.outputs) {
+            const outputs = this.outputs;
             for (const [name, stepOutput] of Object.entries(init.outputs)) {
                 __classPrivateFieldGet(this, _Job_outputDefs, "f")[name] = stepOutput;
-                this.outputs[name] = new ExpressionValue(`needs.${__classPrivateFieldGet(this, _Job_id, "f")}.outputs.${name}`, this);
+                outputs[name] = new ExpressionValue(`needs.${__classPrivateFieldGet(this, _Job_id, "f")}.outputs.${name}`, this);
             }
         }
     }
@@ -48,27 +243,8 @@ export class Job {
         return __classPrivateFieldGet(this, _Job_id, "f");
     }
     resolveSteps() {
-        // collect all reachable steps from leaves
-        const allSteps = new Set();
-        const collect = (s) => {
-            if (allSteps.has(s))
-                return;
-            allSteps.add(s);
-            for (const dep of s.dependencies) {
-                collect(dep);
-            }
-            // also collect steps referenced in if-conditions
-            if (s.config.if instanceof Condition) {
-                for (const source of s.config.if.sources) {
-                    if (source instanceof Step) {
-                        collect(source);
-                    }
-                }
-            }
-        };
-        for (const leaf of __classPrivateFieldGet(this, _Job_leafSteps, "f")) {
-            collect(leaf);
-        }
+        const { graph, leafSteps } = __classPrivateFieldGet(this, _Job_instances, "m", _Job_buildGraph).call(this);
+        const allSteps = new Set(graph.keys());
         // compute priority: each step gets the minimum leaf index of any
         // leaf step that transitively depends on it (directly or via
         // condition sources). This makes the topo sort respect steps order.
@@ -78,30 +254,21 @@ export class Job {
             if (current !== undefined && current <= p)
                 return;
             priority.set(s, p);
-            for (const dep of s.dependencies) {
+            const entry = graph.get(s);
+            if (!entry)
+                return;
+            for (const dep of entry.deps) {
                 if (allSteps.has(dep)) {
                     assignPriority(dep, p);
                 }
             }
-            if (s.config.if instanceof Condition) {
-                for (const source of s.config.if.sources) {
-                    if (source instanceof Step && allSteps.has(source)) {
-                        assignPriority(source, p);
-                    }
-                }
-            }
         };
-        for (let i = 0; i < __classPrivateFieldGet(this, _Job_leafSteps, "f").length; i++) {
-            assignPriority(__classPrivateFieldGet(this, _Job_leafSteps, "f")[i], i);
+        for (let i = 0; i < leafSteps.length; i++) {
+            assignPriority(leafSteps[i], i);
         }
-        const sorted = topoSort(allSteps, priority);
-        // set job reference on each resolved step for cross-job needs inference
-        for (const s of sorted) {
-            s._job = this;
-        }
-        return sorted;
+        return topoSort(allSteps, priority, graph);
     }
-    inferNeeds() {
+    inferNeeds(stepOwners) {
         const config = __classPrivateFieldGet(this, _Job_config, "f");
         const jobSources = new Set();
         // explicit needs
@@ -136,15 +303,14 @@ export class Job {
             if (config.strategy?.failFast != null) {
                 collectJobSources(config.strategy.failFast, jobSources);
             }
-            // collect from all step configs
-            for (const s of __classPrivateFieldGet(this, _Job_leafSteps, "f")) {
-                collectJobSourcesFromStep(s, jobSources);
-            }
+            // collect from all steps in the graph
+            const { graph } = __classPrivateFieldGet(this, _Job_instances, "m", _Job_buildGraph).call(this);
+            collectJobSourcesFromGraph(graph, jobSources, stepOwners);
         }
         // filter out self-references (can happen with cross-job deps in the same job)
         return [...jobSources].filter((j) => j !== this);
     }
-    toYaml() {
+    toYaml(stepOwners) {
         const config = __classPrivateFieldGet(this, _Job_config, "f");
         const result = {};
         if (config.name != null) {
@@ -152,7 +318,7 @@ export class Job {
                 ? config.name.toString()
                 : config.name;
         }
-        const needs = this.inferNeeds();
+        const needs = this.inferNeeds(stepOwners);
         if (needs.length > 0) {
             result.needs = needs.map((j) => j.id);
         }
@@ -261,110 +427,64 @@ export class Job {
             result.outputs = outputs;
         }
         // steps
+        const { graph } = __classPrivateFieldGet(this, _Job_instances, "m", _Job_buildGraph).call(this);
         const resolvedSteps = this.resolveSteps();
-        const effectiveConditions = computeEffectiveConditions(resolvedSteps, __classPrivateFieldGet(this, _Job_leafSteps, "f"));
+        const effectiveConditions = computeEffectiveConditions(resolvedSteps, graph);
         result.steps = resolvedSteps.map((s) => {
             return s.toYaml(effectiveConditions.get(s));
         });
         return result;
     }
 }
-_Job_id = new WeakMap(), _Job_config = new WeakMap(), _Job_leafSteps = new WeakMap(), _Job_outputDefs = new WeakMap();
-// --- condition propagation ---
-function computeEffectiveConditions(sortedSteps, leafSteps) {
-    const posMap = new Map();
-    for (let i = 0; i < sortedSteps.length; i++) {
-        posMap.set(sortedSteps[i], i);
-    }
-    // build dependents map: for each step, which steps depend on it
-    const dependents = new Map();
-    const addDependent = (dep, s) => {
-        let set = dependents.get(dep);
-        if (!set) {
-            set = new Set();
-            dependents.set(dep, set);
-        }
-        set.add(s);
-    };
-    for (const s of sortedSteps) {
-        for (const dep of s.dependencies) {
-            if (posMap.has(dep)) {
-                addDependent(dep, s);
-            }
-        }
-        // condition-inferred dependencies (matches topo sort edges)
-        if (s.config.if instanceof Condition) {
-            for (const source of s.config.if.sources) {
-                if (source instanceof Step && posMap.has(source)) {
-                    addDependent(source, s);
-                }
-            }
-        }
-    }
-    // steps explicitly passed to steps should not receive propagated
-    // conditions — the user declared them directly, so they keep their own if
-    const leafSet = new Set(leafSteps);
-    // compute effective conditions in reverse topo order
+_Job_id = new WeakMap(), _Job_config = new WeakMap(), _Job_leafItems = new WeakMap(), _Job_outputDefs = new WeakMap(), _Job_cachedGraph = new WeakMap(), _Job_cachedLeafSteps = new WeakMap(), _Job_instances = new WeakSet(), _Job_buildGraph = function _Job_buildGraph() {
+    if (__classPrivateFieldGet(this, _Job_cachedGraph, "f") && __classPrivateFieldGet(this, _Job_cachedLeafSteps, "f")) {
+        return { graph: __classPrivateFieldGet(this, _Job_cachedGraph, "f"), leafSteps: __classPrivateFieldGet(this, _Job_cachedLeafSteps, "f") };
+    }
+    const graph = new Map();
+    const leafSteps = [];
+    const deferredAfterDeps = [];
+    for (const item of __classPrivateFieldGet(this, _Job_leafItems, "f")) {
+        flattenStepLike(item, graph, true, leafSteps, deferredAfterDeps);
+    }
+    addConditionSourceDeps(graph);
+    // resolve deferred after-deps: only add ordering edges for steps
+    // already present in the graph (comesAfter does not pull in steps)
+    for (const { step, target } of deferredAfterDeps) {
+        const entry = graph.get(step);
+        for (const t of unwrapSteps(target)) {
+            if (graph.has(t))
+                entry.afterDeps.add(t);
+        }
+    }
+    __classPrivateFieldSet(this, _Job_cachedGraph, graph, "f");
+    __classPrivateFieldSet(this, _Job_cachedLeafSteps, leafSteps, "f");
+    return { graph, leafSteps };
+};
+// --- effective conditions ---
+/**
+ * Computes effective conditions for all steps. Each step's effective condition
+ * is the combination of its collected context conditions (OR'd together,
+ * simplified) AND'd with its intrinsic config.if.
+ *
+ * Context conditions are collected during the tree walk — they flow DOWN
+ * from parent groups and StepRef conditions through dependencies, so shared
+ * top-level conditions like `!(matrix.skip)` naturally stay factored out.
+ */
+function computeEffectiveConditions(steps, graph) {
     const effective = new Map();
-    for (let i = sortedSteps.length - 1; i >= 0; i--) {
-        const s = sortedSteps[i];
-        const ownIf = s.config.if != null ? toCondition(s.config.if) : undefined;
-        if (leafSet.has(s)) {
-            // explicitly added by user — no propagation
-            effective.set(s, ownIf);
-            continue;
-        }
-        const deps = dependents.get(s);
-        if (!deps || deps.size === 0) {
-            effective.set(s, ownIf);
-            continue;
-        }
-        // collect propagatable conditions from dependents
-        const depConditions = [];
-        let mustAlwaysRun = false;
-        for (const d of deps) {
-            const dEffective = effective.get(d);
-            if (dEffective == null) {
-                // dependent has no effective condition — step must always run
-                mustAlwaysRun = true;
-                break;
-            }
-            // check if the condition can propagate to this position
-            if (!canPropagateTo(dEffective, i, posMap)) {
-                // condition references steps at or after this position
-                mustAlwaysRun = true;
-                break;
-            }
-            depConditions.push(dEffective);
-        }
-        const propagated = mustAlwaysRun
-            ? undefined
-            : simplifyOrConditions(depConditions);
-        if (mustAlwaysRun) {
-            effective.set(s, ownIf);
-        }
-        else if (propagated != null && ownIf != null) {
-            effective.set(s, deduplicateAndTerms(propagated.and(ownIf)));
+    for (const s of steps) {
+        const entry = graph.get(s);
+        const ctx = combineContexts(entry);
+        const configIf = s.config.if != null ? toCondition(s.config.if) : undefined;
+        if (ctx != null && configIf != null) {
+            effective.set(s, deduplicateAndTerms(ctx.and(configIf)));
         }
         else {
-            effective.set(s, propagated ?? ownIf);
+            effective.set(s, ctx ?? configIf);
         }
     }
     return effective;
 }
-// a condition can propagate backward to a step at targetPos only if none of
-// the condition's Step sources are at or after that position
-function canPropagateTo(condition, targetPos, posMap) {
-    for (const source of condition.sources) {
-        if (source instanceof Step) {
-            const pos = posMap.get(source);
-            if (pos !== undefined && pos >= targetPos) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
 // --- condition simplification ---
 /**
  * Simplifies an array of conditions that will be OR'd together:
@@ -606,26 +726,18 @@ function extractCommonFactors(terms) {
     return result;
 }
 // --- topological sort ---
-function topoSort(steps, priority) {
+function topoSort(steps, priority, graph) {
     // build in-degree map (only counting unique predecessors within our set)
     const inDegree = new Map();
     for (const s of steps) {
+        const entry = graph.get(s);
         const predecessors = new Set();
-        for (const dep of s.dependencies) {
+        for (const dep of entry.deps) {
             if (steps.has(dep)) {
                 predecessors.add(dep);
             }
         }
-        // also count condition-inferred deps (deduplicated via Set)
-        if (s.config.if instanceof Condition) {
-            for (const source of s.config.if.sources) {
-                if (source instanceof Step && steps.has(source)) {
-                    predecessors.add(source);
-                }
-            }
-        }
-        // also count comesAfter ordering deps
-        for (const dep of s.comesAfterDeps) {
+        for (const dep of entry.afterDeps) {
             if (steps.has(dep)) {
                 predecessors.add(dep);
             }
@@ -663,31 +775,9 @@ function topoSort(steps, priority) {
         for (const s of allSteps) {
             if (s === current)
                 continue;
-            let isSuccessor = false;
-            for (const dep of s.dependencies) {
-                if (dep === current) {
-                    isSuccessor = true;
-                    break;
-                }
-            }
-            // check condition sources too
-            if (!isSuccessor && s.config.if instanceof Condition) {
-                for (const source of s.config.if.sources) {
-                    if (source === current) {
-                        isSuccessor = true;
-                        break;
-                    }
-                }
-            }
-            // check comesAfter deps (s.comesAfter(current) means s comes after current)
-            if (!isSuccessor) {
-                for (const dep of s.comesAfterDeps) {
-                    if (dep === current) {
-                        isSuccessor = true;
-                        break;
-                    }
-                }
-            }
+            const entry = graph.get(s);
+            const isSuccessor = entry.deps.has(current) ||
+                entry.afterDeps.has(current);
             if (isSuccessor) {
                 const newDeg = (inDegree.get(s) ?? 0) - 1;
                 inDegree.set(s, newDeg);
@@ -716,7 +806,7 @@ function topoSort(steps, priority) {
             if (!resultSet.has(s))
                 remaining.add(s);
         }
-        const cyclePath = findCyclePath(remaining);
+        const cyclePath = findCyclePath(remaining, graph);
         throw new Error(`Cycle detected in step ordering: ${cyclePath.map(stepLabel).join(" → ")}`);
     }
     return result;
@@ -725,29 +815,22 @@ function stepLabel(s) {
     return s.config.name ?? s.config.uses ?? s.id;
 }
 /** DFS on the remaining (unsorted) steps to find and return one cycle. */
-function findCyclePath(remaining) {
+function findCyclePath(remaining, graph) {
     // build successor map within remaining steps
     const successors = new Map();
     for (const s of remaining) {
         successors.set(s, []);
     }
     for (const s of remaining) {
-        // dependsOn edges: s depends on dep → dep is predecessor of s
-        for (const dep of s.dependencies) {
+        const entry = graph.get(s);
+        // deps: s depends on dep → dep is predecessor of s
+        for (const dep of entry.deps) {
             if (remaining.has(dep)) {
                 successors.get(dep).push(s);
             }
         }
-        // condition-source edges
-        if (s.config.if instanceof Condition) {
-            for (const source of s.config.if.sources) {
-                if (source instanceof Step && remaining.has(source)) {
-                    successors.get(source).push(s);
-                }
-            }
-        }
-        // comesAfter edges: s.comesAfter(dep) → dep is predecessor of s
-        for (const dep of s.comesAfterDeps) {
+        // afterDeps: s comesAfter dep → dep is predecessor of s
+        for (const dep of entry.afterDeps) {
             if (remaining.has(dep)) {
                 successors.get(dep).push(s);
             }
@@ -821,24 +904,25 @@ function collectJobSources(value, out) {
         }
     }
 }
-function collectJobSourcesFromStep(s, out, visited = new Set()) {
-    if (visited.has(s))
-        return;
-    visited.add(s);
-    collectJobSources(s.config.if, out);
-    if (s.config.with)
-        collectJobSources(s.config.with, out);
-    if (s.config.env)
-        collectJobSources(s.config.env, out);
-    // check cross-job step dependencies (e.g., artifact download → upload)
-    for (const dep of s._crossJobDeps) {
-        if (dep._job instanceof Job) {
-            out.add(dep._job);
-        }
-    }
-    // walk dependencies recursively
-    for (const dep of s.dependencies) {
-        collectJobSourcesFromStep(dep, out, visited);
+function collectJobSourcesFromGraph(graph, out, stepOwners) {
+    for (const [step, entry] of graph) {
+        collectJobSources(step.config.if, out);
+        for (const ctx of entry.contexts) {
+            collectJobSources(ctx, out);
+        }
+        if (step.config.with)
+            collectJobSources(step.config.with, out);
+        if (step.config.env)
+            collectJobSources(step.config.env, out);
+        if (stepOwners) {
+            for (const dep of step._crossJobDeps) {
+                const owners = stepOwners.get(dep);
+                if (owners) {
+                    for (const j of owners)
+                        out.add(j);
+                }
+            }
+        }
     }
 }
 function serializeService(svc) {
@@ -900,7 +984,7 @@ export function job(id, config) {
     }
     const { id: _id, steps, outputs, ...jobConfig } = config;
     return new Job(id, jobConfig, {
-        steps: steps instanceof StepGroup ? [steps] : steps,
+        steps: Array.isArray(steps) ? steps : [steps],
         outputs,
     });
 }

package/esm/mod.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import "./_dnt.polyfills.js";
-export { Step, step, StepGroup, steps } from "./step.js";
+export { Step, step, StepRef } from "./step.js";
 export type { ConditionLike, ConfigValue, StepConfig, StepLike, } from "./step.js";
 export { Job, job } from "./job.js";
 export type { JobConfig, JobDef, ReusableJobConfig, ReusableJobDef, ServiceContainer, StepsJobConfig, StepsJobDef, } from "./job.js";

package/esm/mod.d.ts.map CHANGED Viewed

	@@ -1 +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,~~SAAS~~,EAAE,~~KAAK,EAAE,~~MAAM,WAAW,CAAC;~~AACzD~~,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"}
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"}

package/esm/mod.js CHANGED Viewed

@@ -1,5 +1,5 @@
 import "./_dnt.polyfills.js";
-export { Step, step, StepGroup, steps } from "./step.js";
+export { Step, step, StepRef } from "./step.js";
 export { Job, job } from "./job.js";
 export { createWorkflow, isLinting, Workflow } from "./workflow.js";
 export { Condition, conditions, ElseIfBuilder, expr, ExpressionValue, ThenBuilder, } from "./expression.js";

package/esm/step.d.ts CHANGED Viewed

@@ -2,48 +2,63 @@ import { Condition, type ExpressionSource, ExpressionValue } from "./expression.
 export type ConditionLike = Condition | ExpressionValue | string;
 export type ConfigValue = string | number | boolean | ExpressionValue;
 export interface StepConfig<O extends string = never> {
-    name?: string;
-    id?: string;
-    uses?: string;
-    run?: string | string[];
-    with?: Record<string, ConfigValue>;
-    env?: Record<string, ConfigValue>;
-    if?: ConditionLike;
-    shell?: string;
-    workingDirectory?: string;
-    continueOnError?: boolean | string;
-    timeoutMinutes?: number;
-    outputs?: readonly O[];
+    readonly name?: string;
+    readonly id?: string;
+    readonly uses?: string;
+    readonly run?: string | string[];
+    readonly with?: Readonly<Record<string, ConfigValue>>;
+    readonly env?: Readonly<Record<string, ConfigValue>>;
+    readonly if?: ConditionLike;
+    readonly shell?: string;
+    readonly workingDirectory?: string;
+    readonly continueOnError?: boolean | string;
+    readonly timeoutMinutes?: number;
+    readonly outputs?: readonly O[];
 }
 export declare function resetStepCounter(): void;
-export type StepLike = Step<string> | StepGroup;
+export type StepLike = Step<string> | StepRef<string>;
 export declare class Step<O extends string = never> implements ExpressionSource {
     #private;
     readonly config: StepConfig<O>;
-    readonly dependencies: Step<string>[];
-    readonly comesAfterDeps: Step<string>[];
     readonly outputs: {
         [K in O]: ExpressionValue;
     };
-    readonly _crossJobDeps: Step<string>[];
-    _job?: ExpressionSource;
-    constructor(config: StepConfig<O>);
+    readonly _crossJobDeps: readonly Step<string>[];
+    readonly children: readonly StepLike[];
+    constructor(config: StepConfig<O>, crossJobDeps?: Step<string>[]);
+    constructor(children: readonly StepLike[]);
     get id(): string;
-    dependsOn(...deps: StepLike[]): this;
-    comesAfter(...deps: StepLike[]): this;
-    if(condition: ConditionLike): this;
+    dependsOn(...deps: StepLike[]): StepRef<O>;
+    comesAfter(...deps: StepLike[]): StepRef<O>;
+    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 declare class StepRef<O extends string = never> {
+    readonly step: Step<O>;
+    readonly condition?: ConditionLike;
+    readonly dependencies: readonly StepLike[];
+    readonly afterDependencies: readonly StepLike[];
+    constructor(step: Step<O>, init?: {
+        condition?: ConditionLike;
+        dependencies?: readonly StepLike[];
+        afterDependencies?: readonly StepLike[];
+    });
+    get id(): string;
+    get config(): StepConfig<O>;
+    get outputs(): {
+        [K in O]: ExpressionValue;
+    };
+    dependsOn(...deps: StepLike[]): StepRef<O>;
+    comesAfter(...deps: StepLike[]): StepRef<O>;
+    if(condition: ConditionLike): StepRef<O>;
+}
 export declare function serializeConditionLike(c: ConditionLike): string;
 export declare function toCondition(c: ConditionLike): Condition;
 export declare function serializeConfigValues(record: Record<string, ConfigValue>): Record<string, string | number | boolean>;
-export declare class StepGroup {
-    readonly all: Step<string>[];
-    constructor(steps: Step<string>[]);
-    if(condition: ConditionLike): this;
-    dependsOn(...deps: StepLike[]): this;
-    comesAfter(...deps: StepLike[]): this;
-}
-export declare function steps(...items: (Step<string> | StepGroup | StepConfig)[]): StepGroup;
+/** Extracts the underlying Step from a StepLike (Step or StepRef). */
+export declare function unwrapStep(item: Step<string> | StepRef<string>): Step<string>;
+/** Extracts all underlying leaf Steps from a StepLike (recursively for composites). */
+export declare function unwrapSteps(item: StepLike): Step<string>[];
 //# sourceMappingURL=step.d.ts.map

package/esm/step.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,KAAK,gBAAgB,EACrB,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,eAAe,GAAG,MAAM,CAAC;AACjE,MAAM,MAAM,WAAW,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,eAAe,CAAC;AAEtE,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;~~IACd~~,EAAE,CAAC,EAAE,MAAM,CAAC;~~IACZ~~,IAAI,CAAC,EAAE,MAAM,CAAC;~~IACd~~,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;~~IACxB~~,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;~~IACnC~~,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;~~IAClC~~,EAAE,CAAC,EAAE,aAAa,CAAC;~~IACnB~~,KAAK,CAAC,EAAE,MAAM,CAAC;~~IACf~~,gBAAgB,CAAC,EAAE,MAAM,CAAC;~~IAC1B~~,eAAe,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;~~IACnC~~,cAAc,CAAC,EAAE,MAAM,CAAC;~~IACxB~~,OAAO,CAAC,EAAE,SAAS,CAAC,EAAE,CAAC;~~CACxB~~;AAKD,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;AAED,MAAM,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,~~SAAS~~,CAAC;~~AAEhD~~,qBAAa,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,CAAE,YAAW,gBAAgB;;IAErE,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC/B,QAAQ,CAAC,~~YAAY~~,EAAE,~~IAAI,~~CAAC,~~MAAM~~,CAAC,~~EAAE~~,~~CAAM~~;~~IAC3C~~,QAAQ,CAAC,~~cAAc~~,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE,~~CAAM~~;~~IAC7C~~,QAAQ,CAAC,~~OAAO~~,EAAE~~;SAAG~~,~~CAAC~~,~~IAAI~~,~~CAAC~~,~~GAAG,eAAe;KAAE,~~CAAC;~~IAEhD~~,~~QAAQ~~,~~CAAC,aAAa,~~EAAE,~~IAAI~~,CAAC,~~MAAM~~,CAAC,EAAE,~~CAAM;IAE5C~~,~~IAAI,~~CAAC,EAAE,~~gBAAgB~~,CAAC~~;gBAEZ~~,MAAM,EAAE,~~UAAU~~,~~CAAC~~,~~CAAC~~,~~CAAC~~;~~IAwBjC~~,IAAI,EAAE,IAAI,MAAM,CAEf;IAED,SAAS,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,~~IAAI~~;~~IAWpC~~,UAAU,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,~~IAAI~~;~~IAWrC~~,EAAE,CAAC,SAAS,EAAE,aAAa,GAAG,~~IAAI~~;~~IAUlC~~,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAqDzD;AAED,wBAAgB,IAAI,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,GAAG,KAAK,EACjD,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,GACpB,IAAI,CAAC,CAAC,CAAC,~~CAET~~;~~AAID~~,wBAAgB,~~sBAAsB~~,~~CAAC~~,~~CAAC~~,EAAE,~~aAAa~~,~~GAAG~~,MAAM,~~CAQ/D;AAED~~,~~wBAAgB~~,~~WAAW~~,CAAC,CAAC,EAAE,~~aAAa~~,~~GAAG~~,~~SAAS~~,~~CAMvD;AAED~~,~~wBAAgB~~,~~qBAAqB~~,~~CACnC~~,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,~~WAAW~~,CAAC,~~GAClC~~,~~MAAM~~,CAAC,~~MAAM~~,~~EAAE~~,~~MAAM~~,~~GAAG~~,MAAM,GAAG,~~OAAO~~,CAAC,~~CAM3C~~;~~AAID~~,~~qBAAa~~,SAAS;~~IACpB~~,QAAQ,CAAC,~~GAAG~~,EAAE,~~IAAI~~,CAAC,~~MAAM~~,CAAC,EAAE,CAAC;~~gBAEjB~~,~~KAAK~~,EAAE,IAAI,CAAC,~~MAAM~~,CAAC,EAAE;~~IAIjC~~,EAAE,CAAC,SAAS,EAAE,~~aAAa~~,~~GAAG~~,IAAI;~~IAOlC~~,SAAS,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,~~IAAI~~;~~IAOpC~~,UAAU,CAAC,GAAG,IAAI,EAAE,QAAQ,EAAE,GAAG,~~IAAI~~;~~CAMtC~~;AAED,wBAAgB,~~KAAK~~,~~CACnB~~,GAAG,~~KAAK~~,EAAE,CAAC,~~IAAI~~,CAAC,MAAM,CAAC,GAAG,~~SAAS~~,GAAG,UAAU,CAAC,EAAE,~~GAClD~~,~~SAAS~~,~~CAeX~~"}
1	+ {"version":3,"file":"step.d.ts","sourceRoot":"","sources":["../src/step.ts"],"names":[],"mappings":"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"}

package/esm/step.js CHANGED Viewed

@@ -17,7 +17,7 @@ export function resetStepCounter() {
     stepCounter = 0;
 }
 export class Step {
-    constructor(config) {
+    constructor(configOrChildren, crossJobDeps) {
         _Step_id.set(this, void 0);
         Object.defineProperty(this, "config", {
             enumerable: true,
@@ -25,18 +25,6 @@ export class Step {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "dependencies", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
-        Object.defineProperty(this, "comesAfterDeps", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
         Object.defineProperty(this, "outputs", {
             enumerable: true,
             configurable: true,
@@ -48,20 +36,33 @@ export class Step {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: void 0
         });
-        // set by Job.resolveSteps() — the job that owns this step
-        Object.defineProperty(this, "_job", {
+        Object.defineProperty(this, "children", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        if (Array.isArray(configOrChildren)) {
+            // composite step (group of children)
+            if (configOrChildren.length === 0) {
+                throw new Error("step() requires at least one step");
+            }
+            __classPrivateFieldSet(this, _Step_id, `_step_${stepCounter++}`, "f");
+            this.config = {};
+            this._crossJobDeps = Object.freeze([]);
+            this.outputs = {};
+            this.children = Object.freeze([...configOrChildren]);
+            return;
+        }
+        const config = configOrChildren;
         if (config.outputs?.length && !config.id) {
             throw new Error("Step with outputs must have an explicit id");
         }
         __classPrivateFieldSet(this, _Step_id, config.id ?? `_step_${stepCounter++}`, "f");
         this.config = config;
+        this._crossJobDeps = Object.freeze(crossJobDeps ?? []);
         // build typed outputs
         const outputs = {};
         if (config.outputs) {
@@ -71,41 +72,19 @@ export class Step {
             }
         }
         this.outputs = outputs;
+        this.children = Object.freeze([]);
     }
     get id() {
         return __classPrivateFieldGet(this, _Step_id, "f");
     }
     dependsOn(...deps) {
-        for (const d of deps) {
-            if (d instanceof StepGroup) {
-                this.dependencies.push(...d.all);
-            }
-            else {
-                this.dependencies.push(d);
-            }
-        }
-        return this;
+        return new StepRef(this, { dependencies: deps });
     }
     comesAfter(...deps) {
-        for (const d of deps) {
-            if (d instanceof StepGroup) {
-                this.comesAfterDeps.push(...d.all);
-            }
-            else {
-                this.comesAfterDeps.push(d);
-            }
-        }
-        return this;
+        return new StepRef(this, { afterDependencies: deps });
     }
     if(condition) {
-        const cond = toCondition(condition);
-        if (this.config.if != null) {
-            this.config.if = cond.and(toCondition(this.config.if));
-        }
-        else {
-            this.config.if = cond;
-        }
-        return this;
+        return new StepRef(this, { condition });
     }
     toYaml(effectiveIf) {
         const result = {};
@@ -150,8 +129,86 @@ export class Step {
     }
 }
 _Step_id = new WeakMap();
-export function step(config) {
-    return new Step(config);
+export function step(...args) {
+    if (args.length === 1) {
+        return new Step(args[0]);
+    }
+    const children = [];
+    for (const item of args) {
+        if (item instanceof Step || item instanceof StepRef) {
+            children.push(item);
+        }
+        else {
+            children.push(new Step(item));
+        }
+    }
+    return new Step(children);
+}
+// --- StepRef: immutable wrapper for per-usage deps/conditions ---
+export class StepRef {
+    constructor(step, init) {
+        Object.defineProperty(this, "step", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "condition", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "dependencies", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "afterDependencies", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.step = step;
+        this.condition = init?.condition;
+        this.dependencies = init?.dependencies ?? [];
+        this.afterDependencies = init?.afterDependencies ?? [];
+    }
+    get id() {
+        return this.step.id;
+    }
+    get config() {
+        return this.step.config;
+    }
+    get outputs() {
+        return this.step.outputs;
+    }
+    dependsOn(...deps) {
+        return new StepRef(this.step, {
+            condition: this.condition,
+            dependencies: [...this.dependencies, ...deps],
+            afterDependencies: this.afterDependencies,
+        });
+    }
+    comesAfter(...deps) {
+        return new StepRef(this.step, {
+            condition: this.condition,
+            dependencies: this.dependencies,
+            afterDependencies: [...this.afterDependencies, ...deps],
+        });
+    }
+    if(condition) {
+        const newCond = this.condition != null
+            ? toCondition(condition).and(toCondition(this.condition))
+            : condition;
+        return new StepRef(this.step, {
+            condition: newCond,
+            dependencies: this.dependencies,
+            afterDependencies: this.afterDependencies,
+        });
+    }
 }
 // --- serialization helpers ---
 export function serializeConditionLike(c) {
@@ -180,51 +237,16 @@ export function serializeConfigValues(record) {
     }
     return result;
 }
-// --- step group ---
-export class StepGroup {
-    constructor(steps) {
-        Object.defineProperty(this, "all", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.all = steps;
-    }
-    if(condition) {
-        for (const s of this.all) {
-            s.if(condition);
-        }
-        return this;
-    }
-    dependsOn(...deps) {
-        for (const s of this.all) {
-            s.dependsOn(...deps);
-        }
-        return this;
-    }
-    comesAfter(...deps) {
-        for (const s of this.all) {
-            s.comesAfter(...deps);
-        }
-        return this;
-    }
+// --- helpers ---
+/** Extracts the underlying Step from a StepLike (Step or StepRef). */
+export function unwrapStep(item) {
+    return item instanceof StepRef ? item.step : item;
 }
-export function steps(...items) {
-    if (items.length === 0) {
-        throw new Error("steps() requires at least one step");
-    }
-    const created = [];
-    for (const item of items) {
-        if (item instanceof StepGroup) {
-            created.push(...item.all);
-        }
-        else if (item instanceof Step) {
-            created.push(item);
-        }
-        else {
-            created.push(new Step(item));
-        }
+/** Extracts all underlying leaf Steps from a StepLike (recursively for composites). */
+export function unwrapSteps(item) {
+    const s = unwrapStep(item);
+    if (s.children.length > 0) {
+        return s.children.flatMap(unwrapSteps);
     }
-    return new StepGroup(created);
+    return [s];
 }

package/esm/workflow.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../src/workflow.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAgB,KAAK,MAAM,EAAgB,MAAM,UAAU,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,~~EAAE~~,MAAM,WAAW,CAAC;~~AAG7C~~,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,CAAC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC7C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC9C;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,CAAC,EAAE;QACL,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;IACF,YAAY,CAAC,EAAE;QACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;IACF,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,aAAa,CAAC,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,gBAAgB,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,CAAA;KAAE,CAAC;IACrE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAClC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;CACzB;AAED,qBAAa,QAAQ;;gBAIP,MAAM,EAAE,cAAc;IAqBlC,YAAY,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;~~IAmDnD~~,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,EAAE,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAIpE,WAAW,CACT,OAAO,EAAE;QAAE,QAAQ,EAAE,GAAG,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAC1C,IAAI;CAoBR;AAED,0EAA0E;AAC1E,eAAO,MAAM,SAAS,EAAE,OAAyC,CAAC;AAElE,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,QAAQ,CAE/D"}
1	+ {"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../src/workflow.ts"],"names":[],"mappings":"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"}

package/esm/workflow.js CHANGED Viewed

@@ -63,14 +63,22 @@ export class Workflow {
             }
             obj.env = env;
         }
-        // pre-resolve all jobs to establish step→job mappings for cross-job deps
+        // pre-resolve all jobs and build step→job mapping for cross-job deps
+        const stepOwners = new Map();
         for (const job of __classPrivateFieldGet(this, _Workflow_jobs, "f").values()) {
-            job.resolveSteps();
+            for (const s of job.resolveSteps()) {
+                let owners = stepOwners.get(s);
+                if (!owners) {
+                    owners = [];
+                    stepOwners.set(s, owners);
+                }
+                owners.push(job);
+            }
         }
         // jobs
         const jobs = {};
         for (const [id, job] of __classPrivateFieldGet(this, _Workflow_jobs, "f")) {
-            jobs[id] = job.toYaml();
+            jobs[id] = job.toYaml(stepOwners);
         }
         obj.jobs = jobs;
         const yaml = stringify(obj, {

package/package.json CHANGED Viewed

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