@invarn/cibuild 1.7.0 → 1.8.0

package/dist/src/commands/build.d.ts

@@ -1,5 +1,48 @@
+export interface SetupOptions {
+    keystore: boolean;
+    keystoreProperties: boolean;
+    googleServices: boolean;
+    googlePlayDeploy: boolean;
+    googlePlayPackageName: string;
+    /** Whether the release workflow should produce an AAB or APK. Defaults to 'apk'. */
+    artifactType: 'apk' | 'aab';
+    /** Resolved keystore file paths per workflow (relative to project root), if found on disk. */
+    keystorePaths: Record<string, string>;
+}
+export interface WorkflowVariantConfig {
+    /** Value for the VARIANT env var, e.g. "debug", "release", "stagingDebug". */
+    variant: string;
+    /** Capitalised build type for gradle-build inputs, e.g. "Debug", "Release", "StagingDebug". */
+    buildType: string;
+    /** Gradle assemble task, e.g. "assembleDebug", "assembleRelease", "assembleStagingDebug". */
+    gradleTask: string;
+}
+export interface WorkflowVariants {
+    primary: WorkflowVariantConfig;
+    pullRequest: WorkflowVariantConfig;
+    release: WorkflowVariantConfig;
+}
+export interface IosWorkflowSchemeConfig {
+    scheme: string;
+    configuration: string;
+    distributionMethod: string;
+}
+export interface IosWorkflowVariants {
+    primary: IosWorkflowSchemeConfig;
+    pullRequest: IosWorkflowSchemeConfig;
+    release: IosWorkflowSchemeConfig;
+}
+export interface IosSetupOptions {
+    cocoaPods: boolean;
+    codeSigning: boolean;
+    appStoreDeploy: boolean;
+    bundleId: string;
+}
+export declare function generateAndroidPipeline(javaVersion?: number, setup?: SetupOptions, variants?: WorkflowVariants, cacheTechnology?: "gradle" | "kmm", metaNamespace?: 'invarn' | 'cibuild.io'): string;
+export declare function generateIosPipeline(projectPath: string, setup: IosSetupOptions, variants: IosWorkflowVariants, metaNamespace?: 'invarn' | 'cibuild.io'): string;
 export declare function handleBuildCommand(detectMobileProjectRoot: (dir: string) => "android" | "ios" | "kmm" | null, options?: {
     createPipelinesDir?: boolean;
     nonInteractive?: boolean;
+    metaNamespace?: 'invarn' | 'cibuild.io';
 }): Promise<void>;
 //# sourceMappingURL=build.d.ts.map

package/dist/src/commands/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAm8BA,wBAAsB,kBAAkB,CACtC,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,EAC1E,OAAO,GAAE;IAAE,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAAC,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GACvE,OAAO,CAAC,IAAI,CAAC,CA4Bf"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/commands/build.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,OAAO,CAAC;IAClB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,oFAAoF;IACpF,YAAY,EAAE,KAAK,GAAG,KAAK,CAAC;IAC5B,8FAA8F;IAC9F,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,qBAAqB;IACpC,8EAA8E;IAC9E,OAAO,EAAE,MAAM,CAAC;IAChB,+FAA+F;IAC/F,SAAS,EAAE,MAAM,CAAC;IAClB,6FAA6F;IAC7F,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,qBAAqB,CAAC;IAC/B,WAAW,EAAE,qBAAqB,CAAC;IACnC,OAAO,EAAE,qBAAqB,CAAC;CAChC;AAiBD,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,uBAAuB,CAAC;IACjC,WAAW,EAAE,uBAAuB,CAAC;IACrC,OAAO,EAAE,uBAAuB,CAAC;CAClC;AAED,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,EAAE,OAAO,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAoJD,wBAAgB,uBAAuB,CACrC,WAAW,GAAE,MAAW,EACxB,KAAK,GAAE,YAAgL,EACvL,QAAQ,GAAE,gBAAmC,EAC7C,eAAe,GAAE,QAAQ,GAAG,KAAgB,EAC5C,aAAa,GAAE,QAAQ,GAAG,YAA2B,GACpD,MAAM,CA2NR;AAED,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,MAAM,EACnB,KAAK,EAAE,eAAe,EACtB,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,GAAE,QAAQ,GAAG,YAA2B,GACpD,MAAM,CA4LR;AAgVD,wBAAsB,kBAAkB,CACtC,uBAAuB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,SAAS,GAAG,KAAK,GAAG,KAAK,GAAG,IAAI,EAC1E,OAAO,GAAE;IACP,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC;CACpC,GACL,OAAO,CAAC,IAAI,CAAC,CA4Bf"}

