@vendure/cloud 0.5.0-dev.20261027073222.g579677e → 0.5.0-dev.20261027163057.gdd15de9
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/dist/cli/commands/deployment/deploy.d.ts +1 -1
- package/dist/cli/commands/deployment/deploy.d.ts.map +1 -1
- package/dist/cli/commands/deployment/deploy.js +46 -6
- package/dist/cli/commands/deployment/deploy.js.map +1 -1
- package/dist/cli/commands/deployment/recovery.d.ts.map +1 -1
- package/dist/cli/commands/deployment/recovery.js +11 -8
- package/dist/cli/commands/deployment/recovery.js.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/binding-cleanup.d.ts +1 -1
- package/dist/cli/commands/project-config/init/conversion/binding-cleanup.d.ts.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/binding-cleanup.js +9 -6
- package/dist/cli/commands/project-config/init/conversion/binding-cleanup.js.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/migrations-declaration.d.ts +3 -1
- package/dist/cli/commands/project-config/init/conversion/migrations-declaration.d.ts.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/migrations-declaration.js +77 -7
- package/dist/cli/commands/project-config/init/conversion/migrations-declaration.js.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/package-manifest.d.ts +1 -0
- package/dist/cli/commands/project-config/init/conversion/package-manifest.d.ts.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/package-manifest.js +57 -0
- package/dist/cli/commands/project-config/init/conversion/package-manifest.js.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/plan-conversion.d.ts.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/plan-conversion.js +21 -4
- package/dist/cli/commands/project-config/init/conversion/plan-conversion.js.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/plugin-conversion.d.ts +11 -0
- package/dist/cli/commands/project-config/init/conversion/plugin-conversion.d.ts.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/plugin-conversion.js +70 -8
- package/dist/cli/commands/project-config/init/conversion/plugin-conversion.js.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/text-edits.d.ts +2 -0
- package/dist/cli/commands/project-config/init/conversion/text-edits.d.ts.map +1 -1
- package/dist/cli/commands/project-config/init/conversion/text-edits.js +14 -2
- package/dist/cli/commands/project-config/init/conversion/text-edits.js.map +1 -1
- package/dist/cli/lib/contract/deployments.d.ts +5 -0
- package/dist/cli/lib/contract/deployments.d.ts.map +1 -1
- package/dist/cli/lib/contract/deployments.js.map +1 -1
- package/dist/cloud-config-module.d.ts +1 -0
- package/dist/cloud-config-module.d.ts.map +1 -1
- package/dist/cloud-config-module.js +6 -1
- package/dist/cloud-config-module.js.map +1 -1
- package/dist/dev/dev-initial-data.js +4 -1
- package/dist/dev/dev-initial-data.js.map +1 -1
- package/dist/dev/dev-migrate.js +4 -1
- package/dist/dev/dev-migrate.js.map +1 -1
- package/dist/dev/dev-server.js +4 -1
- package/dist/dev/dev-server.js.map +1 -1
- package/dist/dev/dev-worker.js +4 -1
- package/dist/dev/dev-worker.js.map +1 -1
- package/dist/entrypoint.js +2 -1
- package/dist/entrypoint.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import { type CloudCommandInput } from "../../index.js";
|
|
2
|
-
export declare function deploy(
|
|
2
|
+
export declare function deploy(input: CloudCommandInput): Promise<number | undefined>;
|
|
3
3
|
export declare function firstDeployHint(environmentSlug: string): string;
|
|
4
4
|
//# sourceMappingURL=deploy.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,iBAAiB,EAcvB,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/deploy.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,iBAAiB,EAcvB,MAAM,gBAAgB,CAAC;AAuExB,wBAAsB,MAAM,CAAC,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAkMlF;AA8ND,wBAAgB,eAAe,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAE/D"}
|
|
@@ -48,7 +48,8 @@ function spinnerMessage(status) {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
// The exit code is returned because the Vendure CLI host calls `process.exit` with it.
|
|
51
|
-
export async function deploy(
|
|
51
|
+
export async function deploy(input) {
|
|
52
|
+
const { options, globals } = input;
|
|
52
53
|
const wait = readNegatableOption(options.wait);
|
|
53
54
|
const json = globals.json === true;
|
|
54
55
|
const { project, environment } = await resolveEnvironment(globals);
|
|
@@ -142,11 +143,14 @@ export async function deploy({ options, globals }) {
|
|
|
142
143
|
spinner?.message(current.statusMessage ?? spinnerMessage(current.status));
|
|
143
144
|
}
|
|
144
145
|
if (json) {
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
return
|
|
146
|
+
if (current.status === "RUNNING" || current.status === "SUCCEEDED") {
|
|
147
|
+
process.stdout.write(`${JSON.stringify(current)}\n`);
|
|
148
|
+
return;
|
|
148
149
|
}
|
|
149
|
-
|
|
150
|
+
// Joined as `deployment show --json` joins them, so a script reads the next action here.
|
|
151
|
+
const { recovery, unavailableReason } = await fetchDeploymentRecovery(client, current);
|
|
152
|
+
process.stdout.write(`${JSON.stringify({ ...current, recovery, recoveryUnavailableReason: unavailableReason })}\n`);
|
|
153
|
+
return 1;
|
|
150
154
|
}
|
|
151
155
|
if (current.githubDeployment)
|
|
152
156
|
output.info(describeGitHubDeploymentSync(current.githubDeployment));
|
|
@@ -192,7 +196,43 @@ export async function deploy({ options, globals }) {
|
|
|
192
196
|
output.warn(formatDeploymentRecovery(recovery, current.id));
|
|
193
197
|
else if (unavailableReason)
|
|
194
198
|
output.warn(unavailableReason);
|
|
195
|
-
return
|
|
199
|
+
return offerSavedRevision(client, environment, recovery, current, input);
|
|
200
|
+
}
|
|
201
|
+
// A refusal whose missing secrets the latest saved revision already sets. Applying it is the
|
|
202
|
+
// customer's decision, so only a terminal asks, and the question names every other change the
|
|
203
|
+
// revision applies. The retry builds the same commit.
|
|
204
|
+
async function offerSavedRevision(client, environment, recovery, failed, input) {
|
|
205
|
+
const saved = recovery?.savedConfigRevision;
|
|
206
|
+
if (!saved || !process.stdin.isTTY)
|
|
207
|
+
return 1;
|
|
208
|
+
let status;
|
|
209
|
+
try {
|
|
210
|
+
status = await fetchConfigRevisionStatus(client, environment.id);
|
|
211
|
+
}
|
|
212
|
+
catch (error) {
|
|
213
|
+
// Without the change list the question would understate what it applies; the printed command
|
|
214
|
+
// remains.
|
|
215
|
+
logger.warn(`Could not read the configuration revision status: ${error instanceof Error ? error.message : String(error)}`);
|
|
216
|
+
return 1;
|
|
217
|
+
}
|
|
218
|
+
// A revision saved since the recovery was read would make the change list describe it instead.
|
|
219
|
+
if (status.latest?.number !== saved.number)
|
|
220
|
+
return 1;
|
|
221
|
+
const others = status.changes.filter((change) => !saved.secrets.includes(change.key));
|
|
222
|
+
const retry = await prompts.confirm({
|
|
223
|
+
initialValue: true,
|
|
224
|
+
message: `Deploy with configuration revision ${saved.number}, which sets ${saved.secrets.join(", ")}${others.length > 0 ? ` and also applies ${formatConfigRevisionChanges(others)}` : ""}?`,
|
|
225
|
+
});
|
|
226
|
+
if (prompts.isCancel(retry) || !retry)
|
|
227
|
+
return 1;
|
|
228
|
+
return deploy({
|
|
229
|
+
...input,
|
|
230
|
+
options: {
|
|
231
|
+
...input.options,
|
|
232
|
+
configRevision: String(saved.number),
|
|
233
|
+
commit: failed.commitHash ?? input.options.commit,
|
|
234
|
+
},
|
|
235
|
+
});
|
|
196
236
|
}
|
|
197
237
|
// Warns about env vars the local app references but the target environment lacks. Returns whether
|
|
198
238
|
// to proceed: an interactive TTY confirms, other runs continue. A check that could not run prints a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/deploy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/deploy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAEL,gBAAgB,EAKhB,iBAAiB,EACjB,yBAAyB,EACzB,4BAA4B,EAC5B,iCAAiC,EACjC,4BAA4B,EAC5B,MAAM,EACN,eAAe,EACf,kBAAkB,EAClB,QAAQ,EACR,KAAK,GACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,yBAAyB,EACzB,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAEL,yBAAyB,EACzB,2BAA2B,EAC3B,kBAAkB,GACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAC;AAClF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAC/B,uEAAuE;AACvE,MAAM,yBAAyB,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAIjD,SAAS,SAAS,CAAC,UAAsB;IACvC,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACpC,OAAO,cAAc,CAAC;IACxB,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,IAAI,UAAU,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;QACvE,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAClC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,WAAW,CAClB,KAA0B,EAC1B,UAAsB;IAEtB,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,qBAAqB,IAAI,yBAAyB,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC;IACzF,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,cAAc;YACjB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,sBAAsB,EAAE,CAAC;QAC/C,KAAK,OAAO;YACV,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAChC,KAAK,SAAS;YACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;QACxC,KAAK,SAAS;YACZ,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC/C,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,MAAc;IACpC,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,UAAU;YACb,OAAO,aAAa,CAAC;QACvB,KAAK,OAAO;YACV,OAAO,8BAA8B,CAAC;QACxC,KAAK,WAAW;YACd,OAAO,cAAc,CAAC;QACxB;YACE,OAAO,+BAA+B,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,KAAwB;IACnD,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IACnC,MAAM,IAAI,GAAG,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,KAAK,IAAI,CAAC;IAEnC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAEnE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,aAAa,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,MAAM,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAChE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,MAAM,oBAAoB,CACvE,MAAM,EACN,WAAW,EACX,gBAAgB,CAAC,OAAO,CAAC,cAAc,EAAE,8BAA8B,CAAC,EACxE,IAAI,CACL,CAAC;IACF,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACnC,OAAO;IACT,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CACX,4DAA4D,gBAAgB,YAAY,CACzF,CAAC;YACF,OAAO;QACT,CAAC;IACH,CAAC;IAED,0FAA0F;IAC1F,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,MAAM,iBAAiB,CACxC,MAAM,EACN,WAAW,CAAC,EAAE,EACd,WAAW,IAAI,OAAO,CAAC,MAAM,EAC7B,cAAc,CACf,CAAC;IACF,IAAI,WAAW,KAAK,SAAS,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QACzE,MAAM,CAAC,IAAI,CAAC,mBAAmB,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,cAAc,IAAI,IAAI,EAAE,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,0BAA0B,UAAU,CAAC,cAAc,GAAG,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChB,YAAY,EAAE,UAAU,CAAC,EAAE;gBAC3B,MAAM,EAAE,UAAU,CAAC,MAAM;gBACzB,UAAU,EAAE,UAAU,CAAC,UAAU;gBACjC,cAAc,EAAE,UAAU,CAAC,cAAc,IAAI,IAAI;aAClD,CAAC,IAAI,CACP,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,IAAI,CACT,iBAAiB,UAAU,CAAC,EAAE,mBAAmB,gBAAgB,oBAAoB,UAAU,CAAC,EAAE,uCAAuC,CAC1I,CAAC;QACJ,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAChD,OAAO,EAAE,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAE5C,IAAI,OAAO,GAAG,UAAU,CAAC;IACzB,IAAI,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC/B,IAAI,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9C,IACE,CAAC,IAAI;YACL,CAAC,iBAAiB;YAClB,CAAC,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EAC9D,CAAC;YACD,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC;YAC/B,iBAAiB,GAAG,IAAI,CAAC;YACzB,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,gBAAgB,CACxC,MAAM,EACN,gBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,8BAA8B,EAC/E,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAC9B,CAAC;gBACF,IAAI,WAAW,EAAE,CAAC;oBAChB,OAAO,GAAG,CAAC;gBACb,CAAC;YACH,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,CAAC,IAAI,CACT,yEACE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CACvD,EAAE,CACH,CAAC;YACJ,CAAC;YACD,OAAO,GAAG,MAAM,MAAM,CAAC,GAAG,CAAa,gBAAgB,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;YACxE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC3C,OAAO,EAAE,KAAK,CAAC,2BAA2B,CAAC,CAAC;YAC9C,CAAC;YACD,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;YAC3B,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,SAAS;QACX,CAAC;QAED,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;YACxB,KAAK,GAAG,SAAS,CAAC;YAClB,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC3B,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC5C,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,WAAW,GAAG,OAAO,CAAC,EAAE,EAAE,CAAC;YAC1C,OAAO,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,KAAK,YAAY,CAAC,CAAC;YAC5C,IAAI,IAAI,EAAE,CAAC;gBACT,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,IAAI,CAC5F,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CACT,GAAG,OAAO,CAAC,KAAK,4BAA4B,OAAO,CAAC,EAAE,GAAG,MAAM,wCAAwC,gBAAgB,4CAA4C,gBAAgB,YAAY,CAChM,CAAC;YACJ,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC;QAED,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC9B,OAAO,GAAG,MAAM,MAAM,CAAC,GAAG,CAAa,gBAAgB,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,IAAI,EAAE,CAAC;QACT,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YACnE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO;QACT,CAAC;QACD,yFAAyF;QACzF,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACvF,OAAO,CAAC,MAAM,CAAC,KAAK,CAClB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,CAAC,IAAI,CAC9F,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;IAED,IAAI,OAAO,CAAC,gBAAgB;QAAE,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAClG,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;QACnE,OAAO,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,cAAc,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,CAAC,IAAI,CACT,uBAAuB,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,EAAE;YAC/C,eAAe,EAAE,WAAW,CAAC,IAAI;YACjC,OAAO;YACP,WAAW,EAAE,OAAO,CAAC,IAAI;SAC1B,CAAC,CACH,CAAC;QACF,6FAA6F;QAC7F,2BAA2B;QAC3B,IAAI,QAA4B,CAAC;QACjC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;YACzD,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpF,QAAQ,GAAG,CAAC,CAAC;YACf,CAAC;QACH,CAAC;QACD,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,IAAI,EAAE,CAAC;QAC5D,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,OAAO,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,MAAM,CAAC,IAAI,CACT,GAAG,kBAAkB,CAAC,MAAM,yBAAyB,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,WAAW,KAAK,WAAW,gBAAgB,gCAAgC,kBAAkB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,GAAG,CACtO,CAAC;QACJ,CAAC;QACD,oFAAoF;QACpF,IAAI,WAAW,CAAC,cAAc,KAAK,IAAI;YAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,OAAO,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,WAAW,CAAC,CAAC;QAC/D,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACnC,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACzB,MAAM,CAAC,KAAK,CACV,4BAA4B,CAAC,OAAO,CAAC,YAAY,EAAE;YACjD,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,eAAe,EAAE,WAAW,CAAC,IAAI;SAClC,CAAC,CACH,CAAC;IACJ,CAAC;IACD,+FAA+F;IAC/F,MAAM,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,MAAM,uBAAuB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvF,IAAI,QAAQ;QAAE,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;SACrE,IAAI,iBAAiB;QAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC3D,OAAO,kBAAkB,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;AAC3E,CAAC;AAED,6FAA6F;AAC7F,8FAA8F;AAC9F,sDAAsD;AACtD,KAAK,UAAU,kBAAkB,CAC/B,MAAiB,EACjB,WAAwB,EACxB,QAAmC,EACnC,MAAkB,EAClB,KAAwB;IAExB,MAAM,KAAK,GAAG,QAAQ,EAAE,mBAAmB,CAAC;IAC5C,IAAI,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,CAAC,CAAC;IAC7C,IAAI,MAAoC,CAAC;IACzC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,yBAAyB,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,6FAA6F;QAC7F,WAAW;QACX,MAAM,CAAC,IAAI,CACT,qDAAqD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC9G,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;IACD,+FAA+F;IAC/F,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,KAAK,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC;IACrD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACtF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;QAClC,YAAY,EAAE,IAAI;QAClB,OAAO,EAAE,sCAAsC,KAAK,CAAC,MAAM,gBAAgB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GACjG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,qBAAqB,2BAA2B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EACnF,GAAG;KACJ,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK;QAAE,OAAO,CAAC,CAAC;IAChD,OAAO,MAAM,CAAC;QACZ,GAAG,KAAK;QACR,OAAO,EAAE;YACP,GAAG,KAAK,CAAC,OAAO;YAChB,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC;YACpC,MAAM,EAAE,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM;SAClD;KACF,CAAC,CAAC;AACL,CAAC;AAED,kGAAkG;AAClG,oGAAoG;AACpG,8DAA8D;AAC9D,KAAK,UAAU,oBAAoB,CACjC,MAAiB,EACjB,WAAwB,EACxB,QAAkC;IAElC,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC7E,IAAI,SAAS,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;QACvC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAEhD,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IAEtC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;QACpC,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,kCAAkC;KAC5C,CAAC,CAAC;IACH,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC;AAC/C,CAAC;AAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAgBtC,KAAK,UAAU,oBAAoB,CACjC,MAAiB,EACjB,WAAwB,EACxB,KAAyB,EACzB,IAAa;IAEb,MAAM,SAAS,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;IACrF,IAAI,OAAO,SAAS,KAAK,QAAQ;QAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAClE,IAAI,SAAS,KAAK,SAAS,IAAI,IAAI;QAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAEpE,IAAI,MAAoC,CAAC;IACzC,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,yBAAyB,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,6FAA6F;QAC7F,2EAA2E;QAC3E,IAAI,SAAS,KAAK,QAAQ;YAAE,MAAM,KAAK,CAAC;QACxC,MAAM,CAAC,IAAI,CACT,qDAAqD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC9G,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,kFAAkF,CAAC,CAAC;QAChG,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;IAEvE,8FAA8F;IAC9F,oDAAoD;IACpD,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAEzF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;IACpC,MAAM,OAAO,GAAG,2BAA2B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC5D,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;YAClC,YAAY,EAAE,IAAI;YAClB,OAAO,EAAE,gCAAgC,MAAM,KAAK,OAAO,IAAI;SAChE,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;QAC5D,IAAI,KAAK;YAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACzC,CAAC;IACD,MAAM,CAAC,IAAI,CACT,0BAA0B,MAAM,KAAK,OAAO,qEAAqE,MAAM,CAAC,OAAO,CAAC,MAAM,wBAAwB,gBAAgB,6BAA6B,MAAM,KAAK,CACvN,CAAC;IACF,OAAO;QACL,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE;YACR,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;YACrF,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;SAC1F;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,iBAAiB,CAC9B,MAAiB,EACjB,aAAqB,EACrB,GAAW,EACX,cAAkC;IAElC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAC9B,iBAAiB,aAAa,iBAAiB,EAC/C,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CACjE,CAAC;IACF,OAAO,MAAM,CAAC,GAAG,CAAa,gBAAgB,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,uBAAuB,CAC9B,OAAiC,EACjC,OAIC;IAED,MAAM,QAAQ,GAAG;QACf,KAAK,EAAE,IAAI,GAAG,EAAU;QACxB,OAAO,EAAE,IAAI,GAAG,EAAU;QAC1B,OAAO,EAAE,IAAI,GAAG,EAAU;KAC3B,CAAC;IAEF,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ;gBAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjE,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ;gBAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrE,CAAC;QAED,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YAC9C,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,KAAK,sBAAsB,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAG;QACZ,gBAAgB;QAChB,YAAY,OAAO,CAAC,WAAW,EAAE;QACjC,gBAAgB,OAAO,CAAC,eAAe,EAAE;KAC1C,CAAC;IACF,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,KAAK,CAAC,IAAI,CAAC,QAAQ,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,KAAK,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxD,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC;YAAE,SAAS;QAC/B,UAAU,GAAG,IAAI,CAAC;QAClB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;IAC3E,CAAC;IAED,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,6BAA6B,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,qBAAqB,CAC5B,QAAkD,EAClD,WAAmB,EACnB,eAAuB;IAEvB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,OAAO,kDAAkD,OAAO,CAAC,KAAK,KAAK,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,eAAe,CAAC,GAAG,CAAC;IAC/I,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ;SACnB,GAAG,CACF,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,OAAO,CAAC,KAAK,KAAK,iBAAiB,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,eAAe,CAAC,GAAG,CAC7F;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;IACd,OAAO,oBAAoB,QAAQ,CAAC,MAAM,oCAAoC,KAAK,EAAE,CAAC;AACxF,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa,EAAE,WAAmB,EAAE,eAAuB;IACpF,OAAO,iCAAiC,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAC;AACpF,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,eAAe,CAAC,eAAuB;IACrD,OAAO,gFAAgF,gBAAgB,2BAA2B,eAAe,KAAK,CAAC;AACzJ,CAAC;AAED,mFAAmF;AACnF,SAAS,cAAc,CAAC,WAAwB,EAAE,MAAiB;IACjE,IAAI,MAAM,CAAC,cAAc,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEpD,OAAO,eAAe,CAAC,WAAW,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAoB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAa5E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAmBD,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,QAAQ,CAAC,GAC5C,OAAO,CAAC,wBAAwB,CAAC,CAkBnC;
|
|
1
|
+
{"version":3,"file":"recovery.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAoB,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAa5E,MAAM,WAAW,wBAAwB;IACvC,QAAQ,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACpC,iBAAiB,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAmBD,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,SAAS,EACjB,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,QAAQ,CAAC,GAC5C,OAAO,CAAC,wBAAwB,CAAC,CAkBnC;AA4CD,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,kBAAkB,EAC5B,YAAY,EAAE,MAAM,GACnB,MAAM,CASR"}
|
|
@@ -36,13 +36,16 @@ export async function fetchDeploymentRecovery(client, deployment) {
|
|
|
36
36
|
// Keyed so an action added to the contract without a command here is a compile error.
|
|
37
37
|
const ACTION_COMMANDS = {
|
|
38
38
|
DEPLOY_AGAIN: () => [`${CLOUD_INVOCATION} deploy`],
|
|
39
|
-
//
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
`${CLOUD_INVOCATION}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
39
|
+
// A saved revision that sets every missing name needs only applying. Otherwise `env add` for a
|
|
40
|
+
// name that is not set, `env update` for one set to a blank value.
|
|
41
|
+
SET_SECRETS_AND_DEPLOY: ({ savedConfigRevision }) => savedConfigRevision
|
|
42
|
+
? [`${CLOUD_INVOCATION} deploy --config-revision ${savedConfigRevision.number}`]
|
|
43
|
+
: [
|
|
44
|
+
`${CLOUD_INVOCATION} env add <NAME>`,
|
|
45
|
+
`${CLOUD_INVOCATION} env update <NAME>`,
|
|
46
|
+
`${CLOUD_INVOCATION} deploy --config-revision latest`,
|
|
47
|
+
],
|
|
48
|
+
FIX_SOURCE_AND_DEPLOY: (_recovery, deploymentId) => [
|
|
46
49
|
`${CLOUD_INVOCATION} deployment logs ${deploymentId}`,
|
|
47
50
|
`${CLOUD_INVOCATION} deploy`,
|
|
48
51
|
],
|
|
@@ -73,7 +76,7 @@ export function formatDeploymentRecovery(recovery, deploymentId) {
|
|
|
73
76
|
lines.push(` ${recovery.stageUnavailableReason}`);
|
|
74
77
|
lines.push("", ` ${recovery.summary}`, "", "Next step:", ` ${recovery.nextActionMessage}`, "");
|
|
75
78
|
// An action added by a newer control plane prints its sentence without a command.
|
|
76
|
-
const commands = ACTION_COMMANDS[recovery.nextAction]?.(deploymentId) ?? [];
|
|
79
|
+
const commands = ACTION_COMMANDS[recovery.nextAction]?.(recovery, deploymentId) ?? [];
|
|
77
80
|
if (commands.length === 0)
|
|
78
81
|
lines.push(` Deployment ID: ${deploymentId}`);
|
|
79
82
|
for (const command of commands)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,gBAAgB,EAAmB,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAe/C,MAAM,WAAW,GAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;AAE1F,oGAAoG;AACpG,0CAA0C;AAC1C,MAAM,sBAAsB,GAA2B;IACrD,SAAS,EACP,0FAA0F;IAC5F,QAAQ,EACN,2IAA2I;CAC9I,CAAC;AAEF,+FAA+F;AAC/F,6EAA6E;AAC7E,EAAE;AACF,iGAAiG;AACjG,mGAAmG;AACnG,oEAAoE;AACpE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAAiB,EACjB,UAA6C;IAE7C,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,sBAAsB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAC/B,gBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,WAAW,CAC7D,CAAC;QACF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,6BAA6B,CAAC,CAAC;QAC3F,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,sEAAsE;SAC1F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,sFAAsF;AACtF,MAAM,eAAe,GAGjB;IACF,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,gBAAgB,SAAS,CAAC;IAClD,
|
|
1
|
+
{"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../../../src/cli/commands/deployment/recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,gBAAgB,EAAmB,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAe/C,MAAM,WAAW,GAA6B,EAAE,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;AAE1F,oGAAoG;AACpG,0CAA0C;AAC1C,MAAM,sBAAsB,GAA2B;IACrD,SAAS,EACP,0FAA0F;IAC5F,QAAQ,EACN,2IAA2I;CAC9I,CAAC;AAEF,+FAA+F;AAC/F,6EAA6E;AAC7E,EAAE;AACF,iGAAiG;AACjG,mGAAmG;AACnG,oEAAoE;AACpE,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,MAAiB,EACjB,UAA6C;IAE7C,IAAI,UAAU,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QACnC,MAAM,MAAM,GAAG,sBAAsB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACzD,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAC9E,CAAC;IACD,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,CAC/B,gBAAgB,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC,WAAW,CAC7D,CAAC;QACF,OAAO,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC;IAC/C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,6BAA6B,CAAC,CAAC;QAC3F,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,sEAAsE;SAC1F,CAAC;IACJ,CAAC;AACH,CAAC;AAED,sFAAsF;AACtF,MAAM,eAAe,GAGjB;IACF,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,gBAAgB,SAAS,CAAC;IAClD,+FAA+F;IAC/F,mEAAmE;IACnE,sBAAsB,EAAE,CAAC,EAAE,mBAAmB,EAAE,EAAE,EAAE,CAClD,mBAAmB;QACjB,CAAC,CAAC,CAAC,GAAG,gBAAgB,6BAA6B,mBAAmB,CAAC,MAAM,EAAE,CAAC;QAChF,CAAC,CAAC;YACE,GAAG,gBAAgB,iBAAiB;YACpC,GAAG,gBAAgB,oBAAoB;YACvC,GAAG,gBAAgB,kCAAkC;SACtD;IACP,qBAAqB,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,EAAE,CAAC;QAClD,GAAG,gBAAgB,oBAAoB,YAAY,EAAE;QACrD,GAAG,gBAAgB,SAAS;KAC7B;IACD,wBAAwB,EAAE,GAAG,EAAE,CAAC;QAC9B,GAAG,gBAAgB,mBAAmB,kBAAkB,EAAE;QAC1D,GAAG,gBAAgB,SAAS;KAC7B;IACD,8FAA8F;IAC9F,kGAAkG;IAClG,6CAA6C;IAC7C,QAAQ,EAAE,GAAG,EAAE,CAAC;QACd,GAAG,gBAAgB,SAAS;QAC5B,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,gBAAgB,mBAAmB,OAAO,EAAE,CAAC;QACjF,GAAG,gBAAgB,kBAAkB;QACrC,GAAG,gBAAgB,2BAA2B;KAC/C;IACD,gGAAgG;IAChG,2EAA2E;IAC3E,eAAe,EAAE,GAAG,EAAE,CAAC,EAAE;IACzB,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,gBAAgB,SAAS,CAAC;CAC1D,CAAC;AAEF,oGAAoG;AACpG,kGAAkG;AAClG,mEAAmE;AACnE,MAAM,UAAU,wBAAwB,CACtC,QAA4B,EAC5B,YAAoB;IAEpB,MAAM,KAAK,GAAG,CAAC,iBAAiB,QAAQ,CAAC,UAAU,IAAI,WAAW,EAAE,CAAC,CAAC;IACtE,IAAI,QAAQ,CAAC,sBAAsB;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,sBAAsB,EAAE,CAAC,CAAC;IACxF,KAAK,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,QAAQ,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,QAAQ,CAAC,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC;IACjG,kFAAkF;IAClF,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC;IACtF,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,oBAAoB,YAAY,EAAE,CAAC,CAAC;IAC1E,KAAK,MAAM,OAAO,IAAI,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,OAAO,EAAE,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { ConversionContext } from "./context.js";
|
|
2
2
|
import { type SourceFile } from "./source-project.js";
|
|
3
|
-
export declare function removeBindingsMadeUnused(ctx: ConversionContext, file: SourceFile): void;
|
|
3
|
+
export declare function removeBindingsMadeUnused(ctx: ConversionContext, file: SourceFile, namedElsewhere: (name: string) => boolean): void;
|
|
4
4
|
export declare function addCloudImports(ctx: ConversionContext, file: SourceFile, names: string[]): void;
|
|
5
5
|
//# sourceMappingURL=binding-cleanup.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binding-cleanup.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/binding-cleanup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,UAAU,EAAiC,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"binding-cleanup.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/binding-cleanup.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,KAAK,UAAU,EAAiC,MAAM,qBAAqB,CAAC;AAarF,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,UAAU,EAChB,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,GACxC,IAAI,CAkBN;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,CAuC/F"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { hasExportModifier, moduleText } from "./source-project.js";
|
|
2
2
|
import { detectStyle, endOfLineBreak, statementRemoval } from "./text-edits.js";
|
|
3
|
-
// Removes the imports, and the
|
|
4
|
-
//
|
|
5
|
-
|
|
3
|
+
// Removes the imports, and the top-level consts, that the conversion's own edits left with no
|
|
4
|
+
// reference. An exported const goes only when no other file of the application names it. A binding
|
|
5
|
+
// that had no reference before conversion is left alone.
|
|
6
|
+
export function removeBindingsMadeUnused(ctx, file, namedElsewhere) {
|
|
6
7
|
const references = collectReferences(ctx, file);
|
|
7
8
|
// Computed once: an import's candidates share a count of removed names across passes.
|
|
8
|
-
const pending = candidates(ctx, file);
|
|
9
|
+
const pending = candidates(ctx, file, namedElsewhere);
|
|
9
10
|
// Each pass can only remove more, and a removed const can free the imports it used.
|
|
10
11
|
for (let pass = 0; pass < pending.length + 1; pass++) {
|
|
11
12
|
let removedAny = false;
|
|
@@ -77,7 +78,7 @@ function compareNames(a, b) {
|
|
|
77
78
|
function isRemoved(ctx, file, node) {
|
|
78
79
|
return ctx.edits.isRemoved(file.path, node.getStart(file.ast));
|
|
79
80
|
}
|
|
80
|
-
function candidates(ctx, file) {
|
|
81
|
+
function candidates(ctx, file, namedElsewhere) {
|
|
81
82
|
const ts = ctx.ts;
|
|
82
83
|
const found = [];
|
|
83
84
|
for (const statement of file.ast.statements) {
|
|
@@ -85,12 +86,14 @@ function candidates(ctx, file) {
|
|
|
85
86
|
found.push(...importCandidates(ctx, file, statement));
|
|
86
87
|
continue;
|
|
87
88
|
}
|
|
88
|
-
if (!ts.isVariableStatement(statement)
|
|
89
|
+
if (!ts.isVariableStatement(statement))
|
|
89
90
|
continue;
|
|
90
91
|
const [declaration, ...others] = statement.declarationList.declarations;
|
|
91
92
|
if (!declaration || others.length > 0 || !ts.isIdentifier(declaration.name))
|
|
92
93
|
continue;
|
|
93
94
|
const name = declaration.name.text;
|
|
95
|
+
if (hasExportModifier(ts, statement) && namedElsewhere(name))
|
|
96
|
+
continue;
|
|
94
97
|
found.push({
|
|
95
98
|
name,
|
|
96
99
|
declaration: statement,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binding-cleanup.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/binding-cleanup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,iBAAiB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAkB,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAShG,
|
|
1
|
+
{"version":3,"file":"binding-cleanup.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/binding-cleanup.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,iBAAiB,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAkB,WAAW,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAShG,8FAA8F;AAC9F,mGAAmG;AACnG,yDAAyD;AACzD,MAAM,UAAU,wBAAwB,CACtC,GAAsB,EACtB,IAAgB,EAChB,cAAyC;IAEzC,MAAM,UAAU,GAAG,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChD,sFAAsF;IACtF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;IACtD,oFAAoF;IACpF,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;QACrD,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;YAChC,IAAI,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC;gBAAE,SAAS;YAC1D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACnD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;gBAAE,SAAS;YACjC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;gBAC1E,SAAS,CAAC,MAAM,EAAE,CAAC;gBACnB,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;QACH,CAAC;QACD,IAAI,CAAC,UAAU;YAAE,OAAO;IAC1B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,GAAsB,EAAE,IAAgB,EAAE,KAAe;IACvF,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;IAClB,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAC3B,CAAC,SAAS,EAAE,EAAE,CACZ,UAAU,CAAC,EAAE,EAAE,SAAS,CAAC,eAAe,CAAC,KAAK,gBAAgB;QAC9D,CAAC,SAAS,CAAC,YAAY,EAAE,UAAU;QACnC,SAAS,CAAC,YAAY,EAAE,aAAa;QACrC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC;QACvD,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CACnC,CAAC;IACF,MAAM,QAAQ,GAAG,QAAQ,EAAE,YAAY,EAAE,aAAa,CAAC;IACvD,IAAI,QAAQ,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5C,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACxF,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7D,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QACjC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7D,MAAM,IAAI,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;QAC3E,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAClD,OAAO;IACT,CAAC;IACD,MAAM,SAAS,GAAG,eAAe,CAAC,KAAK,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;IACpF,MAAM,UAAU,GAAG,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,UAAU,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACrF,IAAI,UAAU,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAC1C,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE;YAClB,KAAK,EAAE,SAAS;YAChB,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,GAAG,SAAS,EAAE;SACrC,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;IAC1D,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,SAAS,GAAG,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;AAClG,CAAC;AAED,yDAAyD;AACzD,SAAS,eAAe,CAAC,KAAgB,EAAE,KAAe;IACxD,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IACrD,OAAO,UAAU,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,CAAC,KAAK,iBAAiB,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;AACtI,CAAC;AAED,SAAS,QAAQ,CAAC,IAAY;IAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,YAAY,CAAC,CAAS,EAAE,CAAS;IACxC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC;AAC/E,CAAC;AAED,SAAS,SAAS,CAAC,GAAsB,EAAE,IAAgB,EAAE,IAAa;IACxE,OAAO,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,UAAU,CACjB,GAAsB,EACtB,IAAgB,EAChB,cAAyC;IAEzC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;IAClB,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;QAC5C,IAAI,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;YACtC,KAAK,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;YACtD,SAAS;QACX,CAAC;QACD,IAAI,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;YAAE,SAAS;QACjD,MAAM,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,GAAG,SAAS,CAAC,eAAe,CAAC,YAAY,CAAC;QACxE,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;YAAE,SAAS;QACtF,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;QACnC,IAAI,iBAAiB,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC;YAAE,SAAS;QACvE,KAAK,CAAC,IAAI,CAAC;YACT,IAAI;YACJ,WAAW,EAAE,SAAS;YACtB,MAAM,EAAE,GAAG,EAAE;gBACX,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC;gBACjE,GAAG,CAAC,MAAM,CACR,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,SAAS,EACT,gDAAgD,CACjD,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,gBAAgB,CACvB,GAAsB,EACtB,IAAgB,EAChB,SAA+B;IAE/B,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;IAClB,MAAM,MAAM,GAAG,SAAS,CAAC,YAAY,CAAC;IACtC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,MAAM,CAAC,aAAa,CAAC;IACtC,MAAM,KAAK,GAAG,QAAQ,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;IACtF,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IACvC,MAAM,KAAK,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,SAAqB,EAAQ,EAAE;QAC/D,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,YAAY,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YAChC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QACD,SAAS,EAAE,CAAC;IACd,CAAC,CAAC;IACF,MAAM,KAAK,GAAgB,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC;IAChC,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,WAAW,EAAE,WAAW;YACxB,MAAM,EAAE,GAAG,EAAE,CACX,UAAU,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE;gBAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC;gBACtE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YACtF,CAAC,CAAC;SACL,CAAC,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,IAAI,EAAE,CAAC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/C,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI;YACxB,WAAW,EAAE,QAAQ;YACrB,MAAM,EAAE,GAAG,EAAE,CACX,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE;gBAClC,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1E,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;YAC9D,CAAC,CAAC;SACL,CAAC,CAAC;IACL,CAAC;IACD,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QAChC,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;YACvB,WAAW,EAAE,OAAO;YACpB,MAAM,EAAE,GAAG,EAAE,CACX,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SACvF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC;AAED,kGAAkG;AAClG,8FAA8F;AAC9F,8EAA8E;AAC9E,SAAS,iBAAiB,CAAC,GAAsB,EAAE,IAAgB;IACjE,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;IAClB,MAAM,UAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAC/C,MAAM,KAAK,GAAG,CAAC,IAAa,EAAQ,EAAE;QACpC,IAAI,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClC,CAAC;QACD,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,WAAW,CAAC,EAA2B,EAAE,IAAmB;IACnE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IAC3B,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,IAAI,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAChF,IAAI,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IACtE,IAAI,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC1E,IACE,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC9D,CAAC,MAAM,CAAC,YAAY,KAAK,IAAI,IAAI,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,EACxF,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,EAAE,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5E,IAAI,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,KAAK,CAAC;IAC3E,IACE,CAAC,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC;QAC/B,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC;QAC9B,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC;QAC9B,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC;QAC5B,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;QACnC,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC;QACnC,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC;QACvB,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC;QAC7B,EAAE,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,CAAC,IAAI,KAAK,IAAI,EACpB,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import type { ConversionContext } from "./context.js";
|
|
2
2
|
import type { ResolvedObject } from "./object-properties.js";
|
|
3
|
-
import type
|
|
3
|
+
import { type PlatformExtension, type PlatformSpread, type PluginsArrayVisit } from "./plugin-conversion.js";
|
|
4
4
|
export declare function extensionIdFor(packageName: string | undefined): string;
|
|
5
5
|
export interface MigrationsDeclarationTarget {
|
|
6
6
|
host: PluginsArrayVisit | undefined;
|
|
7
7
|
root: ResolvedObject | undefined;
|
|
8
8
|
}
|
|
9
9
|
export declare function declareMigrations(ctx: ConversionContext, target: MigrationsDeclarationTarget, directory: string, extensionId: string): boolean;
|
|
10
|
+
export declare function declarePlatformExtension(ctx: ConversionContext, spread: PlatformSpread, directory: string | undefined, extensionId: string): void;
|
|
11
|
+
export declare function declareMigrationsOn(ctx: ConversionContext, extension: PlatformExtension, directory: string): void;
|
|
10
12
|
export declare function migrationsGlob(declaringFile: string, directory: string): string;
|
|
11
13
|
//# sourceMappingURL=migrations-declaration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations-declaration.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/migrations-declaration.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"migrations-declaration.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/migrations-declaration.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAYhC,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAOtE;AAED,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAI,EAAE,cAAc,GAAG,SAAS,CAAC;CAClC;AAKD,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,2BAA2B,EACnC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,OAAO,CA0BT;AAKD,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,cAAc,EACtB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,WAAW,EAAE,MAAM,GAClB,IAAI,CAkBN;AAID,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,iBAAiB,EACtB,SAAS,EAAE,iBAAiB,EAC5B,SAAS,EAAE,MAAM,GAChB,IAAI,CAkBN;AAiBD,wBAAgB,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAI/E"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { dirname, relative, sep } from "node:path";
|
|
2
2
|
import { addPluginsProperty } from "./config-conversion.js";
|
|
3
|
-
import {
|
|
3
|
+
import { PLATFORM_EDITION_INIT, } from "./plugin-conversion.js";
|
|
4
|
+
import { appendToList, detectStyle, indentationOf, lineStartOf, quoted, } from "./text-edits.js";
|
|
4
5
|
// A Vendure Extension id from the package name: `@acme/shop-server` → `acme-shop-server`.
|
|
5
6
|
export function extensionIdFor(packageName) {
|
|
6
7
|
const slug = (packageName ?? "")
|
|
@@ -21,7 +22,10 @@ export function declareMigrations(ctx, target, directory, extensionId) {
|
|
|
21
22
|
}
|
|
22
23
|
const name = uniqueName(ctx, declaringFile, "migrationsExtension");
|
|
23
24
|
const glob = migrationsGlob(declaringFile.path, directory);
|
|
24
|
-
insertDeclaration(ctx, declaringFile, anchorStatement(ctx, target), name, extensionId,
|
|
25
|
+
insertDeclaration(ctx, declaringFile, anchorStatement(ctx, target), name, extensionId, {
|
|
26
|
+
glob,
|
|
27
|
+
plugins: undefined,
|
|
28
|
+
});
|
|
25
29
|
if (target.host) {
|
|
26
30
|
appendToList(ctx.edits, target.host.file, target.host.array, target.host.array.elements, name);
|
|
27
31
|
}
|
|
@@ -29,9 +33,40 @@ export function declareMigrations(ctx, target, directory, extensionId) {
|
|
|
29
33
|
addPluginsProperty(ctx, target.root, name);
|
|
30
34
|
}
|
|
31
35
|
ctx.requireCloudImport(declaringFile, "defineVendureExtension");
|
|
32
|
-
ctx
|
|
36
|
+
recordMigrations(ctx, declaringFile, glob, extensionId);
|
|
33
37
|
return true;
|
|
34
38
|
}
|
|
39
|
+
// Moves a Vendure Platform edition's spread into a new Vendure Extension declared above the
|
|
40
|
+
// statement holding it, with the migrations directory when one is given. The extension takes the
|
|
41
|
+
// spread's place in its array, so the plugins keep their order.
|
|
42
|
+
export function declarePlatformExtension(ctx, spread, directory, extensionId) {
|
|
43
|
+
const { element, file } = spread;
|
|
44
|
+
const name = uniqueName(ctx, file, "platformExtension");
|
|
45
|
+
const glob = directory === undefined ? undefined : migrationsGlob(file.path, directory);
|
|
46
|
+
insertDeclaration(ctx, file, topLevelStatement(ctx, element), name, extensionId, {
|
|
47
|
+
glob,
|
|
48
|
+
plugins: spreadText(ctx, file, element),
|
|
49
|
+
});
|
|
50
|
+
ctx.edits.move(file, { start: element.getStart(file.ast), end: element.end, text: name });
|
|
51
|
+
ctx.requireCloudImport(file, "defineVendureExtension");
|
|
52
|
+
ctx.record(file, element, PLATFORM_EDITION_INIT, "translated", `Moved into the Vendure Extension "${extensionId}". Its plugins stay yours, and a deploy refuses to start if one of them is a plugin Vendure Cloud supplies.`);
|
|
53
|
+
if (glob !== undefined)
|
|
54
|
+
recordMigrations(ctx, file, glob, extensionId);
|
|
55
|
+
}
|
|
56
|
+
// Declares the migrations directory on the extension an earlier run of init moved a Vendure
|
|
57
|
+
// Platform edition into.
|
|
58
|
+
export function declareMigrationsOn(ctx, extension, directory) {
|
|
59
|
+
const { options, file } = extension;
|
|
60
|
+
const style = detectStyle(ctx.ts, file);
|
|
61
|
+
const glob = migrationsGlob(file.path, directory);
|
|
62
|
+
appendToList(ctx.edits, file, options, options.properties, `migrations: [${quoted(style, glob)}]`);
|
|
63
|
+
const id = options.properties.find((property) => ctx.ts.isPropertyAssignment(property) && property.name.getText(file.ast) === "id");
|
|
64
|
+
const idValue = id && ctx.ts.isStringLiteralLike(id.initializer) ? id.initializer.text : undefined;
|
|
65
|
+
recordMigrations(ctx, file, glob, idValue);
|
|
66
|
+
}
|
|
67
|
+
function recordMigrations(ctx, file, glob, extensionId) {
|
|
68
|
+
ctx.record(file, undefined, "migrations", "added", `Declares ${glob} on the Vendure Extension${extensionId === undefined ? "" : ` "${extensionId}"`}, so your migrations run on each deploy and in vendure dev.`);
|
|
69
|
+
}
|
|
35
70
|
export function migrationsGlob(declaringFile, directory) {
|
|
36
71
|
const path = relative(dirname(declaringFile), directory).split(sep).join("/");
|
|
37
72
|
if (path === "")
|
|
@@ -42,24 +77,59 @@ function anchorStatement(ctx, target) {
|
|
|
42
77
|
const node = target.host?.array ?? target.root?.node;
|
|
43
78
|
if (!node)
|
|
44
79
|
throw new Error("Vendure Cloud: no plugins array or configuration to anchor on.");
|
|
80
|
+
return topLevelStatement(ctx, node);
|
|
81
|
+
}
|
|
82
|
+
function topLevelStatement(ctx, node) {
|
|
45
83
|
let current = node;
|
|
46
84
|
while (current.parent && !ctx.ts.isSourceFile(current.parent))
|
|
47
85
|
current = current.parent;
|
|
48
86
|
return current;
|
|
49
87
|
}
|
|
50
|
-
|
|
88
|
+
// The spread's own lines move two levels in from the declaration. Text holding a multi-line
|
|
89
|
+
// template literal moves as written, because re-indenting would change the string.
|
|
90
|
+
function spreadText(ctx, file, element) {
|
|
91
|
+
const ts = ctx.ts;
|
|
92
|
+
const text = element.getText(file.ast);
|
|
93
|
+
const from = indentationOf(file, element.getStart(file.ast));
|
|
94
|
+
let multilineTemplate = false;
|
|
95
|
+
const visit = (node) => {
|
|
96
|
+
if ((ts.isNoSubstitutionTemplateLiteral(node) || ts.isTemplateExpression(node)) &&
|
|
97
|
+
node.getText(file.ast).includes("\n")) {
|
|
98
|
+
multilineTemplate = true;
|
|
99
|
+
}
|
|
100
|
+
ts.forEachChild(node, visit);
|
|
101
|
+
};
|
|
102
|
+
visit(element);
|
|
103
|
+
return (style) => {
|
|
104
|
+
if (multilineTemplate)
|
|
105
|
+
return text;
|
|
106
|
+
const to = style.indent.repeat(2);
|
|
107
|
+
return text
|
|
108
|
+
.split(/\r?\n/)
|
|
109
|
+
.map((line, index) => index === 0 || !line.startsWith(from) ? line : `${to}${line.slice(from.length)}`)
|
|
110
|
+
.join(style.newline);
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
function insertDeclaration(ctx, file, before, name, id, contents) {
|
|
51
114
|
const style = detectStyle(ctx.ts, file);
|
|
52
115
|
const comments = ctx.ts.getLeadingCommentRanges(file.text, before.pos) ?? [];
|
|
53
116
|
const firstComment = comments.find((comment) => !file.text.slice(comment.end, before.getStart(file.ast)).includes("\n\n"));
|
|
54
117
|
const anchor = lineStartOf(file.text, firstComment?.pos ?? before.getStart(file.ast));
|
|
55
118
|
const nl = style.newline;
|
|
56
119
|
const i = style.indent;
|
|
120
|
+
const { glob, plugins } = contents;
|
|
57
121
|
const text = [
|
|
58
|
-
|
|
122
|
+
...(glob === undefined
|
|
123
|
+
? []
|
|
124
|
+
: [
|
|
125
|
+
"// The glob has no extension, so it matches the TypeScript sources and the compiled JavaScript.",
|
|
126
|
+
]),
|
|
59
127
|
`const ${name} = defineVendureExtension({`,
|
|
60
128
|
`${i}id: ${quoted(style, id)},`,
|
|
61
|
-
|
|
62
|
-
|
|
129
|
+
...(plugins === undefined
|
|
130
|
+
? [`${i}plugins: [],`]
|
|
131
|
+
: [`${i}plugins: [`, `${i}${i}${plugins(style)},`, `${i}],`]),
|
|
132
|
+
...(glob === undefined ? [] : [`${i}migrations: [${quoted(style, glob)}],`]),
|
|
63
133
|
`})${style.semicolon}`,
|
|
64
134
|
"",
|
|
65
135
|
"",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations-declaration.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/migrations-declaration.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAQ,QAAQ,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"migrations-declaration.js","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/migrations-declaration.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,4 +21,5 @@ export interface ManifestResult {
|
|
|
21
21
|
dependencies: DependencyChanges;
|
|
22
22
|
}
|
|
23
23
|
export declare function convertManifest(ctx: ConversionContext, input: ManifestInput): ManifestResult;
|
|
24
|
+
export declare function peerRangeConflicts(declared: string, peer: string): boolean;
|
|
24
25
|
//# sourceMappingURL=package-manifest.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-manifest.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/package-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAA4B,MAAM,oBAAoB,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IACtE,kBAAkB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IAEhD,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,YAAY,EAAE,iBAAiB,CAAC;CACjC;AA4CD,wBAAgB,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,aAAa,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"package-manifest.d.ts","sourceRoot":"","sources":["../../../../../../src/cli/commands/project-config/init/conversion/package-manifest.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAA4B,MAAM,oBAAoB,CAAC;AACjF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAElC,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,GAAG,SAAS,CAAC;IACtE,kBAAkB,EAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IAEhD,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAErC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,YAAY,EAAE,iBAAiB,CAAC;CACjC;AA4CD,wBAAgB,eAAe,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,aAAa,GAAG,cAAc,CAwC5F;AA2JD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAK1E"}
|
|
@@ -61,6 +61,7 @@ export function convertManifest(ctx, input) {
|
|
|
61
61
|
development = withKey(development, CLOUD_PACKAGE, input.cloud.version);
|
|
62
62
|
dependencies.added.push({ name: CLOUD_PACKAGE, range: input.cloud.version });
|
|
63
63
|
}
|
|
64
|
+
alignCloudPeers(ctx, input, { dependencies: runtime, devDependencies: development });
|
|
64
65
|
removeUnusedDependencies(input, runtime, dependencies);
|
|
65
66
|
if (Object.keys(runtime).length > 0 || manifest.dependencies !== undefined) {
|
|
66
67
|
manifest.dependencies = runtime;
|
|
@@ -149,6 +150,62 @@ function localDevelopmentRange(name, input, development) {
|
|
|
149
150
|
return core;
|
|
150
151
|
return input.cloud.peerRanges[name];
|
|
151
152
|
}
|
|
153
|
+
// Development tooling `vendure dev` loads, which init raises to the range `@vendure/cloud` accepts.
|
|
154
|
+
// Any other package, such as `pg` or `@vendure/core`, is used by the application's own code, so a
|
|
155
|
+
// conflict there is reported for the developer to resolve.
|
|
156
|
+
const RAISED_PEERS = new Set(["vite", "ts-node"]);
|
|
157
|
+
// A package the application declares at a range no version of which `@vendure/cloud` accepts as a
|
|
158
|
+
// peer, which a package manager refuses to install (npm reports ERESOLVE).
|
|
159
|
+
function alignCloudPeers(ctx, input, records) {
|
|
160
|
+
for (const [name, peerRange] of Object.entries(input.cloud.peerRanges)) {
|
|
161
|
+
for (const [field, record] of Object.entries(records)) {
|
|
162
|
+
const declared = record[name];
|
|
163
|
+
if (declared === undefined || !peerRangeConflicts(declared, peerRange))
|
|
164
|
+
continue;
|
|
165
|
+
if (!RAISED_PEERS.has(name)) {
|
|
166
|
+
ctx.warn(`${name} is declared as "${declared}", and @vendure/cloud needs "${peerRange}". A package manager refuses to install the two together. Move ${name} to a version in "${peerRange}" and check your code against it.`);
|
|
167
|
+
continue;
|
|
168
|
+
}
|
|
169
|
+
record[name] = peerRange;
|
|
170
|
+
ctx.record(input.path, undefined, `${field}.${name}`, "translated", `"${declared}" becomes "${peerRange}", the range @vendure/cloud accepts. A package manager refuses to install the two together otherwise.`);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
// Whether no version satisfies both ranges. Only exact versions and `^`/`~` ranges without a
|
|
175
|
+
// prerelease are compared; anything else is never reported as a conflict.
|
|
176
|
+
export function peerRangeConflicts(declared, peer) {
|
|
177
|
+
const one = simpleRange(declared);
|
|
178
|
+
const other = simpleRange(peer);
|
|
179
|
+
if (!one || !other)
|
|
180
|
+
return false;
|
|
181
|
+
return compareVersions(one.min, other.max) >= 0 || compareVersions(other.min, one.max) >= 0;
|
|
182
|
+
}
|
|
183
|
+
function simpleRange(spec) {
|
|
184
|
+
const match = spec.trim().match(/^([~^]?)=?v?(\d+)\.(\d+)\.(\d+)(?:\+[0-9A-Za-z.-]*)?$/);
|
|
185
|
+
if (!match)
|
|
186
|
+
return undefined;
|
|
187
|
+
const operator = match[1];
|
|
188
|
+
const [major, minor, patch] = [Number(match[2]), Number(match[3]), Number(match[4])];
|
|
189
|
+
const min = [major, minor, patch];
|
|
190
|
+
if (operator === "~")
|
|
191
|
+
return { min, max: [major, minor + 1, 0] };
|
|
192
|
+
if (operator === "^") {
|
|
193
|
+
if (major > 0)
|
|
194
|
+
return { min, max: [major + 1, 0, 0] };
|
|
195
|
+
if (minor > 0)
|
|
196
|
+
return { min, max: [0, minor + 1, 0] };
|
|
197
|
+
return { min, max: [0, 0, patch + 1] };
|
|
198
|
+
}
|
|
199
|
+
return { min, max: [major, minor, patch + 1] };
|
|
200
|
+
}
|
|
201
|
+
function compareVersions(one, other) {
|
|
202
|
+
for (let index = 0; index < 3; index++) {
|
|
203
|
+
const difference = (one[index] ?? 0) - (other[index] ?? 0);
|
|
204
|
+
if (difference !== 0)
|
|
205
|
+
return difference;
|
|
206
|
+
}
|
|
207
|
+
return 0;
|
|
208
|
+
}
|
|
152
209
|
function removeUnusedDependencies(input, runtime, dependencies) {
|
|
153
210
|
const imported = new Set();
|
|
154
211
|
for (const specifiers of moduleSpecifiersBySource(input.sources).values()) {
|