@invarn/cibuild 2.2.6 → 2.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAyCH;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAs5C7C"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA4CH;;;GAGG;AACH,wBAAgB,sBAAsB,IAAI,IAAI,CAq7C7C"}
@@ -24,8 +24,8 @@ import { BitriseSlackStepExecutor } from './bitrise-slack.js';
24
24
  import { BitriseApkInfoStepExecutor } from './bitrise-apk-info.js';
25
25
  import { GooglePlayDeployStepExecutor } from './google-play-deploy.js';
26
26
  import { AppStoreDeployStepExecutor } from './app-store-deploy.js';
27
- import { UiFidelityRenderStepExecutor, DEFAULT_RENDER_SIZE, DEFAULT_SCALE, DEFAULT_PACKAGE_SOURCE, } from './ui-fidelity-render.js';
28
- import { UiFidelityRenderAndroidStepExecutor, DEFAULT_GRADLE_TASK, } from './ui-fidelity-render-android.js';
27
+ import { UiFidelityRenderStepExecutor, DEFAULT_RENDER_SIZE, DEFAULT_SCALE, DEFAULT_PACKAGE_SOURCE, DEFAULT_REFERENCE_SOURCE, } from './ui-fidelity-render.js';
28
+ import { UiFidelityRenderAndroidStepExecutor, DEFAULT_GRADLE_TASK, DEFAULT_PACKAGE_SOURCE as DEFAULT_ANDROID_PACKAGE_SOURCE, DEFAULT_REFERENCE_SOURCE as DEFAULT_ANDROID_REFERENCE_SOURCE, } from './ui-fidelity-render-android.js';
29
29
  /**
30
30
  * Initializes the step registry with all available steps
31
31
  * This function should be called once at application startup
@@ -771,6 +771,13 @@ export function initializeStepRegistry() {
771
771
  required: false,
772
772
  default: DEFAULT_PACKAGE_SOURCE,
773
773
  },
774
+ reference_source: {
775
+ description: "Where each screen's reference image comes from: 'inputs' (default — a " +
776
+ "basename in the run-inputs directory) or 'repo' (a repo-relative path to " +
777
+ 'a committed reference, resolved against the checkout)',
778
+ required: false,
779
+ default: DEFAULT_REFERENCE_SOURCE,
780
+ },
774
781
  package_path: {
775
782
  description: "Path to the user's SwiftPM package containing the screens. " +
776
783
  "Required when package_source is 'repo' (the default); ignored with 'inputs'",
@@ -804,6 +811,26 @@ export function initializeStepRegistry() {
804
811
  'via Roborazzi + Robolectric on the JVM (no device, no emulator)',
805
812
  platform: 'android',
806
813
  inputs: {
814
+ package_source: {
815
+ description: "Where the Gradle render project comes from: 'inputs' (default — " +
816
+ "package.tar.gz shipped in the run-inputs directory) or 'repo' " +
817
+ '(package_path in the checkout, rendered directly without an upload)',
818
+ required: false,
819
+ default: DEFAULT_ANDROID_PACKAGE_SOURCE,
820
+ },
821
+ reference_source: {
822
+ description: "Where each screen's reference image comes from: 'inputs' (default — a " +
823
+ "basename in the run-inputs directory) or 'repo' (a repo-relative path to " +
824
+ 'a committed reference, resolved against the checkout)',
825
+ required: false,
826
+ default: DEFAULT_ANDROID_REFERENCE_SOURCE,
827
+ },
828
+ package_path: {
829
+ description: 'Repo-relative path to the committed Gradle render project. Required ' +
830
+ "when package_source is 'repo'; ignored with 'inputs'",
831
+ required: false,
832
+ inputType: 'path',
833
+ },
807
834
  scale: {
808
835
  description: 'Display scale factor used when reporting logical points; must match the ' +
809
836
  'density qualifier the render test pins (xhdpi = 2)',
@@ -70,6 +70,23 @@ export interface UiFidelityRenderAndroidInputs {
70
70
  * it in whichever subproject declares it.
71
71
  */
72
72
  export declare const DEFAULT_GRADLE_TASK = "recordRoborazziDebug";
