@quenty/nevermore-cli 4.42.0 → 4.42.1-canary.783.30683606415.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 +22 -0
- package/dist/args/global-args.d.ts +13 -0
- package/dist/args/global-args.d.ts.map +1 -1
- package/dist/commands/batch-command/batch-deploy-command.d.ts +3 -0
- package/dist/commands/batch-command/batch-deploy-command.d.ts.map +1 -1
- package/dist/commands/batch-command/batch-deploy-command.js +90 -1
- 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 +7 -2
- package/dist/commands/batch-command/batch-test-command.js.map +1 -1
- package/dist/commands/deploy-command/deploy-init.js +1 -1
- package/dist/commands/deploy-command/deploy-init.js.map +1 -1
- package/dist/commands/deploy-command/index.d.ts +3 -0
- package/dist/commands/deploy-command/index.d.ts.map +1 -1
- package/dist/commands/deploy-command/index.js +301 -60
- package/dist/commands/deploy-command/index.js.map +1 -1
- package/dist/commands/deploy-command/select-target.js +1 -1
- package/dist/commands/deploy-command/select-target.js.map +1 -1
- package/dist/commands/deploy-command/version-command.d.ts.map +1 -1
- package/dist/commands/deploy-command/version-command.js +138 -12
- package/dist/commands/deploy-command/version-command.js.map +1 -1
- package/dist/commands/test-command/test-command.d.ts.map +1 -1
- package/dist/commands/test-command/test-command.js +17 -7
- package/dist/commands/test-command/test-command.js.map +1 -1
- package/dist/nevermore.js +17 -0
- package/dist/nevermore.js.map +1 -1
- package/dist/utils/batch/changed-packages-utils.d.ts +1 -1
- package/dist/utils/batch/changed-packages-utils.d.ts.map +1 -1
- package/dist/utils/batch/changed-packages-utils.js +1 -1
- package/dist/utils/batch/changed-packages-utils.js.map +1 -1
- package/dist/utils/build/base-place-resolver-factory.d.ts +25 -0
- package/dist/utils/build/base-place-resolver-factory.d.ts.map +1 -0
- package/dist/utils/build/base-place-resolver-factory.js +40 -0
- package/dist/utils/build/base-place-resolver-factory.js.map +1 -0
- package/dist/utils/build/build.d.ts +13 -2
- package/dist/utils/build/build.d.ts.map +1 -1
- package/dist/utils/build/build.js.map +1 -1
- package/dist/utils/build/upload.d.ts +1 -1
- package/dist/utils/build/upload.d.ts.map +1 -1
- package/dist/utils/deploy/deploy-metadata.d.ts +1 -1
- package/dist/utils/deploy/deploy-metadata.d.ts.map +1 -1
- package/dist/utils/job-context/base-job-context.d.ts +3 -1
- package/dist/utils/job-context/base-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/base-job-context.js +45 -6
- package/dist/utils/job-context/base-job-context.js.map +1 -1
- package/dist/utils/job-context/batch-script-job-context.d.ts +6 -0
- package/dist/utils/job-context/batch-script-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/batch-script-job-context.js +13 -0
- package/dist/utils/job-context/batch-script-job-context.js.map +1 -1
- package/dist/utils/job-context/cloud-job-context.d.ts +2 -1
- package/dist/utils/job-context/cloud-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/cloud-job-context.js +2 -2
- package/dist/utils/job-context/cloud-job-context.js.map +1 -1
- package/dist/utils/job-context/local-job-context.d.ts +2 -1
- package/dist/utils/job-context/local-job-context.d.ts.map +1 -1
- package/dist/utils/job-context/local-job-context.js +2 -2
- package/dist/utils/job-context/local-job-context.js.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.d.ts +20 -2
- package/dist/utils/open-cloud/open-cloud-client.d.ts.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.js +74 -20
- package/dist/utils/open-cloud/open-cloud-client.js.map +1 -1
- package/dist/utils/open-cloud/open-cloud-client.test.js +89 -12
- package/dist/utils/open-cloud/open-cloud-client.test.js.map +1 -1
- package/dist/utils/testing/runner/combined-project-generator.d.ts +1 -1
- package/dist/utils/testing/runner/combined-project-generator.d.ts.map +1 -1
- package/dist/utils/testing/runner/test-runner.d.ts +1 -1
- package/dist/utils/testing/runner/test-runner.d.ts.map +1 -1
- package/dist/utils/watch/github-context.d.ts +50 -0
- package/dist/utils/watch/github-context.d.ts.map +1 -0
- package/dist/utils/watch/github-context.js +125 -0
- package/dist/utils/watch/github-context.js.map +1 -0
- package/dist/utils/watch/github-context.test.d.ts +2 -0
- package/dist/utils/watch/github-context.test.d.ts.map +1 -0
- package/dist/utils/watch/github-context.test.js +112 -0
- package/dist/utils/watch/github-context.test.js.map +1 -0
- package/dist/utils/watch/http-watch-registry.d.ts +40 -0
- package/dist/utils/watch/http-watch-registry.d.ts.map +1 -0
- package/dist/utils/watch/http-watch-registry.js +262 -0
- package/dist/utils/watch/http-watch-registry.js.map +1 -0
- package/dist/utils/watch/http-watch-registry.test.d.ts +2 -0
- package/dist/utils/watch/http-watch-registry.test.d.ts.map +1 -0
- package/dist/utils/watch/http-watch-registry.test.js +211 -0
- package/dist/utils/watch/http-watch-registry.test.js.map +1 -0
- package/dist/utils/watch/local-watch-loop.d.ts +50 -0
- package/dist/utils/watch/local-watch-loop.d.ts.map +1 -0
- package/dist/utils/watch/local-watch-loop.js +103 -0
- package/dist/utils/watch/local-watch-loop.js.map +1 -0
- package/dist/utils/watch/local-watch-loop.test.d.ts +2 -0
- package/dist/utils/watch/local-watch-loop.test.d.ts.map +1 -0
- package/dist/utils/watch/local-watch-loop.test.js +170 -0
- package/dist/utils/watch/local-watch-loop.test.js.map +1 -0
- package/dist/utils/watch/register-notify-watches.d.ts +41 -0
- package/dist/utils/watch/register-notify-watches.d.ts.map +1 -0
- package/dist/utils/watch/register-notify-watches.js +159 -0
- package/dist/utils/watch/register-notify-watches.js.map +1 -0
- package/dist/utils/watch/register-notify-watches.test.d.ts +2 -0
- package/dist/utils/watch/register-notify-watches.test.d.ts.map +1 -0
- package/dist/utils/watch/register-notify-watches.test.js +225 -0
- package/dist/utils/watch/register-notify-watches.test.js.map +1 -0
- package/dist/utils/watch/register-watches.d.ts +68 -0
- package/dist/utils/watch/register-watches.d.ts.map +1 -0
- package/dist/utils/watch/register-watches.js +221 -0
- package/dist/utils/watch/register-watches.js.map +1 -0
- package/dist/utils/watch/register-watches.test.d.ts +2 -0
- package/dist/utils/watch/register-watches.test.d.ts.map +1 -0
- package/dist/utils/watch/register-watches.test.js +576 -0
- package/dist/utils/watch/register-watches.test.js.map +1 -0
- package/dist/utils/watch/stream-watch-loop.d.ts +54 -0
- package/dist/utils/watch/stream-watch-loop.d.ts.map +1 -0
- package/dist/utils/watch/stream-watch-loop.js +282 -0
- package/dist/utils/watch/stream-watch-loop.js.map +1 -0
- package/dist/utils/watch/stream-watch-loop.test.d.ts +2 -0
- package/dist/utils/watch/stream-watch-loop.test.d.ts.map +1 -0
- package/dist/utils/watch/stream-watch-loop.test.js +392 -0
- package/dist/utils/watch/stream-watch-loop.test.js.map +1 -0
- package/dist/utils/watch/websocket-watch-stream.d.ts +25 -0
- package/dist/utils/watch/websocket-watch-stream.d.ts.map +1 -0
- package/dist/utils/watch/websocket-watch-stream.js +306 -0
- package/dist/utils/watch/websocket-watch-stream.js.map +1 -0
- package/dist/utils/watch/websocket-watch-stream.test.d.ts +2 -0
- package/dist/utils/watch/websocket-watch-stream.test.d.ts.map +1 -0
- package/dist/utils/watch/websocket-watch-stream.test.js +475 -0
- package/dist/utils/watch/websocket-watch-stream.test.js.map +1 -0
- package/package.json +7 -4
- package/src/args/global-args.ts +13 -0
- package/src/commands/batch-command/batch-deploy-command.ts +105 -1
- package/src/commands/batch-command/batch-test-command.ts +8 -2
- package/src/commands/deploy-command/deploy-init.ts +1 -1
- package/src/commands/deploy-command/index.ts +331 -32
- package/src/commands/deploy-command/select-target.ts +1 -1
- package/src/commands/deploy-command/version-command.ts +215 -21
- package/src/commands/test-command/test-command.ts +24 -18
- package/src/nevermore.ts +19 -0
- package/src/utils/batch/changed-packages-utils.ts +1 -1
- package/src/utils/build/base-place-resolver-factory.ts +49 -0
- package/src/utils/build/build.ts +13 -2
- package/src/utils/build/upload.ts +1 -1
- package/src/utils/deploy/deploy-metadata.ts +1 -1
- package/src/utils/job-context/base-job-context.ts +68 -6
- package/src/utils/job-context/batch-script-job-context.ts +18 -0
- package/src/utils/job-context/cloud-job-context.ts +7 -2
- package/src/utils/job-context/local-job-context.ts +7 -2
- package/src/utils/open-cloud/open-cloud-client.test.ts +133 -14
- package/src/utils/open-cloud/open-cloud-client.ts +127 -34
- package/src/utils/testing/runner/combined-project-generator.ts +1 -1
- package/src/utils/testing/runner/test-runner.ts +1 -1
- package/src/utils/watch/github-context.test.ts +154 -0
- package/src/utils/watch/github-context.ts +184 -0
- package/src/utils/watch/http-watch-registry.test.ts +330 -0
- package/src/utils/watch/http-watch-registry.ts +341 -0
- package/src/utils/watch/local-watch-loop.test.ts +197 -0
- package/src/utils/watch/local-watch-loop.ts +190 -0
- package/src/utils/watch/register-notify-watches.test.ts +282 -0
- package/src/utils/watch/register-notify-watches.ts +226 -0
- package/src/utils/watch/register-watches.test.ts +696 -0
- package/src/utils/watch/register-watches.ts +369 -0
- package/src/utils/watch/stream-watch-loop.test.ts +625 -0
- package/src/utils/watch/stream-watch-loop.ts +411 -0
- package/src/utils/watch/websocket-watch-stream.test.ts +581 -0
- package/src/utils/watch/websocket-watch-stream.ts +403 -0
- package/tsconfig.json +19 -6
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/build/deploy-config.d.ts +0 -71
- package/dist/utils/build/deploy-config.d.ts.map +0 -1
- package/dist/utils/build/deploy-config.js +0 -164
- package/dist/utils/build/deploy-config.js.map +0 -1
- package/dist/utils/build/deploy-config.test.d.ts +0 -2
- package/dist/utils/build/deploy-config.test.d.ts.map +0 -1
- package/dist/utils/build/deploy-config.test.js +0 -126
- package/dist/utils/build/deploy-config.test.js.map +0 -1
- package/src/utils/build/deploy-config.test.ts +0 -149
- package/src/utils/build/deploy-config.ts +0 -259
|
@@ -3,7 +3,7 @@ import * as fs from 'fs/promises';
|
|
|
3
3
|
import { OutputHelper } from '@quenty/cli-output-helpers';
|
|
4
4
|
import { formatTable, } from '@quenty/cli-output-helpers/reporting';
|
|
5
5
|
import { getApiKeyAsync } from '@quenty/nevermore-cli-helpers';
|
|
6
|
-
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveDeployTargetPlaces, } from '
|
|
6
|
+
import { createEmptyDeployLock, isBasePlaceVersionKeyword, loadDeployConfigAsync, loadDeployLockAsync, resolveDeployConfigPath, resolveDeployLockPath, resolveDeployTargetPlaces, saveDeployLockAsync, } from '@quenty/nevermore-deploy';
|
|
7
7
|
import { OpenCloudClient } from '../../utils/open-cloud/open-cloud-client.js';
|
|
8
8
|
import { RateLimiter } from '../../utils/open-cloud/rate-limiter.js';
|
|
9
9
|
function _plural(count) {
|
|
@@ -85,27 +85,45 @@ export async function handleVersionUpgradeAsync(args) {
|
|
|
85
85
|
_requireTarget(config, args.target);
|
|
86
86
|
}
|
|
87
87
|
const targetNames = args.target ? [args.target] : Object.keys(config.targets);
|
|
88
|
-
const
|
|
89
|
-
if (
|
|
88
|
+
const allRefs = _collectBasePlaceRefs(config, targetNames);
|
|
89
|
+
if (allRefs.length === 0) {
|
|
90
90
|
OutputHelper.warn(args.target
|
|
91
91
|
? `Target "${args.target}" has no basePlace to pin.`
|
|
92
92
|
: 'No basePlace found in deploy.nevermore.json — nothing to pin.');
|
|
93
93
|
return;
|
|
94
94
|
}
|
|
95
|
-
//
|
|
96
|
-
//
|
|
97
|
-
|
|
98
|
-
|
|
95
|
+
// Two kinds of pin, two files. A number (or an absent pin being frozen for
|
|
96
|
+
// the first time) is intent and belongs in the config; a "saved"/"published"
|
|
97
|
+
// pin is intent that stays put while only the resolved fact moves, so those
|
|
98
|
+
// roll forward in the lock instead.
|
|
99
|
+
const isDynamic = (ref) => ref.basePlace.version != null &&
|
|
100
|
+
isBasePlaceVersionKeyword(ref.basePlace.version);
|
|
101
|
+
const configRefs = allRefs.filter((ref) => !isDynamic(ref));
|
|
102
|
+
const lockRefs = allRefs.filter(isDynamic);
|
|
99
103
|
const apiKey = await getApiKeyAsync(args);
|
|
100
104
|
const client = new OpenCloudClient({
|
|
101
105
|
apiKey,
|
|
102
106
|
rateLimiter: new RateLimiter(),
|
|
103
107
|
});
|
|
108
|
+
if (configRefs.length > 0) {
|
|
109
|
+
await _upgradeConfigPinsAsync(configPath, config, configRefs, client, args);
|
|
110
|
+
}
|
|
111
|
+
// Runs even with no keyword pins left, so converting the last one back to a
|
|
112
|
+
// number still lets an unscoped upgrade clear its orphaned lock entry.
|
|
113
|
+
if (lockRefs.length > 0 || !args.target) {
|
|
114
|
+
await _upgradeLockPinsAsync(cwd, lockRefs, client, args, !args.target);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
/** Roll numeric (and not-yet-pinned) base places forward in the config. */
|
|
118
|
+
async function _upgradeConfigPinsAsync(configPath, config, refs, client, args) {
|
|
119
|
+
// Resolve the latest version once per unique base place id — several targets
|
|
120
|
+
// (e.g. integration/prod) commonly point at the same base place.
|
|
121
|
+
const uniquePlaceIds = [...new Set(refs.map((r) => r.basePlace.placeId))];
|
|
122
|
+
OutputHelper.info(`Resolving latest published version for ${uniquePlaceIds.length} base place${_plural(uniquePlaceIds.length)}...`);
|
|
104
123
|
const latestByPlaceId = new Map();
|
|
105
124
|
await Promise.all(uniquePlaceIds.map(async (placeId) => {
|
|
106
125
|
const ref = refs.find((r) => r.basePlace.placeId === placeId);
|
|
107
|
-
|
|
108
|
-
latestByPlaceId.set(placeId, latest);
|
|
126
|
+
latestByPlaceId.set(placeId, await client.resolveLatestPlaceVersionAsync(ref.basePlace.universeId, placeId, 'published'));
|
|
109
127
|
}));
|
|
110
128
|
const changes = refs.map((ref) => ({
|
|
111
129
|
ref,
|
|
@@ -123,6 +141,109 @@ export async function handleVersionUpgradeAsync(args) {
|
|
|
123
141
|
console.log('');
|
|
124
142
|
await _commitPinChangesAsync(configPath, config, changes, args);
|
|
125
143
|
}
|
|
144
|
+
/**
|
|
145
|
+
* Roll `"saved"`/`"published"` base places forward in the lock file. Each is
|
|
146
|
+
* resolved against the version type it actually tracks, so a `"saved"` pin is
|
|
147
|
+
* never quietly re-pointed at a published version.
|
|
148
|
+
*
|
|
149
|
+
* `prune` drops entries for base places the config no longer references. It is
|
|
150
|
+
* only safe when this ran unscoped, since a single target does not know about
|
|
151
|
+
* the base places belonging to the others.
|
|
152
|
+
*/
|
|
153
|
+
async function _upgradeLockPinsAsync(packagePath, refs, client, args, prune) {
|
|
154
|
+
const lockPath = resolveDeployLockPath(packagePath);
|
|
155
|
+
const existingLock = await loadDeployLockAsync(lockPath);
|
|
156
|
+
if (!existingLock && refs.length === 0) {
|
|
157
|
+
return;
|
|
158
|
+
}
|
|
159
|
+
const lock = existingLock ?? createEmptyDeployLock();
|
|
160
|
+
const uniqueRefs = [
|
|
161
|
+
...new Map(refs.map((ref) => [ref.basePlace.placeId, ref])).values(),
|
|
162
|
+
];
|
|
163
|
+
if (uniqueRefs.length > 0) {
|
|
164
|
+
OutputHelper.info(`Resolving tracked version for ${uniqueRefs.length} base place${_plural(uniqueRefs.length)}...`);
|
|
165
|
+
}
|
|
166
|
+
const changes = [];
|
|
167
|
+
await Promise.all(uniqueRefs.map(async (ref) => {
|
|
168
|
+
const latest = await client.resolveLatestPlaceVersionAsync(ref.basePlace.universeId, ref.basePlace.placeId, _asKeyword(ref.basePlace.version));
|
|
169
|
+
changes.push({
|
|
170
|
+
ref,
|
|
171
|
+
from: lock.basePlaces[String(ref.basePlace.placeId)]?.version,
|
|
172
|
+
to: latest,
|
|
173
|
+
});
|
|
174
|
+
}));
|
|
175
|
+
const columns = [
|
|
176
|
+
{ header: 'Place', value: (c) => c.ref.placeLabel },
|
|
177
|
+
{ header: 'Base place', value: (c) => String(c.ref.basePlace.placeId) },
|
|
178
|
+
{ header: 'Tracks', value: (c) => String(c.ref.basePlace.version) },
|
|
179
|
+
{ header: 'Locked', value: (c) => _formatChange(c) },
|
|
180
|
+
];
|
|
181
|
+
if (changes.length > 0) {
|
|
182
|
+
console.log('');
|
|
183
|
+
console.log(formatTable(changes, columns, { indent: ' ' }));
|
|
184
|
+
console.log('');
|
|
185
|
+
}
|
|
186
|
+
const referenced = new Set(uniqueRefs.map((r) => String(r.basePlace.placeId)));
|
|
187
|
+
const stale = prune
|
|
188
|
+
? Object.keys(lock.basePlaces).filter((id) => !referenced.has(id))
|
|
189
|
+
: [];
|
|
190
|
+
// An entry is stale if either half is wrong. Comparing only the version
|
|
191
|
+
// number strands a config that switched "published" -> "saved" while the
|
|
192
|
+
// number happened to stay put: nothing would be rewritten, and every later
|
|
193
|
+
// --frozen-lockfile build would fail telling the user to run this command.
|
|
194
|
+
const moved = changes.filter((change) => {
|
|
195
|
+
const entry = lock.basePlaces[String(change.ref.basePlace.placeId)];
|
|
196
|
+
return (entry?.version !== change.to ||
|
|
197
|
+
entry?.from !== _asKeyword(change.ref.basePlace.version));
|
|
198
|
+
});
|
|
199
|
+
if (moved.length === 0 && stale.length === 0) {
|
|
200
|
+
OutputHelper.info('Nothing to change — lock is already up to date.');
|
|
201
|
+
return;
|
|
202
|
+
}
|
|
203
|
+
if (stale.length > 0) {
|
|
204
|
+
OutputHelper.info(`Dropping ${stale.length} lock entr${stale.length === 1 ? 'y' : 'ies'} no longer referenced by deploy.nevermore.json: ${stale.join(', ')}`);
|
|
205
|
+
}
|
|
206
|
+
if (args.dryrun) {
|
|
207
|
+
OutputHelper.info(`[DRYRUN] Would update ${moved.length} and drop ${stale.length} lock ` +
|
|
208
|
+
`entr${moved.length + stale.length === 1 ? 'y' : 'ies'} in ${lockPath}`);
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
if (!args.yes) {
|
|
212
|
+
const { confirm } = await inquirer.prompt([
|
|
213
|
+
{
|
|
214
|
+
type: 'confirm',
|
|
215
|
+
name: 'confirm',
|
|
216
|
+
message: `Update ${moved.length} and drop ${stale.length} entr` +
|
|
217
|
+
`${moved.length + stale.length === 1 ? 'y' : 'ies'} in ` +
|
|
218
|
+
`deploy.nevermore.lock.json?`,
|
|
219
|
+
default: true,
|
|
220
|
+
},
|
|
221
|
+
]);
|
|
222
|
+
if (!confirm) {
|
|
223
|
+
OutputHelper.info('Aborted — no changes written.');
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
for (const id of stale) {
|
|
228
|
+
delete lock.basePlaces[id];
|
|
229
|
+
}
|
|
230
|
+
for (const change of moved) {
|
|
231
|
+
lock.basePlaces[String(change.ref.basePlace.placeId)] = {
|
|
232
|
+
version: change.to,
|
|
233
|
+
from: _asKeyword(change.ref.basePlace.version),
|
|
234
|
+
};
|
|
235
|
+
}
|
|
236
|
+
await saveDeployLockAsync(lockPath, lock);
|
|
237
|
+
OutputHelper.info(`Updated ${lockPath}`);
|
|
238
|
+
OutputHelper.hint('Commit deploy.nevermore.lock.json to roll base places forward.');
|
|
239
|
+
}
|
|
240
|
+
/** Narrow a pin already known to be a keyword; the caller filtered for it. */
|
|
241
|
+
function _asKeyword(version) {
|
|
242
|
+
if (version == null || !isBasePlaceVersionKeyword(version)) {
|
|
243
|
+
throw new Error(`Expected a "saved"/"published" pin, got ${_formatVersion(version)}`);
|
|
244
|
+
}
|
|
245
|
+
return version;
|
|
246
|
+
}
|
|
126
247
|
/**
|
|
127
248
|
* `nevermore deploy version promote <from> <to>` — copy the base-place version
|
|
128
249
|
* pins from one target to another (e.g. promote validated `production-demo`
|
|
@@ -156,7 +277,7 @@ export async function handleVersionPromoteAsync(args) {
|
|
|
156
277
|
const existing = versionByPlaceId.get(ref.basePlace.placeId);
|
|
157
278
|
if (existing != null && existing !== version) {
|
|
158
279
|
throw new Error(`Target "${fromTarget}" pins base place ${ref.basePlace.placeId} to ` +
|
|
159
|
-
`two different versions (
|
|
280
|
+
`two different versions (${_formatVersion(existing)} and ${_formatVersion(version)}). ` +
|
|
160
281
|
`Run "nevermore deploy version upgrade ${fromTarget}" to make it consistent first.`);
|
|
161
282
|
}
|
|
162
283
|
versionByPlaceId.set(ref.basePlace.placeId, version);
|
|
@@ -198,9 +319,14 @@ export async function handleVersionPromoteAsync(args) {
|
|
|
198
319
|
}
|
|
199
320
|
await _commitPinChangesAsync(configPath, config, changes, args);
|
|
200
321
|
}
|
|
322
|
+
function _formatVersion(version) {
|
|
323
|
+
if (version == null) {
|
|
324
|
+
return '(latest)';
|
|
325
|
+
}
|
|
326
|
+
return typeof version === 'string' ? `"${version}"` : `v${version}`;
|
|
327
|
+
}
|
|
201
328
|
function _formatChange(change) {
|
|
202
|
-
const from = change.from != null ? `v${change.from}` : '(latest)';
|
|
203
329
|
const unchanged = change.from === change.to ? ' (unchanged)' : '';
|
|
204
|
-
return `${from} →
|
|
330
|
+
return `${_formatVersion(change.from)} → ${_formatVersion(change.to)}${unchanged}`;
|
|
205
331
|
}
|
|
206
332
|
//# sourceMappingURL=version-command.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-command.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/version-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"version-command.js","sourceRoot":"","sources":["../../../src/commands/deploy-command/version-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-command.d.ts","sourceRoot":"","sources":["../../../src/commands/test-command/test-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"test-command.d.ts","sourceRoot":"","sources":["../../../src/commands/test-command/test-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AA2BhE,MAAM,WAAW,eAAgB,SAAQ,mBAAmB;IAC1D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,kBAAkB,CAAC,CAAC,CAC/B,YAAW,aAAa,CAAC,CAAC,EAAE,eAAe,CAAC;IAErC,OAAO,SAAU;IACjB,QAAQ,SAAoC;IAE5C,OAAO,GAAI,MAAM,IAAI,CAAC,CAAC,CAAC,KA2Cd,IAAI,CAAC,eAAe,CAAC,CACpC;IAEK,OAAO,GAAU,MAAM,eAAe,oBAsG3C;CACH"}
|
|
@@ -4,9 +4,10 @@ import { getApiKeyAsync } from '@quenty/nevermore-cli-helpers';
|
|
|
4
4
|
import { OpenCloudClient } from '../../utils/open-cloud/open-cloud-client.js';
|
|
5
5
|
import { RateLimiter } from '../../utils/open-cloud/rate-limiter.js';
|
|
6
6
|
import { isCI, readPackageNameAsync } from '../../utils/nevermore-cli-utils.js';
|
|
7
|
+
import { createBasePlaceResolver } from '../../utils/build/base-place-resolver-factory.js';
|
|
7
8
|
import { CloudJobContext, LocalJobContext, } from '../../utils/job-context/index.js';
|
|
8
9
|
import { runSingleTestAsync } from '../../utils/testing/runner/test-runner.js';
|
|
9
|
-
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveSingleDeployTarget, } from '
|
|
10
|
+
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveSingleDeployTarget, } from '@quenty/nevermore-deploy';
|
|
10
11
|
import { CompositeReporter, GithubCommentTableReporter, JsonFileReporter, SimpleReporter, SpinnerReporter, createTestCommentConfig, } from '../../utils/testing/reporting/index.js';
|
|
11
12
|
export class TestProjectCommand {
|
|
12
13
|
command = 'test';
|
|
@@ -84,16 +85,25 @@ export class TestProjectCommand {
|
|
|
84
85
|
await reporter.startAsync();
|
|
85
86
|
let exitCode = 0;
|
|
86
87
|
try {
|
|
87
|
-
const
|
|
88
|
-
|
|
88
|
+
const config = await loadDeployConfigAsync(resolveDeployConfigPath(cwd));
|
|
89
|
+
const target = resolveSingleDeployTarget(config, 'test', 'nevermore batch test');
|
|
90
|
+
// A local run needs Open Cloud only to fetch a base place. The key is
|
|
91
|
+
// resolved lazily so a package without one is never asked for credentials.
|
|
92
|
+
const client = args.cloud
|
|
93
|
+
? new OpenCloudClient({
|
|
89
94
|
apiKey: await getApiKeyAsync(args),
|
|
90
95
|
rateLimiter: new RateLimiter(),
|
|
91
|
-
})
|
|
92
|
-
: new
|
|
96
|
+
})
|
|
97
|
+
: new OpenCloudClient({
|
|
98
|
+
apiKey: () => getApiKeyAsync(args),
|
|
99
|
+
rateLimiter: new RateLimiter(),
|
|
100
|
+
});
|
|
101
|
+
const basePlaceResolver = createBasePlaceResolver(client, args);
|
|
102
|
+
const context = args.cloud
|
|
103
|
+
? new CloudJobContext(reporter, client, basePlaceResolver)
|
|
104
|
+
: new LocalJobContext(reporter, client, basePlaceResolver);
|
|
93
105
|
let result;
|
|
94
106
|
try {
|
|
95
|
-
const config = await loadDeployConfigAsync(resolveDeployConfigPath(cwd));
|
|
96
|
-
const target = resolveSingleDeployTarget(config, 'test', 'nevermore batch test');
|
|
97
107
|
result = await runSingleTestAsync(context, {
|
|
98
108
|
packagePath: cwd,
|
|
99
109
|
packageName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-command.js","sourceRoot":"","sources":["../../../src/commands/test-command/test-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EACL,eAAe,EACf,eAAe,GAChB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EACL,qBAAqB,EACrB,uBAAuB,EACvB,yBAAyB,GAC1B,MAAM,
|
|
1
|
+
{"version":3,"file":"test-command.js","sourceRoot":"","sources":["../../../src/commands/test-command/test-command.ts"],"names":[],"mappings":"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"}
|
package/dist/nevermore.js
CHANGED
|
@@ -46,6 +46,23 @@ yargs(hideBin(process.argv))
|
|
|
46
46
|
default: false,
|
|
47
47
|
global: true,
|
|
48
48
|
type: 'boolean',
|
|
49
|
+
})
|
|
50
|
+
// Global rather than per-command so every command that can merge a base place
|
|
51
|
+
// gets identical lock semantics from one definition.
|
|
52
|
+
.option('frozen-lockfile', {
|
|
53
|
+
description: 'Fail instead of resolving a base place version that deploy.nevermore.lock.json does not already pin',
|
|
54
|
+
default: false,
|
|
55
|
+
global: true,
|
|
56
|
+
type: 'boolean',
|
|
57
|
+
})
|
|
58
|
+
// The other half of the same policy: a watch-dispatched build must re-resolve
|
|
59
|
+
// the pin the lock is holding still, or it rebuilds the base place it already
|
|
60
|
+
// shipped and the hot reload does nothing.
|
|
61
|
+
.option('refresh-base-place', {
|
|
62
|
+
description: 'Re-resolve "saved"/"published" base place pins instead of reusing the locked version (use in watch-triggered builds)',
|
|
63
|
+
default: false,
|
|
64
|
+
global: true,
|
|
65
|
+
type: 'boolean',
|
|
49
66
|
})
|
|
50
67
|
.middleware((argv) => {
|
|
51
68
|
OutputHelper.setVerbose(argv.verbose);
|
package/dist/nevermore.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nevermore.js","sourceRoot":"","sources":["../src/nevermore.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"nevermore.js","sourceRoot":"","sources":["../src/nevermore.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EACZ,iBAAiB,EAKlB,MAAM,
|
|
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,0BAA0B,CAAC;AAElC,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, toManifestPlaceInfo, } from '
|
|
4
|
+
import { loadDeployConfigAsync, resolveDeployConfigPath, resolveDeployTargetPlaces, toManifestPlaceInfo, } from '@quenty/nevermore-deploy';
|
|
5
5
|
/**
|
|
6
6
|
* Discover all packages that have a deploy.nevermore.json with the given target.
|
|
7
7
|
*/
|
|
@@ -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,EAGL,qBAAqB,EACrB,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,
|
|
1
|
+
{"version":3,"file":"changed-packages-utils.js","sourceRoot":"","sources":["../../../src/utils/batch/changed-packages-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { BasePlaceResolver } from '@quenty/nevermore-deploy';
|
|
2
|
+
import { type OpenCloudClient } from '../open-cloud/open-cloud-client.js';
|
|
3
|
+
/**
|
|
4
|
+
* A resolver that can only answer from the lock file.
|
|
5
|
+
*
|
|
6
|
+
* Watch registration reads baselines with `peekAsync`, which never leaves disk,
|
|
7
|
+
* so registering needs no Open Cloud credentials. A dryrun has no client to
|
|
8
|
+
* build a real resolver from and must not acquire one just to register — and if
|
|
9
|
+
* some future caller does ask this to resolve, throwing beats quietly reaching
|
|
10
|
+
* the network on a dryrun.
|
|
11
|
+
*/
|
|
12
|
+
export declare function createLockOnlyBasePlaceResolver(): BasePlaceResolver;
|
|
13
|
+
/**
|
|
14
|
+
* Build the one resolver a run shares.
|
|
15
|
+
*
|
|
16
|
+
* Every command that can merge a base place goes through here, so `deploy run`,
|
|
17
|
+
* `batch deploy`, `test`, and `batch test` cannot end up disagreeing about lock
|
|
18
|
+
* policy. `OpenCloudClient` satisfies the resolver's `PlaceVersionSource` port
|
|
19
|
+
* structurally — the deploy-config package never learns about Open Cloud.
|
|
20
|
+
*/
|
|
21
|
+
export declare function createBasePlaceResolver(openCloudClient: OpenCloudClient, args: {
|
|
22
|
+
frozenLockfile?: boolean;
|
|
23
|
+
refreshBasePlace?: boolean;
|
|
24
|
+
}): BasePlaceResolver;
|
|
25
|
+
//# sourceMappingURL=base-place-resolver-factory.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base-place-resolver-factory.d.ts","sourceRoot":"","sources":["../../../src/utils/build/base-place-resolver-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E;;;;;;;;GAQG;AACH,wBAAgB,+BAA+B,IAAI,iBAAiB,CAWnE;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE;IAAE,cAAc,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GAC7D,iBAAiB,CAYnB"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { BasePlaceResolver } from '@quenty/nevermore-deploy';
|
|
2
|
+
/**
|
|
3
|
+
* A resolver that can only answer from the lock file.
|
|
4
|
+
*
|
|
5
|
+
* Watch registration reads baselines with `peekAsync`, which never leaves disk,
|
|
6
|
+
* so registering needs no Open Cloud credentials. A dryrun has no client to
|
|
7
|
+
* build a real resolver from and must not acquire one just to register — and if
|
|
8
|
+
* some future caller does ask this to resolve, throwing beats quietly reaching
|
|
9
|
+
* the network on a dryrun.
|
|
10
|
+
*/
|
|
11
|
+
export function createLockOnlyBasePlaceResolver() {
|
|
12
|
+
return new BasePlaceResolver({
|
|
13
|
+
source: {
|
|
14
|
+
resolveLatestPlaceVersionAsync: async () => {
|
|
15
|
+
throw new Error('This resolver answers from deploy.nevermore.lock.json only and ' +
|
|
16
|
+
'cannot reach Open Cloud.');
|
|
17
|
+
},
|
|
18
|
+
},
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Build the one resolver a run shares.
|
|
23
|
+
*
|
|
24
|
+
* Every command that can merge a base place goes through here, so `deploy run`,
|
|
25
|
+
* `batch deploy`, `test`, and `batch test` cannot end up disagreeing about lock
|
|
26
|
+
* policy. `OpenCloudClient` satisfies the resolver's `PlaceVersionSource` port
|
|
27
|
+
* structurally — the deploy-config package never learns about Open Cloud.
|
|
28
|
+
*/
|
|
29
|
+
export function createBasePlaceResolver(openCloudClient, args) {
|
|
30
|
+
if (args.frozenLockfile && args.refreshBasePlace) {
|
|
31
|
+
throw new Error('--frozen-lockfile and --refresh-base-place contradict each other: ' +
|
|
32
|
+
'one forbids resolving base places, the other forces it.');
|
|
33
|
+
}
|
|
34
|
+
return new BasePlaceResolver({
|
|
35
|
+
source: openCloudClient,
|
|
36
|
+
frozen: args.frozenLockfile ?? false,
|
|
37
|
+
refresh: args.refreshBasePlace ?? false,
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=base-place-resolver-factory.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"base-place-resolver-factory.js","sourceRoot":"","sources":["../../../src/utils/build/base-place-resolver-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAG7D;;;;;;;;GAQG;AACH,MAAM,UAAU,+BAA+B;IAC7C,OAAO,IAAI,iBAAiB,CAAC;QAC3B,MAAM,EAAE;YACN,8BAA8B,EAAE,KAAK,IAAI,EAAE;gBACzC,MAAM,IAAI,KAAK,CACb,iEAAiE;oBAC/D,0BAA0B,CAC7B,CAAC;YACJ,CAAC;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,uBAAuB,CACrC,eAAgC,EAChC,IAA8D;IAE9D,IAAI,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CACb,oEAAoE;YAClE,yDAAyD,CAC5D,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,iBAAiB,CAAC;QAC3B,MAAM,EAAE,eAAe;QACvB,MAAM,EAAE,IAAI,CAAC,cAAc,IAAI,KAAK;QACpC,OAAO,EAAE,IAAI,CAAC,gBAAgB,IAAI,KAAK;KACxC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { BuildContext } from '@quenty/nevermore-template-helpers';
|
|
2
|
-
import { DeployTarget } from '
|
|
2
|
+
import { DeployTarget } from '@quenty/nevermore-deploy';
|
|
3
3
|
import { type Reporter } from '@quenty/cli-output-helpers/reporting';
|
|
4
4
|
export interface DeployOverrides {
|
|
5
5
|
universeId?: number;
|
|
@@ -15,7 +15,18 @@ export interface BuildPlaceOptions {
|
|
|
15
15
|
*/
|
|
16
16
|
target: DeployTarget;
|
|
17
17
|
outputFileName?: string;
|
|
18
|
-
|
|
18
|
+
/**
|
|
19
|
+
* Directory the package lives in. Required, not defaulted.
|
|
20
|
+
*
|
|
21
|
+
* Everything downstream is resolved against it: the project file, the build
|
|
22
|
+
* cache key, and which `deploy.nevermore.lock.json` a base place pin is
|
|
23
|
+
* written to. Falling back to `process.cwd()` is silently wrong in a batch —
|
|
24
|
+
* every package sharing a relative `project` path collapses onto one cache
|
|
25
|
+
* key, so one package's build gets uploaded to another's place. It was
|
|
26
|
+
* optional once, and a refactor dropped it from a call site with nothing to
|
|
27
|
+
* catch it.
|
|
28
|
+
*/
|
|
29
|
+
packagePath: string;
|
|
19
30
|
overrides?: DeployOverrides;
|
|
20
31
|
reporter?: Reporter;
|
|
21
32
|
packageName?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/utils/build/build.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../../src/utils/build/build.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,MAAM,WAAW,eAAe;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,iBAAiB;IAChC;;;;OAIG;IACH,MAAM,EAAE,YAAY,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;;;;;;;;;;OAUG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,2FAA2F;IAC3F,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CA6C3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/utils/build/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../../src/utils/build/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAkDlE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAA0B;IAE1B,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,cAAc,GAAG,YAAY,EAC7B,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,EAC3B,SAAS,EACT,QAAQ,EACR,WAAW,GACZ,GAAG,OAAO,CAAC;IAEZ,MAAM,MAAM,GAAiB,EAAE,GAAG,WAAW,EAAE,CAAC;IAEhD,IAAI,SAAS,EAAE,UAAU;QAAE,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC,UAAU,CAAC;IACpE,IAAI,SAAS,EAAE,OAAO;QAAE,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;IAC3D,IAAI,SAAS,EAAE,cAAc;QAC3B,MAAM,CAAC,cAAc,GAAG,SAAS,CAAC,cAAc,CAAC;IAEnD,IAAI,SAAS,EAAE,SAAS,EAAE,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;QACnD,YAAY,CAAC,OAAO,CAAC,+BAA+B,QAAQ,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC;YACH,MAAM,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,yBAAyB,QAAQ,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IAE9D,MAAM,mBAAmB,GAAG,WAAW,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACtE,QAAQ,EAAE,oBAAoB,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAChE,YAAY,CAAC,OAAO,CAClB,yBAAyB,mBAAmB,IAAI,MAAM,CAAC,OAAO,KAAK,CACpE,CAAC;IAEF,MAAM,YAAY,GAAG,MAAM,YAAY,CAAC,WAAW,CAAC;QAClD,MAAM,EAAE,aAAa;KACtB,CAAC,CAAC;IACH,MAAM,QAAQ,GAAG,YAAY,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC1D,MAAM,YAAY,CAAC,cAAc,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;AAC5C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type CredentialArgs } from '@quenty/nevermore-cli-helpers';
|
|
2
|
-
import { type DeployTarget } from '
|
|
2
|
+
import { type DeployTarget } from '@quenty/nevermore-deploy';
|
|
3
3
|
import { OpenCloudClient } from '../open-cloud/open-cloud-client.js';
|
|
4
4
|
import { type BuiltPlace } from './build.js';
|
|
5
5
|
import { type Reporter } from '@quenty/cli-output-helpers/reporting';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/utils/build/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../../src/utils/build/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,sCAAsC,CAAC;AAErE,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,UAAU,CAAC;IACvB,IAAI,EAAE,cAAc,GAAG;QAAE,OAAO,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7C,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,eAAe,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,YAAY,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CA6B5B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type BuiltPlace } from '../build/build.js';
|
|
2
|
-
import { type ManifestPlaceInfo } from '
|
|
2
|
+
import { type ManifestPlaceInfo } from '@quenty/nevermore-deploy';
|
|
3
3
|
/** npm name of the package that ships the manifest module. */
|
|
4
4
|
export declare const MANIFEST_PACKAGE_NAME = "@quenty/nevermoreclimanifest";
|
|
5
5
|
/**
|
|
@@ -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;AACpD,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,
|
|
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,0BAA0B,CAAC;AAElE,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;IACnB,kFAAkF;IAClF,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,GACpC,wBAAwB,CAuB1B;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"}
|
|
@@ -2,6 +2,7 @@ import { type Reporter } from '@quenty/cli-output-helpers/reporting';
|
|
|
2
2
|
import { type BuildPlaceOptions, type BuiltPlace } from '../build/build.js';
|
|
3
3
|
import { type Deployment, type JobContext, type DeployPlaceOptions, type RunScriptOptions, type ScriptRunResult } from './job-context.js';
|
|
4
4
|
import { type OpenCloudClient } from '../open-cloud/open-cloud-client.js';
|
|
5
|
+
import { type BasePlaceResolver } from '@quenty/nevermore-deploy';
|
|
5
6
|
/**
|
|
6
7
|
* Abstract base for JobContext implementations.
|
|
7
8
|
*
|
|
@@ -15,9 +16,10 @@ import { type OpenCloudClient } from '../open-cloud/open-cloud-client.js';
|
|
|
15
16
|
export declare abstract class BaseJobContext implements JobContext {
|
|
16
17
|
protected _reporter: Reporter;
|
|
17
18
|
protected _openCloudClient: OpenCloudClient | undefined;
|
|
19
|
+
private _basePlaceResolver;
|
|
18
20
|
private _builtPlaces;
|
|
19
21
|
private _sharedRojoBuilds;
|
|
20
|
-
constructor(reporter: Reporter, openCloudClient?: OpenCloudClient);
|
|
22
|
+
constructor(reporter: Reporter, openCloudClient?: OpenCloudClient, basePlaceResolver?: BasePlaceResolver);
|
|
21
23
|
buildPlaceAsync(options: BuildPlaceOptions): Promise<BuiltPlace>;
|
|
22
24
|
private _buildCacheKey;
|
|
23
25
|
private _applyTargetOverrides;
|
|
@@ -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,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;
|
|
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,EACrB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAgClE;;;;;;;;;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;YA4B5B,mBAAmB;YAenB,oBAAoB;IA4E5B,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,MAAM,CAAC;IAC9D,QAAQ,CAAC,YAAY,CAAC,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAEtD,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;CAiDpC"}
|