@quenty/nevermore-cli 4.43.4 → 4.45.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.
- package/CHANGELOG.md +10 -0
- package/build-scripts/{combine-test-places.luau → combine-test-places.lua} +3 -3
- package/build-scripts/{transform-inject-deploy-metadata.luau → transform-inject-deploy-metadata.lua} +3 -3
- package/dist/commands/batch-command/batch-deploy-command.js +4 -4
- package/dist/commands/batch-command/batch-deploy-command.js.map +1 -1
- package/dist/commands/batch-command/batch-test-command.d.ts.map +1 -1
- package/dist/commands/batch-command/batch-test-command.js +76 -19
- package/dist/commands/batch-command/batch-test-command.js.map +1 -1
- package/dist/commands/deploy-command/deploy-init-utils.d.ts.map +1 -1
- package/dist/commands/deploy-command/deploy-init-utils.js +7 -1
- package/dist/commands/deploy-command/deploy-init-utils.js.map +1 -1
- package/dist/commands/deploy-command/deploy-init.d.ts.map +1 -1
- package/dist/commands/deploy-command/deploy-init.js +24 -7
- package/dist/commands/deploy-command/deploy-init.js.map +1 -1
- package/dist/commands/deploy-command/index.js +1 -1
- package/dist/commands/deploy-command/index.js.map +1 -1
- package/dist/utils/deploy/deploy-github-columns.d.ts +12 -2
- package/dist/utils/deploy/deploy-github-columns.d.ts.map +1 -1
- package/dist/utils/deploy/deploy-github-columns.js +11 -4
- package/dist/utils/deploy/deploy-github-columns.js.map +1 -1
- package/dist/utils/deploy/deploy-metadata.js +1 -1
- package/dist/utils/deploy/deploy-metadata.js.map +1 -1
- package/dist/utils/job-context/base-job-context.d.ts +2 -2
- package/dist/utils/job-context/base-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/base-job-context.js +1 -1
- package/dist/utils/job-context/base-job-context.js.map +1 -1
- package/dist/utils/job-context/batch-script-job-context.d.ts +37 -2
- package/dist/utils/job-context/batch-script-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/batch-script-job-context.js +59 -22
- package/dist/utils/job-context/batch-script-job-context.js.map +1 -1
- package/dist/utils/job-context/cloud-job-context.d.ts +2 -2
- package/dist/utils/job-context/cloud-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/cloud-job-context.js +10 -5
- package/dist/utils/job-context/cloud-job-context.js.map +1 -1
- package/dist/utils/job-context/cloud-job-context.test.d.ts +7 -0
- package/dist/utils/job-context/cloud-job-context.test.d.ts.map +1 -0
- package/dist/utils/job-context/cloud-job-context.test.js +91 -0
- package/dist/utils/job-context/cloud-job-context.test.js.map +1 -0
- package/dist/utils/job-context/job-context.d.ts +70 -2
- package/dist/utils/job-context/job-context.d.ts.map +1 -1
- package/dist/utils/job-context/local-job-context.d.ts +2 -2
- package/dist/utils/job-context/local-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/local-job-context.js +4 -2
- package/dist/utils/job-context/local-job-context.js.map +1 -1
- package/dist/utils/job-context/local-job-context.test.d.ts +7 -0
- package/dist/utils/job-context/local-job-context.test.d.ts.map +1 -0
- package/dist/utils/job-context/local-job-context.test.js +68 -0
- package/dist/utils/job-context/local-job-context.test.js.map +1 -0
- package/dist/utils/open-cloud/open-cloud-client.d.ts +50 -7
- package/dist/utils/open-cloud/open-cloud-client.d.ts.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.js +49 -13
- package/dist/utils/open-cloud/open-cloud-client.js.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.test.js +125 -1
- package/dist/utils/open-cloud/open-cloud-client.test.js.map +1 -1
- package/dist/utils/open-cloud/open-cloud-logs.characterization.test.d.ts +22 -0
- package/dist/utils/open-cloud/open-cloud-logs.characterization.test.d.ts.map +1 -0
- package/dist/utils/open-cloud/open-cloud-logs.characterization.test.js +202 -0
- package/dist/utils/open-cloud/open-cloud-logs.characterization.test.js.map +1 -0
- package/dist/utils/package-manager-utils.d.ts.map +1 -1
- package/dist/utils/package-manager-utils.js +32 -1
- package/dist/utils/package-manager-utils.js.map +1 -1
- package/dist/utils/package-manager-utils.test.js +25 -0
- package/dist/utils/package-manager-utils.test.js.map +1 -1
- package/dist/utils/testing/batch-run.e2e.test.d.ts +17 -0
- package/dist/utils/testing/batch-run.e2e.test.d.ts.map +1 -0
- package/dist/utils/testing/batch-run.e2e.test.js +343 -0
- package/dist/utils/testing/batch-run.e2e.test.js.map +1 -0
- package/dist/utils/testing/batch-test-runner-template.test.d.ts +11 -0
- package/dist/utils/testing/batch-test-runner-template.test.d.ts.map +1 -0
- package/dist/utils/testing/batch-test-runner-template.test.js +38 -0
- package/dist/utils/testing/batch-test-runner-template.test.js.map +1 -0
- package/dist/utils/testing/log-fetch-stats.d.ts +40 -0
- package/dist/utils/testing/log-fetch-stats.d.ts.map +1 -0
- package/dist/utils/testing/log-fetch-stats.js +18 -0
- package/dist/utils/testing/log-fetch-stats.js.map +1 -0
- package/dist/utils/testing/log-fetch-stats.test.d.ts +2 -0
- package/dist/utils/testing/log-fetch-stats.test.d.ts.map +1 -0
- package/dist/utils/testing/log-fetch-stats.test.js +41 -0
- package/dist/utils/testing/log-fetch-stats.test.js.map +1 -0
- package/dist/utils/testing/parsers/batch-log-parser.d.ts +126 -1
- package/dist/utils/testing/parsers/batch-log-parser.d.ts.map +1 -1
- package/dist/utils/testing/parsers/batch-log-parser.js +440 -103
- package/dist/utils/testing/parsers/batch-log-parser.js.map +1 -1
- package/dist/utils/testing/parsers/batch-log-parser.test.js +494 -1
- package/dist/utils/testing/parsers/batch-log-parser.test.js.map +1 -1
- package/dist/utils/testing/parsers/batch-log-renderer.d.ts +79 -0
- package/dist/utils/testing/parsers/batch-log-renderer.d.ts.map +1 -0
- package/dist/utils/testing/parsers/batch-log-renderer.js +241 -0
- package/dist/utils/testing/parsers/batch-log-renderer.js.map +1 -0
- package/dist/utils/testing/parsers/batch-log-renderer.test.d.ts +2 -0
- package/dist/utils/testing/parsers/batch-log-renderer.test.d.ts.map +1 -0
- package/dist/utils/testing/parsers/batch-log-renderer.test.js +202 -0
- package/dist/utils/testing/parsers/batch-log-renderer.test.js.map +1 -0
- package/dist/utils/testing/runner/combined-project-generator.js +1 -1
- package/dist/utils/testing/runner/combined-project-generator.js.map +1 -1
- package/dist/utils/testing/runner/test-runner.d.ts +24 -0
- package/dist/utils/testing/runner/test-runner.d.ts.map +1 -1
- package/dist/utils/testing/runner/test-runner.js +166 -6
- package/dist/utils/testing/runner/test-runner.js.map +1 -1
- package/dist/utils/testing/runner/test-runner.test.js +228 -2
- package/dist/utils/testing/runner/test-runner.test.js.map +1 -1
- package/dist/utils/testing/structured-test-results.d.ts +77 -0
- package/dist/utils/testing/structured-test-results.d.ts.map +1 -0
- package/dist/utils/testing/structured-test-results.js +140 -0
- package/dist/utils/testing/structured-test-results.js.map +1 -0
- package/dist/utils/testing/structured-test-results.test.d.ts +7 -0
- package/dist/utils/testing/structured-test-results.test.d.ts.map +1 -0
- package/dist/utils/testing/structured-test-results.test.js +179 -0
- package/dist/utils/testing/structured-test-results.test.js.map +1 -0
- package/package.json +6 -6
- package/src/commands/batch-command/batch-deploy-command.ts +4 -4
- package/src/commands/batch-command/batch-test-command.ts +94 -19
- package/src/commands/deploy-command/deploy-init-utils.ts +7 -1
- package/src/commands/deploy-command/deploy-init.ts +41 -11
- package/src/commands/deploy-command/index.ts +1 -1
- package/src/utils/deploy/deploy-github-columns.ts +14 -4
- package/src/utils/deploy/deploy-metadata.ts +1 -1
- package/src/utils/job-context/base-job-context.ts +3 -2
- package/src/utils/job-context/batch-script-job-context.ts +98 -17
- package/src/utils/job-context/cloud-job-context.test.ts +112 -0
- package/src/utils/job-context/cloud-job-context.ts +12 -6
- package/src/utils/job-context/job-context.ts +71 -2
- package/src/utils/job-context/local-job-context.test.ts +89 -0
- package/src/utils/job-context/local-job-context.ts +7 -3
- package/src/utils/open-cloud/open-cloud-client.test.ts +155 -1
- package/src/utils/open-cloud/open-cloud-client.ts +94 -18
- package/src/utils/open-cloud/open-cloud-logs.characterization.test.ts +277 -0
- package/src/utils/package-manager-utils.test.ts +27 -0
- package/src/utils/package-manager-utils.ts +34 -1
- package/src/utils/testing/batch-run.e2e.test.ts +425 -0
- package/src/utils/testing/batch-test-runner-template.test.ts +62 -0
- package/src/utils/testing/log-fetch-stats.test.ts +48 -0
- package/src/utils/testing/log-fetch-stats.ts +55 -0
- package/src/utils/testing/parsers/batch-log-parser.test.ts +660 -1
- package/src/utils/testing/parsers/batch-log-parser.ts +721 -116
- package/src/utils/testing/parsers/batch-log-renderer.test.ts +330 -0
- package/src/utils/testing/parsers/batch-log-renderer.ts +329 -0
- package/src/utils/testing/runner/combined-project-generator.ts +1 -1
- package/src/utils/testing/runner/test-runner.test.ts +332 -2
- package/src/utils/testing/runner/test-runner.ts +231 -9
- package/src/utils/testing/structured-test-results.test.ts +267 -0
- package/src/utils/testing/structured-test-results.ts +199 -0
- package/templates/batch-test-runner.lua +242 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/templates/batch-test-runner.luau +0 -137
- /package/build-scripts/{smoke-test-server.luau → smoke-test-server.lua} +0 -0
- /package/build-scripts/{transform-rojo-merge-place.luau → transform-rojo-merge-place.lua} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [4.45.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/nevermore-cli@4.44.0...@quenty/nevermore-cli@4.45.0) (2026-08-28)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- Dryrun does not create place ([2c7f39d](https://github.com/Quenty/NevermoreEngine/commit/2c7f39d0374c423fae572fa36ccf7f9fd794a27b))
|
|
11
|
+
|
|
12
|
+
# [4.44.0](https://github.com/Quenty/NevermoreEngine/compare/@quenty/nevermore-cli@4.43.4...@quenty/nevermore-cli@4.44.0) (2026-08-28)
|
|
13
|
+
|
|
14
|
+
**Note:** Version bump only for package @quenty/nevermore-cli
|
|
15
|
+
|
|
6
16
|
## [4.43.4](https://github.com/Quenty/NevermoreEngine/compare/@quenty/nevermore-cli@4.43.3...@quenty/nevermore-cli@4.43.4) (2026-08-16)
|
|
7
17
|
|
|
8
18
|
### Bug Fixes
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
-- combine-test-places.
|
|
1
|
+
-- combine-test-places.lua
|
|
2
2
|
-- Merges individually-built test .rbxl files into a single combined place.
|
|
3
3
|
--
|
|
4
|
-
-- Usage: lune run combine-test-places.
|
|
4
|
+
-- Usage: lune run combine-test-places.lua <outputPath> <slug1> <rbxl1> <scriptPath1> [<slug2> <rbxl2> <scriptPath2> ...]
|
|
5
5
|
--
|
|
6
6
|
-- For each triple (slug, rbxl, scriptPath):
|
|
7
7
|
-- 1. Deserializes the .rbxl
|
|
@@ -14,7 +14,7 @@ local roblox = require("@lune/roblox")
|
|
|
14
14
|
|
|
15
15
|
local outputPath = process.args[1]
|
|
16
16
|
if not outputPath then
|
|
17
|
-
print("Usage: lune run combine-test-places.
|
|
17
|
+
print("Usage: lune run combine-test-places.lua <outputPath> <slug> <rbxl> <scriptPath> ...")
|
|
18
18
|
process.exit(1)
|
|
19
19
|
end
|
|
20
20
|
|
package/build-scripts/{transform-inject-deploy-metadata.luau → transform-inject-deploy-metadata.lua}
RENAMED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
-- transform-inject-deploy-metadata.
|
|
1
|
+
-- transform-inject-deploy-metadata.lua
|
|
2
2
|
-- Injects nevermore deploy metadata into a built place.
|
|
3
3
|
--
|
|
4
|
-
-- Usage: lune run transform-inject-deploy-metadata.
|
|
4
|
+
-- Usage: lune run transform-inject-deploy-metadata.lua <inputPath> <outputPath> <metadataJson>
|
|
5
5
|
--
|
|
6
6
|
-- The nevermore-cli-manifest package ships a `NevermoreCLIManifestUtils`
|
|
7
7
|
-- ModuleScript. This transform finds that module in the built place and writes
|
|
@@ -22,7 +22,7 @@ local outputPath = process.args[2]
|
|
|
22
22
|
local metadataJson = process.args[3]
|
|
23
23
|
|
|
24
24
|
if not inputPath or not outputPath or not metadataJson then
|
|
25
|
-
print("Usage: lune run transform-inject-deploy-metadata.
|
|
25
|
+
print("Usage: lune run transform-inject-deploy-metadata.lua <inputPath> <outputPath> <metadataJson>")
|
|
26
26
|
process.exit(1)
|
|
27
27
|
end
|
|
28
28
|
|
|
@@ -16,7 +16,7 @@ import { isCI, readPackageVersionAsync, } from '../../utils/nevermore-cli-utils.
|
|
|
16
16
|
import { parseTestLogs } from '../../utils/testing/test-log-parser.js';
|
|
17
17
|
import { buildWatchMonitorName, parseWatchOption, } from '@quenty/nevermore-deploy';
|
|
18
18
|
import { registerWatchesAsync, } from '../../utils/watch/register-watches.js';
|
|
19
|
-
const SMOKE_TEST_SCRIPT_PATH = resolvePackagePath(import.meta.url, 'build-scripts', 'smoke-test-server.
|
|
19
|
+
const SMOKE_TEST_SCRIPT_PATH = resolvePackagePath(import.meta.url, 'build-scripts', 'smoke-test-server.lua');
|
|
20
20
|
export const batchDeployCommand = {
|
|
21
21
|
command: 'deploy',
|
|
22
22
|
describe: 'Deploy changed packages with deploy targets',
|
|
@@ -200,7 +200,7 @@ async function _runAsync(args) {
|
|
|
200
200
|
reporters.push(new JsonFileReporter(state, args.output));
|
|
201
201
|
}
|
|
202
202
|
if (isCI()) {
|
|
203
|
-
reporters.push(new GithubCommentTableReporter(state, createDeployCommentConfig(), concurrency));
|
|
203
|
+
reporters.push(new GithubCommentTableReporter(state, createDeployCommentConfig(deployLabels), concurrency));
|
|
204
204
|
}
|
|
205
205
|
return reporters;
|
|
206
206
|
});
|
|
@@ -389,7 +389,7 @@ async function _registerWatchesAsync(options) {
|
|
|
389
389
|
function _annotateSmokeTestFailure(logs) {
|
|
390
390
|
const header = 'Post-deploy smoke test failed. The deploy itself succeeded, but a server ' +
|
|
391
391
|
"script errored on boot. ('TaskScript' in any stack trace below refers to " +
|
|
392
|
-
"Nevermore's smoke-test-server.
|
|
392
|
+
"Nevermore's smoke-test-server.lua, which loadstring()s each Script under " +
|
|
393
393
|
'ServerScriptService — if you see "loadstring() is not available", set ' +
|
|
394
394
|
'$properties.LoadStringEnabled = true on ServerScriptService in your ' +
|
|
395
395
|
'rojo project.)';
|
|
@@ -411,7 +411,7 @@ async function _runSmokeTestAsync(reporter, packageName, universeId, placeId, ve
|
|
|
411
411
|
}
|
|
412
412
|
});
|
|
413
413
|
const rawLogs = await client.getRawTaskLogsAsync(task.path);
|
|
414
|
-
const parsed = parseTestLogs(rawLogs);
|
|
414
|
+
const parsed = parseTestLogs(rawLogs.text);
|
|
415
415
|
const infraSuccess = completedTask.state === 'COMPLETE';
|
|
416
416
|
return {
|
|
417
417
|
success: infraSuccess && parsed.success,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-deploy-command.js","sourceRoot":"","sources":["../../../src/commands/batch-command/batch-deploy-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"batch-deploy-command.js","sourceRoot":"","sources":["../../../src/commands/batch-command/batch-deploy-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAElC,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAGL,iBAAiB,EACjB,0BAA0B,EAC1B,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,oBAAoB,GACrB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AAExE,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAEL,yBAAyB,GAC1B,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,6BAA6B,EAC7B,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EACL,uBAAuB,EACvB,+BAA+B,GAChC,MAAM,kDAAkD,CAAC;AAC1D,OAAO,EAEL,8BAA8B,EAC9B,kCAAkC,EAClC,qBAAqB,GACtB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EACL,IAAI,EACJ,uBAAuB,GACxB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EACL,qBAAqB,EACrB,gBAAgB,GAGjB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,oBAAoB,GAErB,MAAM,uCAAuC,CAAC;AAE/C,MAAM,sBAAsB,GAAG,kBAAkB,CAC/C,MAAM,CAAC,IAAI,CAAC,GAAG,EACf,eAAe,EACf,uBAAuB,CACxB,CAAC;AAkBF,MAAM,CAAC,MAAM,kBAAkB,GAG3B;IACF,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,6CAA6C;IACvD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK;aACT,MAAM,CAAC,QAAQ,EAAE;YAChB,QAAQ,EAAE,6CAA6C;YACvD,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,MAAM;SAChB,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,QAAQ,EAAE,2BAA2B;YACrC,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,SAAS,EAAE;YACjB,QAAQ,EAAE,iCAAiC;YAC3C,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,KAAK,EAAE;YACb,QAAQ,EAAE,2DAA2D;YACrE,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,QAAQ,EAAE,8CAA8C;YACxD,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,aAAa;SACvB,CAAC;aACD,MAAM,CAAC,aAAa,EAAE;YACrB,QAAQ,EAAE,sBAAsB;YAChC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,CAAC;SACX,CAAC;aACD,MAAM,CAAC,QAAQ,EAAE;YAChB,QAAQ,EAAE,iCAAiC;YAC3C,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACf,QAAQ,EAAE,kDAAkD;YAC5D,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,MAAM,EAAE;YACd,QAAQ,EAAE,6DAA6D;YACvE,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,YAAY,EAAE;YACpB,QAAQ,EACN,yDAAyD;gBACzD,+DAA+D;YACjE,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,OAAO,EAAE;YACf,QAAQ,EACN,gFAAgF;gBAChF,0EAA0E;gBAC1E,kEAAkE;YACpE,IAAI,EAAE,QAAQ;SACf,CAAC;aACD,MAAM,CAAC,mBAAmB,EAAE;YAC3B,QAAQ,EACN,+EAA+E;gBAC/E,wGAAwG;YAC1G,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC;aACD,MAAM,CAAC,qBAAqB,EAAE;YAC7B,QAAQ,EACN,2FAA2F;gBAC3F,qFAAqF;gBACrF,oDAAoD;YACtD,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;IACP,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;QACtB,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,YAAY,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;CACF,CAAC;AAEF,KAAK,UAAU,SAAS,CAAC,IAAqB;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC;IACzC,0EAA0E;IAC1E,MAAM,WAAW,GACf,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEhE,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG;QACzB,CAAC,CAAC,MAAM,8BAA8B,CAAC,UAAU,CAAC;QAClD,CAAC,CAAC,MAAM,kCAAkC,CAAC,IAAI,CAAC,IAAK,EAAE,UAAU,CAAC,CAAC;IACrE,IAAI,YAAY,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;IAErD,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE,CAAC;QACjC,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,YAAY,CAAC,IAAI,CACf,uBAAuB,UAAU,2DAA2D,UAAU,aAAa;gBACjH,6DAA6D,CAChE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,IAAI,CACf,6BAA6B,IAAI,CAAC,IAAI,YAAY,UAAU,aAAa;gBACvE,mGAAmG,CACtG,CAAC;QACJ,CAAC;QACD,0EAA0E;QAC1E,4EAA4E;QAC5E,0EAA0E;QAC1E,0EAA0E;QAC1E,sCAAsC;QACtC,IAAI,WAAW,EAAE,CAAC;YAChB,YAAY,CAAC,IAAI,CACf,uDAAuD,CACxD,CAAC;YACF,MAAM,qBAAqB,CAAC;gBAC1B,UAAU;gBACV,MAAM,EAAE,WAAW;gBACnB,mEAAmE;gBACnE,wBAAwB;gBACxB,QAAQ,EAAE,+BAA+B,EAAE;gBAC3C,SAAS,EAAE,IAAI,CAAC,cAAc;gBAC9B,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,kBAAkB,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC;gBAC9C,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC,CAAC;QACL,CAAC;QACD,OAAO;IACT,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzD,YAAY,CAAC,IAAI,CACf,yBAAyB,YAAY,CAAC,MAAM,aAAa,KAAK,EAAE,CACjE,CAAC;QACF,wEAAwE;QACxE,2EAA2E;QAC3E,gDAAgD;QAChD,IAAI,WAAW,EAAE,CAAC;YAChB,+DAA+D;YAC/D,EAAE;YACF,sEAAsE;YACtE,uEAAuE;YACvE,yEAAyE;YACzE,mEAAmE;YACnE,sEAAsE;YACtE,4DAA4D;YAC5D,4BAA4B;YAC5B,MAAM,qBAAqB,CAAC;gBAC1B,UAAU;gBACV,MAAM,EAAE,WAAW;gBACnB,QAAQ,EAAE,+BAA+B,EAAE;gBAC3C,SAAS,EAAE,IAAI,CAAC,cAAc;gBAC9B,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;QACL,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;IAC1C,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;IAClE,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACpD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,KAAK,CAAC;IACtC,MAAM,YAAY,GAAG;QACnB,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU;QAChD,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,eAAe;KAC3D,CAAC;IACF,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;IAExD,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CACpC,WAAW,EACX,CAAC,KAAuB,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAe;YAC5B,SAAS;gBACP,CAAC,CAAC,IAAI,eAAe,CAAC,KAAK,EAAE;oBACzB,QAAQ,EAAE,IAAI,CAAC,IAAI,IAAI,KAAK;oBAC5B,OAAO,EAAE,IAAI,CAAC,OAAO;oBACrB,UAAU;oBACV,GAAG,YAAY;iBAChB,CAAC;gBACJ,CAAC,CAAC,IAAI,eAAe,CAAC,KAAK,EAAE;oBACzB,QAAQ,EAAE,IAAI,CAAC,IAAI,IAAI,KAAK;oBAC5B,UAAU;oBACV,GAAG,YAAY;iBAChB,CAAC;YACN,IAAI,oBAAoB,CAAC,KAAK,EAAE;gBAC9B,GAAG,YAAY;gBACf,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU;aAChD,CAAC;SACH,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,SAAS,CAAC,IAAI,CAAC,IAAI,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,IAAI,EAAE,EAAE,CAAC;YACX,SAAS,CAAC,IAAI,CACZ,IAAI,0BAA0B,CAC5B,KAAK,EACL,yBAAyB,CAAC,YAAY,CAAC,EACvC,WAAW,CACZ,CACF,CAAC;QACJ,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CACF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,MAAM;QACN,WAAW,EAAE,IAAI,WAAW,EAAE;KAC/B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,IAAI,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAEzE,2EAA2E;IAC3E,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAC;IAC5C,MAAM,eAAe,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAEjD,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;IAE5B,IAAI,QAAQ,GAAG,CAAC,CAAC;IACjB,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,aAAa,CAAiC;YAClE,KAAK,EAAE,YAAY;YACnB,WAAW;YACX,QAAQ;YACR,YAAY,EAAE,SAAS;YACvB,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE;gBAC/C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC;oBAC/C,MAAM,EAAE,WAAW,CAAC,MAAM;oBAC1B,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa;oBACxD,WAAW,EAAE,WAAW,CAAC,IAAI;oBAC7B,WAAW,EAAE,WAAW,CAAC,IAAI;iBAC9B,CAAC,CAAC;gBAEH,MAAM,QAAQ,GAAG,MAAM,yBAAyB,CAC9C,UAAU,EACV,6BAA6B,CAC3B,aAAa,EACb;oBACE,MAAM,EAAE,UAAU;oBAClB,SAAS,EAAE,OAAO;oBAClB,SAAS,EAAE,eAAe;oBAC1B,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,UAAU;oBACzC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO;oBACnC,cAAc,EAAE,MAAM,uBAAuB,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC/D,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO;oBAClD,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;iBAC9C,EACD,WAAW,CAAC,cAAc,CAC3B,CACF,CAAC;gBAEF,IAAI,OAAe,CAAC;gBACpB,IAAI,CAAC;oBACH,CAAC,EAAE,OAAO,EAAE,GAAG,MAAM,gBAAgB,CAAC;wBACpC,UAAU,EAAE,QAAQ,CAAC,UAAU;wBAC/B,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;wBACzB,MAAM;wBACN,QAAQ,EAAE,WAAW;wBACrB,WAAW,EAAE,WAAW,CAAC,IAAI;qBAC9B,CAAC,CAAC,CAAC;gBACN,CAAC;wBAAS,CAAC;oBACT,MAAM,QAAQ,CAAC,YAAY,EAAE,CAAC;gBAChC,CAAC;gBAED,+CAA+C;gBAC/C,MAAM,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;gBAEjD,IAAI,IAAY,CAAC;gBACjB,IAAI,IAAI,CAAC,SAAS,IAAI,WAAW,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;oBACnD,YAAY,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAC;oBAC1D,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAC1C,WAAW,EACX,WAAW,CAAC,IAAI,EAChB,WAAW,CAAC,MAAM,CAAC,UAAU,EAC7B,WAAW,CAAC,MAAM,CAAC,OAAO,EAC1B,OAAO,EACP,MAAM,CACP,CAAC;oBACF,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;oBACxB,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;wBACzB,OAAO;4BACL,WAAW,EAAE,WAAW,CAAC,IAAI;4BAC7B,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO;4BACnC,OAAO,EAAE,KAAK;4BACd,IAAI,EAAE,yBAAyB,CAAC,IAAI,CAAC;4BACrC,YAAY,EAAE,mBAAmB;yBAClC,CAAC;oBACJ,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;oBAC/C,IAAI,GAAG,GAAG,MAAM,KAAK,OAAO,EAAE,CAAC;gBACjC,CAAC;gBAED,OAAO;oBACL,WAAW,EAAE,WAAW,CAAC,IAAI;oBAC7B,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,OAAO;oBACnC,OAAO,EAAE,IAAI;oBACb,IAAI;oBACJ,eAAe,EAAE;wBACf,IAAI,EAAE,SAAS;wBACf,OAAO;wBACP,GAAG,EAAE,gCAAgC,WAAW,CAAC,MAAM,CAAC,OAAO,EAAE;qBAClE;iBACF,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,GAAG,CAAC,CAAC;QAE7C,6EAA6E;QAC7E,4EAA4E;QAC5E,2EAA2E;QAC3E,qEAAqE;QACrE,0EAA0E;QAC1E,aAAa;QACb,IAAI,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChD,MAAM,qBAAqB,CAAC;gBAC1B,UAAU;gBACV,MAAM,EAAE,WAAW;gBACnB,QAAQ,EAAE,iBAAiB;gBAC3B,SAAS,EAAE,IAAI,CAAC,cAAc;gBAC9B,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM;aACvC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,YAAY,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QACrE,QAAQ,GAAG,CAAC,CAAC;IACf,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC;IAC/B,CAAC;IAED,MAAM,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC3B,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,qBAAqB,CAAC,OAUpC;IACC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAE/B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,YAAY,CAAC,IAAI,CACf,mEAAmE;YACjE,gEAAgE;YAChE,iEAAiE;YACjE,iDAAiD,CACpD,CAAC;QACF,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACxB,YAAY,CAAC,IAAI,CACf,qEAAqE;gBACnE,8DAA8D,CACjE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,YAAY,GAChB,OAAO,CAAC,WAAW,IAAI,CAAC,OAAO,CAAC,MAAM;QACpC,CAAC,CAAC,MAAM,OAAO,CAAC,kBAAkB,EAAE,EAAE;QACtC,CAAC,CAAC,SAAS,CAAC;IAEhB,MAAM,WAAW,GAAG,MAAM,8BAA8B,CAAC,UAAU,CAAC,CAAC;IAErE,4EAA4E;IAC5E,4EAA4E;IAC5E,4EAA4E;IAC5E,sEAAsE;IACtE,2DAA2D;IAC3D,MAAM,SAAS,GAAG,IAAI,GAAG,EAA4B,CAAC;IACtD,KAAK,MAAM,WAAW,IAAI,qBAAqB,CAAC,WAAW,CAAC,EAAE,CAAC;QAC7D,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,IAAI,EAAE,CAAC;YACrC,SAAS;QACX,CAAC;QACD,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAChE,UAAU,CAAC,IAAI,CAAC;YACd,UAAU;YACV,WAAW,EAAE,WAAW,CAAC,WAAW;YACpC,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,KAAK,EAAE,WAAW,CAAC,MAAM;SAC1B,CAAC,CAAC;QACH,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,SAAS,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QACzB,YAAY,CAAC,IAAI,CACf,6CAA6C,UAAU,iBAAiB;YACtE,8DAA8D,CACjE,CAAC;QACF,OAAO;IACT,CAAC;IAED,KAAK,MAAM,CAAC,WAAW,EAAE,UAAU,CAAC,IAAI,SAAS,EAAE,CAAC;QAClD,MAAM,oBAAoB,CAAC;YACzB,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,WAAW,EAAE,qBAAqB,CAAC;gBACjC,WAAW;gBACX,UAAU;gBACV,MAAM,EAAE,OAAO,CAAC,MAAM;aACvB,CAAC;YACF,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,YAAY;YACZ,wEAAwE;YACxE,4DAA4D;YAC5D,oBAAoB,EAAE,OAAO,CAAC,MAAM;YACpC,UAAU;SACX,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,yBAAyB,CAAC,IAAY;IAC7C,MAAM,MAAM,GACV,2EAA2E;QAC3E,2EAA2E;QAC3E,2EAA2E;QAC3E,wEAAwE;QACxE,sEAAsE;QACtE,gBAAgB,CAAC;IACnB,OAAO,GAAG,MAAM,OAAO,IAAI,EAAE,CAAC;AAChC,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,QAAkB,EAClB,WAAmB,EACnB,UAAkB,EAClB,OAAe,EACf,OAAe,EACf,MAAuB;IAEvB,IAAI,aAAqB,CAAC;IAC1B,IAAI,CAAC;QACH,aAAa,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,gCAAgC,sBAAsB,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,QAAQ,CAAC,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC;IACzD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAChD,UAAU,EACV,OAAO,EACP,OAAO,EACP,aAAa,CACd,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,uBAAuB,CACxD,IAAI,CAAC,IAAI,EACT,CAAC,KAAK,EAAE,EAAE;QACR,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;YAC3B,QAAQ,CAAC,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,CACF,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE3C,MAAM,YAAY,GAAG,aAAa,CAAC,KAAK,KAAK,UAAU,CAAC;IACxD,OAAO;QACL,OAAO,EAAE,YAAY,IAAI,MAAM,CAAC,OAAO;QACvC,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-test-command.d.ts","sourceRoot":"","sources":["../../../src/commands/batch-command/batch-test-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"batch-test-command.d.ts","sourceRoot":"","sources":["../../../src/commands/batch-command/batch-test-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAQtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAoChE,UAAU,aAAc,SAAQ,mBAAmB;IACjD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAC1C,mBAAmB,EACnB,aAAa,CA4Fd,CAAC"}
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { OutputHelper } from '@quenty/cli-output-helpers';
|
|
2
|
+
import { AggregatedBatchReporter, } from '@quenty/cli-output-helpers/reporting';
|
|
2
3
|
import { getApiKeyAsync } from '@quenty/nevermore-cli-helpers';
|
|
3
4
|
import { runBatchAsync } from '../../utils/batch/batch-runner.js';
|
|
5
|
+
import { renderBatchOutcome } from '../../utils/testing/parsers/batch-log-renderer.js';
|
|
6
|
+
import { emitDiagnostic } from '../../utils/testing/parsers/batch-log-parser.js';
|
|
4
7
|
import { createBasePlaceResolver } from '../../utils/build/base-place-resolver-factory.js';
|
|
5
8
|
import { BatchScriptJobContext, CloudJobContext, LocalJobContext, } from '../../utils/job-context/index.js';
|
|
6
9
|
import { OpenCloudClient } from '../../utils/open-cloud/open-cloud-client.js';
|
|
@@ -117,20 +120,37 @@ async function _runAsync(args) {
|
|
|
117
120
|
: args.concurrency;
|
|
118
121
|
const isGrouped = !process.stdout.isTTY || args.verbose || isCI();
|
|
119
122
|
const packageNames = packages.map((p) => p.name);
|
|
123
|
+
const aggregated = args.aggregated ?? false;
|
|
124
|
+
// Decided once, here, and passed down. Three separate isCI() lookups — the
|
|
125
|
+
// renderer, OutputHelper's group markers and GroupedReporter — could each
|
|
126
|
+
// answer differently, and a half-grouped log is worse than an ungrouped one.
|
|
127
|
+
const presentation = { useGroups: isCI(), color: !process.env.NO_COLOR };
|
|
128
|
+
let aggregatedReporter;
|
|
120
129
|
const reporter = new CompositeReporter(packageNames, (state) => {
|
|
130
|
+
// An aggregated run is one execution, so there is no per-package progress
|
|
131
|
+
// to report and no per-package moment to report it at.
|
|
132
|
+
if (aggregated) {
|
|
133
|
+
aggregatedReporter = new AggregatedBatchReporter(packages.length, {
|
|
134
|
+
actionVerb: 'Testing',
|
|
135
|
+
});
|
|
136
|
+
}
|
|
121
137
|
const reporters = [
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
138
|
+
aggregatedReporter ??
|
|
139
|
+
(isGrouped
|
|
140
|
+
? new GroupedReporter(state, {
|
|
141
|
+
showLogs: args.logs ?? false,
|
|
142
|
+
verbose: args.verbose,
|
|
143
|
+
actionVerb: 'Testing',
|
|
144
|
+
expectsTestCounts: true,
|
|
145
|
+
})
|
|
146
|
+
: new SpinnerReporter(state, {
|
|
147
|
+
showLogs: args.logs ?? false,
|
|
148
|
+
actionVerb: 'Testing',
|
|
149
|
+
})),
|
|
150
|
+
// Told to expect counts for the same reason the grouped reporter and
|
|
151
|
+
// the PR comment are: a green row with nothing behind it reads exactly
|
|
152
|
+
// like a package that tested something.
|
|
153
|
+
new SummaryTableReporter(state, { expectsTestCounts: true }),
|
|
134
154
|
];
|
|
135
155
|
if (args.output) {
|
|
136
156
|
reporters.push(new JsonFileReporter(state, args.output));
|
|
@@ -164,17 +184,35 @@ async function _runAsync(args) {
|
|
|
164
184
|
const innerContext = cloud
|
|
165
185
|
? new CloudJobContext(innerReporter, client, basePlaceResolver)
|
|
166
186
|
: new LocalJobContext(innerReporter, client, basePlaceResolver);
|
|
167
|
-
const
|
|
187
|
+
const batchContext = aggregated
|
|
168
188
|
? new BatchScriptJobContext(innerContext, packages, {
|
|
169
189
|
batchPlaceId: args.batchPlaceId,
|
|
170
190
|
batchUniverseId: args.batchUniverseId,
|
|
171
191
|
batchTimeoutMs: timeoutMs,
|
|
172
192
|
reporter,
|
|
173
193
|
})
|
|
174
|
-
:
|
|
194
|
+
: undefined;
|
|
195
|
+
const context = batchContext ?? innerContext;
|
|
175
196
|
await reporter.startAsync();
|
|
176
197
|
let exitCode = 0;
|
|
177
198
|
try {
|
|
199
|
+
// Run the batch before the per-package loop asks for anything, for two
|
|
200
|
+
// reasons. The run is shown once, in order, before any per-package result
|
|
201
|
+
// could interleave with it; and the shared build, upload and execution
|
|
202
|
+
// happen outside every package's async context, so the verbose output they
|
|
203
|
+
// produce stops being captured into whichever package first reached the
|
|
204
|
+
// shared promise — which is how the upload URL and a 78-line build list
|
|
205
|
+
// came to be filed under two arbitrary packages.
|
|
206
|
+
if (batchContext && aggregatedReporter) {
|
|
207
|
+
// Retried the same way a package's run is. Running the batch up here took
|
|
208
|
+
// it out from under the per-package retry wrapper that used to cover it,
|
|
209
|
+
// and a cloud task that times out once is exactly what that retry is for.
|
|
210
|
+
const outcome = await _retryOnTransientAsync('batch execution', () => batchContext.getExecutionOutcomeAsync());
|
|
211
|
+
aggregatedReporter.printRun(renderBatchOutcome(outcome, presentation));
|
|
212
|
+
for (const { level, message } of outcome.diagnostics) {
|
|
213
|
+
emitDiagnostic(level, message, presentation.useGroups);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
178
216
|
const results = await runBatchAsync({
|
|
179
217
|
items: packages,
|
|
180
218
|
concurrency,
|
|
@@ -182,7 +220,7 @@ async function _runAsync(args) {
|
|
|
182
220
|
bufferOutput: isGrouped,
|
|
183
221
|
stateTracker: reporter.state,
|
|
184
222
|
executeAsync: async (pkg) => {
|
|
185
|
-
const result = await _runWithRetryAsync(pkg, context, timeoutMs);
|
|
223
|
+
const result = await _runWithRetryAsync(pkg, context, timeoutMs, args.aggregated ?? false);
|
|
186
224
|
return {
|
|
187
225
|
packageName: pkg.name,
|
|
188
226
|
placeId: pkg.target.placeId,
|
|
@@ -195,6 +233,12 @@ async function _runAsync(args) {
|
|
|
195
233
|
progressSummary: result.testCounts
|
|
196
234
|
? { kind: 'test-counts', ...result.testCounts }
|
|
197
235
|
: undefined,
|
|
236
|
+
// Every reporter downstream reads state through resolveResultStatus,
|
|
237
|
+
// so a run judged without its logs is marked once here rather than
|
|
238
|
+
// being re-derived by each of them.
|
|
239
|
+
caveats: result.logsLost
|
|
240
|
+
? ['logs-lost'].slice()
|
|
241
|
+
: undefined,
|
|
198
242
|
error: result.error,
|
|
199
243
|
};
|
|
200
244
|
},
|
|
@@ -214,21 +258,34 @@ async function _runAsync(args) {
|
|
|
214
258
|
// which prevents the event loop from draining. Explicit exit required.
|
|
215
259
|
process.exit(exitCode);
|
|
216
260
|
}
|
|
217
|
-
async function _runWithRetryAsync(pkg, context, timeoutMs) {
|
|
261
|
+
async function _runWithRetryAsync(pkg, context, timeoutMs, aggregated) {
|
|
218
262
|
const opts = {
|
|
219
263
|
packagePath: pkg.path,
|
|
220
264
|
packageName: pkg.name,
|
|
221
265
|
timeoutMs,
|
|
222
266
|
target: pkg.target,
|
|
267
|
+
// One fetch serves every package here, so its provenance is reported once
|
|
268
|
+
// for the whole batch rather than restated per package.
|
|
269
|
+
suppressCountsProvenance: aggregated,
|
|
223
270
|
};
|
|
271
|
+
return _retryOnTransientAsync(pkg.name, () => runSingleTestAsync(context, opts));
|
|
272
|
+
}
|
|
273
|
+
/**
|
|
274
|
+
* Run something once more if it failed for a reason that tends not to repeat.
|
|
275
|
+
*
|
|
276
|
+
* Shared so the batch execution and a single package's run agree on what counts
|
|
277
|
+
* as transient — the batch used to inherit this by being triggered from inside
|
|
278
|
+
* a package's run, and stopped when it moved out to the command.
|
|
279
|
+
*/
|
|
280
|
+
async function _retryOnTransientAsync(label, runAsync) {
|
|
224
281
|
try {
|
|
225
|
-
return await
|
|
282
|
+
return await runAsync();
|
|
226
283
|
}
|
|
227
284
|
catch (err) {
|
|
228
285
|
const message = err instanceof Error ? err.message : String(err);
|
|
229
286
|
if (message.includes('timed out') || message.includes('fetch failed')) {
|
|
230
|
-
OutputHelper.warn(`${
|
|
231
|
-
return await
|
|
287
|
+
OutputHelper.warn(`${label}: transient failure, retrying...`);
|
|
288
|
+
return await runAsync();
|
|
232
289
|
}
|
|
233
290
|
throw err;
|
|
234
291
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-test-command.js","sourceRoot":"","sources":["../../../src/commands/batch-command/batch-test-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"batch-test-command.js","sourceRoot":"","sources":["../../../src/commands/batch-command/batch-test-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-init-utils.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init-utils.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,CAKjC;AAeD,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"deploy-init-utils.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init-utils.ts"],"names":[],"mappings":"AAIA;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,aAAa,CAAC,CAKjC;AAeD,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAmB7B"}
|
|
@@ -39,11 +39,17 @@ export async function detectProjectFileAsync(packagePath) {
|
|
|
39
39
|
return undefined;
|
|
40
40
|
}
|
|
41
41
|
export async function detectScriptFileAsync(packagePath) {
|
|
42
|
+
// Both extensions for each, since a package may use either. The client
|
|
43
|
+
// entry read `ClientMain.server.luau` and so matched nothing: every client
|
|
44
|
+
// script in this repo is `ClientMain.client.lua`, and a `.server` client
|
|
45
|
+
// script does not exist.
|
|
42
46
|
const candidates = [
|
|
43
47
|
'test/scripts/Server/ServerMain.server.lua',
|
|
44
48
|
'test/scripts/Server/ServerMain.server.luau',
|
|
45
49
|
'scripts/Server/ServerMain.server.lua',
|
|
46
|
-
'scripts/
|
|
50
|
+
'scripts/Server/ServerMain.server.luau',
|
|
51
|
+
'scripts/Client/ClientMain.client.lua',
|
|
52
|
+
'scripts/Client/ClientMain.client.luau',
|
|
47
53
|
];
|
|
48
54
|
for (const candidate of candidates) {
|
|
49
55
|
if (await fileExistsAsync(path.join(packagePath, candidate))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-init-utils.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB;IAEnB,IAAI,MAAM,4BAA4B,CAAC,WAAW,CAAC,EAAE,CAAC;QACpD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,WAAmB;IAEnB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IACnE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAuC,CAAC;QACzE,OAAO,MAAM,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAmB;IAEnB,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC;QACtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC;KAC/C,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,MAAM,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB;IAEnB,MAAM,UAAU,GAAG;QACjB,2CAA2C;QAC3C,4CAA4C;QAC5C,sCAAsC;QACtC,uCAAuC;KACxC,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;YAC7D,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
1
|
+
{"version":3,"file":"deploy-init-utils.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB;IAEnB,IAAI,MAAM,4BAA4B,CAAC,WAAW,CAAC,EAAE,CAAC;QACpD,OAAO,aAAa,CAAC;IACvB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,KAAK,UAAU,4BAA4B,CACzC,WAAmB;IAEnB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;IACnE,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAuC,CAAC;QACzE,OAAO,MAAM,CAAC,IAAI,EAAE,UAAU,KAAK,WAAW,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAmB;IAEnB,MAAM,UAAU,GAAG;QACjB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,sBAAsB,CAAC;QACtD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,sBAAsB,CAAC;KAC/C,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,MAAM,eAAe,CAAC,SAAS,CAAC,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB;IAEnB,uEAAuE;IACvE,2EAA2E;IAC3E,yEAAyE;IACzE,yBAAyB;IACzB,MAAM,UAAU,GAAG;QACjB,2CAA2C;QAC3C,4CAA4C;QAC5C,sCAAsC;QACtC,uCAAuC;QACvC,sCAAsC;QACtC,uCAAuC;KACxC,CAAC;IACF,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;YAC7D,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-init.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-init.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AA2BxC,wBAAsB,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBrE"}
|
|
@@ -7,6 +7,11 @@ import { getRobloxCookieAsync, createPlaceInUniverseAsync, findGitRepoRootAsync,
|
|
|
7
7
|
import { fileExistsAsync, buildPlaceNameAsync, } from '../../utils/nevermore-cli-utils.js';
|
|
8
8
|
import { promptPlaceIdAsync } from './deploy-init-prompts.js';
|
|
9
9
|
import { detectProjectFileAsync, detectScriptFileAsync, detectTargetNameAsync, } from './deploy-init-utils.js';
|
|
10
|
+
/**
|
|
11
|
+
* Stands in for the place ID in a `--dryrun` preview. A dryrun never creates a
|
|
12
|
+
* place, so there is no real ID to render — and the preview is never written.
|
|
13
|
+
*/
|
|
14
|
+
const DRYRUN_PLACE_ID = '<would-be-created>';
|
|
10
15
|
export async function handleInitAsync(args) {
|
|
11
16
|
const packagePath = process.cwd();
|
|
12
17
|
const deployJsonPath = path.join(packagePath, 'deploy.nevermore.json');
|
|
@@ -65,8 +70,7 @@ async function resolveNonInteractive(args, state) {
|
|
|
65
70
|
throw new Error(`Missing required flags for non-interactive mode: ${missing.join(', ')}`);
|
|
66
71
|
}
|
|
67
72
|
if (args.createPlace && state.universeId && !state.placeId) {
|
|
68
|
-
|
|
69
|
-
state.placeId = await createPlaceInUniverseAsync(cookie, state.universeId, state.placeName);
|
|
73
|
+
state.placeId = await createPlaceAsync(args, state.universeId, state.placeName);
|
|
70
74
|
}
|
|
71
75
|
if (!state.placeId) {
|
|
72
76
|
throw new Error('Missing required flag for non-interactive mode: --place-id (or use --create-place)');
|
|
@@ -76,7 +80,7 @@ async function resolveInteractiveAsync(args, state) {
|
|
|
76
80
|
await promptModeAsync(state);
|
|
77
81
|
await ensureUniverseIdAsync(args, state); // Resolves targetName before script prompt
|
|
78
82
|
await ensureProjectAndScriptAsync(args, state);
|
|
79
|
-
await ensurePromptPlaceIdAsync(state); // This modifies the cloud, so is last
|
|
83
|
+
await ensurePromptPlaceIdAsync(args, state); // This modifies the cloud, so is last
|
|
80
84
|
}
|
|
81
85
|
function isTestTarget(state) {
|
|
82
86
|
return state.targetName === 'test';
|
|
@@ -158,19 +162,31 @@ async function ensureUniverseIdAsync(args, state) {
|
|
|
158
162
|
state.targetName = answers.targetName ?? state.targetName;
|
|
159
163
|
state.universeId = answers.universeId ?? state.universeId;
|
|
160
164
|
}
|
|
161
|
-
async function ensurePromptPlaceIdAsync(state) {
|
|
165
|
+
async function ensurePromptPlaceIdAsync(args, state) {
|
|
162
166
|
if (!state.universeId) {
|
|
163
167
|
throw new Error('Universe ID is required to set up place ID');
|
|
164
168
|
}
|
|
165
169
|
try {
|
|
166
|
-
|
|
167
|
-
state.placeId = await createPlaceInUniverseAsync(cookie, state.universeId, state.placeName);
|
|
170
|
+
state.placeId = await createPlaceAsync(args, state.universeId, state.placeName);
|
|
168
171
|
}
|
|
169
172
|
catch (err) {
|
|
170
173
|
OutputHelper.warn(`Failed to auto-create place in universe ${state.universeId}: ${err instanceof Error ? err.message : String(err)}`);
|
|
171
174
|
state.placeId = await promptPlaceIdAsync(state.universeId, state.placeName);
|
|
172
175
|
}
|
|
173
176
|
}
|
|
177
|
+
/**
|
|
178
|
+
* Creates the place the target will point at. On a dryrun nothing is created
|
|
179
|
+
* and nothing is fetched — not even the cookie — so the caller gets
|
|
180
|
+
* {@link DRYRUN_PLACE_ID} to render instead.
|
|
181
|
+
*/
|
|
182
|
+
async function createPlaceAsync(args, universeId, placeName) {
|
|
183
|
+
if (args.dryrun) {
|
|
184
|
+
OutputHelper.info(`[DRYRUN] Would create place '${placeName}' in universe ${universeId}`);
|
|
185
|
+
return DRYRUN_PLACE_ID;
|
|
186
|
+
}
|
|
187
|
+
const cookie = await getRobloxCookieAsync();
|
|
188
|
+
return await createPlaceInUniverseAsync(cookie, universeId, placeName);
|
|
189
|
+
}
|
|
174
190
|
async function ensureProjectAndScriptAsync(args, state) {
|
|
175
191
|
const scriptRequired = isTestTarget(state);
|
|
176
192
|
const needsScript = !state.scriptTemplate && !args.scriptTemplate;
|
|
@@ -225,6 +241,7 @@ async function writeConfig(args, state, deployJsonPath) {
|
|
|
225
241
|
targets: {
|
|
226
242
|
[state.targetName]: {
|
|
227
243
|
universeId: state.universeId,
|
|
244
|
+
// On a dryrun this is DRYRUN_PLACE_ID, which only ever gets printed.
|
|
228
245
|
placeId: state.placeId,
|
|
229
246
|
project: state.project.replace(/\\/g, '/'),
|
|
230
247
|
...(state.scriptTemplate
|
|
@@ -235,7 +252,7 @@ async function writeConfig(args, state, deployJsonPath) {
|
|
|
235
252
|
};
|
|
236
253
|
const configJson = JSON.stringify(config, null, 2);
|
|
237
254
|
if (args.dryrun) {
|
|
238
|
-
OutputHelper.info('[DRYRUN]
|
|
255
|
+
OutputHelper.info('[DRYRUN] Would write deploy.nevermore.json:');
|
|
239
256
|
console.log(configJson);
|
|
240
257
|
return;
|
|
241
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-init.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAEL,uBAAuB,GACxB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,eAAe,EACf,mBAAmB,GACpB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EACL,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-init.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/deploy-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -399,7 +399,7 @@ export class DeployCommand {
|
|
|
399
399
|
reporters.push(new JsonFileReporter(state, args.output));
|
|
400
400
|
}
|
|
401
401
|
if (isCI()) {
|
|
402
|
-
reporters.push(new GithubCommentTableReporter(state, createDeployCommentConfig(), isMultiPlace ? MULTI_PLACE_CONCURRENCY : 1));
|
|
402
|
+
reporters.push(new GithubCommentTableReporter(state, createDeployCommentConfig(deployLabels), isMultiPlace ? MULTI_PLACE_CONCURRENCY : 1));
|
|
403
403
|
}
|
|
404
404
|
return reporters;
|
|
405
405
|
});
|