73
+ /** Valid values for the package_source input. */
74
+ export declare const PACKAGE_SOURCES: readonly ["repo", "inputs"];
75
+ export type PackageSource = (typeof PACKAGE_SOURCES)[number];
76
+ /**
77
+ * Default package source: the Gradle project ships as package.tar.gz in the
78
+ * run-inputs directory (the agent-upload path). "repo" instead renders the
79
+ * committed project at package_path, for a triggered (agent-less) run.
80
+ */
81
+ export declare const DEFAULT_PACKAGE_SOURCE: PackageSource;
82
+ /** Valid values for the reference_source input. */
83
+ export declare const REFERENCE_SOURCES: readonly ["repo", "inputs"];
84
+ export type ReferenceSource = (typeof REFERENCE_SOURCES)[number];
85
+ /**
86
+ * Default reference source: references arrive as run inputs (a plain basename
87
+ * under `.ci/inputs`), matching the agent-upload path.
88
+ */
89
+ export declare const DEFAULT_REFERENCE_SOURCE: ReferenceSource;
73
90
  /** Basename of the shipped Gradle-project archive inside the run-inputs dir. */
74
91
  export declare const PACKAGE_ARCHIVE_BASENAME = "package.tar.gz";
75
92
  /** Renderer identifier recorded in protocol-result.json. */
@@ -84,10 +101,31 @@ export declare function isValidGradleTask(task: string): boolean;
84
101
  export interface AndroidRenderScriptConfig {
85
102
  scale: number;
86
103
  gradleTask: string;
104
+ /**
105
+ * Only present (and only ever "repo") when package_source was explicitly set
106
+ * to "repo". When absent, the project ships as package.tar.gz and is
107
+ * extracted/validated exactly as the default, byte-identical script.
108
+ */
109
+ packageSource?: PackageSource;
110
+ /**
111
+ * Repo-relative path to the committed Gradle project. Present (and required)
112
+ * only with packageSource "repo"; ignored otherwise.
113
+ */
114
+ packagePath?: string;
115
+ /**
116
+ * Only present (and only ever "repo") when reference_source was explicitly set
117
+ * to "repo". When absent, references are read from `.ci/inputs/<basename>` and
118
+ * the generated reference-sourcing code is byte-identical to the default.
119
+ */
120
+ referenceSource?: ReferenceSource;
87
121
  }
88
122
  /**
89
123
  * Generates the self-contained runtime node script for the step. Pure function
90
124
  * of its config — exported so tests can execute the script directly.
125
+ *
126
+ * When config.referenceSource is absent the reference block is byte-identical
127
+ * to the default (JSON.stringify drops the undefined key, and the unpatched
128
+ * runtime is used).
91
129
  */
92
130
  export declare function generateAndroidRenderScript(config: AndroidRenderScriptConfig): string;
93
131
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"ui-fidelity-render-android.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-render-android.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAKpE,sDAAsD;AACtD,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,yBAAyB,CAAC;AAE1D,gFAAgF;AAChF,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AAEzD,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,8EAA8E;AAC9E,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;CACpB;AA8xBD;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAYrF;AAED;;;GAGG;AACH,qBAAa,mCAAoC,SAAQ,gBAAgB;IACvE,yBAAyB,CACvB,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAepB,OAAO,CACX,MAAM,EAAE,6BAA6B,EACrC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAgBpB"}
1
+ {"version":3,"file":"ui-fidelity-render-android.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-render-android.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgDG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAKpE,sDAAsD;AACtD,MAAM,WAAW,6BAA6B;IAC5C;;;;OAIG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,eAAO,MAAM,mBAAmB,yBAAyB,CAAC;AAE1D,iDAAiD;AACjD,eAAO,MAAM,eAAe,6BAA8B,CAAC;AAC3D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAAwB,CAAC;AAE9D,mDAAmD;AACnD,eAAO,MAAM,iBAAiB,6BAA8B,CAAC;AAC7D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,wBAAwB,EAAE,eAA0B,CAAC;AAElE,gFAAgF;AAChF,eAAO,MAAM,wBAAwB,mBAAmB,CAAC;AAEzD,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,0BAA0B,CAAC;AAExD;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,8EAA8E;AAC9E,MAAM,WAAW,yBAAyB;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;OAIG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAC9B;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC;AAq5BD;;;;;;;GAOG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,CAoBrF;AAED;;;GAGG;AACH,qBAAa,mCAAoC,SAAQ,gBAAgB;IACvE,yBAAyB,CACvB,OAAO,EAAE,6BAA6B,EACtC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAepB,OAAO,CACX,MAAM,EAAE,6BAA6B,EACrC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CA0EpB"}
@@ -56,6 +56,21 @@ import { RENDER_SCRIPT_FACTS_STAGE, RENDER_SCRIPT_GEOMETRY_STAGE } from './struc
56
56
  * it in whichever subproject declares it.
57
57
  */
58
58
  export const DEFAULT_GRADLE_TASK = 'recordRoborazziDebug';
