@invarn/cibuild 2.0.5 → 2.0.6

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

@@ -1039,8 +1039,11 @@ var TRIM_HELPER_SWIFT = [
   '    return ctx.makeImage()',
   '}',
   '',
-  '// Bounding box of pixels with non-zero alpha, in top-left image coordinates.',
-  'func alphaBoundingBox(_ image: CGImage) -> CGRect? {',
+  '// Bounding box of content: pixels that are neither transparent nor part of a',
+  '// uniform solid background. The background is detected from the four corners',
+  '// (opaque and agreeing within a tight tolerance); when the corners disagree,',
+  '// only transparency is trimmed. Top-left image coordinates.',
+  'func contentBoundingBox(_ image: CGImage) -> CGRect? {',
   '    let w = image.width, h = image.height',
   '    if w == 0 || h == 0 { return nil }',
   '    let bytesPerRow = w * 4',
@@ -1048,11 +1051,36 @@ var TRIM_HELPER_SWIFT = [
   '    let space = CGColorSpaceCreateDeviceRGB()',
   '    guard let ctx = CGContext(data: &data, width: w, height: h, bitsPerComponent: 8, bytesPerRow: bytesPerRow, space: space, bitmapInfo: CGImageAlphaInfo.premultipliedLast.rawValue) else { return nil }',
   '    ctx.draw(image, in: CGRect(x: 0, y: 0, width: w, height: h))',
+  '    // Tight tolerance: exact solid fills match, near-colored content does not.',
+  '    let tolerance = 4',
+  '    func sample(_ x: Int, _ y: Int) -> (Int, Int, Int, Int) {',
+  '        let i = y * bytesPerRow + x * 4',
+  '        return (Int(data[i]), Int(data[i + 1]), Int(data[i + 2]), Int(data[i + 3]))',
+  '    }',
+  '    // Detect a uniform opaque background shared by all four corners.',
+  '    let corners = [sample(0, 0), sample(w - 1, 0), sample(0, h - 1), sample(w - 1, h - 1)]',
+  '    var background: (Int, Int, Int, Int)? = corners[0]',
+  '    for c in corners {',
+  '        if let bg = background {',
+  '            if c.3 == 0 || abs(c.0 - bg.0) > tolerance || abs(c.1 - bg.1) > tolerance || abs(c.2 - bg.2) > tolerance || abs(c.3 - bg.3) > tolerance {',
+  '                background = nil',
+  '            }',
+  '        }',
+  '    }',
   '    var minX = w, minY = h, maxX = -1, maxY = -1',
   '    for y in 0..<h {',
   '        let rowBase = y * bytesPerRow',
   '        for x in 0..<w {',
-  '            if data[rowBase + x * 4 + 3] > 0 {',
+  '            let idx = rowBase + x * 4',
+  '            let a = Int(data[idx + 3])',
+  '            var isMargin = a == 0',
+  '            if !isMargin, let bg = background {',
+  '                let r = Int(data[idx]), g = Int(data[idx + 1]), b = Int(data[idx + 2])',
+  '                if abs(r - bg.0) <= tolerance && abs(g - bg.1) <= tolerance && abs(b - bg.2) <= tolerance && abs(a - bg.3) <= tolerance {',
+  '                    isMargin = true',
+  '                }',
+  '            }',
+  '            if !isMargin {',
   '                if x < minX { minX = x }',
   '                if x > maxX { maxX = x }',
   '                if y < minY { minY = y }',
@@ -1075,8 +1103,8 @@ var TRIM_HELPER_SWIFT = [
   '    FileHandle.standardError.write(Data(("could not read image at " + inputPath).utf8))',
   '    exit(65)',
   '}',
-  'guard let box = alphaBoundingBox(image) else {',
-  '    FileHandle.standardError.write(Data("image is fully transparent; nothing to trim".utf8))',
+  'guard let box = contentBoundingBox(image) else {',
+  '    FileHandle.standardError.write(Data("no content to trim (image is uniform)".utf8))',
   '    exit(66)',
   '}',
   'guard let cropped = image.cropping(to: box) else {',
@@ -1106,8 +1134,9 @@ var TRIM_HELPER_SWIFT = [
   '    }',
   '}',
   '',
-  '// Report: rendered (trimmed) px then reference px (0 0 when unavailable).',
-  'print("TRIMDIMS " + String(croppedWidth) + " " + String(croppedHeight) + " " + String(referenceWidth) + " " + String(referenceHeight))'
+  '// Report: rendered (trimmed) px, reference px (0 0 when unavailable), then',
+  '// the pre-trim source px so the caller can log how much margin was removed.',
+  'print("TRIMDIMS " + String(croppedWidth) + " " + String(croppedHeight) + " " + String(referenceWidth) + " " + String(referenceHeight) + " " + String(image.width) + " " + String(image.height))'
 ].join('\n') + '\n';
 
 // Write the helper into the harness dir once (idempotent across screens).
@@ -1124,15 +1153,23 @@ function roundTwo(value) {
   return Math.round(value * 100) / 100;
 }
 
-// Parse the helper's "TRIMDIMS <rW> <rH> <refW> <refH>" line (last one wins).
+// Parse the helper's "TRIMDIMS <rW> <rH> <refW> <refH> <srcW> <srcH>" line
+// (rendered/reference/source px; last one wins).
 function parseTrimDims(stdout) {
   var lines = String(stdout || '').split('\n');
   for (var i = lines.length - 1; i >= 0; i--) {
     var parts = lines[i].trim().split(/\s+/);
-    if (parts[0] === 'TRIMDIMS' && parts.length >= 5) {
-      var nums = [Number(parts[1]), Number(parts[2]), Number(parts[3]), Number(parts[4])];
+    if (parts[0] === 'TRIMDIMS' && parts.length >= 7) {
+      var nums = [
+        Number(parts[1]), Number(parts[2]), Number(parts[3]),
+        Number(parts[4]), Number(parts[5]), Number(parts[6]),
+      ];
       if (nums.every(function (n) { return Number.isFinite(n); })) {
-        return { rendered: [nums[0], nums[1]], reference: [nums[2], nums[3]] };
+        return {
+          rendered: [nums[0], nums[1]],
+          reference: [nums[2], nums[3]],
+          source: [nums[4], nums[5]],
+        };
       }
     }
   }
@@ -1171,6 +1208,12 @@ function trimRenderedImage(entry, renderedPath, harnessDir) {
       logical_pt: [roundTwo(dims.rendered[0] / scale), roundTwo(dims.rendered[1] / scale)],
       reference_px: dims.reference[0] > 0 && dims.reference[1] > 0 ? dims.reference : null,
     };
+    // Surface how much margin was removed -- a no-op (source == rendered) means
+    // the view fills an opaque canvas with no transparent or uniform margin.
+    log(
+      'trimmed ' + entry.screen + ': ' + dims.source[0] + 'x' + dims.source[1] +
+        ' -> ' + dims.rendered[0] + 'x' + dims.rendered[1]
+    );
   }
   if (fs.existsSync(alignedPath)) {
     entry.aligned_image_path = alignedRelative;

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

@@ -116,7 +116,8 @@ const FAKE_SWIFT_LINES = [
     // 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). FAKE_TRIM_FAIL exercises warn-and-continue.
+    // 320x640, reference 160x320, source 400x800). FAKE_TRIM_FAIL exercises
+    // warn-and-continue.
     '    if [ -n "$FAKE_TRIM_FAIL" ]; then echo "trim: simulated failure" >&2; exit 1; fi',
     '    in_png="$1"; out_png="$2"; aligned_png="$3"',
     "    printf '\\x89PNG\\r\\n\\x1a\\n' > \"$out_png\"",
@@ -125,7 +126,7 @@ const FAKE_SWIFT_LINES = [
     "      printf '\\x89PNG\\r\\n\\x1a\\n' > \"$aligned_png\"",
     '      printf \'aligned:%s\' "$(basename "$in_png")" >> "$aligned_png"',
     '    fi',
-    '    echo "TRIMDIMS 320 640 160 320"',
+    '    echo "TRIMDIMS 320 640 160 320 400 800"',
     '    exit 0 ;;',
     '  *)',
     '    exit 0 ;;',
@@ -1030,6 +1031,15 @@ describe('render output trimming (package_source variants)', () => {
             reference_px: [160, 320],
         });
     });
+    test('logs how much margin the trim removed (source -> rendered)', async () => {
+        const project = makeProject({ screens: { HomeView: 'home.png' } });
+        writeReference(project, 'home.png');
+        const run = runScript(project, await buildScript(project, { package_source: 'repo' }));
+        expect(run.status).toBe(0);
+        // The pre-trim source size and the trimmed size are both surfaced, so a
+        // no-op trim (an opaque-canvas wrapper) is visible in the build log.
+        expect(run.stdout).toContain('trimmed HomeView: 400x800 -> 320x640');
+    });
     test('a failing trim warns but still renders (warn-and-continue)', 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.5",
+  "version": "2.0.6",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",