package/dist/src/commands/build.js

@@ -122,7 +122,7 @@ function detectSetupNeeds(warnings) {
         artifactType: 'apk',
     };
 }
-function generateAndroidPipeline(javaVersion = 17, setup = { keystore: false, keystoreProperties: false, googleServices: false, googlePlayDeploy: false, googlePlayPackageName: '', artifactType: 'apk', keystorePaths: {} }, variants = DEFAULT_VARIANTS, cacheTechnology = "gradle") {
+export function generateAndroidPipeline(javaVersion = 17, setup = { keystore: false, keystoreProperties: false, googleServices: false, googlePlayDeploy: false, googlePlayPackageName: '', artifactType: 'apk', keystorePaths: {} }, variants = DEFAULT_VARIANTS, cacheTechnology = "gradle", metaNamespace = 'cibuild.io') {
     const keystoreStepFor = (wf) => {
         if (!setup.keystore)
             return "";
@@ -204,7 +204,7 @@ function generateAndroidPipeline(javaVersion = 17, setup = { keystore: false, ke
     return `format_version: '1'
 
 meta:
-  cibuild.io:
+  ${metaNamespace}:
     stack: ${stack}
     machine_type: standard
     platform: ${platformMeta}
@@ -333,7 +333,7 @@ ${googlePlayStep}
               fi
 `;
 }
-function generateIosPipeline(projectPath, setup, variants) {
+export function generateIosPipeline(projectPath, setup, variants, metaNamespace = 'cibuild.io') {
     const { primary: pv, pullRequest: prv, release: rv } = variants;
     // Global scheme is the primary scheme (used as default across workflows)
     const globalScheme = pv.scheme;
@@ -409,7 +409,7 @@ function generateIosPipeline(projectPath, setup, variants) {
     return `format_version: '1'
 
 meta:
-  cibuild.io:
+  ${metaNamespace}:
     stack: macos-xcode-26.4
     machine_type: performance
     platform: ios
@@ -771,7 +771,7 @@ async function handleIosBuildCommand(cwd, options = {}) {
         }
     }
     // 7. Generate and write the pipeline
-    const yaml = generateIosPipeline(iosScanResult.projectPath, iosSetupOptions, iosVariants);
+    const yaml = generateIosPipeline(iosScanResult.projectPath, iosSetupOptions, iosVariants, options.metaNamespace);
     writeFileSync(outputPath, yaml, "utf-8");
     console.log("\n✅ Generated .ci/pipelines/cibuild.yml");
     console.log("   Platform: iOS");
@@ -1042,7 +1042,7 @@ async function handleAndroidBuildCommand(cwd, options, cacheTechnology) {
     // that exact JDK — a newer JDK can cross-compile. Enforce a minimum of 17
     // since ubuntu-latest runners ship with JDK 17+ and JDK <17 is unavailable.
     const javaVersion = Math.max(scanResult.detectedJavaVersion ?? 17, 17);
-    const yaml = generateAndroidPipeline(javaVersion, setupOptions, variants, cacheTechnology);
+    const yaml = generateAndroidPipeline(javaVersion, setupOptions, variants, cacheTechnology, options.metaNamespace);
     writeFileSync(outputPath, yaml, "utf-8");
     console.log("\n✅ Generated .ci/pipelines/cibuild.yml");
     console.log(`   Platform: ${platformLabel}`);

package/dist/src/commands/build.test.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Unit tests for the YAML scaffold generators in build.ts.
+ *
+ * `generateIosPipeline` and `generateAndroidPipeline` are pure
+ * functions today (input → YAML string), so we drive them directly
+ * rather than through the interactive `handleBuildCommand` shell.
+ *
+ * Focus is the meta-namespace flip: standalone `cibuild` callers get
+ * `meta.cibuild.io:` (default), while invarn-CLI-routed calls pass
+ * `metaNamespace: 'invarn'` and get `meta.invarn:`.
+ */
+export {};
+//# sourceMappingURL=build.test.d.ts.map

package/dist/src/commands/build.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"build.test.d.ts","sourceRoot":"","sources":["../../../src/commands/build.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG"}

package/dist/src/commands/build.test.js

@@ -0,0 +1,59 @@
+/**
+ * Unit tests for the YAML scaffold generators in build.ts.
+ *
+ * `generateIosPipeline` and `generateAndroidPipeline` are pure
+ * functions today (input → YAML string), so we drive them directly
+ * rather than through the interactive `handleBuildCommand` shell.
+ *
+ * Focus is the meta-namespace flip: standalone `cibuild` callers get
+ * `meta.cibuild.io:` (default), while invarn-CLI-routed calls pass
+ * `metaNamespace: 'invarn'` and get `meta.invarn:`.
+ */
+import { describe, test, expect } from '@jest/globals';
+import { generateIosPipeline, generateAndroidPipeline, } from './build.js';
+const iosSetup = {
+    cocoaPods: false,
+    codeSigning: false,
+    appStoreDeploy: false,
+    bundleId: 'com.example.app',
+};
+const iosVariants = {
+    primary: { scheme: 'MyApp', configuration: 'Debug', distributionMethod: 'development' },
+    pullRequest: { scheme: 'MyApp', configuration: 'Debug', distributionMethod: 'development' },
+    release: { scheme: 'MyApp', configuration: 'Release', distributionMethod: 'app-store' },
+};
+describe('generateIosPipeline — meta namespace', () => {
+    test('emits meta.cibuild.io: by default (standalone cibuild path)', () => {
+        const yaml = generateIosPipeline('./MyApp', iosSetup, iosVariants);
+        expect(yaml).toContain('meta:\n  cibuild.io:\n');
+        expect(yaml).not.toContain('meta:\n  invarn:\n');
+    });
+    test('emits meta.cibuild.io: when explicitly passed "cibuild.io"', () => {
+        const yaml = generateIosPipeline('./MyApp', iosSetup, iosVariants, 'cibuild.io');
+        expect(yaml).toContain('meta:\n  cibuild.io:\n');
+        expect(yaml).not.toContain('meta:\n  invarn:\n');
+    });
+    test('emits meta.invarn: when explicitly passed "invarn" (invarn-CLI path)', () => {
+        const yaml = generateIosPipeline('./MyApp', iosSetup, iosVariants, 'invarn');
+        expect(yaml).toContain('meta:\n  invarn:\n');
+        expect(yaml).not.toContain('meta:\n  cibuild.io:\n');
+    });
+});
+describe('generateAndroidPipeline — meta namespace', () => {
+    test('emits meta.cibuild.io: by default (standalone cibuild path)', () => {
+        const yaml = generateAndroidPipeline();
+        expect(yaml).toContain('meta:\n  cibuild.io:\n');
+        expect(yaml).not.toContain('meta:\n  invarn:\n');
+    });
+    test('emits meta.cibuild.io: when explicitly passed "cibuild.io"', () => {
+        const yaml = generateAndroidPipeline(17, undefined, undefined, 'gradle', 'cibuild.io');
+        expect(yaml).toContain('meta:\n  cibuild.io:\n');
+        expect(yaml).not.toContain('meta:\n  invarn:\n');
+    });
+    test('emits meta.invarn: when explicitly passed "invarn" (invarn-CLI path)', () => {
+        const yaml = generateAndroidPipeline(17, undefined, undefined, 'gradle', 'invarn');
+        expect(yaml).toContain('meta:\n  invarn:\n');
+        expect(yaml).not.toContain('meta:\n  cibuild.io:\n');
+    });
+});
+//# sourceMappingURL=build.test.js.map

package/dist/src/commands/init.d.ts

@@ -1,6 +1,13 @@
 export interface InitOptions {
     importPath?: string;
     create?: boolean;
+    /**
+     * Which namespace to emit in the generated `meta.<ns>` block of the new
+     * pipeline YAML. Defaults to `'cibuild.io'` so the standalone `cibuild`
+     * CLI keeps emitting the legacy namespace. Invarn-CLI-routed calls pass
+     * `'invarn'` so wrapped flows emit the canonical Invarn namespace.
+     */
+    metaNamespace?: 'invarn' | 'cibuild.io';
 }
 /**
  * Check dependencies, then either import an existing YAML pipeline or

package/dist/src/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAUD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA0Q7E"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../src/commands/init.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,WAAW;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,YAAY,CAAC;CACzC;AAUD;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2Q7E"}

package/dist/src/commands/init.js

@@ -189,6 +189,7 @@ export async function handleInitCommand(opts = {}) {
         await handleBuildCommand(detectMobileProjectRoot, {
             createPipelinesDir: true,
             nonInteractive: !!opts.create,
+            metaNamespace: opts.metaNamespace,
         });
         process.exit(0);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "1.7.0",
+  "version": "1.8.0",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",