59
+ /** Valid values for the package_source input. */
60
+ export const PACKAGE_SOURCES = ['repo', 'inputs'];
61
+ /**
62
+ * Default package source: the Gradle project ships as package.tar.gz in the
63
+ * run-inputs directory (the agent-upload path). "repo" instead renders the
64
+ * committed project at package_path, for a triggered (agent-less) run.
65
+ */
66
+ export const DEFAULT_PACKAGE_SOURCE = 'inputs';
67
+ /** Valid values for the reference_source input. */
68
+ export const REFERENCE_SOURCES = ['repo', 'inputs'];
69
+ /**
70
+ * Default reference source: references arrive as run inputs (a plain basename
71
+ * under `.ci/inputs`), matching the agent-upload path.
72
+ */
73
+ export const DEFAULT_REFERENCE_SOURCE = 'inputs';
59
74
  /** Basename of the shipped Gradle-project archive inside the run-inputs dir. */
60
75
  export const PACKAGE_ARCHIVE_BASENAME = 'package.tar.gz';
61
76
  /** Renderer identifier recorded in protocol-result.json. */
@@ -863,11 +878,122 @@ try {
863
878
  }
864
879
  process.exit(exitCode);
865
880
  `;
881
+ /**
882
+ * Replaces exactly one occurrence of `anchor` in `source`. Throws when the
883
+ * anchor is missing or ambiguous, so any drift between the default runtime text
884
+ * and a *_source variant fails loudly at module load.
885
+ */
886
+ function replaceOnce(source, anchor, replacement) {
887
+ const first = source.indexOf(anchor);
888
+ if (first === -1 || source.indexOf(anchor, first + anchor.length) !== -1) {
889
+ throw new Error('ui-fidelity-render-android: expected exactly one occurrence of anchor: ' + anchor);
890
+ }
891
+ return source.slice(0, first) + replacement + source.slice(first + anchor.length);
892
+ }
893
+ /**
894
+ * Builds the runtime main for package_source "repo" by patching the default
895
+ * (inputs) runtime text: the result document records package_source "repo", and
896
+ * the project is resolved from the committed checkout at package_path instead of
897
+ * being extracted from a shipped tarball. ANDROID_RENDER_SCRIPT_MAIN itself is
898
+ * never modified, so omitting package_source keeps the generated script
899
+ * byte-identical to the default. Mirrors the iOS package_source patch.
900
+ */
901
+ function buildAndroidPackageRepoMain(base) {
902
+ let main = base;
903
+ // The result document advertises the repo package source.
904
+ main = replaceOnce(main, "package_source: 'inputs',", "package_source: 'repo',");
905
+ // Render directly from the committed project at package_path; no archive
906
+ // extract/validate. A missing or non-Gradle directory is a clean per-build
907
+ // error (the same exit-on-buildError path the inputs archive validation uses).
908
+ main = replaceOnce(main, ' // 3. Extract + validate the shipped Gradle project, then render the\n' +
909
+ ' // renderable screens. The project stage runs even when no screen is\n' +
910
+ ' // renderable, so packaging mistakes are always reported.\n' +
911
+ ' var renderable = currentEntries.filter(function (entry) { return entry.error === null; });\n' +
912
+ ' try {\n' +
913
+ ' var projectRoot = prepareShippedProject();\n' +
914
+ ' if (projectRoot !== null) {\n' +
915
+ ' if (renderable.length > 0) {\n' +
916
+ ' renderScreens(renderable, projectRoot);\n' +
917
+ ' } else if (currentEntries.length > 0) {\n' +
918
+ " log('no renderable screens, skipping render');\n" +
919
+ ' }\n' +
920
+ ' }\n' +
921
+ ' } finally {\n' +
922
+ ' cleanupShippedProject();\n' +
923
+ ' }', ' // 3. Resolve the committed Gradle project at package_path and render the\n' +
924
+ ' // renderable screens directly from the checkout (no archive extract).\n' +
925
+ ' var renderable = currentEntries.filter(function (entry) { return entry.error === null; });\n' +
926
+ ' var projectRoot = path.resolve(CONFIG.packagePath);\n' +
927
+ ' registerPathReplacement(\n' +
928
+ ' projectRoot,\n' +
929
+ " path.isAbsolute(CONFIG.packagePath) ? '<package_path>' : CONFIG.packagePath\n" +
930
+ ' );\n' +
931
+ ' if (!fs.existsSync(projectRoot)) {\n' +
932
+ " setBuildError('ANDROID_PROJECT_MISSING', 'package_path does not exist: ' + projectRoot);\n" +
933
+ ' } else if (!hasSettings(projectRoot)) {\n' +
934
+ ' setBuildError(\n' +
935
+ " 'ANDROID_PROJECT_ROOT_MISSING',\n" +
936
+ " 'no settings.gradle(.kts) at the top of package_path: ' + projectRoot\n" +
937
+ ' );\n' +
938
+ ' } else if (renderable.length > 0) {\n' +
939
+ ' renderScreens(renderable, projectRoot);\n' +
940
+ ' } else if (currentEntries.length > 0) {\n' +
941
+ " log('no renderable screens, skipping render');\n" +
942
+ ' }');
943
+ return main;
944
+ }
945
+ const ANDROID_RENDER_SCRIPT_MAIN_REPO = buildAndroidPackageRepoMain(ANDROID_RENDER_SCRIPT_MAIN);
946
+ /**
947
+ * Patches the reference-sourcing block to read each screen's reference from a
948
+ * repo-relative path (resolved against the checkout) instead of a plain basename
949
+ * under `.ci/inputs/`. Mirrors the iOS reference_source: repo patch. The
950
+ * downstream stat/copy/provenance logic is unchanged; only how `source` is
951
+ * computed differs, so a triggered (agent-less) run can point at a committed
952
+ * reference that lives in the cloned repo.
953
+ */
954
+ function buildAndroidReferenceRepoMain(base) {
955
+ return replaceOnce(base, 'var basename = params.screens[entry.screen];\n' +
956
+ ' if (\n' +
957
+ " typeof basename !== 'string' || basename === '' ||\n" +
958
+ " basename === '.' || basename === '..' ||\n" +
959
+ ' basename !== path.basename(basename)\n' +
960
+ ' ) {\n' +
961
+ ' setError(\n' +
962
+ ' entry,\n' +
963
+ " 'REFERENCE_MISSING',\n" +
964
+ " 'reference for ' + entry.screen + ' must be a plain file basename inside ' +\n" +
965
+ " inputsDir + ', got: ' + JSON.stringify(basename)\n" +
966
+ ' );\n' +
967
+ ' return;\n' +
968
+ ' }\n' +
969
+ ' var source = path.join(inputsDir, basename);', 'var refPath = params.screens[entry.screen];\n' +
970
+ " if (typeof refPath !== 'string' || refPath === '') {\n" +
971
+ ' setError(\n' +
972
+ ' entry,\n' +
973
+ " 'REFERENCE_MISSING',\n" +
974
+ " 'reference for ' + entry.screen + ' must be a non-empty repo-relative path, got: ' +\n" +
975
+ ' JSON.stringify(refPath)\n' +
976
+ ' );\n' +
977
+ ' return;\n' +
978
+ ' }\n' +
979
+ ' var source = path.resolve(refPath);');
980
+ }
866
981
  /**
867
982
  * Generates the self-contained runtime node script for the step. Pure function
868
983
  * of its config — exported so tests can execute the script directly.
984
+ *
985
+ * When config.referenceSource is absent the reference block is byte-identical
986
+ * to the default (JSON.stringify drops the undefined key, and the unpatched
987
+ * runtime is used).
869
988
  */
870
989
  export function generateAndroidRenderScript(config) {
990
+ let main = config.packageSource === 'repo' ? ANDROID_RENDER_SCRIPT_MAIN_REPO : ANDROID_RENDER_SCRIPT_MAIN;
991
+ // Reference-from-repo is an independent dimension layered on top of whichever
992
+ // package base applies. Absent → byte-identical reference block (default
993
+ // basename behaviour).
994
+ if (config.referenceSource === 'repo') {
995
+ main = buildAndroidReferenceRepoMain(main);
996
+ }
871
997
  return [
872
998
  "'use strict';",
873
999
  '// ui-fidelity-render-android runtime script (generated by cibuild at YAML conversion time)',
@@ -877,7 +1003,7 @@ export function generateAndroidRenderScript(config) {
877
1003
  RENDER_SCRIPT_TRIM_STAGE,
878
1004
  RENDER_SCRIPT_FACTS_STAGE,
879
1005
  RENDER_SCRIPT_GEOMETRY_STAGE,
880
- ANDROID_RENDER_SCRIPT_MAIN,
1006
+ main,
881
1007
  ].join('\n');
882
1008
  }
883
1009
  /**
@@ -899,7 +1025,51 @@ export class UiFidelityRenderAndroidStepExecutor extends BaseStepExecutor {
899
1025
  throw new Error(`Invalid gradle_task '${gradleTask}' for step '${stepName}': ` +
900
1026
  'expected a Gradle task path (letters, digits, and : - _)');
901
1027
  }
1028
+ // package_source: validate when provided, but only record (and patch the
1029
+ // script for) the non-default "repo" so omitting it — or setting the default
1030
+ // "inputs" — keeps the default archive-extract script byte-identical. In
1031
+ // repo mode package_path is required (the committed project to render).
1032
+ const rawPackageSource = this.getInput(inputs, 'package_source', undefined);
1033
+ let packageSource;
1034
+ if (rawPackageSource !== undefined) {
1035
+ const value = String(rawPackageSource);
1036
+ if (!PACKAGE_SOURCES.includes(value)) {
1037
+ throw new Error(`Invalid package_source '${value}' for step '${stepName}': ` +
1038
+ `expected one of: ${PACKAGE_SOURCES.join(', ')}`);
1039
+ }
1040
+ if (value === 'repo') {
1041
+ packageSource = 'repo';
1042
+ }
1043
+ }
1044
+ let packagePath;
1045
+ if (packageSource === 'repo') {
1046
+ packagePath = String(this.getRequiredInput(inputs, 'package_path', stepName));
1047
+ }
1048
+ // reference_source: validate when provided, but only record (and patch the
1049
+ // script for) the non-default "repo" so omitting it — or setting the default
1050
+ // "inputs" — keeps the default basename reference block intact.
1051
+ const rawReferenceSource = this.getInput(inputs, 'reference_source', undefined);
1052
+ let referenceSource;
1053
+ if (rawReferenceSource !== undefined) {
1054
+ const value = String(rawReferenceSource);
1055
+ if (!REFERENCE_SOURCES.includes(value)) {
1056
+ throw new Error(`Invalid reference_source '${value}' for step '${stepName}': ` +
1057
+ `expected one of: ${REFERENCE_SOURCES.join(', ')}`);
1058
+ }
1059
+ if (value === 'repo') {
1060
+ referenceSource = 'repo';
1061
+ }
1062
+ }
902
1063
  const config = { scale, gradleTask };
1064
+ if (packageSource !== undefined) {
1065
+ config.packageSource = packageSource;
1066
+ }
1067
+ if (packagePath !== undefined) {
1068
+ config.packagePath = packagePath;
1069
+ }
1070
+ if (referenceSource !== undefined) {
1071
+ config.referenceSource = referenceSource;
1072
+ }
903
1073
  const script = generateAndroidRenderScript(config);
904
1074
  return this.createNodeStep(script, stepName);
905
1075
  }
@@ -4,7 +4,10 @@ import { gzipSync } from 'node:zlib';
4
4
  import { tmpdir } from 'node:os';
5
5
  import { dirname, join, resolve } from 'node:path';
6
6
  import { fileURLToPath } from 'node:url';
7
- import { ANDROID_RENDERER, UiFidelityRenderAndroidStepExecutor, } from './ui-fidelity-render-android.js';
7
+ import { ANDROID_RENDERER, DEFAULT_GRADLE_TASK, UiFidelityRenderAndroidStepExecutor, } from './ui-fidelity-render-android.js';
8
+ import { DEFAULT_SCALE } from './ui-fidelity-render.js';
9
+ import { clearRegistry, getStepMetadata, hasStep } from './registry.js';
10
+ import { initializeStepRegistry } from './index.js';
8
11
  import { testConfig } from './test-config.js';
9
12
  const PNG_MAGIC = Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]);
10
13
  const tempDirs = [];
@@ -166,6 +169,48 @@ function runScript(project, script, env = {}) {
166
169
  function readResult(project) {
167
170
  return JSON.parse(readFileSync(join(project.dir, '.ci', 'artifacts', 'protocol-result.json'), 'utf-8'));
168
171
  }
172
+ describe('registry integration', () => {
173
+ test('ui-fidelity-render-android is registered with its input schema', () => {
174
+ clearRegistry();
175
+ initializeStepRegistry();
176
+ expect(hasStep('ui-fidelity-render-android')).toBe(true);
177
+ const metadata = getStepMetadata('ui-fidelity-render-android');
178
+ expect(metadata?.platform).toBe('android');
179
+ const inputs = metadata?.inputs ?? {};
180
+ expect(Object.keys(inputs).sort()).toEqual([
181
+ 'gradle_task',
182
+ 'package_path',
183
+ 'package_source',
184
+ 'reference_source',
185
+ 'scale',
186
+ ]);
187
+ expect(inputs.package_source.required).toBe(false);
188
+ expect(inputs.package_source.default).toBe('inputs');
189
+ expect(inputs.reference_source.required).toBe(false);
190
+ expect(inputs.reference_source.default).toBe('inputs');
191
+ // package_path is enforced by the executor only in repo mode; the default
192
+ // (inputs) config is valid without it, so it is not unconditionally required.
193
+ expect(inputs.package_path.required).toBe(false);
194
+ expect(inputs.scale.required).toBe(false);
195
+ expect(inputs.scale.default).toBe(DEFAULT_SCALE);
196
+ expect(inputs.gradle_task.required).toBe(false);
197
+ expect(inputs.gradle_task.default).toBe(DEFAULT_GRADLE_TASK);
198
+ });
199
+ });
200
+ describe('default byte compatibility', () => {
201
+ // Snapshot of the script generated for the default inputs (no package_source,
202
+ // no reference_source), captured from the executor with everything else at its
203
+ // default. Omitting both *_source inputs must keep the generated script
204
+ // byte-identical to this snapshot, so existing protocols are provably
205
+ // untouched. Update the snapshot only for a deliberate, reviewed change to the
206
+ // default runtime.
207
+ const DEFAULT_SCRIPT_SNAPSHOT = resolve(dirname(fileURLToPath(import.meta.url)), '../../../test/fixtures/ui-fidelity-render-android-v1-script.txt');
208
+ test('omitting package_source and reference_source generates a byte-identical script', async () => {
209
+ const executor = new UiFidelityRenderAndroidStepExecutor();
210
+ const step = await executor.execute({}, {}, testConfig);
211
+ expect(step.script).toBe(readFileSync(DEFAULT_SCRIPT_SNAPSHOT, 'utf-8'));
212
+ });
213
+ });
169
214
  describe('UiFidelityRenderAndroidStepExecutor', () => {
170
215
  test('returns a node StepDef named ui-fidelity-render-android', async () => {
171
216
  const executor = new UiFidelityRenderAndroidStepExecutor();
@@ -541,6 +586,139 @@ describe('android render runtime — error isolation', () => {
541
586
  expect(y?.error?.code).toBe('RENDER_FAILED');
542
587
  });
543
588
  });
589
+ /** Materialize a well-formed Gradle render project (fake gradlew) on disk. */
590
+ function writeGradleProjectDir(dir) {
591
+ mkdirSync(join(dir, 'proof'), { recursive: true });
592
+ writeFileSync(join(dir, 'settings.gradle.kts'), 'rootProject.name = "p"\ninclude(":proof")\n');
593
+ const gradlew = join(dir, 'gradlew');
594
+ writeFileSync(gradlew, FAKE_GRADLEW_LINES.join('\n') + '\n');
595
+ chmodSync(gradlew, 0o755);
596
+ writeFileSync(join(dir, 'proof', 'build.gradle.kts'), '// module\n');
597
+ }
598
+ describe('package_source: repo', () => {
599
+ test('rejects an unknown package_source value', async () => {
600
+ const executor = new UiFidelityRenderAndroidStepExecutor();
601
+ await expect(executor.execute({ package_source: 'cloud' }, {}, testConfig)).rejects.toThrow(/package_source/);
602
+ });
603
+ test('package_source repo requires package_path', async () => {
604
+ const executor = new UiFidelityRenderAndroidStepExecutor();
605
+ await expect(executor.execute({ package_source: 'repo' }, {}, testConfig)).rejects.toThrow(/package_path/);
606
+ });
607
+ test('omitting package_source bakes no packageSource/packagePath into the config', async () => {
608
+ const script = await buildScript();
609
+ const configLine = script.split('\n').find((l) => l.startsWith('var CONFIG = '));
610
+ expect(configLine).toBeDefined();
611
+ expect(configLine).not.toContain('packageSource');
612
+ expect(configLine).not.toContain('packagePath');
613
+ });
614
+ test('renders the checked-out Gradle project at package_path (no archive)', async () => {
615
+ const project = makeProject({ screens: { XProof: 'x.png' } });
616
+ writeReference(project, 'x.png');
617
+ // The committed project lives at a repo-relative path; no package.tar.gz.
618
+ writeGradleProjectDir(join(project.dir, 'android-app'));
619
+ const run = runScript(project, await buildScript({ package_source: 'repo', package_path: 'android-app' }), { FAKE_ROBORAZZI_SCREENS: 'XProof' });
620
+ expect(run.status).toBe(0);
621
+ const doc = readResult(project);
622
+ expect(doc.package_source).toBe('repo');
623
+ expect(doc.error).toBeNull();
624
+ const screen = doc.screens.find((s) => s.screen === 'XProof');
625
+ expect(screen?.status).toBe('rendered');
626
+ expect(screen?.rendered_image_path).toBe('ui-fidelity/rendered/XProof.png');
627
+ // The render came from the checkout, not an extracted tarball.
628
+ expect(existsSync(join(project.dir, '.ci', 'inputs', 'package.tar.gz'))).toBe(false);
629
+ });
630
+ test('a missing package_path directory fails cleanly with a per-build error', async () => {
631
+ const project = makeProject({ screens: { XProof: 'x.png' } });
632
+ writeReference(project, 'x.png');
633
+ // No project at the path.
634
+ const run = runScript(project, await buildScript({ package_source: 'repo', package_path: 'nope' }), { FAKE_ROBORAZZI_SCREENS: 'XProof' });
635
+ expect(run.status).toBe(1);
636
+ const doc = readResult(project);
637
+ expect(doc.package_source).toBe('repo');
638
+ expect(doc.error?.code).toBe('ANDROID_PROJECT_MISSING');
639
+ });
640
+ test('a package_path without a settings script fails cleanly', async () => {
641
+ const project = makeProject({ screens: { XProof: 'x.png' } });
642
+ writeReference(project, 'x.png');
643
+ // A directory that is not a Gradle project root.
644
+ mkdirSync(join(project.dir, 'not-a-project'), { recursive: true });
645
+ writeFileSync(join(project.dir, 'not-a-project', 'README.md'), '# nope\n');
646
+ const run = runScript(project, await buildScript({ package_source: 'repo', package_path: 'not-a-project' }), { FAKE_ROBORAZZI_SCREENS: 'XProof' });
647
+ expect(run.status).toBe(1);
648
+ expect(readResult(project).error?.code).toBe('ANDROID_PROJECT_ROOT_MISSING');
649
+ });
650
+ test('composes with reference_source repo (project + reference both from the checkout)', async () => {
651
+ const project = makeProject({ screens: { XProof: 'refs/x.png' } });
652
+ mkdirSync(join(project.dir, 'refs'), { recursive: true });
653
+ writeFileSync(join(project.dir, 'refs', 'x.png'), Buffer.concat([PNG_MAGIC, Buffer.from('ref:x')]));
654
+ writeGradleProjectDir(join(project.dir, 'android-app'));
655
+ const run = runScript(project, await buildScript({
656
+ package_source: 'repo',
657
+ package_path: 'android-app',
658
+ reference_source: 'repo',
659
+ }), { FAKE_ROBORAZZI_SCREENS: 'XProof' });
660
+ expect(run.status).toBe(0);
661
+ const doc = readResult(project);
662
+ expect(doc.package_source).toBe('repo');
663
+ const screen = doc.screens.find((s) => s.screen === 'XProof');
664
+ expect(screen?.status).toBe('rendered');
665
+ expect(screen?.reference_image_path).toBe('ui-fidelity/references/XProof.png');
666
+ });
667
+ });
668
+ describe('reference_source: repo', () => {
669
+ test('rejects an unknown reference_source value', async () => {
670
+ const executor = new UiFidelityRenderAndroidStepExecutor();
671
+ await expect(executor.execute({ reference_source: 'artifact' }, {}, testConfig)).rejects.toThrow(/reference_source/);
672
+ });
673
+ test('omitting reference_source bakes no referenceSource into the script config', async () => {
674
+ const script = await buildScript();
675
+ const configLine = script.split('\n').find((l) => l.startsWith('var CONFIG = '));
676
+ expect(configLine).toBeDefined();
677
+ expect(configLine).not.toContain('referenceSource');
678
+ });
679
+ test('reads each screen reference from its repo-relative path in the checkout', async () => {
680
+ const project = makeProject({
681
+ screens: { XProof: 'refs/x.png', YProof: 'design/y.png' },
682
+ });
683
+ // Committed references live at repo-relative paths (resolved against cwd),
684
+ // NOT in .ci/inputs.
685
+ mkdirSync(join(project.dir, 'refs'), { recursive: true });
686
+ mkdirSync(join(project.dir, 'design'), { recursive: true });
687
+ writeFileSync(join(project.dir, 'refs', 'x.png'), Buffer.concat([PNG_MAGIC, Buffer.from('ref:x')]));
688
+ writeFileSync(join(project.dir, 'design', 'y.png'), Buffer.concat([PNG_MAGIC, Buffer.from('ref:y')]));
689
+ stageArchive(project, gradleProjectEntries());
690
+ const run = runScript(project, await buildScript({ reference_source: 'repo' }), {
691
+ FAKE_ROBORAZZI_SCREENS: 'XProof,YProof',
692
+ });
693
+ expect(run.status).toBe(0);
694
+ const doc = readResult(project);
695
+ expect(doc.screens.map((s) => s.status)).toEqual(['rendered', 'rendered']);
696
+ expect(doc.screens.map((s) => s.reference_image_path)).toEqual([
697
+ 'ui-fidelity/references/XProof.png',
698
+ 'ui-fidelity/references/YProof.png',
699
+ ]);
700
+ expect(isPng(artifact(project, 'ui-fidelity/references/XProof.png'))).toBe(true);
701
+ expect(isPng(artifact(project, 'ui-fidelity/references/YProof.png'))).toBe(true);
702
+ });
703
+ test('fails one screen when its committed reference is missing, renders the rest', async () => {
704
+ const project = makeProject({
705
+ screens: { XProof: 'refs/x.png', GhostProof: 'refs/ghost.png' },
706
+ });
707
+ mkdirSync(join(project.dir, 'refs'), { recursive: true });
708
+ writeFileSync(join(project.dir, 'refs', 'x.png'), Buffer.concat([PNG_MAGIC, Buffer.from('ref:x')]));
709
+ // refs/ghost.png intentionally absent.
710
+ stageArchive(project, gradleProjectEntries());
711
+ const run = runScript(project, await buildScript({ reference_source: 'repo' }), {
712
+ FAKE_ROBORAZZI_SCREENS: 'XProof',
713
+ });
714
+ expect(run.status).not.toBe(0);
715
+ const doc = readResult(project);
716
+ expect(doc.screens.find((s) => s.screen === 'XProof')?.status).toBe('rendered');
717
+ const ghost = doc.screens.find((s) => s.screen === 'GhostProof');
718
+ expect(ghost?.status).toBe('render_failed');
719
+ expect(ghost?.error?.code).toBe('REFERENCE_MISSING');
720
+ });
721
+ });
544
722
  // The fake gradlew/swift cannot exercise the real Roborazzi/Robolectric render
545
723
  // or the CoreGraphics trim. This end-to-end guard ships the committed Roborazzi
546
724
  // fixture as the render package and runs the whole step with the real
@@ -75,6 +75,16 @@ export interface UiFidelityRenderInputs {
75
75
  * product.
76
76
  */
77
77
  target?: string;
78
+ /**
79
+ * Where each screen's reference image comes from (default "inputs"):
80
+ * - "inputs" (default / v1): `params.screens[<Screen>]` is a plain file
81
+ * basename read from `.ci/inputs/<basename>` (an agent-uploaded run input).
82
+ * - "repo": `params.screens[<Screen>]` is a repo-relative path to a COMMITTED
83
+ * reference image, resolved against the checkout. Lets a triggered
84
+ * (agent-less) run point at a reference that lives in the cloned repo.
85
+ * Omitting reference_source generates a byte-identical v1 script.
86
+ */
87
+ reference_source?: 'repo' | 'inputs';
78
88
  /** Render size in device points, formatted "<width>x<height>" (default 393x852) */
79
89
  render_size?: string;
80
90
  /** Display scale factor applied to the render (default 2) */
@@ -94,6 +104,11 @@ export declare const PACKAGE_SOURCES: readonly ["repo", "inputs"];
94
104
  export type PackageSource = (typeof PACKAGE_SOURCES)[number];
95
105
  /** Default package source: the package lives in the repo checkout. */
96
106
  export declare const DEFAULT_PACKAGE_SOURCE: PackageSource;
107
+ /** Valid values for the reference_source input. */
108
+ export declare const REFERENCE_SOURCES: readonly ["repo", "inputs"];
109
+ export type ReferenceSource = (typeof REFERENCE_SOURCES)[number];
110
+ /** Default reference source: references arrive as run inputs (v1 behaviour). */
111
+ export declare const DEFAULT_REFERENCE_SOURCE: ReferenceSource;
97
112
  /** Basename of the shipped package archive inside the run-inputs directory. */
98
113
  export declare const PACKAGE_ARCHIVE_BASENAME = "package.tar.gz";
99
114
  /**
@@ -140,6 +155,12 @@ export interface RenderScriptConfig {
140
155
  height: number;
141
156
  scale: number;
142
157
  packageSource?: PackageSource;
158
+ /**
159
+ * Only present (and only ever "repo") when reference_source was explicitly set
160
+ * to "repo". When absent, references are read from `.ci/inputs/<basename>` and
161
+ * the generated reference-sourcing code is byte-identical to v1.
162
+ */
163
+ referenceSource?: ReferenceSource;
143
164
  }
144
165
  /** Options consumed by the pure Swift-source generators. */
145
166
  export interface HarnessGeneratorOptions {
@@ -1 +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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"}
1
+ {"version":3,"file":"ui-fidelity-render.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ui-fidelity-render.ts"],"names":[],"mappings":"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"}