@invarn/cibuild 1.4.1 → 1.4.3

package/dist/src/shared/detect-project.js

@@ -0,0 +1,53 @@
+import { existsSync, readdirSync, statSync } from "node:fs";
+import { resolve } from "node:path";
+/**
+ * Detects whether the given directory is the root of an Android, iOS, or
+ * KMM project. Returns the detected project type, or null if none match.
+ *
+ * KMM is checked before Android because both have Gradle files; KMM is
+ * distinguished by the presence of an `iosApp/`, `shared/`, or
+ * `composeApp/` directory alongside the Gradle files.
+ */
+export function detectMobileProjectRoot(dir) {
+    const androidIndicators = [
+        "build.gradle",
+        "build.gradle.kts",
+        "settings.gradle",
+        "settings.gradle.kts",
+        "gradlew",
+    ];
+    const hasAndroidIndicator = androidIndicators.some((f) => existsSync(resolve(dir, f)));
+    if (hasAndroidIndicator) {
+        const kmmIndicators = ["iosApp", "shared", "composeApp"];
+        const hasKmmIndicator = kmmIndicators.some((d) => {
+            const fullPath = resolve(dir, d);
+            try {
+                return existsSync(fullPath) && statSync(fullPath).isDirectory();
+            }
+            catch {
+                return false;
+            }
+        });
+        if (hasKmmIndicator)
+            return "kmm";
+        return "android";
+    }
+    const iosFileIndicators = ["Podfile"];
+    const hasIosFile = iosFileIndicators.some((f) => existsSync(resolve(dir, f)));
+    if (!hasIosFile) {
+        try {
+            const entries = readdirSync(dir);
+            const hasXcodeDir = entries.some((e) => e.endsWith(".xcodeproj") || e.endsWith(".xcworkspace"));
+            if (hasXcodeDir)
+                return "ios";
+        }
+        catch {
+            // Unreadable directory — fall through.
+        }
+    }
+    else {
+        return "ios";
+    }
+    return null;
+}
+//# sourceMappingURL=detect-project.js.map

package/dist/src/shared/gitignore.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Ensures CI Build runtime files are listed in .gitignore. Safe to call
+ * repeatedly — only appends entries that are missing.
+ */
+export declare function ensureCiBuildGitignoreEntries(cwd: string): void;
+//# sourceMappingURL=gitignore.d.ts.map

package/dist/src/shared/gitignore.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitignore.d.ts","sourceRoot":"","sources":["../../../src/shared/gitignore.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAiB/D"}

package/dist/src/shared/gitignore.js

