gagen 0.2.2 → 0.2.3

package/README.md

@@ -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/expression.d.ts

@@ -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

@@ -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

@@ -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

@@ -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 {

package/esm/job.d.ts.map

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

package/esm/job.js

@@ -12,81 +12,170 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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, StepRef, toCondition, unwrapSteps, } 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() };
+        entry = { deps: new Set(), afterDeps: new Set(), contexts: [] };
         graph.set(step, entry);
     }
     return entry;
 }
-/** Adds a condition to a graph entry, ANDing with any existing condition. */
-function addEntryCondition(entry, condition) {
-    if (entry.condition != null) {
-        entry.condition = toCondition(condition).and(toCondition(entry.condition));
+/**
+ * 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;
     }
-    else {
-        entry.condition = condition;
+    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 StepGroups can apply their modifiers.
+ * 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) {
-    if (item instanceof Step) {
-        ensureEntry(graph, item);
-        if (isLeaf)
-            leafSteps.push(item);
-        return [item];
-    }
-    else if (item instanceof StepRef) {
+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);
-        if (item.condition != null) {
-            addEntryCondition(entry, item.condition);
-        }
+        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);
+            flattenDep(dep, entry.deps, graph, deferredAfterDeps, depContext);
         }
         for (const dep of item.afterDependencies) {
             deferredAfterDeps.push({ step, target: dep });
         }
         return [step];
     }
-    else {
-        // StepGroup: recursively flatten children, then apply group modifiers
+    // Step (leaf or composite)
+    if (item.children.length > 0) {
+        // composite step: recurse into children with same context
         const contributed = [];
-        for (const s of item.all) {
-            contributed.push(...flattenStepLike(s, graph, isLeaf, leafSteps, deferredAfterDeps));
-        }
-        // apply group-level modifiers to all contributed steps
-        for (const step of contributed) {
-            const entry = graph.get(step);
-            if (item.condition != null) {
-                addEntryCondition(entry, item.condition);
-            }
-            for (const dep of item.dependencies) {
-                flattenDep(dep, entry.deps, graph, deferredAfterDeps);
-            }
-            for (const dep of item.afterDependencies) {
-                deferredAfterDeps.push({ step, target: dep });
-            }
+        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) {
-    const steps = flattenStepLike(dep, graph, false, [], deferredAfterDeps);
+function flattenDep(dep, targetSet, graph, deferredAfterDeps, contextCondition) {
+    const steps = flattenStepLike(dep, graph, false, [], deferredAfterDeps, contextCondition);
     for (const s of steps) {
         targetSet.add(s);
     }
@@ -101,7 +190,7 @@ function addConditionSourceDeps(graph) {
     while (changed) {
         changed = false;
         for (const [step, entry] of [...graph]) {
-            for (const cond of [step.config.if, entry.condition]) {
+            for (const cond of [step.config.if, ...entry.contexts]) {
                 if (!(cond instanceof Condition))
                     continue;
                 for (const source of cond.sources) {
@@ -338,9 +427,9 @@ export class Job {
             result.outputs = outputs;
         }
         // steps
-        const { graph, leafSteps } = __classPrivateFieldGet(this, _Job_instances, "m", _Job_buildGraph).call(this);
+        const { graph } = __classPrivateFieldGet(this, _Job_instances, "m", _Job_buildGraph).call(this);
         const resolvedSteps = this.resolveSteps();
-        const effectiveConditions = computeEffectiveConditions(resolvedSteps, leafSteps, graph);
+        const effectiveConditions = computeEffectiveConditions(resolvedSteps, graph);
         result.steps = resolvedSteps.map((s) => {
             return s.toYaml(effectiveConditions.get(s));
         });
@@ -371,106 +460,31 @@ _Job_id = new WeakMap(), _Job_config = new WeakMap(), _Job_leafItems = new WeakM
     __classPrivateFieldSet(this, _Job_cachedLeafSteps, leafSteps, "f");
     return { graph, leafSteps };
 };
-// --- condition propagation ---
-function computeEffectiveConditions(sortedSteps, leafSteps, graph) {
-    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) {
-        const entry = graph.get(s);
-        for (const dep of entry.deps) {
-            if (posMap.has(dep)) {
-                addDependent(dep, s);
-            }
-        }
-    }
-    // steps explicitly passed as leaves 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
+// --- 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];
+    for (const s of steps) {
         const entry = graph.get(s);
-        const ownIf = getOwnCondition(s.config.if, entry.condition);
-        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)));
+        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;
 }
-/** Combines config.if (intrinsic) with context condition (per-job). */
-function getOwnCondition(configIf, contextCondition) {
-    const configCond = configIf != null ? toCondition(configIf) : undefined;
-    const ctxCond = contextCondition != null
-        ? toCondition(contextCondition)
-        : undefined;
-    if (configCond != null && ctxCond != null) {
-        return ctxCond.and(configCond);
-    }
-    return ctxCond ?? configCond;
-}
-// 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:
@@ -893,7 +907,9 @@ function collectJobSources(value, out) {
 function collectJobSourcesFromGraph(graph, out, stepOwners) {
     for (const [step, entry] of graph) {
         collectJobSources(step.config.if, out);
-        collectJobSources(entry.condition, out);
+        for (const ctx of entry.contexts) {
+            collectJobSources(ctx, out);
+        }
         if (step.config.with)
             collectJobSources(step.config.with, out);
         if (step.config.env)
@@ -968,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

@@ -1,5 +1,5 @@
 import "./_dnt.polyfills.js";
-export { Step, step, StepGroup, StepRef, 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

@@ -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,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClE,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,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

@@ -1,5 +1,5 @@
 import "./_dnt.polyfills.js";
-export { Step, step, StepGroup, StepRef, 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

@@ -16,7 +16,7 @@ export interface StepConfig<O extends string = never> {
     readonly outputs?: readonly O[];
 }
 export declare function resetStepCounter(): void;
-export type StepLike = Step<string> | StepRef<string> | StepGroup;
+export type StepLike = Step<string> | StepRef<string>;
 export declare class Step<O extends string = never> implements ExpressionSource {
     #private;
     readonly config: StepConfig<O>;
@@ -24,7 +24,9 @@ export declare class Step<O extends string = never> implements ExpressionSource
         [K in O]: ExpressionValue;
     };
     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[]): StepRef<O>;
     comesAfter(...deps: StepLike[]): StepRef<O>;
@@ -32,6 +34,7 @@ export declare class Step<O extends string = never> implements ExpressionSource
     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;
@@ -56,21 +59,6 @@ export declare function toCondition(c: ConditionLike): Condition;
 export declare function serializeConfigValues(record: Record<string, ConfigValue>): Record<string, string | number | boolean>;
 /** Extracts the underlying Step from a StepLike (Step or StepRef). */
 export declare function unwrapStep(item: Step<string> | StepRef<string>): Step<string>;
-/** Extracts all underlying Steps from a StepLike (recursively for groups). */
+/** Extracts all underlying leaf Steps from a StepLike (recursively for composites). */
 export declare function unwrapSteps(item: StepLike): Step<string>[];
-export declare class StepGroup {
-    readonly all: readonly StepLike[];
-    readonly condition?: ConditionLike;
-    readonly dependencies: readonly StepLike[];
-    readonly afterDependencies: readonly StepLike[];
-    constructor(items: readonly StepLike[], init?: {
-        condition?: ConditionLike;
-        dependencies?: readonly StepLike[];
-        afterDependencies?: readonly StepLike[];
-    });
-    if(condition: ConditionLike): StepGroup;
-    dependsOn(...deps: StepLike[]): StepGroup;
-    comesAfter(...deps: StepLike[]): StepGroup;
-}
-export declare function steps(...items: (Step<string> | StepRef<string> | StepGroup | StepConfig)[]): StepGroup;
 //# sourceMappingURL=step.d.ts.map

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

@@ -17,7 +17,7 @@ export function resetStepCounter() {
     stepCounter = 0;
 }
 export class Step {
-    constructor(config, crossJobDeps) {
+    constructor(configOrChildren, crossJobDeps) {
         _Step_id.set(this, void 0);
         Object.defineProperty(this, "config", {
             enumerable: true,
@@ -38,6 +38,25 @@ export class Step {
             writable: true,
             value: void 0
         });
+        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");
         }
@@ -53,6 +72,7 @@ export class Step {
             }
         }
         this.outputs = outputs;
+        this.children = Object.freeze([]);
     }
     get id() {
         return __classPrivateFieldGet(this, _Step_id, "f");
@@ -109,8 +129,20 @@ 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 {
@@ -210,83 +242,11 @@ export function serializeConfigValues(record) {
 export function unwrapStep(item) {
     return item instanceof StepRef ? item.step : item;
 }
-/** Extracts all underlying Steps from a StepLike (recursively for groups). */
+/** Extracts all underlying leaf Steps from a StepLike (recursively for composites). */
 export function unwrapSteps(item) {
-    if (item instanceof StepGroup) {
-        return item.all.flatMap(unwrapSteps);
-    }
-    return [unwrapStep(item)];
-}
-// --- step group ---
-export class StepGroup {
-    constructor(items, init) {
-        Object.defineProperty(this, "all", {
-            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.all = items;
-        this.condition = init?.condition;
-        this.dependencies = init?.dependencies ?? [];
-        this.afterDependencies = init?.afterDependencies ?? [];
-    }
-    if(condition) {
-        const newCond = this.condition != null
-            ? toCondition(condition).and(toCondition(this.condition))
-            : condition;
-        return new StepGroup(this.all, {
-            condition: newCond,
-            dependencies: this.dependencies,
-            afterDependencies: this.afterDependencies,
-        });
-    }
-    dependsOn(...deps) {
-        return new StepGroup(this.all, {
-            condition: this.condition,
-            dependencies: [...this.dependencies, ...deps],
-            afterDependencies: this.afterDependencies,
-        });
-    }
-    comesAfter(...deps) {
-        return new StepGroup(this.all, {
-            condition: this.condition,
-            dependencies: this.dependencies,
-            afterDependencies: [...this.afterDependencies, ...deps],
-        });
-    }
-}
-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 Step || item instanceof StepRef ||
-            item instanceof StepGroup) {
-            created.push(item);
-        }
-        else {
-            created.push(new Step(item));
-        }
+    const s = unwrapStep(item);
+    if (s.children.length > 0) {
+        return s.children.flatMap(unwrapSteps);
     }
-    return new StepGroup(created);
+    return [s];
 }

package/package.json

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