@quenty/nevermore-cli 4.38.0 → 4.40.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 +12 -0
- package/dist/commands/batch-command/batch-deploy-command.js +1 -1
- package/dist/commands/batch-command/batch-deploy-command.js.map +1 -1
- package/dist/commands/deploy-command/index.d.ts.map +1 -1
- package/dist/commands/deploy-command/index.js +5 -2
- package/dist/commands/deploy-command/index.js.map +1 -1
- package/dist/commands/tools-command/strip-sourcemap-jest-command.d.ts +5 -1
- package/dist/commands/tools-command/strip-sourcemap-jest-command.d.ts.map +1 -1
- package/dist/commands/tools-command/strip-sourcemap-jest-command.js +40 -14
- package/dist/commands/tools-command/strip-sourcemap-jest-command.js.map +1 -1
- package/dist/utils/batch/changed-packages-utils.d.ts +8 -1
- package/dist/utils/batch/changed-packages-utils.d.ts.map +1 -1
- package/dist/utils/batch/changed-packages-utils.js +10 -2
- package/dist/utils/batch/changed-packages-utils.js.map +1 -1
- package/dist/utils/build/deploy-config.d.ts +14 -0
- package/dist/utils/build/deploy-config.d.ts.map +1 -1
- package/dist/utils/build/deploy-config.js +8 -0
- package/dist/utils/build/deploy-config.js.map +1 -1
- package/dist/utils/deploy/deploy-metadata.d.ts +7 -1
- package/dist/utils/deploy/deploy-metadata.d.ts.map +1 -1
- package/dist/utils/deploy/deploy-metadata.js +13 -1
- package/dist/utils/deploy/deploy-metadata.js.map +1 -1
- package/dist/utils/deploy/deploy-metadata.test.js +25 -0
- package/dist/utils/deploy/deploy-metadata.test.js.map +1 -1
- package/package.json +2 -2
- package/src/commands/batch-command/batch-deploy-command.ts +11 -7
- package/src/commands/deploy-command/index.ts +15 -7
- package/src/commands/tools-command/strip-sourcemap-jest-command.ts +46 -16
- package/src/utils/batch/changed-packages-utils.ts +18 -1
- package/src/utils/build/deploy-config.ts +22 -0
- package/src/utils/deploy/deploy-metadata.test.ts +28 -0
- package/src/utils/deploy/deploy-metadata.ts +17 -1
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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.40.0](https://github.com/Quenty/Nevermore/compare/@quenty/nevermore-cli@4.39.0...@quenty/nevermore-cli@4.40.0) (2026-07-20)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- **manifest:** stamp and read the deploy target's place table ([9542015](https://github.com/Quenty/Nevermore/commit/954201515424fa415a0cbfb3eb1101b3d6f3ec85))
|
|
11
|
+
|
|
12
|
+
# [4.39.0](https://github.com/Quenty/Nevermore/compare/@quenty/nevermore-cli@4.38.0...@quenty/nevermore-cli@4.39.0) (2026-07-18)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- pin translation behavior with tests and fix camelCase key generation ([#737](https://github.com/Quenty/Nevermore/issues/737)) ([1b7a536](https://github.com/Quenty/Nevermore/commit/1b7a536dde7e124f8432e57612ec8138dd835d75))
|
|
17
|
+
|
|
6
18
|
# [4.38.0](https://github.com/Quenty/Nevermore/compare/@quenty/nevermore-cli@4.37.0...@quenty/nevermore-cli@4.38.0) (2026-07-17)
|
|
7
19
|
|
|
8
20
|
### Features
|
|
@@ -169,7 +169,7 @@ async function _runAsync(args) {
|
|
|
169
169
|
timestamp: deployTimestamp,
|
|
170
170
|
universeId: buildTarget.target.universeId,
|
|
171
171
|
placeId: buildTarget.target.placeId,
|
|
172
|
-
}));
|
|
172
|
+
}, buildTarget.manifestPlaces));
|
|
173
173
|
let version;
|
|
174
174
|
try {
|
|
175
175
|
({ version } = await uploadPlaceAsync({
|
|
@@ -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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy-command/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAa5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy-command/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAa5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAkChE,MAAM,WAAW,UAAW,SAAQ,mBAAmB;IACrD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,qBAAa,aAAa,CAAC,CAAC,CAAE,YAAW,aAAa,CAAC,CAAC,EAAE,UAAU,CAAC;IAC5D,OAAO,SAAqB;IAC5B,QAAQ,SAA4C;IAEpD,OAAO,GAAI,MAAM,IAAI,CAAC,CAAC,CAAC,KA0Kd,IAAI,CAAC,UAAU,CAAC,CAC/B;IAEK,OAAO,sBAAkB;mBAEX,eAAe;CAuPrC"}
|
|
@@ -10,7 +10,7 @@ import { RateLimiter } from '../../utils/open-cloud/rate-limiter.js';
|
|
|
10
10
|
import { CloudJobContext } from '../../utils/job-context/cloud-job-context.js';
|
|
11
11
|
import { runBatchAsync } from '../../utils/batch/batch-runner.js';
|
|
12
12
|
import { isCI, readPackageNameAsync } from '../../utils/nevermore-cli-utils.js';
|
|
13
|
-
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveDeployTargetPlaces, } from '../../utils/build/deploy-config.js';
|
|
13
|
+
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveDeployTargetPlaces, toManifestPlaceInfo, } from '../../utils/build/deploy-config.js';
|
|
14
14
|
import { handleInitAsync } from './deploy-init.js';
|
|
15
15
|
import { handleVersionUpgradeAsync, handleVersionPromoteAsync, } from './version-command.js';
|
|
16
16
|
import { selectTargetAsync } from './select-target.js';
|
|
@@ -163,6 +163,7 @@ export class DeployCommand {
|
|
|
163
163
|
});
|
|
164
164
|
const config = await loadDeployConfigAsync(resolveDeployConfigPath(cwd));
|
|
165
165
|
const places = resolveDeployTargetPlaces(config, targetName);
|
|
166
|
+
const manifestPlaces = places.map(toManifestPlaceInfo);
|
|
166
167
|
const isMultiPlace = places.length > 1;
|
|
167
168
|
if (isMultiPlace) {
|
|
168
169
|
const overrides = [];
|
|
@@ -185,6 +186,7 @@ export class DeployCommand {
|
|
|
185
186
|
packageName,
|
|
186
187
|
path: cwd,
|
|
187
188
|
target: place,
|
|
189
|
+
manifestPlaces,
|
|
188
190
|
};
|
|
189
191
|
})
|
|
190
192
|
: [
|
|
@@ -193,6 +195,7 @@ export class DeployCommand {
|
|
|
193
195
|
packageName,
|
|
194
196
|
path: cwd,
|
|
195
197
|
target: places[0],
|
|
198
|
+
manifestPlaces,
|
|
196
199
|
},
|
|
197
200
|
];
|
|
198
201
|
const publish = args.publish ?? false;
|
|
@@ -289,7 +292,7 @@ export class DeployCommand {
|
|
|
289
292
|
timestamp: deployTimestamp,
|
|
290
293
|
universeId: args.universeId ?? buildTarget.target.universeId,
|
|
291
294
|
placeId: args.placeId ?? buildTarget.target.placeId,
|
|
292
|
-
}));
|
|
295
|
+
}, buildTarget.manifestPlaces));
|
|
293
296
|
let uploadResult;
|
|
294
297
|
try {
|
|
295
298
|
uploadResult = await uploadPlaceAsync({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,17 @@ interface StripSourcemapJestArgs extends NevermoreGlobalArgs {
|
|
|
4
4
|
sourcemap?: string;
|
|
5
5
|
}
|
|
6
6
|
/**
|
|
7
|
-
* Temporary workaround:
|
|
7
|
+
* Temporary workaround: strip shadowing modules from Jest subtrees in sourcemap.json.
|
|
8
8
|
*
|
|
9
9
|
* luau-lsp's require-by-name resolution picks the first file matching a name
|
|
10
10
|
* in the sourcemap. Jest vendors internal copies of modules (Promise, string,
|
|
11
11
|
* symbol, etc.) that shadow Nevermore packages. The real loader handles this
|
|
12
12
|
* correctly, but luau-lsp doesn't yet.
|
|
13
13
|
*
|
|
14
|
+
* We drop only the Jest descendants whose name also exists elsewhere in the
|
|
15
|
+
* sourcemap (the shadowing copies), and keep the Jest-unique modules (Jest,
|
|
16
|
+
* JestGlobals, ...) so `require("Jest")` still resolves.
|
|
17
|
+
*
|
|
14
18
|
* Long-term fix: smarter require resolution in luau-lsp (plugins or fork).
|
|
15
19
|
*/
|
|
16
20
|
export declare const stripSourcemapJestCommand: CommandModule<NevermoreGlobalArgs, StripSourcemapJestArgs>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip-sourcemap-jest-command.d.ts","sourceRoot":"","sources":["../../../src/commands/tools-command/strip-sourcemap-jest-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGhE,UAAU,sBAAuB,SAAQ,mBAAmB;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED
|
|
1
|
+
{"version":3,"file":"strip-sourcemap-jest-command.d.ts","sourceRoot":"","sources":["../../../src/commands/tools-command/strip-sourcemap-jest-command.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAGhE,UAAU,sBAAuB,SAAQ,mBAAmB;IAC1D,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,yBAAyB,EAAE,aAAa,CACnD,mBAAmB,EACnB,sBAAsB,CA+EvB,CAAC"}
|
|
@@ -2,18 +2,22 @@ import * as fs from 'fs';
|
|
|
2
2
|
import * as path from 'path';
|
|
3
3
|
import { OutputHelper } from '@quenty/cli-output-helpers';
|
|
4
4
|
/**
|
|
5
|
-
* Temporary workaround:
|
|
5
|
+
* Temporary workaround: strip shadowing modules from Jest subtrees in sourcemap.json.
|
|
6
6
|
*
|
|
7
7
|
* luau-lsp's require-by-name resolution picks the first file matching a name
|
|
8
8
|
* in the sourcemap. Jest vendors internal copies of modules (Promise, string,
|
|
9
9
|
* symbol, etc.) that shadow Nevermore packages. The real loader handles this
|
|
10
10
|
* correctly, but luau-lsp doesn't yet.
|
|
11
11
|
*
|
|
12
|
+
* We drop only the Jest descendants whose name also exists elsewhere in the
|
|
13
|
+
* sourcemap (the shadowing copies), and keep the Jest-unique modules (Jest,
|
|
14
|
+
* JestGlobals, ...) so `require("Jest")` still resolves.
|
|
15
|
+
*
|
|
12
16
|
* Long-term fix: smarter require resolution in luau-lsp (plugins or fork).
|
|
13
17
|
*/
|
|
14
18
|
export const stripSourcemapJestCommand = {
|
|
15
19
|
command: 'strip-sourcemap-jest',
|
|
16
|
-
describe:
|
|
20
|
+
describe: "Strip modules from Jest subtrees in sourcemap.json that shadow names elsewhere, keeping require('Jest') resolvable",
|
|
17
21
|
builder: (yargs) => {
|
|
18
22
|
return yargs.option('sourcemap', {
|
|
19
23
|
describe: 'Path to sourcemap.json',
|
|
@@ -32,25 +36,47 @@ export const stripSourcemapJestCommand = {
|
|
|
32
36
|
process.exit(1);
|
|
33
37
|
}
|
|
34
38
|
const sourcemap = JSON.parse(content);
|
|
35
|
-
|
|
36
|
-
|
|
39
|
+
// Every module name that lives OUTSIDE any Jest subtree. Jest's vendored copies of these
|
|
40
|
+
// are what shadow the real Nevermore modules under luau-lsp's first-match resolution.
|
|
41
|
+
const externalNames = new Set();
|
|
42
|
+
function collectExternalNames(node, insideJest) {
|
|
37
43
|
if (!node.children)
|
|
38
44
|
return;
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
45
|
+
for (const child of node.children) {
|
|
46
|
+
const childInsideJest = insideJest || child.name === 'Jest';
|
|
47
|
+
if (!childInsideJest) {
|
|
48
|
+
externalNames.add(child.name);
|
|
43
49
|
}
|
|
44
|
-
|
|
45
|
-
}
|
|
50
|
+
collectExternalNames(child, childInsideJest);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
collectExternalNames(sourcemap, false);
|
|
54
|
+
// Within each Jest subtree, drop any node whose name also exists elsewhere (the shadowing
|
|
55
|
+
// copies), keeping the Jest-unique modules so require("Jest") still resolves. Also drop a
|
|
56
|
+
// Jest node nested inside another Jest: the jest-lua package folder ("Jest", whose
|
|
57
|
+
// init.lua exports `.Globals`) contains a leaf "Jest" submodule that lacks `.Globals`, and
|
|
58
|
+
// the duplicate name makes require("Jest") resolve to the wrong one for some packages.
|
|
59
|
+
let stripped = 0;
|
|
60
|
+
function stripShadowingNodes(node, insideJest) {
|
|
61
|
+
if (!node.children)
|
|
62
|
+
return;
|
|
63
|
+
if (insideJest) {
|
|
64
|
+
node.children = node.children.filter((child) => {
|
|
65
|
+
if (externalNames.has(child.name) || child.name === 'Jest') {
|
|
66
|
+
stripped++;
|
|
67
|
+
return false;
|
|
68
|
+
}
|
|
69
|
+
return true;
|
|
70
|
+
});
|
|
71
|
+
}
|
|
46
72
|
for (const child of node.children) {
|
|
47
|
-
|
|
73
|
+
stripShadowingNodes(child, insideJest || child.name === 'Jest');
|
|
48
74
|
}
|
|
49
75
|
}
|
|
50
|
-
|
|
76
|
+
stripShadowingNodes(sourcemap, false);
|
|
51
77
|
fs.writeFileSync(sourcemapPath, JSON.stringify(sourcemap));
|
|
52
|
-
if (
|
|
53
|
-
OutputHelper.info(`
|
|
78
|
+
if (stripped > 0) {
|
|
79
|
+
OutputHelper.info(`Stripped ${stripped} shadowing node(s) from Jest subtrees in ${sourcemapPath}`);
|
|
54
80
|
}
|
|
55
81
|
},
|
|
56
82
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strip-sourcemap-jest-command.js","sourceRoot":"","sources":["../../../src/commands/tools-command/strip-sourcemap-jest-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQ1D
|
|
1
|
+
{"version":3,"file":"strip-sourcemap-jest-command.js","sourceRoot":"","sources":["../../../src/commands/tools-command/strip-sourcemap-jest-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAQ1D;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAGlC;IACF,OAAO,EAAE,sBAAsB;IAC/B,QAAQ,EACN,oHAAoH;IACtH,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QACjB,OAAO,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE;YAC/B,QAAQ,EAAE,wBAAwB;YAClC,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,gBAAgB;SAC1B,CAAC,CAAC;IACL,CAAC;IACD,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE;QAChB,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAU,CAAC,CAAC;QAEpD,IAAI,OAAe,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACpD,CAAC;QAAC,MAAM,CAAC;YACP,YAAY,CAAC,KAAK,CAAC,wBAAwB,aAAa,EAAE,CAAC,CAAC;YAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAkB,CAAC;QAEvD,yFAAyF;QACzF,sFAAsF;QACtF,MAAM,aAAa,GAAG,IAAI,GAAG,EAAU,CAAC;QACxC,SAAS,oBAAoB,CAC3B,IAAmB,EACnB,UAAmB;YAEnB,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAC3B,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,MAAM,eAAe,GAAG,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;gBAC5D,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;gBACD,oBAAoB,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;QACD,oBAAoB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAEvC,0FAA0F;QAC1F,0FAA0F;QAC1F,mFAAmF;QACnF,2FAA2F;QAC3F,uFAAuF;QACvF,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,SAAS,mBAAmB,CAC1B,IAAmB,EACnB,UAAmB;YAEnB,IAAI,CAAC,IAAI,CAAC,QAAQ;gBAAE,OAAO;YAE3B,IAAI,UAAU,EAAE,CAAC;gBACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC7C,IAAI,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAC3D,QAAQ,EAAE,CAAC;wBACX,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,mBAAmB,CAAC,KAAK,EAAE,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;YAClE,CAAC;QACH,CAAC;QACD,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAEtC,EAAE,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC;QAE3D,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;YACjB,YAAY,CAAC,IAAI,CACf,YAAY,QAAQ,4CAA4C,aAAa,EAAE,CAChF,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DeployTarget } from '../build/deploy-config.js';
|
|
1
|
+
import { DeployTarget, ManifestPlaceInfo } from '../build/deploy-config.js';
|
|
2
2
|
export interface TargetPackage {
|
|
3
3
|
name: string;
|
|
4
4
|
path: string;
|
|
@@ -23,6 +23,13 @@ export interface BatchTarget {
|
|
|
23
23
|
path: string;
|
|
24
24
|
/** The single resolved place this BatchTarget represents. */
|
|
25
25
|
target: DeployTarget;
|
|
26
|
+
/**
|
|
27
|
+
* Every place of this package's target (including `target` itself), stamped
|
|
28
|
+
* into the runtime manifest so a deployed place can resolve its siblings' IDs.
|
|
29
|
+
* Same for every BatchTarget fanned out from one package. Only the deploy
|
|
30
|
+
* paths populate this; test/script BatchTargets omit it.
|
|
31
|
+
*/
|
|
32
|
+
manifestPlaces?: ManifestPlaceInfo[];
|
|
26
33
|
}
|
|
27
34
|
/**
|
|
28
35
|
* Discover all packages that have a deploy.nevermore.json with the given target.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changed-packages-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/batch/changed-packages-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"changed-packages-utils.d.ts","sourceRoot":"","sources":["../../../src/utils/batch/changed-packages-utils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,YAAY,EACZ,iBAAiB,EAKlB,MAAM,2BAA2B,CAAC;AAEnC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,aAAa,EAAE,YAAY,EAAE,CAAC;CAC/B;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,uFAAuF;IACvF,WAAW,EAAE,MAAM,CAAC;IACpB,yBAAyB;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,MAAM,EAAE,YAAY,CAAC;IACrB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,iBAAiB,EAAE,CAAC;CACtC;AAED;;GAEG;AACH,wBAAsB,8BAA8B,CAClD,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,EAAE,CAAC,CAW1B;AAED;;;GAGG;AACH,wBAAsB,kCAAkC,CACtD,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,aAAa,EAAE,CAAC,CAwB1B;AAED;;;GAGG;AACH,wBAAsB,oCAAoC,IAAI,OAAO,CACnE,WAAW,EAAE,CACd,CAGA;AAED;;;;GAIG;AACH,wBAAsB,wCAAwC,CAC5D,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,WAAW,EAAE,CAAC,CAGxB;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,aAAa,EAAE,GACxB,WAAW,EAAE,CA2Bf"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as fs from 'fs/promises';
|
|
2
2
|
import { execa } from 'execa';
|
|
3
3
|
import { OutputHelper } from '@quenty/cli-output-helpers';
|
|
4
|
-
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveDeployTargetPlaces, } from '../build/deploy-config.js';
|
|
4
|
+
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveDeployTargetPlaces, toManifestPlaceInfo, } from '../build/deploy-config.js';
|
|
5
5
|
/**
|
|
6
6
|
* Discover all packages that have a deploy.nevermore.json with the given target.
|
|
7
7
|
*/
|
|
@@ -68,19 +68,27 @@ export async function discoverChangedTestableBatchTargetsAsync(baseBranch) {
|
|
|
68
68
|
export function flattenToBatchTargets(packages) {
|
|
69
69
|
const result = [];
|
|
70
70
|
for (const pkg of packages) {
|
|
71
|
+
const manifestPlaces = pkg.activeTargets.map(toManifestPlaceInfo);
|
|
71
72
|
if (pkg.activeTargets.length === 1) {
|
|
72
73
|
result.push({
|
|
73
74
|
name: pkg.name,
|
|
74
75
|
packageName: pkg.name,
|
|
75
76
|
path: pkg.path,
|
|
76
77
|
target: pkg.activeTargets[0],
|
|
78
|
+
manifestPlaces,
|
|
77
79
|
});
|
|
78
80
|
continue;
|
|
79
81
|
}
|
|
80
82
|
for (const target of pkg.activeTargets) {
|
|
81
83
|
const suffix = target.name;
|
|
82
84
|
const name = suffix ? `${pkg.name} - ${suffix}` : pkg.name;
|
|
83
|
-
result.push({
|
|
85
|
+
result.push({
|
|
86
|
+
name,
|
|
87
|
+
packageName: pkg.name,
|
|
88
|
+
path: pkg.path,
|
|
89
|
+
target,
|
|
90
|
+
manifestPlaces,
|
|
91
|
+
});
|
|
84
92
|
}
|
|
85
93
|
}
|
|
86
94
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"changed-packages-utils.js","sourceRoot":"","sources":["../../../src/utils/batch/changed-packages-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"changed-packages-utils.js","sourceRoot":"","sources":["../../../src/utils/batch/changed-packages-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,20 @@ export interface DeployConfig {
|
|
|
28
28
|
universeId?: number;
|
|
29
29
|
targets: Record<string, DeployTargetConfig>;
|
|
30
30
|
}
|
|
31
|
+
/**
|
|
32
|
+
* The subset of a resolved place that gets baked into the runtime manifest
|
|
33
|
+
* (see the nevermore-cli-manifest package). A deployed place carries the whole
|
|
34
|
+
* target's place table so it can resolve its siblings' IDs at runtime — e.g. a
|
|
35
|
+
* chapter place teleporting to another chapter without hard-coding place IDs.
|
|
36
|
+
*/
|
|
37
|
+
export interface ManifestPlaceInfo {
|
|
38
|
+
/** Place name from a multi-place target (e.g. "chapter0"); absent for single-place targets. */
|
|
39
|
+
name?: string;
|
|
40
|
+
placeId: number;
|
|
41
|
+
universeId: number;
|
|
42
|
+
}
|
|
43
|
+
/** Project a resolved deploy place down to the fields stamped into the manifest. */
|
|
44
|
+
export declare function toManifestPlaceInfo(place: DeployTarget): ManifestPlaceInfo;
|
|
31
45
|
export declare function loadDeployConfigAsync(configPath: string): Promise<DeployConfig>;
|
|
32
46
|
/**
|
|
33
47
|
* Expand a target into one DeployTarget per place. Single-place targets resolve
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-config.d.ts","sourceRoot":"","sources":["../../../src/utils/build/deploy-config.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAED,wFAAwF;AACxF,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,sBAAsB,CAAC;AAEvE,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC7C;AAuCD,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC,CAmCvB;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,EAAE,CAchB;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,EAClB,WAAW,SAA2B,GACrC,YAAY,CAcd;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAmBrE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAoC7B"}
|
|
1
|
+
{"version":3,"file":"deploy-config.d.ts","sourceRoot":"","sources":["../../../src/utils/build/deploy-config.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,eAAe,CAAC;CAC7B;AAED,wFAAwF;AACxF,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,sBAAsB,CAAC;AAEvE,MAAM,WAAW,YAAY;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC7C;AAED;;;;;GAKG;AACH,MAAM,WAAW,iBAAiB;IAChC,+FAA+F;IAC/F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,oFAAoF;AACpF,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,YAAY,GAAG,iBAAiB,CAM1E;AAuCD,wBAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,YAAY,CAAC,CAmCvB;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,GACjB,YAAY,EAAE,CAchB;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,YAAY,EACpB,UAAU,EAAE,MAAM,EAClB,WAAW,SAA2B,GACrC,YAAY,CAcd;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAmBrE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAoC7B"}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import * as fs from 'fs/promises';
|
|
2
2
|
import * as path from 'path';
|
|
3
|
+
/** Project a resolved deploy place down to the fields stamped into the manifest. */
|
|
4
|
+
export function toManifestPlaceInfo(place) {
|
|
5
|
+
return {
|
|
6
|
+
name: place.name,
|
|
7
|
+
placeId: place.placeId,
|
|
8
|
+
universeId: place.universeId,
|
|
9
|
+
};
|
|
10
|
+
}
|
|
3
11
|
function _isMultiPlace(target) {
|
|
4
12
|
return Array.isArray(target.places);
|
|
5
13
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-config.js","sourceRoot":"","sources":["../../../src/utils/build/deploy-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-config.js","sourceRoot":"","sources":["../../../src/utils/build/deploy-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type BuiltPlace } from '../build/build.js';
|
|
2
|
+
import { type ManifestPlaceInfo } from '../build/deploy-config.js';
|
|
2
3
|
/** npm name of the package that ships the manifest module. */
|
|
3
4
|
export declare const MANIFEST_PACKAGE_NAME = "@quenty/nevermoreclimanifest";
|
|
4
5
|
/**
|
|
@@ -41,8 +42,13 @@ export interface DeployPlaceInfo {
|
|
|
41
42
|
* round-trip through Lune serialization as float32, which silently corrupts IDs
|
|
42
43
|
* above 2^24 (e.g. 123456789 -> 123456792). Strings are exact; the Luau reader
|
|
43
44
|
* converts them back with `tonumber`.
|
|
45
|
+
*
|
|
46
|
+
* When `places` is given (the whole target's place table), it is stamped as a
|
|
47
|
+
* `Places` JSON-string attribute. The IDs inside stay numeric — a JSON string
|
|
48
|
+
* is exact text, and the Luau reader decodes it to 64-bit numbers, so the
|
|
49
|
+
* float32 hazard that forces the top-level IDs to be stringified doesn't apply.
|
|
44
50
|
*/
|
|
45
|
-
export declare function buildDeployMetadataAttributes(git: GitDeployInfo, place: DeployPlaceInfo): DeployMetadataAttributes;
|
|
51
|
+
export declare function buildDeployMetadataAttributes(git: GitDeployInfo, place: DeployPlaceInfo, places?: readonly ManifestPlaceInfo[]): DeployMetadataAttributes;
|
|
46
52
|
/** A built place with metadata injected, plus a handle to clean up its temp dir. */
|
|
47
53
|
export interface InjectedPlace {
|
|
48
54
|
builtPlace: BuiltPlace;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-metadata.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-metadata.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy-metadata.d.ts","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-metadata.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,8DAA8D;AAC9D,eAAO,MAAM,qBAAqB,iCAAiC,CAAC;AAEpE;;;;GAIG;AACH,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,MAAM,EACN,MAAM,GAAG,MAAM,GAAG,OAAO,CAC1B,CAAC;AAoBF,kEAAkE;AAClE,MAAM,WAAW,aAAa;IAC5B,wCAAwC;IACxC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,aAAa,CASnD;AAED,4CAA4C;AAC5C,MAAM,WAAW,eAAe;IAC9B,kFAAkF;IAClF,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,SAAS,EAAE,OAAO,CAAC;IACnB,sFAAsF;IACtF,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,GACpC,wBAAwB,CAsB1B;AAED,oFAAoF;AACpF,MAAM,WAAW,aAAa;IAC5B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED;;;;;GAKG;AACH,wBAAsB,yBAAyB,CAC7C,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,wBAAwB,GACnC,OAAO,CAAC,aAAa,CAAC,CAgBxB;AAED;;;;;GAKG;AACH,wBAAsB,gCAAgC,CACpD,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,wBAAwB,GACnC,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,OAAO,CAAC,CAqBlB"}
|
|
@@ -44,8 +44,13 @@ export function gatherGitDeployInfo() {
|
|
|
44
44
|
* round-trip through Lune serialization as float32, which silently corrupts IDs
|
|
45
45
|
* above 2^24 (e.g. 123456789 -> 123456792). Strings are exact; the Luau reader
|
|
46
46
|
* converts them back with `tonumber`.
|
|
47
|
+
*
|
|
48
|
+
* When `places` is given (the whole target's place table), it is stamped as a
|
|
49
|
+
* `Places` JSON-string attribute. The IDs inside stay numeric — a JSON string
|
|
50
|
+
* is exact text, and the Luau reader decodes it to 64-bit numbers, so the
|
|
51
|
+
* float32 hazard that forces the top-level IDs to be stringified doesn't apply.
|
|
47
52
|
*/
|
|
48
|
-
export function buildDeployMetadataAttributes(git, place) {
|
|
53
|
+
export function buildDeployMetadataAttributes(git, place, places) {
|
|
49
54
|
const attributes = {
|
|
50
55
|
Deployed: true,
|
|
51
56
|
Target: place.target,
|
|
@@ -60,6 +65,13 @@ export function buildDeployMetadataAttributes(git, place) {
|
|
|
60
65
|
attributes.Version = git.version;
|
|
61
66
|
if (git.branch)
|
|
62
67
|
attributes.Branch = git.branch;
|
|
68
|
+
if (places && places.length > 0) {
|
|
69
|
+
attributes.Places = JSON.stringify(places.map((p) => ({
|
|
70
|
+
name: p.name,
|
|
71
|
+
placeId: p.placeId,
|
|
72
|
+
universeId: p.universeId,
|
|
73
|
+
})));
|
|
74
|
+
}
|
|
63
75
|
return attributes;
|
|
64
76
|
}
|
|
65
77
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-metadata.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-metadata.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,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;
|
|
1
|
+
{"version":3,"file":"deploy-metadata.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,6 +61,31 @@ describe('buildDeployMetadataAttributes', () => {
|
|
|
61
61
|
const attributes = buildDeployMetadataAttributes({}, { ...PLACE, published: false });
|
|
62
62
|
expect(attributes.Published).toBe(false);
|
|
63
63
|
});
|
|
64
|
+
it('omits Places when no place table is given', () => {
|
|
65
|
+
const attributes = buildDeployMetadataAttributes({}, PLACE);
|
|
66
|
+
expect('Places' in attributes).toBe(false);
|
|
67
|
+
});
|
|
68
|
+
it('stamps Places as a JSON string preserving large IDs exactly', () => {
|
|
69
|
+
const attributes = buildDeployMetadataAttributes({}, PLACE, [
|
|
70
|
+
{ name: 'chapter0', placeId: 97235312452456, universeId: 10192566764 },
|
|
71
|
+
{ name: 'chapter1', placeId: 87639818897831, universeId: 10192566764 },
|
|
72
|
+
]);
|
|
73
|
+
expect(typeof attributes.Places).toBe('string');
|
|
74
|
+
const parsed = JSON.parse(attributes.Places);
|
|
75
|
+
// Large place IDs must survive exactly (JSON text, not a float32 attribute).
|
|
76
|
+
expect(parsed).toEqual([
|
|
77
|
+
{ name: 'chapter0', placeId: 97235312452456, universeId: 10192566764 },
|
|
78
|
+
{ name: 'chapter1', placeId: 87639818897831, universeId: 10192566764 },
|
|
79
|
+
]);
|
|
80
|
+
});
|
|
81
|
+
it('omits the name key for a single-place (nameless) target', () => {
|
|
82
|
+
const attributes = buildDeployMetadataAttributes({}, PLACE, [
|
|
83
|
+
{ placeId: 123, universeId: 456 },
|
|
84
|
+
]);
|
|
85
|
+
const parsed = JSON.parse(attributes.Places);
|
|
86
|
+
expect(parsed).toEqual([{ placeId: 123, universeId: 456 }]);
|
|
87
|
+
expect('name' in parsed[0]).toBe(false);
|
|
88
|
+
});
|
|
64
89
|
});
|
|
65
90
|
describe('packageUsesManifestAsync', () => {
|
|
66
91
|
it('is true for the manifest package itself', async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy-metadata.test.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-metadata.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deploy-metadata.test.js","sourceRoot":"","sources":["../../../src/utils/deploy/deploy-metadata.test.ts"],"names":[],"mappings":"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"}
|