@quenty/nevermore-cli 4.50.1 → 4.52.0

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.
Files changed (116) hide show
  1. package/CHANGELOG.md +18 -0
  2. package/dist/commands/batch-command/batch-bundle-command.d.ts +15 -0
  3. package/dist/commands/batch-command/batch-bundle-command.d.ts.map +1 -0
  4. package/dist/commands/batch-command/batch-bundle-command.js +168 -0
  5. package/dist/commands/batch-command/batch-bundle-command.js.map +1 -0
  6. package/dist/commands/batch-command/batch-deploy-command.d.ts +2 -0
  7. package/dist/commands/batch-command/batch-deploy-command.d.ts.map +1 -1
  8. package/dist/commands/batch-command/batch-deploy-command.js +115 -16
  9. package/dist/commands/batch-command/batch-deploy-command.js.map +1 -1
  10. package/dist/commands/batch-command/batch-test-command.d.ts +1 -0
  11. package/dist/commands/batch-command/batch-test-command.d.ts.map +1 -1
  12. package/dist/commands/batch-command/batch-test-command.js +109 -17
  13. package/dist/commands/batch-command/batch-test-command.js.map +1 -1
  14. package/dist/commands/batch-command/index.d.ts.map +1 -1
  15. package/dist/commands/batch-command/index.js +2 -0
  16. package/dist/commands/batch-command/index.js.map +1 -1
  17. package/dist/commands/deploy-command/index.d.ts.map +1 -1
  18. package/dist/commands/deploy-command/index.js +7 -0
  19. package/dist/commands/deploy-command/index.js.map +1 -1
  20. package/dist/commands/test-command/test-command.d.ts +1 -0
  21. package/dist/commands/test-command/test-command.d.ts.map +1 -1
  22. package/dist/commands/test-command/test-command.js +19 -3
  23. package/dist/commands/test-command/test-command.js.map +1 -1
  24. package/dist/commands/tools-command/ci-post-deploy-results.d.ts.map +1 -1
  25. package/dist/commands/tools-command/ci-post-deploy-results.js +6 -2
  26. package/dist/commands/tools-command/ci-post-deploy-results.js.map +1 -1
  27. package/dist/commands/tools-command/ci-post-test-results.d.ts +1 -0
  28. package/dist/commands/tools-command/ci-post-test-results.d.ts.map +1 -1
  29. package/dist/commands/tools-command/ci-post-test-results.js +12 -3
  30. package/dist/commands/tools-command/ci-post-test-results.js.map +1 -1
  31. package/dist/utils/batch/changed-packages-utils.d.ts +11 -0
  32. package/dist/utils/batch/changed-packages-utils.d.ts.map +1 -1
  33. package/dist/utils/batch/changed-packages-utils.js +14 -0
  34. package/dist/utils/batch/changed-packages-utils.js.map +1 -1
  35. package/dist/utils/build/build.d.ts +7 -0
  36. package/dist/utils/build/build.d.ts.map +1 -1
  37. package/dist/utils/build/build.js.map +1 -1
  38. package/dist/utils/bundle/untrusted-tar.d.ts +28 -0
  39. package/dist/utils/bundle/untrusted-tar.d.ts.map +1 -0
  40. package/dist/utils/bundle/untrusted-tar.js +116 -0
  41. package/dist/utils/bundle/untrusted-tar.js.map +1 -0
  42. package/dist/utils/deploy/deploy-github-columns.d.ts +8 -1
  43. package/dist/utils/deploy/deploy-github-columns.d.ts.map +1 -1
  44. package/dist/utils/deploy/deploy-github-columns.js.map +1 -1
  45. package/dist/utils/deploy/deploy-metadata.d.ts +5 -0
  46. package/dist/utils/deploy/deploy-metadata.d.ts.map +1 -1
  47. package/dist/utils/deploy/deploy-metadata.js +36 -0
  48. package/dist/utils/deploy/deploy-metadata.js.map +1 -1
  49. package/dist/utils/deploy/deploy-metadata.test.js +35 -2
  50. package/dist/utils/deploy/deploy-metadata.test.js.map +1 -1
  51. package/dist/utils/deploy/prebuilt-deploy-bundle.d.ts +38 -0
  52. package/dist/utils/deploy/prebuilt-deploy-bundle.d.ts.map +1 -0
  53. package/dist/utils/deploy/prebuilt-deploy-bundle.js +209 -0
  54. package/dist/utils/deploy/prebuilt-deploy-bundle.js.map +1 -0
  55. package/dist/utils/deploy/prebuilt-deploy-bundle.test.d.ts +2 -0
  56. package/dist/utils/deploy/prebuilt-deploy-bundle.test.d.ts.map +1 -0
  57. package/dist/utils/deploy/prebuilt-deploy-bundle.test.js +194 -0
  58. package/dist/utils/deploy/prebuilt-deploy-bundle.test.js.map +1 -0
  59. package/dist/utils/job-context/base-job-context.d.ts.map +1 -1
  60. package/dist/utils/job-context/base-job-context.js +3 -2
  61. package/dist/utils/job-context/base-job-context.js.map +1 -1
  62. package/dist/utils/job-context/batch-script-job-context.d.ts +12 -0
  63. package/dist/utils/job-context/batch-script-job-context.d.ts.map +1 -1
  64. package/dist/utils/job-context/batch-script-job-context.js +19 -0
  65. package/dist/utils/job-context/batch-script-job-context.js.map +1 -1
  66. package/dist/utils/open-cloud/open-cloud-client.d.ts +1 -0
  67. package/dist/utils/open-cloud/open-cloud-client.d.ts.map +1 -1
  68. package/dist/utils/open-cloud/open-cloud-client.js +5 -0
  69. package/dist/utils/open-cloud/open-cloud-client.js.map +1 -1
  70. package/dist/utils/open-cloud/open-cloud-client.test.js +11 -0
  71. package/dist/utils/open-cloud/open-cloud-client.test.js.map +1 -1
  72. package/dist/utils/sourcemap/sourcemap-loader.d.ts +3 -3
  73. package/dist/utils/sourcemap/sourcemap-loader.d.ts.map +1 -1
  74. package/dist/utils/sourcemap/sourcemap-loader.js +6 -7
  75. package/dist/utils/sourcemap/sourcemap-loader.js.map +1 -1
  76. package/dist/utils/testing/batch-run.e2e.test.js +36 -0
  77. package/dist/utils/testing/batch-run.e2e.test.js.map +1 -1
  78. package/dist/utils/testing/runner/prebuilt-batch-bundle.d.ts +26 -0
  79. package/dist/utils/testing/runner/prebuilt-batch-bundle.d.ts.map +1 -0
  80. package/dist/utils/testing/runner/prebuilt-batch-bundle.js +145 -0
  81. package/dist/utils/testing/runner/prebuilt-batch-bundle.js.map +1 -0
  82. package/dist/utils/testing/runner/prebuilt-batch-bundle.test.d.ts +2 -0
  83. package/dist/utils/testing/runner/prebuilt-batch-bundle.test.d.ts.map +1 -0
  84. package/dist/utils/testing/runner/prebuilt-batch-bundle.test.js +197 -0
  85. package/dist/utils/testing/runner/prebuilt-batch-bundle.test.js.map +1 -0
  86. package/dist/utils/testing/runner/test-runner.d.ts +8 -1
  87. package/dist/utils/testing/runner/test-runner.d.ts.map +1 -1
  88. package/dist/utils/testing/runner/test-runner.js +19 -6
  89. package/dist/utils/testing/runner/test-runner.js.map +1 -1
  90. package/package.json +7 -6
  91. package/src/commands/batch-command/batch-bundle-command.ts +236 -0
  92. package/src/commands/batch-command/batch-deploy-command.ts +160 -16
  93. package/src/commands/batch-command/batch-test-command.ts +162 -18
  94. package/src/commands/batch-command/index.ts +2 -0
  95. package/src/commands/deploy-command/index.ts +7 -0
  96. package/src/commands/test-command/test-command.ts +20 -3
  97. package/src/commands/tools-command/ci-post-deploy-results.ts +9 -2
  98. package/src/commands/tools-command/ci-post-test-results.ts +20 -3
  99. package/src/utils/batch/changed-packages-utils.ts +23 -0
  100. package/src/utils/build/build.ts +7 -0
  101. package/src/utils/bundle/untrusted-tar.ts +160 -0
  102. package/src/utils/deploy/deploy-github-columns.ts +8 -1
  103. package/src/utils/deploy/deploy-metadata.test.ts +50 -1
  104. package/src/utils/deploy/deploy-metadata.ts +39 -0
  105. package/src/utils/deploy/prebuilt-deploy-bundle.test.ts +265 -0
  106. package/src/utils/deploy/prebuilt-deploy-bundle.ts +297 -0
  107. package/src/utils/job-context/base-job-context.ts +4 -2
  108. package/src/utils/job-context/batch-script-job-context.ts +34 -3
  109. package/src/utils/open-cloud/open-cloud-client.test.ts +15 -0
  110. package/src/utils/open-cloud/open-cloud-client.ts +11 -0
  111. package/src/utils/sourcemap/sourcemap-loader.ts +7 -9
  112. package/src/utils/testing/batch-run.e2e.test.ts +42 -0
  113. package/src/utils/testing/runner/prebuilt-batch-bundle.test.ts +272 -0
  114. package/src/utils/testing/runner/prebuilt-batch-bundle.ts +204 -0
  115. package/src/utils/testing/runner/test-runner.ts +43 -13
  116. package/tsconfig.tsbuildinfo +1 -1
