@invarn/cibuild 1.6.2 → 1.8.0

package/dist/src/yaml/platform-detector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"platform-detector.d.ts","sourceRoot":"","sources":["../../../src/yaml/platform-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAElG,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAMD;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,YAAY,CAAS;gBAEjB,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM;IAMhF;;;;;;;;OAQG;IACH,WAAW,IAAI,QAAQ;IAmBvB;;;OAGG;IACH,QAAQ,IAAI,MAAM,GAAG,IAAI;IAIzB;;;OAGG;IACH,cAAc,IAAI,WAAW,GAAG,IAAI;IAIpC;;;OAGG;IACH,eAAe,IAAI,YAAY;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAchC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAqC3B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAkBxB;;;;OAIG;IACH,OAAO,CAAC,aAAa;CAOtB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,QAAQ,CAQrF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,YAAY,CAQ7F"}
+{"version":3,"file":"platform-detector.d.ts","sourceRoot":"","sources":["../../../src/yaml/platform-detector.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAGlG,qBAAa,sBAAuB,SAAQ,KAAK;gBACnC,OAAO,EAAE,MAAM;CAI5B;AAMD;;GAEG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,QAAQ,CAAe;IAC/B,OAAO,CAAC,YAAY,CAAS;gBAEjB,QAAQ,EAAE,YAAY,EAAE,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM;IAMhF;;;;;;;;OAQG;IACH,WAAW,IAAI,QAAQ;IAmBvB;;;OAGG;IACH,QAAQ,IAAI,MAAM,GAAG,IAAI;IAIzB;;;OAGG;IACH,cAAc,IAAI,WAAW,GAAG,IAAI;IAIpC;;;OAGG;IACH,eAAe,IAAI,YAAY;IAQ/B;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAchC;;;;OAIG;IACH,OAAO,CAAC,mBAAmB;IAqC3B;;;;OAIG;IACH,OAAO,CAAC,gBAAgB;IAkBxB;;;;OAIG;IACH,OAAO,CAAC,aAAa;CAOtB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,QAAQ,CAQrF;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,GAAG,YAAY,CAQ7F"}

package/dist/src/yaml/platform-detector.js

@@ -2,6 +2,7 @@
  * Platform detection logic for YAML pipelines
  * Implements 3-tier priority detection: stack → platform → auto-detect from steps
  */
+import { getInvarnMeta } from './meta-helpers.js';
 export class PlatformDetectionError extends Error {
     constructor(message) {
         super(message);
@@ -25,7 +26,7 @@ export class PlatformDetector {
     }
     /**
      * Detects the platform using 3-tier priority detection
-     * Priority 1: meta.cibuild.io.stack
+     * Priority 1: meta.invarn.stack (preferred), falling back to meta.cibuild.io.stack
      * Priority 2: meta.platform
      * Priority 3: auto-detect from workflow steps
      *
@@ -33,9 +34,9 @@ export class PlatformDetector {
      * @throws PlatformDetectionError if detection fails or mixed platforms detected
      */
     getPlatform() {
-        // Priority 1: Extract from meta.cibuild.io.stack
-        if (this.pipeline.meta?.['cibuild.io']?.stack) {
-            const stack = this.pipeline.meta['cibuild.io'].stack;
+        // Priority 1: Extract from stack on the Invarn-owned meta block
+        const stack = getInvarnMeta(this.pipeline)?.stack;
+        if (stack) {
             const platform = this.extractPlatformFromStack(stack);
             if (platform) {
                 return platform;
@@ -53,14 +54,14 @@ export class PlatformDetector {
      * @returns Stack identifier (e.g., 'macos-xcode-26.4') or null
      */
     getStack() {
-        return this.pipeline.meta?.['cibuild.io']?.stack ?? null;
+        return getInvarnMeta(this.pipeline)?.stack ?? null;
     }
     /**
      * Gets the machine type if specified
      * @returns Machine type ('standard' or 'performance') or null
      */
     getMachineType() {
-        return this.pipeline.meta?.['cibuild.io']?.machine_type ?? null;
+        return getInvarnMeta(this.pipeline)?.machine_type ?? null;
     }
     /**
      * Gets complete platform information

package/dist/src/yaml/platform-detector.test.js

@@ -46,6 +46,117 @@ describe('PlatformDetector', () => {
             expect(detector.getMachineType()).toBe('standard');
         });
     });
+    describe('Priority 1: Extract from meta.invarn.stack', () => {
+        test('should detect macOS from meta.invarn stack when only invarn is present', () => {
+            const pipeline = {
+                format_version: '4',
+                meta: {
+                    invarn: {
+                        stack: 'macos-xcode-26.4',
+                        machine_type: 'standard',
+                    },
+                },
+                workflows: {
+                    primary: {
+                        steps: [{ 'script@1.0.0': { inputs: { content: 'echo "test"' } } }],
+                    },
+                },
+            };
+            const detector = new PlatformDetector(pipeline, pipeline.workflows.primary, 'primary');
+            expect(detector.getPlatform()).toBe('macos');
+            expect(detector.getStack()).toBe('macos-xcode-26.4');
+            expect(detector.getMachineType()).toBe('standard');
+        });
+        test('should prefer meta.invarn over meta.cibuild.io when both are present', () => {
+            const pipeline = {
+                format_version: '4',
+                meta: {
+                    invarn: {
+                        stack: 'macos-xcode-26.4',
+                        machine_type: 'performance',
+                    },
+                    'cibuild.io': {
+                        stack: 'linux-docker-android-22.04',
+                        machine_type: 'standard',
+                    },
+                },
+                workflows: {
+                    primary: {
+                        steps: [{ 'script@1.0.0': { inputs: {} } }],
+                    },
+                },
+            };
+            const detector = new PlatformDetector(pipeline, pipeline.workflows.primary, 'primary');
+            expect(detector.getPlatform()).toBe('macos');
+            expect(detector.getStack()).toBe('macos-xcode-26.4');
+            expect(detector.getMachineType()).toBe('performance');
+        });
+        test('should expose meta.invarn fields via getPlatformInfo()', () => {
+            const pipeline = {
+                format_version: '4',
+                meta: {
+                    invarn: {
+                        stack: 'linux-docker-android-22.04',
+                        machine_type: 'performance',
+                    },
+                },
+                workflows: {
+                    primary: {
+                        steps: [{ 'script@1.0.0': { inputs: {} } }],
+                    },
+                },
+            };
+            const detector = new PlatformDetector(pipeline, pipeline.workflows.primary, 'primary');
+            const info = detector.getPlatformInfo();
+            expect(info.platform).toBe('linux');
+            expect(info.stack).toBe('linux-docker-android-22.04');
+            expect(info.machineType).toBe('performance');
+        });
+        test('should treat a partial meta.invarn block as the sole source — meta.cibuild.io is ignored field-by-field', () => {
+            // PRD: "When both are present, meta.invarn wins." Block-level precedence — once
+            // meta.invarn appears, the legacy meta.cibuild.io block is treated as stale and ignored.
+            const pipeline = {
+                format_version: '4',
+                meta: {
+                    invarn: {
+                        stack: 'macos-xcode-26.4',
+                    },
+                    'cibuild.io': {
+                        stack: 'linux-docker-android-22.04',
+                        machine_type: 'performance',
+                    },
+                },
+                workflows: {
+                    primary: {
+                        steps: [{ 'script@1.0.0': { inputs: {} } }],
+                    },
+                },
+            };
+            const detector = new PlatformDetector(pipeline, pipeline.workflows.primary, 'primary');
+            expect(detector.getStack()).toBe('macos-xcode-26.4');
+            expect(detector.getMachineType()).toBeNull();
+        });
+        test('should fall back to meta.cibuild.io when meta.invarn is absent (backward-compat lock-in)', () => {
+            const pipeline = {
+                format_version: '4',
+                meta: {
+                    'cibuild.io': {
+                        stack: 'macos-xcode-26.4',
+                        machine_type: 'performance',
+                    },
+                },
+                workflows: {
+                    primary: {
+                        steps: [{ 'script@1.0.0': { inputs: {} } }],
+                    },
+                },
+            };
+            const detector = new PlatformDetector(pipeline, pipeline.workflows.primary, 'primary');
+            expect(detector.getPlatform()).toBe('macos');
+            expect(detector.getStack()).toBe('macos-xcode-26.4');
+            expect(detector.getMachineType()).toBe('performance');
+        });
+    });
     describe('Priority 2: Use meta.platform field', () => {
         test('should use meta.platform when stack not specified', () => {
             const pipeline = {

package/dist/src/yaml/types.d.ts

@@ -14,6 +14,7 @@ export interface YAMLCIBuildMeta {
     cachedBuild?: boolean;
 }
 export interface YAMLMeta {
+    invarn?: YAMLCIBuildMeta;
     'cibuild.io'?: YAMLCIBuildMeta;
     'bitrise.io'?: YAMLCIBuildMeta;
     platform?: Platform;

package/dist/src/yaml/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/yaml/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,QAAQ;IACvB,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAGD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAGD,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;CACrB;AAGD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAGD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/yaml/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,OAAO,CAAC;AACzC,MAAM,MAAM,WAAW,GAAG,UAAU,GAAG,aAAa,CAAC;AAGrD,MAAM,WAAW,UAAU;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB;AAGD,MAAM,WAAW,eAAe;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,WAAW,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;IAC/C,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,QAAQ;IACvB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,YAAY,CAAC,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAGD,MAAM,WAAW,cAAc;IAC7B,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAGD,MAAM,WAAW,QAAQ;IACvB,CAAC,mBAAmB,EAAE,MAAM,GAAG;QAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,cAAc,CAAC;QACxB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAGD,MAAM,WAAW,YAAY;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACpB,KAAK,EAAE,QAAQ,EAAE,CAAC;CACnB;AAGD,MAAM,WAAW,OAAO;IACtB,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;CACrB;AAGD,MAAM,WAAW,WAAW;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0BAA0B,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAGD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,SAAS,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,CAAA;KAAE,CAAC;IAC5C,WAAW,CAAC,EAAE,WAAW,EAAE,CAAC;CAC7B;AAGD,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAGD,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B"}

package/package.json

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