@@ -0,0 +1,26 @@
+import { appendFileSync, existsSync, readFileSync, writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+/**
+ * Ensures CI Build runtime files are listed in .gitignore. Safe to call
+ * repeatedly — only appends entries that are missing.
+ */
+export function ensureCiBuildGitignoreEntries(cwd) {
+    const gitignorePath = resolve(cwd, ".gitignore");
+    const gitignoreEntries = [".cibuild-secrets.json", ".ci/.envstore.json", ".ci/keys/", "build/"];
+    if (existsSync(gitignorePath)) {
+        const contents = readFileSync(gitignorePath, "utf-8");
+        const lines = contents.split("\n").map((l) => l.trim());
+        const toAdd = gitignoreEntries.filter((e) => !lines.includes(e));
+        if (toAdd.length > 0) {
+            appendFileSync(gitignorePath, `\n${toAdd.join("\n")}\n`);
+            for (const entry of toAdd) {
+                console.log(`✅ Added ${entry} to .gitignore`);
+            }
+        }
+    }
+    else {
+        writeFileSync(gitignorePath, `${gitignoreEntries.join("\n")}\n`);
+        console.log(`✅ Created .gitignore with CI Build entries`);
+    }
+}
+//# sourceMappingURL=gitignore.js.map

package/dist/src/shared/prompts.d.ts

@@ -0,0 +1,18 @@
+import type { YAMLPipeline } from "../yaml/types.js";
+import type { CIConfig } from "../types.js";
+/**
+ * Shows an interactive workflow picker. If exactly one workflow exists,
+ * returns it without prompting. Returns `undefined` when the user cancels
+ * or no workflows are defined.
+ */
+export declare function promptForWorkflow(workflows: string[]): Promise<string | undefined>;
+/**
+ * Runs pre-execution validation, separates issues into user-fillable
+ * (missing env vars) vs hard-blocking, and collects all missing values
+ * upfront in a single form-like pass before execution begins.
+ *
+ * @returns true if it's safe to proceed, false if the user cancelled or
+ *   hard errors exist.
+ */
+export declare function promptForMissingVariables(yamlPipeline: YAMLPipeline, workflowName: string, config: CIConfig, yamlFilePath: string): Promise<boolean>;
+//# sourceMappingURL=prompts.d.ts.map

package/dist/src/shared/prompts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/shared/prompts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA0BxF;AAED;;;;;;;GAOG;AACH,wBAAsB,yBAAyB,CAC7C,YAAY,EAAE,YAAY,EAC1B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,QAAQ,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC,CAgFlB"}

package/dist/src/shared/prompts.js

@@ -0,0 +1,96 @@
+import prompts from "prompts";
+import { StepValidator, formatValidationResult } from "../yaml/step-validator.js";
+import { MissingEnvHandler } from "../yaml/missing-env-handler.js";
+import { MissingEnvironmentVariableError } from "../yaml/env-resolver.js";
+/**
+ * Shows an interactive workflow picker. If exactly one workflow exists,
+ * returns it without prompting. Returns `undefined` when the user cancels
+ * or no workflows are defined.
+ */
+export async function promptForWorkflow(workflows) {
+    if (workflows.length === 0) {
+        console.error("Error: No workflows found in pipeline file");
+        return undefined;
+    }
+    if (workflows.length === 1) {
+        console.log(`Using workflow: ${workflows[0]}\n`);
+        return workflows[0];
+    }
+    const response = await prompts({
+        type: "select",
+        name: "workflow",
+        message: "Select a workflow to run:",
+        choices: workflows.map((name) => ({ title: name, value: name })),
+        initial: 0,
+    });
+    if (!response.workflow) {
+        console.log("\nWorkflow selection cancelled");
+        return undefined;
+    }
+    console.log();
+    return response.workflow;
+}
+/**
+ * Runs pre-execution validation, separates issues into user-fillable
+ * (missing env vars) vs hard-blocking, and collects all missing values
+ * upfront in a single form-like pass before execution begins.
+ *
+ * @returns true if it's safe to proceed, false if the user cancelled or
+ *   hard errors exist.
+ */
+export async function promptForMissingVariables(yamlPipeline, workflowName, config, yamlFilePath) {
+    console.log(`\n🔍 Running pre-execution validation...`);
+    const validator = new StepValidator(yamlPipeline, workflowName, config, yamlFilePath);
+    const result = await validator.validateWorkflow();
+    const errorIssues = result.issues.filter((i) => i.requirement.severity === "error" && i.result && !i.result.passed);
+    const fillable = errorIssues.filter((i) => i.requirement.timing === "pre-execution" &&
+        (i.requirement.category === "environment" || i.requirement.category === "input"));
+    const blocking = errorIssues.filter((i) => !(i.requirement.timing === "pre-execution" &&
+        (i.requirement.category === "environment" || i.requirement.category === "input")));
+    if (blocking.length > 0) {
+        console.log(formatValidationResult(result));
+        return false;
+    }
+    if (fillable.length === 0) {
+        if (result.counts.warnings > 0 || result.counts.info > 0) {
+            console.log(formatValidationResult(result));
+        }
+        else {
+            console.log("✅ Pre-execution validation passed\n");
+        }
+        return true;
+    }
+    console.log(`\n${fillable.length} required value(s) missing — provide them to continue:\n`);
+    for (const issue of fillable) {
+        const stepInfo = issue.stepName ? `  needed by: ${issue.stepName}` : "";
+        console.log(`  • ${issue.requirement.name.padEnd(30)}${stepInfo}`);
+    }
+    console.log();
+    const handler = new MissingEnvHandler({
+        interactive: true,
+        workflow: workflowName,
+    });
+    for (let i = 0; i < fillable.length; i++) {
+        const issue = fillable[i];
+        const error = new MissingEnvironmentVariableError(issue.requirement.name, issue.stepName, issue.requirement.hint);
+        const original = console.log;
+        const label = `(${i + 1} of ${fillable.length})`;
+        let patched = false;
+        console.log = (...args) => {
+            if (!patched && typeof args[0] === "string" && args[0].includes("MISSING REQUIRED")) {
+                original(`║  MISSING REQUIRED ENVIRONMENT VARIABLE ${label.padEnd(28)}║`);
+                patched = true;
+                return;
+            }
+            original(...args);
+        };
+        const handleResult = await handler.handleMissingVariable(error);
+        console.log = original;
+        if (handleResult.cancelled) {
+            return false;
+        }
+    }
+    handler.close();
+    return true;
+}
+//# sourceMappingURL=prompts.js.map

package/dist/src/yaml/steps/cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cache.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAUrD,CAAC;AAoBF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAoGzF,iBAAiB;CA2FhC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAwJzF,iBAAiB;CA6FhC"}
+{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cache.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAExD;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,yGAAyG;IACzG,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAUrD,CAAC;AAoBF;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAoGzF,iBAAiB;CAoGhC;AAED;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;YAwJzF,iBAAiB;CAoGhC"}

package/dist/src/yaml/steps/cache.js

@@ -131,14 +131,21 @@ export class CachePullStepExecutor extends BaseStepExecutor {
         commands.push(`CACHE_DIR="${this.escapeBash(config.paths.cacheDir)}"`);
         commands.push('mkdir -p "$CACHE_DIR"');
         commands.push('');
+        // Helper: resolve lockfile path — checks exact path first, then searches
+        // recursively (handles SPM Package.resolved inside .xcodeproj/.xcworkspace)
+        commands.push('__ci_find_lockfile() {');
+        commands.push('  if [ -f "$1" ]; then echo "$1"; return; fi');
+        commands.push('  find . -name "$(basename "$1")" -not -path "*/DerivedData/*" -not -path "*/.build/*" 2>/dev/null | head -1');
+        commands.push('}');
+        commands.push('');
         if (chain.length === 1) {
             const preset = chain[0];
-            commands.push(`LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
-            commands.push('if [ -f "$LOCKFILE" ]; then');
+            commands.push(`LOCKFILE=$(__ci_find_lockfile "${this.escapeBash(preset.lockfile)}")`);
+            commands.push('if [ -n "$LOCKFILE" ] && [ -f "$LOCKFILE" ]; then');
             commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
             commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
             commands.push('else');
-            commands.push(`  echo "Warning: $LOCKFILE not found, using fallback cache key"`);
+            commands.push(`  echo "Warning: ${this.escapeBash(preset.lockfile)} not found, using fallback cache key"`);
             commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-no-lockfile"`);
             commands.push('fi');
         }
@@ -147,8 +154,9 @@ export class CachePullStepExecutor extends BaseStepExecutor {
             for (let i = 0; i < chain.length; i++) {
                 const preset = chain[i];
                 const cond = i === 0 ? 'if' : 'elif';
-                commands.push(`${cond} [ -f "${this.escapeBash(preset.lockfile)}" ]; then`);
-                commands.push(`  LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
+                commands.push(`__ci_lockfile_candidate=$(__ci_find_lockfile "${this.escapeBash(preset.lockfile)}")`);
+                commands.push(`${cond} [ -n "$__ci_lockfile_candidate" ] && [ -f "$__ci_lockfile_candidate" ]; then`);
+                commands.push('  LOCKFILE="$__ci_lockfile_candidate"');
                 commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
                 commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
                 if (isDebugMode) {
@@ -341,14 +349,19 @@ export class CachePushStepExecutor extends BaseStepExecutor {
         commands.push(`CACHE_DIR="${this.escapeBash(config.paths.cacheDir)}"`);
         commands.push('mkdir -p "$CACHE_DIR"');
         commands.push('');
+        commands.push('__ci_find_lockfile() {');
+        commands.push('  if [ -f "$1" ]; then echo "$1"; return; fi');
+        commands.push('  find . -name "$(basename "$1")" -not -path "*/DerivedData/*" -not -path "*/.build/*" 2>/dev/null | head -1');
+        commands.push('}');
+        commands.push('');
         if (chain.length === 1) {
             const preset = chain[0];
-            commands.push(`LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
-            commands.push('if [ -f "$LOCKFILE" ]; then');
+            commands.push(`LOCKFILE=$(__ci_find_lockfile "${this.escapeBash(preset.lockfile)}")`);
+            commands.push('if [ -n "$LOCKFILE" ] && [ -f "$LOCKFILE" ]; then');
             commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
             commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
             commands.push('else');
-            commands.push(`  echo "Warning: $LOCKFILE not found, using fallback cache key"`);
+            commands.push(`  echo "Warning: ${this.escapeBash(preset.lockfile)} not found, using fallback cache key"`);
             commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-no-lockfile"`);
             commands.push('fi');
         }
@@ -356,8 +369,9 @@ export class CachePushStepExecutor extends BaseStepExecutor {
             for (let i = 0; i < chain.length; i++) {
                 const preset = chain[i];
                 const cond = i === 0 ? 'if' : 'elif';
-                commands.push(`${cond} [ -f "${this.escapeBash(preset.lockfile)}" ]; then`);
-                commands.push(`  LOCKFILE="${this.escapeBash(preset.lockfile)}"`);
+                commands.push(`__ci_lockfile_candidate=$(__ci_find_lockfile "${this.escapeBash(preset.lockfile)}")`);
+                commands.push(`${cond} [ -n "$__ci_lockfile_candidate" ] && [ -f "$__ci_lockfile_candidate" ]; then`);
+                commands.push('  LOCKFILE="$__ci_lockfile_candidate"');
                 commands.push(`  CHECKSUM=$(shasum -a 256 "$LOCKFILE" | cut -d ' ' -f1 | head -c 16)`);
                 commands.push(`  CACHE_KEY="${this.escapeBash(preset.keyPrefix)}-\${CHECKSUM}"`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "1.4.1",
+  "version": "1.4.3",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",
@@ -9,6 +9,10 @@
     "./lib": {
       "import": "./dist/src/lib.js",
       "types": "./dist/src/lib.d.ts"
+    },
+    "./commands": {
+      "import": "./dist/src/commands/index.js",
+      "types": "./dist/src/commands/index.d.ts"
     }
   },
   "bin": {
@@ -48,7 +52,8 @@
   },
   "homepage": "https://github.com/invarnhq/cibuild",
   "dependencies": {
-    "js-yaml": "^4.1.0"
+    "js-yaml": "^4.1.0",
+    "prompts": "^2.4.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
@@ -59,7 +64,6 @@
     "esbuild": "^0.27.3",
     "javascript-obfuscator": "^5.3.0",
     "jest": "^29.7.0",
-    "prompts": "^2.4.2",
     "ts-jest": "^29.4.6",
     "typescript": "^5.7.2"
   }