@invarn/cibuild 2.0.2 → 2.0.3

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

@@ -865,6 +865,97 @@ function cleanupShippedPackage() {
   shippedExtractDir = null;
 }
 `;
+/**
+ * Runtime support for asset catalogs (package_source variants only).
+ *
+ * `swift build` copies a target's .xcassets into its resource bundle but never
+ * runs actool, so SwiftUI's Image("name") finds no compiled catalog and the
+ * image does not resolve. After the harness builds, compile every .xcassets in
+ * the package with actool into the harness bin directory (= the render
+ * executable's Bundle.main), so unmodified Image("name") references resolve.
+ * One actool invocation over all catalogs (it merges them). Best-effort:
+ * a compile failure is logged and rendering continues -- the affected images
+ * simply will not appear, which the human comparing the screens will see.
+ */
+const RENDER_SCRIPT_ASSET_CATALOG_STAGE = String.raw `
+// ---- asset-catalog stage (package_source variants) ----
+
+var ASSET_CATALOG_MIN_MACOS = '13.0';
+
+// Recursively collect *.xcassets directories under root, skipping .build and
+// the catalogs' own contents (a catalog is a leaf for this scan).
+function findAssetCatalogs(root) {
+  var found = [];
+  var stack = [root];
+  while (stack.length > 0) {
+    var dir = stack.pop();
+    var entries;
+    try {
+      entries = fs.readdirSync(dir, { withFileTypes: true });
+    } catch (readError) {
+      continue;
+    }
+    for (var i = 0; i < entries.length; i++) {
+      var entry = entries[i];
+      if (!entry.isDirectory()) continue;
+      if (entry.name === '.build') continue;
+      var full = path.join(dir, entry.name);
+      if (entry.name.slice(-9) === '.xcassets') {
+        found.push(full);
+      } else {
+        stack.push(full);
+      }
+    }
+  }
+  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;
+  }
+  try {
+    fs.mkdirSync(binPath, { recursive: true });
+  } catch (mkdirError) {
+    // best effort -- actool reports a missing output dir itself
+  }
+
+  var args = ['actool'].concat(catalogs);
+  args.push(
+    '--compile', binPath,
+    '--platform', 'macosx',
+    '--minimum-deployment-target', ASSET_CATALOG_MIN_MACOS,
+    '--output-format', 'human-readable-text'
+  );
+  log('xcrun ' + args.join(' '));
+  var result = cp.spawnSync('xcrun', args, {
+    encoding: 'utf-8',
+    maxBuffer: 16 * 1024 * 1024,
+  });
+  if (result.stdout) process.stdout.write(result.stdout);
+  if (result.stderr) process.stderr.write(result.stderr);
+  if (result.error || result.status !== 0) {
+    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())
+    );
+    return;
+  }
+  log('compiled ' + catalogs.length + ' asset catalog(s) for macOS');
+}
+`;
 /**
  * Replaces exactly one occurrence of `anchor` in `source`. Throws when the
  * anchor is missing or ambiguous, so any drift between the v1 runtime text
@@ -966,6 +1057,12 @@ function buildPackageSourceMain() {
         '  }\n');
     // The shipped-package stage is defined ahead of main().
     main = replaceOnce(main, 'function main() {', RENDER_SCRIPT_PACKAGE_STAGE + '\nfunction main() {');
+    // Asset-catalog stage: define the helpers ahead of renderWithHarness, then
+    // compile any catalogs once the package has proven it builds (after the
+    // probe) and before the per-screen renders that depend on the images.
+    main = replaceOnce(main, 'function renderWithHarness(renderable, packagePath) {', RENDER_SCRIPT_ASSET_CATALOG_STAGE + '\nfunction renderWithHarness(renderable, packagePath) {');
+    main = replaceOnce(main, '    renderable.forEach(function (entry) {', '    compileAssetCatalogs(packagePath, harnessDir);\n\n' +
+        '    renderable.forEach(function (entry) {');
     return main;
 }
 const RENDER_SCRIPT_MAIN_WITH_PACKAGE_SOURCE = buildPackageSourceMain();

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

@@ -58,15 +58,17 @@ const FAKE_SWIFT_LINES = [
     '    printf \'{"name":"shipped-package","products":[%s]}\\n\' "$json"',
     '    exit 0 ;;',
     '  build)',
-    '    product=""; target=""; pkg=""',
+    '    product=""; target=""; pkg=""; showbin=""',
     '    while [ $# -gt 0 ]; do',
     '      case "$1" in',
     '        --product) product="$2"; shift 2 ;;',
     '        --target) target="$2"; shift 2 ;;',
     '        --package-path) pkg="$2"; shift 2 ;;',
+    '        --show-bin-path) showbin=1; shift ;;',
     '        *) shift ;;',
     '      esac',
     '    done',
+    '    if [ -n "$showbin" ]; then echo "$pkg/.build/debug"; exit 0; fi',
     '    name="${product:-$target}"',
     '    if [ "$name" = "RenderProbe" ]; then',
     '      if [ -n "$FAKE_SWIFT_PROBE_FAIL" ]; then',
@@ -109,6 +111,35 @@ const FAKE_SWIFT_LINES = [
     '    exit 0 ;;',
     'esac',
 ];
+/**
+ * PATH-shimmed fake `xcrun` covering `xcrun actool`. Logs its args to
+ * $FAKE_XCRUN_LOG, writes a stub Assets.car into the --compile directory,
+ * and fails (exit 1) when FAKE_ACTOOL_FAIL is set so the warn-and-continue
+ * path is exercisable.
+ */
+const FAKE_XCRUN_LINES = [
+    '#!/bin/bash',
+    '[ -n "$FAKE_XCRUN_LOG" ] && echo "$*" >> "$FAKE_XCRUN_LOG"',
+    'sub="$1"; shift',
+    'case "$sub" in',
+    '  actool)',
+    '    out=""',
+    '    while [ $# -gt 0 ]; do',
+    '      case "$1" in',
+    '        --compile) out="$2"; shift 2 ;;',
+    '        *) shift ;;',
+    '      esac',
+    '    done',
+    '    if [ -n "$FAKE_ACTOOL_FAIL" ]; then',
+    '      echo "error: actool: malformed asset catalog" >&2',
+    '      exit 1',
+    '    fi',
+    '    [ -n "$out" ] && mkdir -p "$out" && printf \'fake-car\' > "$out/Assets.car"',
+    '    exit 0 ;;',
+    '  *)',
+    '    exit 0 ;;',
+    'esac',
+];
 const tempDirs = [];
 afterAll(() => {
     for (const dir of tempDirs) {
@@ -131,6 +162,9 @@ function makeProject(params) {
     const swiftPath = join(binDir, 'swift');
     writeFileSync(swiftPath, FAKE_SWIFT_LINES.join('\n') + '\n');
     chmodSync(swiftPath, 0o755);
+    const xcrunPath = join(binDir, 'xcrun');
+    writeFileSync(xcrunPath, FAKE_XCRUN_LINES.join('\n') + '\n');
+    chmodSync(xcrunPath, 0o755);
     if (params !== undefined) {
         writeFileSync(join(dir, '.ci', 'inputs', 'params.json'), typeof params === 'string' ? params : JSON.stringify(params));
     }
@@ -862,6 +896,47 @@ describe('render script runtime (package_source: repo)', () => {
             ],
         });
     });
+    test('compiles asset catalogs found in the package before rendering', async () => {
+        const project = makeProject({ screens: { HomeView: 'home.png' } });
+        writeReference(project, 'home.png');
+        // A catalog at the package root: SwiftPM ignores it, so the renderer must
+        // compile it with actool for Image("name") to resolve at render time.
+        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 });
+        expect(run.status).toBe(0);
+        expect(isPng(artifact(project, 'ui-fidelity/rendered/HomeView.png'))).toBe(true);
+        const xcrunCalls = readFileSync(xcrunLog, 'utf-8');
+        expect(xcrunCalls).toContain('actool');
+        expect(xcrunCalls).toContain('Media.xcassets');
+        expect(xcrunCalls).toContain('--compile');
+        expect(xcrunCalls).toContain('--platform macosx');
+    });
+    test('does not invoke actool when the package has no asset catalogs', async () => {
+        const project = makeProject({ screens: { HomeView: 'home.png' } });
+        writeReference(project, 'home.png');
+        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 });
+        expect(run.status).toBe(0);
+        expect(isPng(artifact(project, 'ui-fidelity/rendered/HomeView.png'))).toBe(true);
+        expect(existsSync(xcrunLog)).toBe(false);
+    });
+    test('a failing asset-catalog compile warns but still renders (warn-and-continue)', async () => {
+        const project = makeProject({ screens: { HomeView: 'home.png' } });
+        writeReference(project, 'home.png');
+        const catalog = join(project.packageDir, 'Media.xcassets');
+        mkdirSync(catalog, { recursive: true });
+        writeFileSync(join(catalog, 'Contents.json'), '{}');
+        const script = await buildScript(project, { package_source: 'repo' });
+        const run = runScript(project, script, { FAKE_ACTOOL_FAIL: '1' });
+        expect(run.status).toBe(0);
+        expect(isPng(artifact(project, 'ui-fidelity/rendered/HomeView.png'))).toBe(true);
+        expect(run.stderr).toContain('asset-catalog compile failed');
+    });
 });
 describe('render script runtime (package_source: inputs)', () => {
     test('renders every screen from a shipped archive with a single package root', async () => {

package/package.json

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