@salesforce/plugin-deploy-retrieve 3.11.4 → 3.12.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/README.md +18 -18
- package/lib/commands/project/delete/source.js +3 -7
- package/lib/commands/project/delete/source.js.map +1 -1
- package/lib/commands/project/deploy/report.js +3 -6
- package/lib/commands/project/deploy/report.js.map +1 -1
- package/lib/commands/project/deploy/resume.js +4 -5
- package/lib/commands/project/deploy/resume.js.map +1 -1
- package/lib/commands/project/deploy/start.d.ts +3 -12
- package/lib/commands/project/deploy/start.js +36 -22
- package/lib/commands/project/deploy/start.js.map +1 -1
- package/lib/commands/project/deploy/validate.js +3 -6
- package/lib/commands/project/deploy/validate.js.map +1 -1
- package/lib/commands/project/retrieve/start.d.ts +1 -6
- package/lib/commands/project/retrieve/start.js +18 -50
- package/lib/commands/project/retrieve/start.js.map +1 -1
- package/lib/utils/output.d.ts +1 -0
- package/lib/utils/output.js +8 -0
- package/lib/utils/output.js.map +1 -1
- package/lib/utils/progressBar.d.ts +11 -0
- package/lib/utils/progressBar.js +80 -0
- package/lib/utils/progressBar.js.map +1 -0
- package/lib/utils/types.d.ts +4 -1
- package/lib/utils/types.js.map +1 -1
- package/messages/retrieve.start.md +12 -0
- package/oclif.manifest.json +2 -2
- package/package.json +6 -7
- package/schemas/project-deploy-cancel.json +17 -5
- package/schemas/project-deploy-quick.json +17 -5
- package/schemas/project-deploy-report.json +17 -5
- package/schemas/project-deploy-resume.json +17 -5
- package/schemas/project-deploy-start.json +17 -5
- package/schemas/project-deploy-validate.json +17 -5
- package/lib/utils/deployStages.d.ts +0 -26
- package/lib/utils/deployStages.js +0 -141
- package/lib/utils/deployStages.js.map +0 -1
|
@@ -10,9 +10,9 @@ import { EnvironmentVariable, Lifecycle, Messages, OrgConfigProperties, SfError
|
|
|
10
10
|
import { RequestStatus } from '@salesforce/source-deploy-retrieve';
|
|
11
11
|
import { Duration, ensureArray } from '@salesforce/kit';
|
|
12
12
|
import { SfCommand, toHelpSection, Flags } from '@salesforce/sf-plugins-core';
|
|
13
|
-
import { DeployStages } from '../../../utils/deployStages.js';
|
|
14
13
|
import { AsyncDeployResultFormatter } from '../../../formatters/asyncDeployResultFormatter.js';
|
|
15
14
|
import { DeployResultFormatter } from '../../../formatters/deployResultFormatter.js';
|
|
15
|
+
import { DeployProgress } from '../../../utils/progressBar.js';
|
|
16
16
|
import { TestLevel } from '../../../utils/types.js';
|
|
17
17
|
import { executeDeploy, resolveApi, determineExitCode, validateTests } from '../../../utils/deploy.js';
|
|
18
18
|
import { DEPLOY_STATUS_CODES_DESCRIPTIONS } from '../../../utils/errorCodes.js';
|
|
@@ -165,17 +165,14 @@ export default class DeployMetadataValidate extends SfCommand {
|
|
|
165
165
|
if (!deploy.id) {
|
|
166
166
|
throw new SfError('The deploy id is not available.');
|
|
167
167
|
}
|
|
168
|
+
this.log(`Deploy ID: ${ansis.bold(deploy.id)}`);
|
|
168
169
|
if (flags.async) {
|
|
169
|
-
this.log(`Deploy ID: ${ansis.bold(deploy.id)}`);
|
|
170
170
|
const asyncFormatter = new AsyncDeployResultFormatter(deploy.id);
|
|
171
171
|
if (!this.jsonEnabled())
|
|
172
172
|
asyncFormatter.display();
|
|
173
173
|
return asyncFormatter.getJson();
|
|
174
174
|
}
|
|
175
|
-
new
|
|
176
|
-
title: 'Validating Deployment',
|
|
177
|
-
jsonEnabled: this.jsonEnabled(),
|
|
178
|
-
}).start({ deploy, username });
|
|
175
|
+
new DeployProgress(deploy, this.jsonEnabled()).start();
|
|
179
176
|
const result = await deploy.pollStatus(500, flags.wait?.seconds);
|
|
180
177
|
process.exitCode = determineExitCode(result);
|
|
181
178
|
const formatter = new DeployResultFormatter(result, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/validate.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAE9B,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,QAAQ,EAAE,mBAAmB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAA2C,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAC5G,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC9E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
2
1
|
import { SfError } from '@salesforce/core';
|
|
3
|
-
import { RetrieveResult
|
|
2
|
+
import { RetrieveResult } from '@salesforce/source-deploy-retrieve';
|
|
4
3
|
import { SfCommand } from '@salesforce/sf-plugins-core';
|
|
5
4
|
import { Duration } from '@salesforce/kit';
|
|
6
5
|
import { Interfaces } from '@oclif/core';
|
|
@@ -29,10 +28,6 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
|
29
28
|
static configurationVariablesSection: import("@oclif/core").HelpSection;
|
|
30
29
|
static envVariablesSection: import("@oclif/core").HelpSection;
|
|
31
30
|
protected retrieveResult: RetrieveResult;
|
|
32
|
-
protected ms: MultiStageOutput<{
|
|
33
|
-
status: string;
|
|
34
|
-
apiData: RetrieveVersionData;
|
|
35
|
-
}>;
|
|
36
31
|
run(): Promise<RetrieveResultJson>;
|
|
37
32
|
protected catch(error: Error | SfError): Promise<never>;
|
|
38
33
|
private moveResultsForRetrieveTargetDir;
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
import { rm } from 'node:fs/promises';
|
|
8
8
|
import { dirname, join, resolve } from 'node:path';
|
|
9
9
|
import * as fs from 'node:fs';
|
|
10
|
-
import { MultiStageOutput } from '@oclif/multi-stage-output';
|
|
11
10
|
import { EnvironmentVariable, Lifecycle, Messages, OrgConfigProperties, SfError, SfProject } from '@salesforce/core';
|
|
12
11
|
import { RetrieveResult, ComponentSetBuilder, ComponentSet, RegistryAccess, RequestStatus, } from '@salesforce/source-deploy-retrieve';
|
|
13
12
|
import { SfCommand, toHelpSection, Flags, Ux } from '@salesforce/sf-plugins-core';
|
|
@@ -118,7 +117,6 @@ export default class RetrieveMetadata extends SfCommand {
|
|
|
118
117
|
static configurationVariablesSection = toHelpSection('CONFIGURATION VARIABLES', OrgConfigProperties.TARGET_ORG, OrgConfigProperties.ORG_API_VERSION);
|
|
119
118
|
static envVariablesSection = toHelpSection('ENVIRONMENT VARIABLES', EnvironmentVariable.SF_TARGET_ORG, EnvironmentVariable.SF_USE_PROGRESS_BAR);
|
|
120
119
|
retrieveResult;
|
|
121
|
-
ms;
|
|
122
120
|
// eslint-disable-next-line complexity
|
|
123
121
|
async run() {
|
|
124
122
|
const { flags } = await this.parse(RetrieveMetadata);
|
|
@@ -131,6 +129,7 @@ export default class RetrieveMetadata extends SfCommand {
|
|
|
131
129
|
}
|
|
132
130
|
const format = flags['target-metadata-dir'] ? 'metadata' : 'source';
|
|
133
131
|
const zipFileName = flags['zip-file-name'] ?? DEFAULT_ZIP_FILE_NAME;
|
|
132
|
+
this.spinner.start(messages.getMessage('spinner.start'));
|
|
134
133
|
const { componentSetFromNonDeletes, fileResponsesFromDelete = [] } = await buildRetrieveAndDeleteTargets(flags, format);
|
|
135
134
|
if (format === 'source' && (Boolean(flags.manifest) || Boolean(flags.metadata))) {
|
|
136
135
|
const access = new RegistryAccess(undefined, SfProject.getInstance()?.getPath());
|
|
@@ -142,60 +141,34 @@ export default class RetrieveMetadata extends SfCommand {
|
|
|
142
141
|
});
|
|
143
142
|
}
|
|
144
143
|
}
|
|
145
|
-
const stages = ['Preparing retrieve request', 'Sending request to org', 'Waiting for the org to respond', 'Done'];
|
|
146
|
-
this.ms = new MultiStageOutput({
|
|
147
|
-
stages,
|
|
148
|
-
title: 'Retrieving Metadata',
|
|
149
|
-
jsonEnabled: this.jsonEnabled(),
|
|
150
|
-
preStagesBlock: [
|
|
151
|
-
{
|
|
152
|
-
type: 'message',
|
|
153
|
-
get: (data) => data?.apiData &&
|
|
154
|
-
messages.getMessage('apiVersionMsgDetailed', [
|
|
155
|
-
'Retrieving',
|
|
156
|
-
`v${data.apiData.manifestVersion}`,
|
|
157
|
-
flags['target-org'].getUsername(),
|
|
158
|
-
data.apiData.apiVersion,
|
|
159
|
-
]),
|
|
160
|
-
},
|
|
161
|
-
],
|
|
162
|
-
postStagesBlock: [
|
|
163
|
-
{
|
|
164
|
-
label: 'Status',
|
|
165
|
-
get: (data) => data?.status,
|
|
166
|
-
bold: true,
|
|
167
|
-
type: 'dynamic-key-value',
|
|
168
|
-
},
|
|
169
|
-
],
|
|
170
|
-
});
|
|
171
|
-
this.ms.goto('Preparing retrieve request');
|
|
172
144
|
const retrieveOpts = await buildRetrieveOptions(flags, format, zipFileName, resolvedTargetDir);
|
|
173
|
-
this.
|
|
145
|
+
this.spinner.status = messages.getMessage('spinner.sending');
|
|
174
146
|
this.retrieveResult = new RetrieveResult({}, componentSetFromNonDeletes);
|
|
175
147
|
if (componentSetFromNonDeletes.size !== 0 || retrieveOpts.packageOptions?.length) {
|
|
176
|
-
|
|
148
|
+
// eslint-disable-next-line @typescript-eslint/require-await
|
|
149
|
+
Lifecycle.getInstance().on('apiVersionRetrieve', async (apiData) => {
|
|
150
|
+
this.log(messages.getMessage('apiVersionMsgDetailed', [
|
|
151
|
+
'Retrieving',
|
|
152
|
+
`v${apiData.manifestVersion}`,
|
|
153
|
+
flags['target-org'].getUsername(),
|
|
154
|
+
apiData.apiVersion,
|
|
155
|
+
]));
|
|
156
|
+
});
|
|
177
157
|
const retrieve = await componentSetFromNonDeletes.retrieve(retrieveOpts);
|
|
178
|
-
this.
|
|
158
|
+
this.spinner.status = messages.getMessage('spinner.polling');
|
|
179
159
|
retrieve.onUpdate((data) => {
|
|
180
|
-
this.
|
|
181
|
-
});
|
|
182
|
-
retrieve.onFinish((data) => {
|
|
183
|
-
this.ms.goto('Done', { status: mdTransferMessages.getMessage(data.response.status) });
|
|
184
|
-
});
|
|
185
|
-
retrieve.onCancel((data) => {
|
|
186
|
-
this.ms.updateData({ status: mdTransferMessages.getMessage(data?.status ?? 'Canceled') });
|
|
187
|
-
this.ms.stop(new Error('Retrieve canceled'));
|
|
160
|
+
this.spinner.status = mdTransferMessages.getMessage(data.status);
|
|
188
161
|
});
|
|
162
|
+
// any thing else should stop the progress bar
|
|
163
|
+
retrieve.onFinish((data) => this.spinner.stop(mdTransferMessages.getMessage(data.response.status)));
|
|
164
|
+
retrieve.onCancel((data) => this.spinner.stop(mdTransferMessages.getMessage(data?.status ?? 'Canceled')));
|
|
189
165
|
retrieve.onError((error) => {
|
|
190
|
-
|
|
191
|
-
this.ms.updateData({ status: 'Client Timeout' });
|
|
192
|
-
}
|
|
193
|
-
this.ms.stop(error);
|
|
166
|
+
this.spinner.stop(error.name);
|
|
194
167
|
throw error;
|
|
195
168
|
});
|
|
196
169
|
this.retrieveResult = await retrieve.pollStatus(500, flags.wait.seconds);
|
|
197
170
|
}
|
|
198
|
-
this.
|
|
171
|
+
this.spinner.stop();
|
|
199
172
|
// flags['output-dir'] will set resolvedTargetDir var, so this check is redundant, but allows for nice typings in the moveResultsForRetrieveTargetDir method
|
|
200
173
|
if (flags['output-dir'] && resolvedTargetDir) {
|
|
201
174
|
await this.moveResultsForRetrieveTargetDir(flags['output-dir'], resolvedTargetDir);
|
|
@@ -233,8 +206,6 @@ export default class RetrieveMetadata extends SfCommand {
|
|
|
233
206
|
}
|
|
234
207
|
catch(error) {
|
|
235
208
|
if (!this.jsonEnabled() && error instanceof SourceConflictError && error.data) {
|
|
236
|
-
this.ms.updateData({ status: 'Failed' });
|
|
237
|
-
this.ms.stop(error);
|
|
238
209
|
writeConflictTable(error.data);
|
|
239
210
|
// set the message and add plugin-specific actions
|
|
240
211
|
return super.catch({
|
|
@@ -243,9 +214,6 @@ export default class RetrieveMetadata extends SfCommand {
|
|
|
243
214
|
actions: messages.getMessages('error.Conflicts.Actions'),
|
|
244
215
|
});
|
|
245
216
|
}
|
|
246
|
-
else {
|
|
247
|
-
this.ms.stop(error);
|
|
248
|
-
}
|
|
249
217
|
return super.catch(error);
|
|
250
218
|
}
|
|
251
219
|
async moveResultsForRetrieveTargetDir(targetDir, resolvedTargetDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/retrieve/start.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/retrieve/start.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/output.d.ts
CHANGED
|
@@ -6,6 +6,7 @@ export declare const makePathRelative: <T extends FileResponse | FileResponseSuc
|
|
|
6
6
|
*/
|
|
7
7
|
export declare const fileResponseSortFn: (i: FileResponse, j: FileResponse) => number;
|
|
8
8
|
export declare const exitCodeAsNumber: () => number | undefined;
|
|
9
|
+
export declare const getZipFileSize: (bytes: number) => string;
|
|
9
10
|
/** oclif table doesn't like "interface" but likes "type". SDR exports an interface */
|
|
10
11
|
export declare const getFileResponseSuccessProps: (s: FileResponseSuccess) => Pick<FileResponseSuccess, "filePath" | "fullName" | "state" | "type">;
|
|
11
12
|
export declare function error(message: string): string;
|
package/lib/utils/output.js
CHANGED
|
@@ -32,6 +32,14 @@ export const exitCodeAsNumber = () => {
|
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
|
+
export const getZipFileSize = (bytes) => {
|
|
36
|
+
const units = ['B', 'KB', 'MB', 'GB'];
|
|
37
|
+
while (bytes > 1024 && units.length) {
|
|
38
|
+
bytes /= 1024;
|
|
39
|
+
units.shift();
|
|
40
|
+
}
|
|
41
|
+
return parseFloat(bytes.toFixed(2)) + ' ' + units[0];
|
|
42
|
+
};
|
|
35
43
|
/** oclif table doesn't like "interface" but likes "type". SDR exports an interface */
|
|
36
44
|
export const getFileResponseSuccessProps = (s) => ({
|
|
37
45
|
filePath: s.filePath,
|
package/lib/utils/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,MAAM,UAAU,WAAW,CAAC,OAAe;IACzC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAqE,EAAK,EAAK,EAAE,CAC/G,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACpF;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAe,EAAE,CAAe,EAAU,EAAE;IAC7E,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAClD,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9B,OAAO,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,CAAC,EAAE,QAAQ,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAuB,EAAE;IACvD,IAAI,CAAC;QACH,OAAO,OAAO,OAAO,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IAClG,CAAC;IAAC,MAAM,CAAC;QACP,qDAAqD;QACrD,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC,CAAC;AAEF,wFAAwF;AACxF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,CAAsB,EACiD,EAAE,CAAC,CAAC;IAC3E,QAAQ,EAAE,CAAC,CAAC,QAAQ;IACpB,QAAQ,EAAE,CAAC,CAAC,QAAQ;IACpB,IAAI,EAAE,CAAC,CAAC,IAAI;IACZ,KAAK,EAAE,CAAC,CAAC,KAAK;CACf,CAAC,CAAC;AAEH,MAAM,UAAU,KAAK,CAAC,OAAe;IACnC,OAAO,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,OAAe;IACrC,OAAO,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/utils/output.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { MetadataApiDeploy } from '@salesforce/source-deploy-retrieve';
|
|
2
|
+
import { Progress } from '@salesforce/sf-plugins-core';
|
|
3
|
+
export declare class DeployProgress extends Progress {
|
|
4
|
+
private deploy;
|
|
5
|
+
private static OPTIONS;
|
|
6
|
+
private lifecycle;
|
|
7
|
+
constructor(deploy: MetadataApiDeploy, jsonEnabled?: boolean);
|
|
8
|
+
start(): void;
|
|
9
|
+
private updateTrackingProgress;
|
|
10
|
+
private updateProgress;
|
|
11
|
+
}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) 2022, salesforce.com, inc.
|
|
3
|
+
* All rights reserved.
|
|
4
|
+
* Licensed under the BSD 3-Clause license.
|
|
5
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
6
|
+
*/
|
|
7
|
+
import { envVars as env, EnvironmentVariable, Lifecycle, Messages, Logger } from '@salesforce/core';
|
|
8
|
+
import { Progress } from '@salesforce/sf-plugins-core';
|
|
9
|
+
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
|
|
10
|
+
const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
|
|
11
|
+
const showBar = Boolean(process.env.TERM !== 'dumb' && process.stdin.isTTY && env.getBoolean(EnvironmentVariable.SF_USE_PROGRESS_BAR, true));
|
|
12
|
+
const logger = await Logger.child('deploy-progress');
|
|
13
|
+
export class DeployProgress extends Progress {
|
|
14
|
+
deploy;
|
|
15
|
+
static OPTIONS = {
|
|
16
|
+
title: 'Status',
|
|
17
|
+
format: `%s: {status} ${showBar ? '| {bar} ' : ''}| {value}/{total} Components{errorInfo}{testInfo}{trackingInfo}`,
|
|
18
|
+
barCompleteChar: '\u2588',
|
|
19
|
+
barIncompleteChar: '\u2591',
|
|
20
|
+
linewrap: true,
|
|
21
|
+
// people really like to get text output in CI systems
|
|
22
|
+
// they won't get the "bar" but will get the remaining template bits this way
|
|
23
|
+
noTTYOutput: true,
|
|
24
|
+
};
|
|
25
|
+
lifecycle = Lifecycle.getInstance();
|
|
26
|
+
constructor(deploy, jsonEnabled = false) {
|
|
27
|
+
super(!jsonEnabled);
|
|
28
|
+
this.deploy = deploy;
|
|
29
|
+
}
|
|
30
|
+
start() {
|
|
31
|
+
super.start(0, { status: 'Waiting', trackingInfo: '', testInfo: '' }, DeployProgress.OPTIONS);
|
|
32
|
+
// for sourceMember polling events
|
|
33
|
+
this.lifecycle.on('sourceMemberPollingEvent', (event) => Promise.resolve(this.updateTrackingProgress(event)));
|
|
34
|
+
this.deploy.onUpdate((data) => this.updateProgress(data));
|
|
35
|
+
// any thing else should make one final update, then stop the progress bar
|
|
36
|
+
this.deploy.onFinish((data) => {
|
|
37
|
+
this.updateProgress(data.response);
|
|
38
|
+
this.finish({ status: mdTransferMessages.getMessage(data.response.status) });
|
|
39
|
+
});
|
|
40
|
+
this.deploy.onCancel(() => this.stop());
|
|
41
|
+
this.deploy.onError((error) => {
|
|
42
|
+
this.stop();
|
|
43
|
+
throw error;
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
updateTrackingProgress(data) {
|
|
47
|
+
const { remaining, original } = data;
|
|
48
|
+
this.update(0, {
|
|
49
|
+
status: 'Polling SourceMembers',
|
|
50
|
+
trackingInfo: ` | Tracking: ${original - remaining}/${original}`,
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
updateProgress(data) {
|
|
54
|
+
// the numCompTot. isn't computed right away, wait to start until we know how many we have
|
|
55
|
+
const testInfo = data.numberTestsTotal
|
|
56
|
+
? ` | ${data.numberTestsCompleted ?? 0}/${data.numberTestsTotal ?? 0} Tests${data.numberTestErrors ? `(Errors:${data.numberTestErrors})` : ''}`
|
|
57
|
+
: '';
|
|
58
|
+
const errorInfo = data.numberComponentErrors > 0 ? ` | Errors: ${data.numberComponentErrors}` : '';
|
|
59
|
+
if (data.numberComponentsTotal) {
|
|
60
|
+
this.setTotal(data.numberComponentsTotal);
|
|
61
|
+
this.update(data.numberComponentsDeployed, {
|
|
62
|
+
errorInfo: data.numberComponentErrors > 0 ? ` | Errors: ${data.numberComponentErrors}` : '',
|
|
63
|
+
status: mdTransferMessages.getMessage(data.status),
|
|
64
|
+
testInfo,
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
let status;
|
|
69
|
+
try {
|
|
70
|
+
status = mdTransferMessages.getMessage(data.status);
|
|
71
|
+
}
|
|
72
|
+
catch (e) {
|
|
73
|
+
logger.debug(`data.status message lookup failed for: ${data.status}`);
|
|
74
|
+
status = 'Waiting';
|
|
75
|
+
}
|
|
76
|
+
this.update(0, { errorInfo, testInfo, status });
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=progressBar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"progressBar.js","sourceRoot":"","sources":["../../src/utils/progressBar.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/types.d.ts
CHANGED
|
@@ -19,6 +19,8 @@ export type Verbosity = 'verbose' | 'concise' | 'normal';
|
|
|
19
19
|
export type AsyncDeployResultJson = Omit<Partial<MetadataApiDeployStatus>, 'status'> & {
|
|
20
20
|
status: RequestStatus | 'Queued' | 'Nothing to deploy';
|
|
21
21
|
files: FileResponse[];
|
|
22
|
+
zipSize?: number;
|
|
23
|
+
zipFileCount?: number;
|
|
22
24
|
};
|
|
23
25
|
type ConvertEntry = {
|
|
24
26
|
fullName: string;
|
|
@@ -43,8 +45,9 @@ export type DeleteSourceJson = {
|
|
|
43
45
|
export type CoverageResultsFileInfo = Record<keyof Partial<typeof DefaultReportOptions>, string>;
|
|
44
46
|
export type DeployResultJson = (MetadataApiDeployStatus & {
|
|
45
47
|
files: FileResponse[];
|
|
46
|
-
} & {
|
|
47
48
|
replacements?: Record<string, string[]>;
|
|
49
|
+
zipSize?: number;
|
|
50
|
+
zipFileCount?: number;
|
|
48
51
|
}) | AsyncDeployResultJson;
|
|
49
52
|
export type MetadataRetrieveResultJson = Omit<MetadataApiRetrieveStatus, 'zipFile'> & {
|
|
50
53
|
zipFilePath: string;
|
package/lib/utils/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,eAAe,GAShB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oDAAuC,CAAA;IACvC,4CAA+B,CAAA;IAC/B,kDAAqC,CAAA;AACvC,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,oBAAa,CAAA;IACb,oBAAa,CAAA;AACf,CAAC,EAHW,GAAG,KAAH,GAAG,QAGd;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/utils/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,eAAe,GAShB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAE7D,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;AAEnE,MAAM,CAAN,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,oCAAuB,CAAA;IACvB,oDAAuC,CAAA;IACvC,4CAA+B,CAAA;IAC/B,kDAAqC,CAAA;AACvC,CAAC,EALW,SAAS,KAAT,SAAS,QAKpB;AAED,MAAM,CAAN,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,oBAAa,CAAA;IACb,oBAAa,CAAA;AACf,CAAC,EAHW,GAAG,KAAH,GAAG,QAGd;AAiED,oEAAoE;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAiB,EAAyB,EAAE,CAC5E,QAAQ,CAAC,EAAE,CAAC;IACZ,MAAM,IAAI,EAAE;IACZ,OAAO,EAAE,CAAC,IAAI,KAAK,QAAQ;IAC3B,EAAE,CAAC,IAAI,KAAK,IAAI;IAChB,MAAM,IAAI,EAAE,CAAC,IAAI;IACjB,OAAO,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ;IAChC,UAAU,IAAI,EAAE;IAChB,aAAa,IAAI,EAAE;IACnB,0EAA0E;IAC1E,OAAO,EAAE,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAElC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAiB,EAA2C,EAAE,CACrG,iBAAiB,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC,GAAG,KAAK,QAAQ,CAAC;AAErE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,YAA0B,EAAuC,EAAE,CAC9F,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC;AAEhD,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,YAAiC,EAAW,EAAE,CAClF,YAAY,CAAC,KAAK,KAAK,eAAe,CAAC,OAAO,CAAC;AAEjD,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,KAAS,EAAc,EAAE,CAAC,KAAK,KAAK,SAAS,CAAC"}
|
|
@@ -145,6 +145,18 @@ Extract all files from the retrieved zip file.
|
|
|
145
145
|
|
|
146
146
|
File name to use for the retrieved zip file.
|
|
147
147
|
|
|
148
|
+
# spinner.start
|
|
149
|
+
|
|
150
|
+
Preparing retrieve request
|
|
151
|
+
|
|
152
|
+
# spinner.sending
|
|
153
|
+
|
|
154
|
+
Sending request to org
|
|
155
|
+
|
|
156
|
+
# spinner.polling
|
|
157
|
+
|
|
158
|
+
Waiting for the org to respond
|
|
159
|
+
|
|
148
160
|
# error.Conflicts
|
|
149
161
|
|
|
150
162
|
There are changes in your local files that conflict with the org changes you're trying to retrieve.
|
package/oclif.manifest.json
CHANGED
|
@@ -310,7 +310,7 @@
|
|
|
310
310
|
"deprecateAliases": true,
|
|
311
311
|
"name": "output-dir",
|
|
312
312
|
"summary": "Output directory to store the Metadata API–formatted files in.",
|
|
313
|
-
"default": "
|
|
313
|
+
"default": "metadataPackage_1724785521500",
|
|
314
314
|
"hasDynamicHelp": false,
|
|
315
315
|
"multiple": false,
|
|
316
316
|
"type": "option"
|
|
@@ -3026,5 +3026,5 @@
|
|
|
3026
3026
|
]
|
|
3027
3027
|
}
|
|
3028
3028
|
},
|
|
3029
|
-
"version": "3.
|
|
3029
|
+
"version": "3.12.0"
|
|
3030
3030
|
}
|
package/package.json
CHANGED
|
@@ -1,24 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-deploy-retrieve",
|
|
3
3
|
"description": "deploy and retrieve commands for sf",
|
|
4
|
-
"version": "3.
|
|
4
|
+
"version": "3.12.0",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@oclif/core": "^4.0.18",
|
|
9
|
-
"@oclif/multi-stage-output": "^0.3.1",
|
|
10
9
|
"@salesforce/apex-node": "^8.1.3",
|
|
11
10
|
"@salesforce/core": "^8.4.0",
|
|
12
11
|
"@salesforce/kit": "^3.2.1",
|
|
13
12
|
"@salesforce/plugin-info": "^3.3.28",
|
|
14
13
|
"@salesforce/sf-plugins-core": "^11.3.2",
|
|
15
|
-
"@salesforce/source-deploy-retrieve": "^12.
|
|
14
|
+
"@salesforce/source-deploy-retrieve": "^12.6.0",
|
|
16
15
|
"@salesforce/source-tracking": "^7.1.7",
|
|
17
16
|
"@salesforce/ts-types": "^2.0.12",
|
|
18
17
|
"ansis": "^3.3.2"
|
|
19
18
|
},
|
|
20
19
|
"devDependencies": {
|
|
21
|
-
"@oclif/plugin-command-snapshot": "^5.2.
|
|
20
|
+
"@oclif/plugin-command-snapshot": "^5.2.13",
|
|
22
21
|
"@salesforce/cli-plugins-testkit": "^5.3.26",
|
|
23
22
|
"@salesforce/dev-scripts": "^10.2.9",
|
|
24
23
|
"@salesforce/plugin-command-reference": "^3.1.16",
|
|
@@ -26,7 +25,7 @@
|
|
|
26
25
|
"@salesforce/source-testkit": "^2.2.57",
|
|
27
26
|
"@salesforce/ts-sinon": "^1.4.24",
|
|
28
27
|
"cross-env": "^7.0.3",
|
|
29
|
-
"eslint-plugin-sf-plugin": "^1.20.
|
|
28
|
+
"eslint-plugin-sf-plugin": "^1.20.5",
|
|
30
29
|
"oclif": "^4.14.19",
|
|
31
30
|
"ts-node": "^10.9.2",
|
|
32
31
|
"typescript": "^5.5.4"
|
|
@@ -251,7 +250,7 @@
|
|
|
251
250
|
"exports": "./lib/index.js",
|
|
252
251
|
"type": "module",
|
|
253
252
|
"sfdx": {
|
|
254
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.
|
|
255
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.
|
|
253
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.12.0.crt",
|
|
254
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/3.12.0.sig"
|
|
256
255
|
}
|
|
257
256
|
}
|
|
@@ -8,6 +8,12 @@
|
|
|
8
8
|
"type": "object",
|
|
9
9
|
"additionalProperties": false,
|
|
10
10
|
"properties": {
|
|
11
|
+
"files": {
|
|
12
|
+
"type": "array",
|
|
13
|
+
"items": {
|
|
14
|
+
"$ref": "#/definitions/FileResponse"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
11
17
|
"replacements": {
|
|
12
18
|
"type": "object",
|
|
13
19
|
"additionalProperties": {
|
|
@@ -17,11 +23,11 @@
|
|
|
17
23
|
}
|
|
18
24
|
}
|
|
19
25
|
},
|
|
20
|
-
"
|
|
21
|
-
"type": "
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
26
|
+
"zipSize": {
|
|
27
|
+
"type": "number"
|
|
28
|
+
},
|
|
29
|
+
"zipFileCount": {
|
|
30
|
+
"type": "number"
|
|
25
31
|
},
|
|
26
32
|
"id": {
|
|
27
33
|
"type": "string"
|
|
@@ -496,6 +502,12 @@
|
|
|
496
502
|
"$ref": "#/definitions/FileResponse"
|
|
497
503
|
}
|
|
498
504
|
},
|
|
505
|
+
"zipSize": {
|
|
506
|
+
"type": "number"
|
|
507
|
+
},
|
|
508
|
+
"zipFileCount": {
|
|
509
|
+
"type": "number"
|
|
510
|
+
},
|
|
499
511
|
"canceledBy": {
|
|
500
512
|
"type": "string"
|
|
501
513
|
},
|
|
@@ -8,6 +8,12 @@
|
|
|
8
8
|
"type": "object",
|
|
9
9
|
"additionalProperties": false,
|
|
10
10
|
"properties": {
|
|
11
|
+
"files": {
|
|
12
|
+
"type": "array",
|
|
13
|
+
"items": {
|
|
14
|
+
"$ref": "#/definitions/FileResponse"
|
|
15
|
+
}
|
|
16
|
+
},
|
|
11
17
|
"replacements": {
|
|
12
18
|
"type": "object",
|
|
13
19
|
"additionalProperties": {
|
|
@@ -17,11 +23,11 @@
|
|
|
17
23
|
}
|
|
18
24
|
}
|
|
19
25
|
},
|
|
20
|
-
"
|
|
21
|
-
"type": "
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
26
|
+
"zipSize": {
|
|
27
|
+
"type": "number"
|
|
28
|
+
},
|
|
29
|
+
"zipFileCount": {
|
|
30
|
+
"type": "number"
|
|
25
31
|
},
|
|
26
32
|
"id": {
|
|
27
33
|
"type": "string"
|
|
@@ -496,6 +502,12 @@
|
|
|
496
502
|
"$ref": "#/definitions/FileResponse"
|
|
497
503
|
}
|
|
498
504
|
},
|
|
505
|
+
"zipSize": {
|
|
506
|
+
"type": "number"
|
|
507
|
+
},
|
|
508
|
+
"zipFileCount": {
|
|
509
|
+
"type": "number"
|
|
510
|
+
},
|
|
499
511
|
"canceledBy": {
|
|
500
512
|
"type": "string"
|
|
501
513
|
},
|