@invarn/cibuild 2.0.3 → 2.0.4

package/dist/src/yaml/steps/ui-fidelity-render.d.ts.map

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

package/dist/src/yaml/steps/ui-fidelity-render.js

@@ -910,29 +910,17 @@ function findAssetCatalogs(root) {
   return found.sort();
 }
 
-function compileAssetCatalogs(packageDir, harnessDir) {
-  var catalogs = findAssetCatalogs(packageDir);
-  if (catalogs.length === 0) return;
-
-  var binResult = runSwift(['build', '--package-path', harnessDir, '--show-bin-path']);
-  if (binResult.status !== 0) {
-    logError('asset-catalog compile skipped: could not resolve the build bin path');
-    return;
-  }
-  var binPath = String(binResult.stdout || '').trim().split('\n').pop().trim();
-  if (!binPath) {
-    logError('asset-catalog compile skipped: empty build bin path');
-    return;
-  }
+// Run actool over the given catalogs, emitting Assets.car into outDir.
+// Best-effort: a failure is logged (warn-and-continue) and rendering proceeds.
+function compileCatalogsInto(catalogs, outDir, label) {
   try {
-    fs.mkdirSync(binPath, { recursive: true });
+    fs.mkdirSync(outDir, { recursive: true });
   } catch (mkdirError) {
     // best effort -- actool reports a missing output dir itself
   }
-
   var args = ['actool'].concat(catalogs);
   args.push(
-    '--compile', binPath,
+    '--compile', outDir,
     '--platform', 'macosx',
     '--minimum-deployment-target', ASSET_CATALOG_MIN_MACOS,
     '--output-format', 'human-readable-text'
@@ -948,12 +936,54 @@ function compileAssetCatalogs(packageDir, harnessDir) {
     var detail = (result.stderr || '') +
       (result.error ? String(result.error.message || result.error) : '');
     logError(
-      'asset-catalog compile failed (continuing; catalog images may not ' +
-        'resolve): ' + sanitizeMessage(detail.trim())
+      'asset-catalog compile failed for ' + label + ' (continuing; catalog ' +
+        'images may not resolve): ' + sanitizeMessage(detail.trim())
     );
+  }
+}
+
+// SwiftUI resolves Image("name") against Bundle.main and
+// Image("name", bundle: .module) against a target's own resource bundle.
+// swift build copies a .process'd .xcassets into the module bundle but never
+// compiles it, and a loose catalog is copied nowhere. So compile twice:
+// the package's source catalogs into the bin dir (= Bundle.main), AND each
+// module bundle's copied catalog in place (= Bundle.module). This covers both
+// reference idioms, so the agent need not know which bundle the renderer uses.
+function compileAssetCatalogs(packageDir, harnessDir) {
+  var sourceCatalogs = findAssetCatalogs(packageDir);
+  if (sourceCatalogs.length === 0) return;
+
+  var binResult = runSwift(['build', '--package-path', harnessDir, '--show-bin-path']);
+  if (binResult.status !== 0) {
+    logError('asset-catalog compile skipped: could not resolve the build bin path');
+    return;
+  }
+  var binPath = String(binResult.stdout || '').trim().split('\n').pop().trim();
+  if (!binPath) {
+    logError('asset-catalog compile skipped: empty build bin path');
     return;
   }
-  log('compiled ' + catalogs.length + ' asset catalog(s) for macOS');
+
+  // Bundle.main: the package's source catalogs, merged into the bin dir.
+  compileCatalogsInto(sourceCatalogs, binPath, 'Bundle.main');
+
+  // Bundle.module: each *.bundle in the bin dir that carries a copied catalog,
+  // compiled in place so Image(..., bundle: .module) resolves.
+  var entries;
+  try {
+    entries = fs.readdirSync(binPath, { withFileTypes: true });
+  } catch (readError) {
+    entries = [];
+  }
+  for (var i = 0; i < entries.length; i++) {
+    var entry = entries[i];
+    if (!entry.isDirectory() || entry.name.slice(-7) !== '.bundle') continue;
+    var bundleDir = path.join(binPath, entry.name);
+    var bundleCatalogs = findAssetCatalogs(bundleDir);
+    if (bundleCatalogs.length > 0) {
+      compileCatalogsInto(bundleCatalogs, bundleDir, entry.name);
+    }
+  }
 }
 `;
 /**

package/dist/src/yaml/steps/ui-fidelity-render.test.js

@@ -68,7 +68,11 @@ const FAKE_SWIFT_LINES = [
     '        *) shift ;;',
     '      esac',
     '    done',
-    '    if [ -n "$showbin" ]; then echo "$pkg/.build/debug"; exit 0; fi',
+    '    if [ -n "$showbin" ]; then',
+    '      bp="$pkg/.build/debug"',
+    '      [ -n "$FAKE_SWIFT_MODULE_CATALOG" ] && mkdir -p "$bp/$FAKE_SWIFT_MODULE_CATALOG.bundle/Media.xcassets"',
+    '      echo "$bp"; exit 0',
+    '    fi',
     '    name="${product:-$target}"',
     '    if [ "$name" = "RenderProbe" ]; then',
     '      if [ -n "$FAKE_SWIFT_PROBE_FAIL" ]; then',
@@ -915,6 +919,29 @@ describe('render script runtime (package_source: repo)', () => {
         expect(xcrunCalls).toContain('--compile');
         expect(xcrunCalls).toContain('--platform macosx');
     });
+    test('also compiles catalogs in module bundles for Bundle.module references', async () => {
+        const project = makeProject({ screens: { HomeView: 'home.png' } });
+        writeReference(project, 'home.png');
+        // Source catalog drives the main-bundle (Bundle.main) compile. The module
+        // bundle — which the fake toolchain materializes to mimic `swift build`
+        // copying a .process resource — must ALSO be compiled in place, or an
+        // Image("name", bundle: .module) reference finds only the raw catalog.
+        const catalog = join(project.packageDir, 'Assets', 'Media.xcassets');
+        mkdirSync(catalog, { recursive: true });
+        writeFileSync(join(catalog, 'Contents.json'), '{}');
+        const script = await buildScript(project, { package_source: 'repo' });
+        const xcrunLog = join(project.dir, 'xcrun-invocations.log');
+        const run = runScript(project, script, {
+            FAKE_XCRUN_LOG: xcrunLog,
+            FAKE_SWIFT_MODULE_CATALOG: 'FixtureViews',
+        });
+        expect(run.status).toBe(0);
+        const calls = readFileSync(xcrunLog, 'utf-8').trim().split('\n');
+        // The module bundle's own catalog is compiled into the bundle directory.
+        const moduleCompile = calls.find((c) => c.includes('.bundle/Media.xcassets'));
+        expect(moduleCompile).toBeTruthy();
+        expect(moduleCompile).toMatch(/--compile \S+\.bundle(\s|$)/);
+    });
     test('does not invoke actool when the package has no asset catalogs', async () => {
         const project = makeProject({ screens: { HomeView: 'home.png' } });
         writeReference(project, 'home.png');

package/package.json

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