@@ -0,0 +1,209 @@
1
+ import * as fs from 'fs/promises';
2
+ import * as path from 'path';
3
+ import * as tar from 'tar';
4
+ import { BuildContext } from '@quenty/nevermore-template-helpers';
5
+ import { PLACE_UPLOAD_MAX_BYTES } from '../open-cloud/open-cloud-client.js';
6
+ import { PACKAGE_NAME_PATTERN, readUntrustedTarAsync, } from '../bundle/untrusted-tar.js';
7
+ /** Suggested file suffix, following `deploy.nevermore.json`. */
8
+ export const DEPLOY_BUNDLE_FILE_SUFFIX = '.nevermore.deploy.tar';
9
+ const MANIFEST_FILE_NAME = 'manifest.json';
10
+ const FORMAT_VERSION = 1;
11
+ const MAX_PLACES = 64;
12
+ const MAX_MANIFEST_BYTES = 1024 * 1024;
13
+ const MAX_PROJECT_BYTES = 1024 * 1024;
14
+ const PLACE_FILE_PATTERN = /^place-\d{1,3}\.rbxl$/;
15
+ const PROJECT_FILE_PATTERN = /^project-\d{1,3}\.json$/;
16
+ const TARGET_NAME_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
17
+ const SHORT_SHA_PATTERN = /^[0-9a-f]{4,40}$/;
18
+ const SHA_PATTERN = /^[0-9a-f]{40}$/;
19
+ const BRANCH_PATTERN = /^[A-Za-z0-9._/-]{1,200}$/;
20
+ const PACKAGE_VERSION_PATTERN = /^[0-9A-Za-z.+-]{1,64}$/;
21
+ export async function writePrebuiltDeployBundleAsync(file, target, git, places) {
22
+ const stage = await BuildContext.createAsync({ prefix: 'deploy-bundle-' });
23
+ const stageDir = stage.buildDir;
24
+ try {
25
+ const manifest = {
26
+ formatVersion: FORMAT_VERSION,
27
+ kind: 'deploy',
28
+ target,
29
+ git,
30
+ places: [],
31
+ };
32
+ for (const [index, place] of places.entries()) {
33
+ const placeFile = `place-${index + 1}.rbxl`;
34
+ const projectFile = `project-${index + 1}.json`;
35
+ await fs.copyFile(place.rbxlPath, path.join(stageDir, placeFile));
36
+ await fs.copyFile(place.projectPath, path.join(stageDir, projectFile));
37
+ manifest.places.push({
38
+ name: place.name,
39
+ file: placeFile,
40
+ project: projectFile,
41
+ packageVersion: place.packageVersion,
42
+ });
43
+ }
44
+ await fs.writeFile(path.join(stageDir, MANIFEST_FILE_NAME), JSON.stringify(manifest, null, 2));
45
+ await fs.mkdir(path.dirname(path.resolve(file)), { recursive: true });
46
+ await tar.c({ file, cwd: stageDir, portable: true }, [
47
+ MANIFEST_FILE_NAME,
48
+ ...manifest.places.flatMap((p) => [p.file, p.project]),
49
+ ]);
50
+ }
51
+ finally {
52
+ await stage.cleanupAsync();
53
+ }
54
+ }
55
+ /**
56
+ * Read a deploy bundle file. It is untrusted: it comes from a fork's CI run.
57
+ * Entries are read rather than extracted, every manifest string is checked
58
+ * before it can reach a place attribute or the PR comment, and the bundle
59
+ * names places only by target name — where each one deploys, and which base
60
+ * place it merges onto, come from the deploying checkout's config.
61
+ */
62
+ export async function readPrebuiltDeployBundleAsync(file) {
63
+ let stat;
64
+ try {
65
+ stat = await fs.lstat(file);
66
+ }
67
+ catch {
68
+ throw new Error(`Bundle file not found: ${file}`);
69
+ }
70
+ if (!stat.isFile()) {
71
+ throw new Error(`Bundle ${file} is not a regular file`);
72
+ }
73
+ const buildContext = await BuildContext.createAsync({
74
+ prefix: 'deploy-bundle-',
75
+ });
76
+ const dir = buildContext.buildDir;
77
+ try {
78
+ const { manifestText, entrySizes } = await readUntrustedTarAsync(file, dir, {
79
+ kind: 'deploy',
80
+ manifestName: MANIFEST_FILE_NAME,
81
+ maxManifestBytes: MAX_MANIFEST_BYTES,
82
+ isEntryAllowed: (name) => PLACE_FILE_PATTERN.test(name) || PROJECT_FILE_PATTERN.test(name),
83
+ maxEntries: MAX_PLACES * 2,
84
+ maxEntriesMessage: `Bundle must hold at most ${MAX_PLACES} places`,
85
+ checkEntrySize: (name, size) => {
86
+ if (PLACE_FILE_PATTERN.test(name) && size > PLACE_UPLOAD_MAX_BYTES) {
87
+ return `${name} is over the place upload limit`;
88
+ }
89
+ if (PROJECT_FILE_PATTERN.test(name) && size > MAX_PROJECT_BYTES) {
90
+ return `${name} is over the project file size limit`;
91
+ }
92
+ return undefined;
93
+ },
94
+ });
95
+ const parsed = _parseManifest(manifestText, dir, entrySizes);
96
+ for (const place of parsed.places) {
97
+ await _validateProjectFileAsync(place.projectPath);
98
+ }
99
+ return { ...parsed, buildContext };
100
+ }
101
+ catch (err) {
102
+ await buildContext.cleanupAsync();
103
+ throw err;
104
+ }
105
+ }
106
+ function _parseManifest(manifestText, dir, entrySizes) {
107
+ let parsed;
108
+ try {
109
+ parsed = JSON.parse(manifestText);
110
+ }
111
+ catch {
112
+ throw new Error('Bundle manifest is not valid JSON');
113
+ }
114
+ const manifest = parsed;
115
+ if (manifest?.formatVersion !== FORMAT_VERSION) {
116
+ throw new Error(`Unsupported bundle format ${String(manifest?.formatVersion)} ` +
117
+ `(expected ${FORMAT_VERSION})`);
118
+ }
119
+ if (typeof manifest.target !== 'string' ||
120
+ !TARGET_NAME_PATTERN.test(manifest.target)) {
121
+ throw new Error(`Bundle lists an invalid target: ${String(manifest.target)}`);
122
+ }
123
+ if (!Array.isArray(manifest.places) || manifest.places.length > MAX_PLACES) {
124
+ throw new Error(`Bundle must list at most ${MAX_PLACES} places`);
125
+ }
126
+ if (manifest.places.length * 2 !== entrySizes.size) {
127
+ throw new Error('Bundle manifest does not list every file it holds');
128
+ }
129
+ const git = _parseGit(manifest.git);
130
+ const seenNames = new Set();
131
+ const seenFiles = new Set();
132
+ const places = [];
133
+ for (const entry of manifest.places) {
134
+ const { name, file, project, packageVersion } = entry ?? {};
135
+ if (typeof name !== 'string' || !PACKAGE_NAME_PATTERN.test(name)) {
136
+ throw new Error(`Bundle lists an invalid package name: ${String(name)}`);
137
+ }
138
+ if (seenNames.has(name)) {
139
+ throw new Error(`Bundle lists ${name} more than once`);
140
+ }
141
+ seenNames.add(name);
142
+ for (const [listed, pattern] of [
143
+ [file, PLACE_FILE_PATTERN],
144
+ [project, PROJECT_FILE_PATTERN],
145
+ ]) {
146
+ if (typeof listed !== 'string' ||
147
+ !pattern.test(listed) ||
148
+ !entrySizes.has(listed) ||
149
+ seenFiles.has(listed)) {
150
+ throw new Error(`Bundle lists an invalid file for ${name}: ${String(listed)}`);
151
+ }
152
+ seenFiles.add(listed);
153
+ }
154
+ if (packageVersion !== undefined &&
155
+ (typeof packageVersion !== 'string' ||
156
+ !PACKAGE_VERSION_PATTERN.test(packageVersion))) {
157
+ throw new Error(`Bundle lists an invalid package version for ${name}`);
158
+ }
159
+ places.push({
160
+ name,
161
+ rbxlPath: path.join(dir, file),
162
+ projectPath: path.join(dir, project),
163
+ packageVersion,
164
+ });
165
+ }
166
+ return { target: manifest.target, git, places };
167
+ }
168
+ function _parseGit(git) {
169
+ if (git === undefined) {
170
+ return {};
171
+ }
172
+ if (typeof git !== 'object' || git === null) {
173
+ throw new Error('Bundle lists invalid git info');
174
+ }
175
+ const { commit, version, branch } = git;
176
+ const result = {};
177
+ for (const [key, value, pattern] of [
178
+ ['commit', commit, SHORT_SHA_PATTERN],
179
+ ['version', version, SHA_PATTERN],
180
+ ]) {
181
+ if (value === undefined) {
182
+ continue;
183
+ }
184
+ if (typeof value !== 'string' || !pattern.test(value)) {
185
+ throw new Error(`Bundle lists an invalid git ${key}`);
186
+ }
187
+ result[key] = value;
188
+ }
189
+ // Git allows branch names this pattern does not, and a branch is only a
190
+ // label, so one that fails it is dropped rather than failing the deploy.
191
+ if (typeof branch === 'string' && BRANCH_PATTERN.test(branch)) {
192
+ result.branch = branch;
193
+ }
194
+ return result;
195
+ }
196
+ async function _validateProjectFileAsync(projectPath) {
197
+ let project;
198
+ try {
199
+ project = JSON.parse(await fs.readFile(projectPath, 'utf-8'));
200
+ }
201
+ catch {
202
+ throw new Error(`Bundle project ${path.basename(projectPath)} is not valid JSON`);
203
+ }
204
+ const tree = project?.tree;
205
+ if (typeof tree !== 'object' || tree === null) {
206
+ throw new Error(`Bundle project ${path.basename(projectPath)} has no "tree"`);
207
+ }
208
+ }
209
+ //# sourceMappingURL=prebuilt-deploy-bundle.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prebuilt-deploy-bundle.js","sourceRoot":"","sources":["../../../src/utils/deploy/prebuilt-deploy-bundle.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=prebuilt-deploy-bundle.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prebuilt-deploy-bundle.test.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/prebuilt-deploy-bundle.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,194 @@
1
+ import * as fs from 'fs/promises';
2
+ import * as os from 'os';
3
+ import * as path from 'path';
4
+ import { Header } from 'tar';
5
+ import { afterEach, beforeEach, describe, expect, it } from 'vitest';
6
+ import { readPrebuiltDeployBundleAsync, writePrebuiltDeployBundleAsync, } from './prebuilt-deploy-bundle.js';
7
+ const PROJECT_TEXT = JSON.stringify({ name: 'game', tree: {} });
8
+ const SHA = 'a'.repeat(40);
9
+ function rawTar(entries) {
10
+ const blocks = [];
11
+ for (const entry of entries) {
12
+ const body = Buffer.from(entry.body ?? '');
13
+ const header = new Header({
14
+ path: entry.path,
15
+ type: entry.type ?? 'File',
16
+ linkpath: entry.linkpath,
17
+ size: entry.type && entry.type !== 'File' ? 0 : body.length,
18
+ mode: 0o644,
19
+ mtime: new Date(0),
20
+ });
21
+ header.encode();
22
+ blocks.push(header.block);
23
+ if (!entry.type || entry.type === 'File') {
24
+ const padded = Buffer.alloc(Math.ceil(body.length / 512) * 512);
25
+ body.copy(padded);
26
+ blocks.push(padded);
27
+ }
28
+ }
29
+ blocks.push(Buffer.alloc(1024));
30
+ return Buffer.concat(blocks);
31
+ }
32
+ function validManifest() {
33
+ return {
34
+ formatVersion: 1,
35
+ target: 'integration',
36
+ git: { commit: 'aaaaaaa', version: SHA },
37
+ places: [
38
+ {
39
+ name: '@quenty/integration',
40
+ file: 'place-1.rbxl',
41
+ project: 'project-1.json',
42
+ packageVersion: '1.2.3',
43
+ },
44
+ ],
45
+ };
46
+ }
47
+ describe('prebuilt deploy bundle', () => {
48
+ let workDir;
49
+ const opened = [];
50
+ beforeEach(async () => {
51
+ workDir = await fs.mkdtemp(path.join(os.tmpdir(), 'deploy-bundle-'));
52
+ });
53
+ afterEach(async () => {
54
+ for (const bundle of opened.splice(0)) {
55
+ await bundle.buildContext.cleanupAsync();
56
+ }
57
+ await fs.rm(workDir, { recursive: true, force: true });
58
+ });
59
+ async function readAsync(file) {
60
+ const bundle = await readPrebuiltDeployBundleAsync(file);
61
+ opened.push(bundle);
62
+ return bundle;
63
+ }
64
+ async function writeRawAsync(entries) {
65
+ const file = path.join(workDir, 'raw.nevermore.deploy.tar');
66
+ await fs.writeFile(file, rawTar(entries));
67
+ return file;
68
+ }
69
+ async function writeManifestAsync(manifest, projectText = PROJECT_TEXT) {
70
+ return writeRawAsync([
71
+ { path: 'manifest.json', body: JSON.stringify(manifest) },
72
+ { path: 'place-1.rbxl', body: 'place bytes' },
73
+ { path: 'project-1.json', body: projectText },
74
+ ]);
75
+ }
76
+ it('round-trips places, projects, versions and git info through one file', async () => {
77
+ const place = path.join(workDir, 'source.rbxl');
78
+ const project = path.join(workDir, 'default.project.json');
79
+ await fs.writeFile(place, 'place bytes');
80
+ await fs.writeFile(project, PROJECT_TEXT);
81
+ const file = path.join(workDir, 'out', 'pr-1.nevermore.deploy.tar');
82
+ await writePrebuiltDeployBundleAsync(file, 'integration', { commit: 'abc1234', version: SHA, branch: 'feature/x' }, [
83
+ {
84
+ name: '@quenty/integration',
85
+ rbxlPath: place,
86
+ projectPath: project,
87
+ packageVersion: '1.0.0',
88
+ },
89
+ ]);
90
+ const bundle = await readAsync(file);
91
+ expect(bundle.target).toBe('integration');
92
+ expect(bundle.git).toEqual({
93
+ commit: 'abc1234',
94
+ version: SHA,
95
+ branch: 'feature/x',
96
+ });
97
+ expect(bundle.places).toHaveLength(1);
98
+ expect(bundle.places[0].name).toBe('@quenty/integration');
99
+ expect(bundle.places[0].packageVersion).toBe('1.0.0');
100
+ expect(await fs.readFile(bundle.places[0].rbxlPath, 'utf-8')).toBe('place bytes');
101
+ expect(await fs.readFile(bundle.places[0].projectPath, 'utf-8')).toBe(PROJECT_TEXT);
102
+ });
103
+ it('reads an empty bundle as no places', async () => {
104
+ const file = path.join(workDir, 'empty.nevermore.deploy.tar');
105
+ await writePrebuiltDeployBundleAsync(file, 'integration', {}, []);
106
+ const bundle = await readAsync(file);
107
+ expect(bundle.places).toEqual([]);
108
+ });
109
+ it('never writes outside its own directory for an entry that escapes', async () => {
110
+ const file = await writeRawAsync([
111
+ { path: 'manifest.json', body: JSON.stringify(validManifest()) },
112
+ { path: 'place-1.rbxl', body: 'place bytes' },
113
+ { path: 'project-1.json', body: PROJECT_TEXT },
114
+ { path: '../escaped.json', body: 'evil' },
115
+ ]);
116
+ await expect(readAsync(file)).rejects.toThrow('unexpected entry');
117
+ await expect(fs.stat(path.join(os.tmpdir(), 'escaped.json'))).rejects.toThrow();
118
+ });
119
+ it('rejects a symlink entry', async () => {
120
+ const file = await writeRawAsync([
121
+ { path: 'manifest.json', body: JSON.stringify(validManifest()) },
122
+ { path: 'place-1.rbxl', body: 'place bytes' },
123
+ { path: 'project-1.json', type: 'SymbolicLink', linkpath: '/etc/passwd' },
124
+ ]);
125
+ await expect(readAsync(file)).rejects.toThrow('not a regular file');
126
+ });
127
+ it('rejects a file the manifest does not list', async () => {
128
+ const file = await writeRawAsync([
129
+ { path: 'manifest.json', body: JSON.stringify(validManifest()) },
130
+ { path: 'place-1.rbxl', body: 'place bytes' },
131
+ { path: 'project-1.json', body: PROJECT_TEXT },
132
+ { path: 'place-2.rbxl', body: 'extra' },
133
+ ]);
134
+ await expect(readAsync(file)).rejects.toThrow('every file it holds');
135
+ });
136
+ it('rejects a place pointing at a project file as its place', async () => {
137
+ const manifest = validManifest();
138
+ manifest.places[0].file = 'project-1.json';
139
+ await expect(readAsync(await writeManifestAsync(manifest))).rejects.toThrow('invalid file');
140
+ });
141
+ it('rejects a project without a tree', async () => {
142
+ await expect(readAsync(await writeManifestAsync(validManifest(), '{"name":"x"}'))).rejects.toThrow('has no "tree"');
143
+ });
144
+ it.each([
145
+ ['target', (m) => (m.target = 'integration; rm -rf /')],
146
+ [
147
+ 'package name',
148
+ (m) => (m.places[0].name = '@quenty/x [a](http://x)'),
149
+ ],
150
+ ['git version', (m) => (m.git.version = 'not-a-sha')],
151
+ ['package version', (m) => (m.places[0].packageVersion = '1.0 <b>')],
152
+ ])('rejects an invalid %s', async (label, mutate) => {
153
+ const manifest = validManifest();
154
+ mutate(manifest);
155
+ await expect(readAsync(await writeManifestAsync(manifest))).rejects.toThrow('invalid');
156
+ });
157
+ it('drops a branch name it will not stamp instead of failing', async () => {
158
+ const manifest = validManifest();
159
+ manifest.git.branch = 'main\n<img>';
160
+ const bundle = await readAsync(await writeManifestAsync(manifest));
161
+ expect(bundle.git.branch).toBeUndefined();
162
+ expect(bundle.git.version).toBe(SHA);
163
+ });
164
+ it('rejects an unknown format version', async () => {
165
+ const manifest = validManifest();
166
+ manifest.formatVersion = 2;
167
+ await expect(readAsync(await writeManifestAsync(manifest))).rejects.toThrow('Unsupported bundle format');
168
+ });
169
+ it('names the right command for a tests bundle', async () => {
170
+ const file = await writeRawAsync([
171
+ {
172
+ path: 'manifest.json',
173
+ body: JSON.stringify({
174
+ formatVersion: 1,
175
+ kind: 'tests',
176
+ chunks: [
177
+ {
178
+ file: 'place-1.rbxl',
179
+ packages: [{ name: '@quenty/maid', slug: 'maid' }],
180
+ },
181
+ ],
182
+ }),
183
+ },
184
+ { path: 'place-1.rbxl', body: 'place bytes' },
185
+ ]);
186
+ await expect(readAsync(file)).rejects.toThrow('This is a tests bundle, not a deploy bundle. Run it with "nevermore batch test --bundle <file>".');
187
+ });
188
+ it('rejects a bundle of an unknown kind', async () => {
189
+ const manifest = validManifest();
190
+ manifest.kind = 'mystery';
191
+ await expect(readAsync(await writeManifestAsync(manifest))).rejects.toThrow('unknown kind');
192
+ });
193
+ });
194
+ //# sourceMappingURL=prebuilt-deploy-bundle.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"prebuilt-deploy-bundle.test.js","sourceRoot":"","sources":["../../../src/utils/deploy/prebuilt-deploy-bundle.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"base-job-context.d.ts","sourceRoot":"","sources":["../../../src/utils/job-context/base-job-context.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,OAAO,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAiClE;;;;;;;;;GASG;AACH,8BAAsB,cAAe,YAAW,UAAU;IACxD,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC9B,SAAS,CAAC,gBAAgB,EAAE,eAAe,GAAG,SAAS,CAAC;IACxD,OAAO,CAAC,kBAAkB,CAAgC;IAC1D,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,iBAAiB,CAAsC;gBAG7D,QAAQ,EAAE,QAAQ,EAClB,eAAe,CAAC,EAAE,eAAe,EACjC,iBAAiB,CAAC,EAAE,iBAAiB;IAOjC,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IAsCtE,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,qBAAqB;YAYf,4BAA4B;YA2B5B,mBAAmB;YAenB,oBAAoB;IAgF5B,sBAAsB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BnE,QAAQ,CAAC,qBAAqB,CAC5B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC;IACtB,QAAQ,CAAC,cAAc,CACrB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAC/D,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiDpC"}
1
+ {"version":3,"file":"base-job-context.d.ts","sourceRoot":"","sources":["../../../src/utils/job-context/base-job-context.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,OAAO,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAiClE;;;;;;;;;GASG;AACH,8BAAsB,cAAe,YAAW,UAAU;IACxD,SAAS,CAAC,SAAS,EAAE,QAAQ,CAAC;IAC9B,SAAS,CAAC,gBAAgB,EAAE,eAAe,GAAG,SAAS,CAAC;IACxD,OAAO,CAAC,kBAAkB,CAAgC;IAC1D,OAAO,CAAC,YAAY,CAAgC;IACpD,OAAO,CAAC,iBAAiB,CAAsC;gBAG7D,QAAQ,EAAE,QAAQ,EAClB,eAAe,CAAC,EAAE,eAAe,EACjC,iBAAiB,CAAC,EAAE,iBAAiB;IAOjC,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IAsCtE,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,qBAAqB;YAYf,4BAA4B;YA2B5B,mBAAmB;YAenB,oBAAoB;IAkF5B,sBAAsB,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IA+BnE,QAAQ,CAAC,qBAAqB,CAC5B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC;IACtB,QAAQ,CAAC,cAAc,CACrB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAC/D,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiDpC"}
@@ -61,7 +61,7 @@ export class BaseJobContext {
61
61
  }
62
62
  const tracked = new TrackedBuiltPlace(rbxlPath, target, sharedKey, ownContext);
63
63
  this._builtPlaces.add(tracked);
64
- if (target.basePlace) {
64
+ if (target.basePlace && !options.deferBasePlaceMerge) {
65
65
  await this._mergeBasePlaceAsync(tracked, options);
66
66
  }
67
67
  return tracked;
@@ -158,7 +158,8 @@ export class BaseJobContext {
158
158
  await fs.writeFile(basePath, buffer);
159
159
  this._reporter.onPackagePhaseChange(resolvedName, 'merging');
160
160
  const packagePath = options.packagePath;
161
- const projectPath = path.resolve(packagePath, tracked.target.project);
161
+ const projectPath = options.overrides?.projectFile ??
162
+ path.resolve(packagePath, tracked.target.project);
162
163
  const mergedPath = mergeContext.resolvePath('merged.rbxl');
163
164
  await mergeContext.executeLuneTransformScriptAsync(MERGE_SCRIPT_PATH, basePath, tracked.rbxlPath, projectPath, mergedPath);
164
165
  tracked.rbxlPath = mergedPath;
@@ -1 +1 @@
1
- {"version":3,"file":"base-job-context.js","sourceRoot":"","sources":["../../../src/utils/job-context/base-job-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EACL,YAAY,EACZ,kBAAkB,GACnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EACL,eAAe,GAGhB,MAAM,mBAAmB,CAAC;AAY3B,MAAM,iBAAiB,GAAG,kBAAkB,CAC1C,MAAM,CAAC,IAAI,CAAC,GAAG,EACf,eAAe,EACf,gCAAgC,CACjC,CAAC;AAOF,MAAM,iBAAiB;IACrB,QAAQ,CAAS;IACjB,MAAM,CAAuB;IAC7B,SAAS,CAAU;IACnB,UAAU,CAAgB;IAC1B,gBAAgB,CAAU;IAE1B,YACE,QAAgB,EAChB,MAA4B,EAC5B,SAA6B,EAC7B,UAAoC;QAEpC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;CACF;AAED;;;;;;;;;GASG;AACH,MAAM,OAAgB,cAAc;IACxB,SAAS,CAAW;IACpB,gBAAgB,CAA8B;IAChD,kBAAkB,CAAgC;IAClD,YAAY,GAAG,IAAI,GAAG,EAAqB,CAAC;IAC5C,iBAAiB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE/D,YACE,QAAkB,EAClB,eAAiC,EACjC,iBAAqC;QAErC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAA0B;QAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE9C,IAAI,QAAgB,CAAC;QACrB,IAAI,MAA4B,CAAC;QACjC,IAAI,SAA6B,CAAC;QAClC,IAAI,UAAoC,CAAC;QAEzC,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,4BAA4B,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC1E,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,SAAS,GAAG,QAAQ,CAAC;YACrB,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QACzE,CAAC;aAAM,CAAC;YACN,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;gBACnC,GAAG,OAAO;gBACV,QAAQ,EAAE,IAAI,CAAC,SAAS;aACzB,CAAC,CAAC;YACH,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;YAC3B,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;YACvB,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC;QACnC,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,iBAAiB,CACnC,QAAQ,EACR,MAAM,EACN,SAAS,EACT,UAAU,CACX,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE/B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,cAAc,CAAC,OAA0B;QAC/C,iEAAiE;QACjE,IAAI,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,IAAI,YAAY,CAAC;QAC9D,OAAO,GAAG,WAAW,IAAI,cAAc,EAAE,CAAC;IAC5C,CAAC;IAEO,qBAAqB,CAC3B,MAA4B,EAC5B,SAAyC;QAEzC,MAAM,GAAG,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;QAC1B,IAAI,SAAS,EAAE,UAAU;YAAE,GAAG,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;QACjE,IAAI,SAAS,EAAE,OAAO;YAAE,GAAG,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QACxD,IAAI,SAAS,EAAE,cAAc;YAC3B,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;QAChD,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACxC,QAAgB,EAChB,OAA0B;QAE1B,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtD,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACpB,4DAA4D;YAC5D,yEAAyE;YACzE,MAAM,YAAY,GAChB,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;YAC5D,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;YAC9D,OAAO,QAAQ,CAAC,OAAO,CAAC;QAC1B,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,KAAK,GAAoB,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAE5C,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACxC,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAC/B,OAA0B;QAE1B,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC;YACnC,GAAG,OAAO;YACV,QAAQ,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,CAAC;IAC1E,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAChC,OAA0B,EAC1B,OAA0B;QAE1B,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QACrC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QAED,2EAA2E;QAC3E,wEAAwE;QACxE,uCAAuC;QACvC,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACvD,MAAM,IAAI,KAAK,CACb,2BAA2B,SAAS,CAAC,OAAO,6BAA6B;gBACvE,sEAAsE,CACzE,CAAC;QACJ,CAAC;QAED,4EAA4E;QAC5E,kEAAkE;QAClE,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC;YAClD,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;QAEH,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QAE/C,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAEjE,4EAA4E;QAC5E,0EAA0E;QAC1E,uEAAuE;QACvE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CACxD,OAAO,CAAC,WAAW,EACnB,SAAS,CACV,CAAC;QACF,yEAAyE;QACzE,4EAA4E;QAC5E,iEAAiE;QACjE,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC;QACnC,YAAY,CAAC,OAAO,CAClB,OAAO,SAAS,CAAC,OAAO,KAAK,QAAQ;YACnC,CAAC,CAAC,mCAAmC,OAAO,gBAAgB;YAC5D,CAAC,CAAC,2BACE,SAAS,CAAC,OAAO,IAAI,WACvB,OAAO,OAAO,gBAAgB,CACnC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAC3D,SAAS,CAAC,UAAU,EACpB,SAAS,CAAC,OAAO,EACjB,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;YACrB,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,YAAY,EAAE;gBACnD,IAAI,EAAE,OAAO;gBACb,gBAAgB,EAAE,WAAW;gBAC7B,UAAU,EAAE,KAAK;aAClB,CAAC,CAAC;QACL,CAAC,EACD,OAAO,CACR,CAAC;QACF,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QACvD,MAAM,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAErC,IAAI,CAAC,SAAS,CAAC,oBAAoB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAE3D,MAAM,YAAY,CAAC,+BAA+B,CAChD,iBAAiB,EACjB,QAAQ,EACR,OAAO,CAAC,QAAQ,EAChB,WAAW,EACX,UAAU,CACX,CAAC;QAEF,OAAO,CAAC,QAAQ,GAAG,UAAU,CAAC;QAC9B,OAAO,CAAC,UAAU,GAAG,YAAY,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,UAAsB;QACjD,MAAM,OAAO,GAAG,UAA+B,CAAC;QAChD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YACpC,OAAO,CAAC,4CAA4C;QACtD,CAAC;QACD,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAElC,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;YACvB,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;YACxC,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACtB,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC;YAC9B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;YAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9C,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACjB,IAAI,KAAK,CAAC,QAAQ,IAAI,CAAC,EAAE,CAAC;oBACxB,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBACnC,IAAI,CAAC;wBACH,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC;wBAC7C,MAAM,YAAY,CAAC,YAAY,EAAE,CAAC;oBACpC,CAAC;oBAAC,MAAM,CAAC;wBACP,yCAAyC;oBAC3C,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAYD,KAAK,CAAC,YAAY;QAChB,KAAK,MAAM,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7C,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAC7C,CAAC;QACD,iEAAiE;QACjE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAClD,IAAI,CAAC;gBACH,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC;gBAC7C,MAAM,YAAY,CAAC,YAAY,EAAE,CAAC;YACpC,CAAC;YAAC,MAAM,CAAC;gBACP,cAAc;YAChB,CAAC;YACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QAED,4EAA4E;QAC5E,mEAAmE;QACnE,4EAA4E;QAC5E,0EAA0E;QAC1E,6BAA6B;QAC7B,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;gBAC3D,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE,CAAC;oBAC/B,YAAY,CAAC,IAAI,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC;gBAC3C,CAAC;gBACD,uEAAuE;gBACvE,oEAAoE;gBACpE,gEAAgE;gBAChE,uEAAuE;gBACvE,+DAA+D;gBAC/D,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;oBAC7D,YAAY,CAAC,IAAI,CACf,8BAA8B,OAAO,CAAC,MAAM,aAC1C,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC9B,iDAAiD;wBAC/C,4DAA4D;wBAC5D,iCAAiC,CACpC,CAAC;gBACJ,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,YAAY,CAAC,IAAI,CACf,yCACE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CACjD,EAAE,CACH,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;CACF"}
1
+ {"version":3,"file":"base-job-context.js","sourceRoot":"","sources":["../../../src/utils/job-context/base-job-context.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,9 @@
1
+ import { type BuildContext } from '@quenty/nevermore-template-helpers';
1
2
  import { type Reporter } from '@quenty/cli-output-helpers/reporting';
2
3
  import { type BuiltPlace, type Deployment, type DeployPlaceOptions, type JobContext, type RunScriptOptions, type ScriptRunResult, type JobLogs } from './job-context.js';
3
4
  import { type BuildPlaceOptions } from '../build/build.js';
4
5
  import { type BatchTarget } from '../batch/changed-packages-utils.js';
6
+ import { type CombinedPlaceChunk } from '../testing/runner/combined-project-generator.js';
5
7
  import { type BatchDiagnosticLevel, type BatchPackageResult } from '../testing/parsers/batch-log-parser.js';
6
8
  import { type LogFetchStats } from '../testing/log-fetch-stats.js';
7
9
  import { type RenderableLogLine } from '../testing/parsers/batch-log-renderer.js';
@@ -68,6 +70,15 @@ export declare class BatchScriptJobContext implements JobContext {
68
70
  */
69
71
  maxChunkBytes?: number;
70
72
  reporter?: Reporter;
73
+ /**
74
+ * Places already built by `batch bundle --test`, run instead of building. They
75
+ * upload to `batchPlaceId` in `batchUniverseId`, which are then required.
76
+ * The context owns `buildContext` and cleans it up like its own build.
77
+ */
78
+ prebuilt?: {
79
+ chunks: CombinedPlaceChunk[];
80
+ buildContext: BuildContext;
81
+ };
71
82
  });
72
83
  buildPlaceAsync(options: BuildPlaceOptions): Promise<BuiltPlace>;
73
84
  deployBuiltPlaceAsync(options: DeployPlaceOptions): Promise<Deployment>;
@@ -80,6 +91,7 @@ export declare class BatchScriptJobContext implements JobContext {
80
91
  * build and upload out of any one package's async context.
81
92
  */
82
93
  getExecutionOutcomeAsync(): Promise<BatchExecutionOutcome>;
94
+ getBuiltChunksAsync(): Promise<CombinedPlaceChunk[]>;
83
95
  getLogsAsync(deployment: Deployment): Promise<JobLogs>;
84
96
  releaseAsync(_deployment: Deployment): Promise<void>;
85
97
  releaseBuiltPlaceAsync(_builtPlace: BuiltPlace): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"batch-script-job-context.d.ts","sourceRoot":"","sources":["../../../src/utils/job-context/batch-script-job-context.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"batch-script-job-context.d.ts","sourceRoot":"","sources":["../../../src/utils/job-context/batch-script-job-context.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,YAAY,EAElB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AACrE,OAAO,EACL,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,OAAO,EACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAEL,KAAK,kBAAkB,EAIxB,MAAM,iDAAiD,CAAC;AACzD,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EAExB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,0CAA0C,CAAC;AAoBlD;;;;;;;;;;;;;;GAcG;AACH;;;;;;;;;GASG;AACH,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IACzC,gEAAgE;IAChE,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,sFAAsF;IACtF,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,sEAAsE;IACtE,WAAW,EAAE,KAAK,CAAC;QAAE,KAAK,EAAE,oBAAoB,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrE,qEAAqE;IACrE,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACpC;AAED,qBAAa,qBAAsB,YAAW,UAAU;IACtD,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,aAAa,CAAgB;IACrC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAS;IAClC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,cAAc,CAAC,CAAS;IAChC,OAAO,CAAC,SAAS,CAAC,CAAW;IAG7B,OAAO,CAAC,qBAAqB,CAAC,CAAsB;IACpD,OAAO,CAAC,UAAU,CAAC,CAAa;IAChC,OAAO,CAAC,iBAAiB,CAAC,CAAiC;IAG3D,OAAO,CAAC,qBAAqB,CAAC,CAAe;gBAG3C,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,WAAW,EAAE,EAC3B,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB;;;WAGG;QACH,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;QACpB;;;;WAIG;QACH,QAAQ,CAAC,EAAE;YAAE,MAAM,EAAE,kBAAkB,EAAE,CAAC;YAAC,YAAY,EAAE,YAAY,CAAA;SAAE,CAAC;KACzE;IA2CG,eAAe,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC;IAahE,qBAAqB,CACzB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,UAAU,CAAC;IAOhB,cAAc,CAClB,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,eAAe,CAAC;IAwB3B;;;;;;OAMG;IACG,wBAAwB,IAAI,OAAO,CAAC,qBAAqB,CAAC;IAI1D,mBAAmB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;IAIpD,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAatD,YAAY,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpD,sBAAsB,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBnC,OAAO,CAAC,sBAAsB;YAOhB,qBAAqB;YAgDrB,kBAAkB;YAKlB,iBAAiB;IAW/B,OAAO,CAAC,wBAAwB;YAWlB,mBAAmB;IAqBjC,OAAO,CAAC,uBAAuB;YAWjB,sBAAsB;IAyBpC,OAAO,CAAC,uBAAuB;YAajB,sBAAsB;CAmFrC"}
@@ -37,6 +37,22 @@ export class BatchScriptJobContext {
37
37
  this._batchTimeoutMs = options?.batchTimeoutMs ?? 300_000;
38
38
  this._maxChunkBytes = options?.maxChunkBytes;
39
39
  this._reporter = options?.reporter;
40
+ if (options?.prebuilt) {
41
+ if (!this._batchPlaceId || !this._batchUniverseId) {
42
+ throw new Error('Prebuilt places need batchPlaceId and batchUniverseId to upload to');
43
+ }
44
+ const { chunks, buildContext } = options.prebuilt;
45
+ this._combinedBuildContext = buildContext;
46
+ this._chunkRuns = chunks.map((chunk) => ({ chunk }));
47
+ this._combinedBuildPromise = Promise.resolve({
48
+ chunks,
49
+ primaryTarget: {
50
+ placeId: this._batchPlaceId,
51
+ universeId: this._batchUniverseId,
52
+ project: '',
53
+ },
54
+ });
55
+ }
40
56
  const withBasePlace = batchTargets.filter((t) => t.target.basePlace);
41
57
  if (withBasePlace.length > 0) {
42
58
  OutputHelper.warn(`${withBasePlace.length} package${withBasePlace.length === 1 ? '' : 's'} configure a basePlace, which an aggregated batch run cannot merge — ` +
@@ -93,6 +109,9 @@ export class BatchScriptJobContext {
93
109
  async getExecutionOutcomeAsync() {
94
110
  return this._getBatchExecutionAsync();
95
111
  }
112
+ async getBuiltChunksAsync() {
113
+ return (await this._getChunkRunsAsync()).map((run) => run.chunk);
114
+ }
96
115
  async getLogsAsync(deployment) {
97
116
  const batchDeployment = deployment;
98
117
  const { results, stats } = await this._getBatchExecutionAsync();