@invarn/cibuild 2.3.8 → 2.4.1

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

@@ -15,7 +15,7 @@
  * Swift toolchain (macOS with Xcode required, slow).
  */
 import { describe, test, expect, afterAll } from '@jest/globals';
-import { spawnSync } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import { gzipSync } from 'node:zlib';
 import { chmodSync, existsSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, realpathSync, rmSync, writeFileSync, } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -111,15 +111,24 @@ const FAKE_SWIFT_LINES = [
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out\"",
     '    printf \'fake-render:%s\' "$screen" >> "$out"',
     '    exit 0 ;;',
-    '  *.swift)',
-    // Script-interpreter mode (swift <Trim.swift> <in> <out> <aligned> <ref>):
-    // stands in for the CoreGraphics trim helper. Overwrites <out> with a PNG
-    // marked "trimmed:<in basename>" and writes an "aligned:<in basename>" PNG so
-    // tests can prove both outputs. Emits a fixed TRIMDIMS line (rendered
-    // 320x640, reference 160x320, source 400x800). FAKE_TRIM_FAIL exercises
-    // warn-and-continue.
+    '  *)',
+    '    exit 0 ;;',
+    'esac',
+];
+/**
+ * PATH-shimmed fake `ci`, providing only the branch the shared trim stage
+ * uses: `ci fidelity-trim <in> <out> <aligned> <ref>`. Overwrites <out> with a
+ * PNG marked "trimmed:<in basename>" and writes an "aligned:<in basename>" PNG
+ * so tests can prove both outputs. Emits a fixed TRIMDIMS line (rendered
+ * 320x640, reference 160x320, source 400x800). FAKE_TRIM_FAIL exercises
+ * warn-and-continue.
+ */
+const FAKE_CI_LINES = [
+    '#!/bin/bash',
+    'case "$1" in',
+    '  fidelity-trim)',
     '    if [ -n "$FAKE_TRIM_FAIL" ]; then echo "trim: simulated failure" >&2; exit 1; fi',
-    '    in_png="$1"; out_png="$2"; aligned_png="$3"',
+    '    in_png="$2"; out_png="$3"; aligned_png="$4"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out_png\"",
     '    printf \'trimmed:%s\' "$(basename "$in_png")" >> "$out_png"',
     '    if [ -n "$aligned_png" ]; then',
@@ -128,8 +137,7 @@ const FAKE_SWIFT_LINES = [
     '    fi',
     '    echo "TRIMDIMS 320 640 160 320 400 800"',
     '    exit 0 ;;',
-    '  *)',
-    '    exit 0 ;;',
+    '  *) exit 0 ;;',
     'esac',
 ];
 /**
@@ -186,6 +194,9 @@ function makeProject(params) {
     const xcrunPath = join(binDir, 'xcrun');
     writeFileSync(xcrunPath, FAKE_XCRUN_LINES.join('\n') + '\n');
     chmodSync(xcrunPath, 0o755);
+    const ciPath = join(binDir, 'ci');
+    writeFileSync(ciPath, FAKE_CI_LINES.join('\n') + '\n');
+    chmodSync(ciPath, 0o755);
     if (params !== undefined) {
         writeFileSync(join(dir, '.ci', 'inputs', 'params.json'), typeof params === 'string' ? params : JSON.stringify(params));
     }
@@ -231,7 +242,9 @@ function makeTarGz(entries) {
     const blocks = [];
     for (const entry of entries) {
         const isDir = entry.name.endsWith('/');
-        const content = Buffer.from(entry.content ?? '', 'utf-8');
+        const content = Buffer.isBuffer(entry.content)
+            ? entry.content
+            : Buffer.from(entry.content ?? '', 'utf-8');
         blocks.push(tarHeader(entry.name, isDir ? 0 : content.length, isDir ? '5' : '0'));
         if (!isDir && content.length > 0) {
             const padded = Buffer.alloc(Math.ceil(content.length / 512) * 512);
@@ -439,6 +452,157 @@ describe('package_source input', () => {
         expect(inputsNames).toEqual(['swift', 'tar']);
     });
 });
+// Clone-free package delivery (fidelity-linux 03): the dispatched YAML carries
+// a signed package_url; the runtime downloads it to .ci/inputs/package.tar.gz
+// and proceeds like inputs mode, resolving each screen's committed reference
+// INSIDE the extracted package (repo-relative path minus the package_path
+// prefix) — there is no checkout on a clone-free worker. Mirrors the Android
+// step's url mode so both platform kinds accept the same dispatched inputs.
+describe('package_source: url', () => {
+    /**
+     * Serve one tar.gz (or a 404) from a loopback HTTP server IN A CHILD
+     * PROCESS. runScript executes the generated script via spawnSync, which
+     * blocks this process's event loop — an in-process server would deadlock
+     * against the script's curl.
+     */
+    const SERVE_PACKAGE_SRC = [
+        "var http = require('http');",
+        "var fs = require('fs');",
+        'var filePath = process.argv[1];',
+        'var server = http.createServer(function (req, res) {',
+        "  if (filePath === '-') { res.statusCode = 404; res.end('gone'); return; }",
+        "  res.setHeader('content-type', 'application/gzip');",
+        '  res.end(fs.readFileSync(filePath));',
+        '});',
+        "server.listen(0, '127.0.0.1', function () {",
+        "  console.log('PORT ' + server.address().port);",
+        '});',
+    ].join('\n');
+    async function servePackage(archive) {
+        let filePath = '-';
+        if (archive !== null) {
+            const dir = mkdtempSync(join(tmpdir(), 'ui-fidelity-url-serve-'));
+            tempDirs.push(dir);
+            filePath = join(dir, 'package.tar.gz');
+            writeFileSync(filePath, archive);
+        }
+        const child = spawn('node', ['-e', SERVE_PACKAGE_SRC, filePath], {
+            stdio: ['ignore', 'pipe', 'inherit'],
+        });
+        const port = await new Promise((resolvePort, rejectPort) => {
+            let buffered = '';
+            const timer = setTimeout(() => rejectPort(new Error('package server did not start')), 10_000);
+            child.stdout.on('data', (chunk) => {
+                buffered += chunk.toString();
+                const match = /PORT (\d+)/.exec(buffered);
+                if (match) {
+                    clearTimeout(timer);
+                    resolvePort(Number(match[1]));
+                }
+            });
+            child.on('exit', () => rejectPort(new Error('package server exited early')));
+        });
+        return {
+            url: `http://127.0.0.1:${port}/api/fidelity/packages/blob1?exp=1&sig=ab`,
+            close: () => new Promise((resolveClose) => {
+                child.once('exit', () => resolveClose(undefined));
+                child.kill('SIGKILL');
+            }),
+        };
+    }
+    /** Archive shaped like the dashboard's assembly: package-dir contents at the
+     *  archive root, committed references under references/. */
+    function packagedProjectWithReference() {
+        return makeTarGz([
+            ...shippedPackageEntries(''),
+            {
+                name: 'references/home.png',
+                content: Buffer.concat([PNG_MAGIC, Buffer.from('ref:url-home')]),
+            },
+        ]);
+    }
+    test('package_source url requires package_url and package_path', async () => {
+        const executor = new UiFidelityRenderStepExecutor();
+        await expect(executor.execute({ package_source: 'url', package_path: 'ios-pkg' }, {}, testConfig)).rejects.toThrow(/package_url/);
+        await expect(executor.execute({ package_source: 'url', package_url: 'https://x.test/p' }, {}, testConfig)).rejects.toThrow(/package_path/);
+    });
+    test('rejects reference_source alongside package_source url', async () => {
+        const executor = new UiFidelityRenderStepExecutor();
+        await expect(executor.execute({
+            package_source: 'url',
+            package_url: 'https://x.test/p',
+            package_path: 'ios-pkg',
+            reference_source: 'repo',
+        }, {}, testConfig)).rejects.toThrow(/reference_source/);
+    });
+    test('url mode requires swift, tar, and curl', () => {
+        const executor = new UiFidelityRenderStepExecutor();
+        const names = executor
+            .getValidationRequirements({ package_source: 'url' }, {}, testConfig)
+            .map((requirement) => requirement.name);
+        expect(names).toEqual(['swift', 'tar', 'curl']);
+    });
+    test('downloads the package, renders, and resolves references inside it', async () => {
+        const project = makeProject({ screens: { HomeView: 'ios-pkg/references/home.png' } });
+        const served = await servePackage(packagedProjectWithReference());
+        try {
+            const executor = new UiFidelityRenderStepExecutor();
+            const step = await executor.execute({ package_source: 'url', package_url: served.url, package_path: 'ios-pkg' }, {}, testConfig);
+            const run = runScript(project, step.script);
+            expect(run.status).toBe(0);
+            const doc = readResult(project);
+            expect(doc.package_source).toBe('url');
+            const screen = doc.screens.find((s) => s.screen === 'HomeView');
+            expect(screen?.status).toBe('rendered');
+            expect(screen?.reference_image_path).toBe('ui-fidelity/references/HomeView.png');
+            expect(isPng(artifact(project, 'ui-fidelity/references/HomeView.png'))).toBe(true);
+        }
+        finally {
+            await served.close();
+        }
+    });
+    test('a failed download is one structured build error, not per-screen noise', async () => {
+        const project = makeProject({ screens: { HomeView: 'ios-pkg/references/home.png' } });
+        const served = await servePackage(null); // 404
+        try {
+            const executor = new UiFidelityRenderStepExecutor();
+            const step = await executor.execute({ package_source: 'url', package_url: served.url, package_path: 'ios-pkg' }, {}, testConfig);
+            const run = runScript(project, step.script);
+            expect(run.status).not.toBe(0);
+            const doc = readResult(project);
+            expect(doc.error?.code).toBe('PACKAGE_DOWNLOAD_FAILED');
+            const screen = doc.screens.find((s) => s.screen === 'HomeView');
+            expect(screen?.error).toBeNull();
+            expectNoAbsolutePathLeaks(project, doc);
+        }
+        finally {
+            await served.close();
+        }
+    });
+    test('a reference outside the package directory fails that screen only', async () => {
+        const project = makeProject({
+            screens: {
+                HomeView: 'ios-pkg/references/home.png',
+                Stray: 'design/elsewhere/stray.png',
+            },
+        });
+        const served = await servePackage(packagedProjectWithReference());
+        try {
+            const executor = new UiFidelityRenderStepExecutor();
+            const step = await executor.execute({ package_source: 'url', package_url: served.url, package_path: 'ios-pkg' }, {}, testConfig);
+            const run = runScript(project, step.script, { FAKE_SWIFT_RUN_SILENT: 'Stray' });
+            expect(run.status).not.toBe(0);
+            const doc = readResult(project);
+            expect(doc.screens.find((s) => s.screen === 'HomeView')?.status).toBe('rendered');
+            const stray = doc.screens.find((s) => s.screen === 'Stray');
+            expect(stray?.status).toBe('render_failed');
+            expect(stray?.error?.code).toBe('REFERENCE_MISSING');
+        }
+        finally {
+            await served.close();
+        }
+    });
+});
 describe('render size and scale parsing', () => {
     test('default render size is 393x852 device points', () => {
         expect(DEFAULT_RENDER_SIZE).toBe('393x852');
@@ -1016,20 +1180,14 @@ describe('render output trimming (package_source variants)', () => {
     function readArtifact(project, relative) {
         return readFileSync(artifact(project, relative), 'utf-8');
     }
-    test('trims the rendered PNG in place via the Swift helper', async () => {
+    test('trims the rendered PNG in place via the ci fidelity-trim helper', async () => {
         const project = makeProject({ screens: { HomeView: 'home.png' } });
         writeReference(project, 'home.png');
         const script = await buildScript(project, { package_source: 'repo' });
-        const logPath = join(project.dir, 'swift-invocations.log');
-        const run = runScript(project, script, { FAKE_SWIFT_LOG: logPath });
+        const run = runScript(project, script);
         expect(run.status).toBe(0);
-        // The helper is invoked in script mode with the rendered PNG as in and out
-        // (in-place overwrite), after the render run.
-        const invocations = readFileSync(logPath, 'utf-8').trim().split('\n');
-        const trimCall = invocations.find((c) => c.includes('Trim.swift'));
-        expect(trimCall).toBeTruthy();
-        expect(trimCall).toContain('ui-fidelity/rendered/HomeView.png');
-        // The rendered file now holds the trim helper's output, not the raw render.
+        // The rendered file now holds the trim helper's output, not the raw render
+        // (the fake ci overwrites in place, proving the in/out in-place contract).
         expect(isPng(artifact(project, 'ui-fidelity/rendered/HomeView.png'))).toBe(true);
         expect(readArtifact(project, 'ui-fidelity/rendered/HomeView.png')).toContain('trimmed:HomeView.png');
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "2.3.8",
+  "version": "2.4.1",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",
@@ -55,12 +55,14 @@
   "homepage": "https://github.com/invarnhq/cibuild",
   "dependencies": {
     "js-yaml": "^4.1.0",
+    "pngjs": "7.0.0",
     "prompts": "^2.4.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^22.10.1",
+    "@types/pngjs": "6.0.5",
     "@types/prompts": "^2.4.9",
     "@yao-pkg/pkg": "^6.14.1",
     "esbuild": "^0.27.3",