@salesforce/plugin-deploy-retrieve 1.9.6 → 1.10.1
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/lib/commands/project/deploy/start.d.ts +106 -2
- package/lib/commands/project/deploy/start.js +21 -3
- package/lib/commands/project/deploy/start.js.map +1 -1
- package/lib/commands/project/retrieve/start.d.ts +2 -0
- package/lib/commands/project/retrieve/start.js +71 -7
- package/lib/commands/project/retrieve/start.js.map +1 -1
- package/lib/formatters/metadataRetrieveResultFormatter.js +1 -1
- package/lib/formatters/metadataRetrieveResultFormatter.js.map +1 -1
- package/lib/utils/promiseQueue.d.ts +9 -0
- package/lib/utils/promiseQueue.js +37 -0
- package/lib/utils/promiseQueue.js.map +1 -0
- package/messages/{retrieve.metadata.md → retrieve.start.md} +14 -0
- package/oclif.manifest.json +32 -2
- package/package.json +5 -5
|
@@ -21,14 +21,118 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
|
|
|
21
21
|
'single-package': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
22
22
|
'source-dir': import("@oclif/core/lib/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
23
23
|
'target-org': import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
24
|
-
tests:
|
|
24
|
+
tests: {
|
|
25
|
+
helpGroup: string;
|
|
26
|
+
name: string;
|
|
27
|
+
char?: import("@oclif/core/lib/interfaces").AlphabetLowercase | import("@oclif/core/lib/interfaces").AlphabetUppercase | undefined;
|
|
28
|
+
summary?: string | undefined;
|
|
29
|
+
description?: string | undefined;
|
|
30
|
+
helpLabel?: string | undefined;
|
|
31
|
+
env?: string | undefined;
|
|
32
|
+
hidden?: boolean | undefined;
|
|
33
|
+
required?: boolean | undefined;
|
|
34
|
+
dependsOn?: string[] | undefined;
|
|
35
|
+
exclusive?: string[] | undefined;
|
|
36
|
+
exactlyOne?: string[] | undefined;
|
|
37
|
+
relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[] | undefined;
|
|
38
|
+
deprecated?: true | import("@oclif/core/lib/interfaces").Deprecation | undefined;
|
|
39
|
+
aliases?: string[] | undefined;
|
|
40
|
+
deprecateAliases?: boolean | undefined;
|
|
41
|
+
delimiter?: "," | undefined;
|
|
42
|
+
type: "option";
|
|
43
|
+
helpValue?: string | undefined;
|
|
44
|
+
options?: string[] | undefined;
|
|
45
|
+
multiple: false;
|
|
46
|
+
parse: import("@oclif/core/lib/interfaces/parser").FlagParser<string[] | undefined, string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
47
|
+
defaultHelp?: import("@oclif/core/lib/interfaces/parser").FlagDefaultHelp<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
48
|
+
input: string[];
|
|
49
|
+
default?: import("@oclif/core/lib/interfaces/parser").FlagDefault<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
50
|
+
} | {
|
|
51
|
+
helpGroup: string;
|
|
52
|
+
name: string;
|
|
53
|
+
char?: import("@oclif/core/lib/interfaces").AlphabetLowercase | import("@oclif/core/lib/interfaces").AlphabetUppercase | undefined;
|
|
54
|
+
summary?: string | undefined;
|
|
55
|
+
description?: string | undefined;
|
|
56
|
+
helpLabel?: string | undefined;
|
|
57
|
+
env?: string | undefined;
|
|
58
|
+
hidden?: boolean | undefined;
|
|
59
|
+
required?: boolean | undefined;
|
|
60
|
+
dependsOn?: string[] | undefined;
|
|
61
|
+
exclusive?: string[] | undefined;
|
|
62
|
+
exactlyOne?: string[] | undefined;
|
|
63
|
+
relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[] | undefined;
|
|
64
|
+
deprecated?: true | import("@oclif/core/lib/interfaces").Deprecation | undefined;
|
|
65
|
+
aliases?: string[] | undefined;
|
|
66
|
+
deprecateAliases?: boolean | undefined;
|
|
67
|
+
delimiter?: "," | undefined;
|
|
68
|
+
type: "option";
|
|
69
|
+
helpValue?: string | undefined;
|
|
70
|
+
options?: string[] | undefined;
|
|
71
|
+
multiple: true;
|
|
72
|
+
parse: import("@oclif/core/lib/interfaces/parser").FlagParser<string[] | undefined, string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
73
|
+
defaultHelp?: import("@oclif/core/lib/interfaces/parser").FlagDefaultHelp<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
74
|
+
input: string[];
|
|
75
|
+
default?: import("@oclif/core/lib/interfaces/parser").FlagDefault<(string[] | undefined)[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
76
|
+
};
|
|
25
77
|
'test-level': import("@oclif/core/lib/interfaces").OptionFlag<TestLevel | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
26
78
|
verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
27
79
|
wait: import("@oclif/core/lib/interfaces").OptionFlag<import("@salesforce/kit").Duration | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
28
80
|
'purge-on-delete': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
29
81
|
'pre-destructive-changes': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
30
82
|
'post-destructive-changes': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
31
|
-
'coverage-formatters':
|
|
83
|
+
'coverage-formatters': {
|
|
84
|
+
helpGroup: string;
|
|
85
|
+
name: string;
|
|
86
|
+
char?: import("@oclif/core/lib/interfaces").AlphabetLowercase | import("@oclif/core/lib/interfaces").AlphabetUppercase | undefined;
|
|
87
|
+
summary?: string | undefined;
|
|
88
|
+
description?: string | undefined;
|
|
89
|
+
helpLabel?: string | undefined;
|
|
90
|
+
env?: string | undefined;
|
|
91
|
+
hidden?: boolean | undefined;
|
|
92
|
+
required?: boolean | undefined;
|
|
93
|
+
dependsOn?: string[] | undefined;
|
|
94
|
+
exclusive?: string[] | undefined;
|
|
95
|
+
exactlyOne?: string[] | undefined;
|
|
96
|
+
relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[] | undefined;
|
|
97
|
+
deprecated?: true | import("@oclif/core/lib/interfaces").Deprecation | undefined;
|
|
98
|
+
aliases?: string[] | undefined;
|
|
99
|
+
deprecateAliases?: boolean | undefined;
|
|
100
|
+
delimiter?: "," | undefined;
|
|
101
|
+
type: "option";
|
|
102
|
+
helpValue?: string | undefined;
|
|
103
|
+
options?: string[] | undefined;
|
|
104
|
+
multiple: false;
|
|
105
|
+
parse: import("@oclif/core/lib/interfaces/parser").FlagParser<string[] | undefined, string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
106
|
+
defaultHelp?: import("@oclif/core/lib/interfaces/parser").FlagDefaultHelp<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
107
|
+
input: string[];
|
|
108
|
+
default?: import("@oclif/core/lib/interfaces/parser").FlagDefault<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
109
|
+
} | {
|
|
110
|
+
helpGroup: string;
|
|
111
|
+
name: string;
|
|
112
|
+
char?: import("@oclif/core/lib/interfaces").AlphabetLowercase | import("@oclif/core/lib/interfaces").AlphabetUppercase | undefined;
|
|
113
|
+
summary?: string | undefined;
|
|
114
|
+
description?: string | undefined;
|
|
115
|
+
helpLabel?: string | undefined;
|
|
116
|
+
env?: string | undefined;
|
|
117
|
+
hidden?: boolean | undefined;
|
|
118
|
+
required?: boolean | undefined;
|
|
119
|
+
dependsOn?: string[] | undefined;
|
|
120
|
+
exclusive?: string[] | undefined;
|
|
121
|
+
exactlyOne?: string[] | undefined;
|
|
122
|
+
relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[] | undefined;
|
|
123
|
+
deprecated?: true | import("@oclif/core/lib/interfaces").Deprecation | undefined;
|
|
124
|
+
aliases?: string[] | undefined;
|
|
125
|
+
deprecateAliases?: boolean | undefined;
|
|
126
|
+
delimiter?: "," | undefined;
|
|
127
|
+
type: "option";
|
|
128
|
+
helpValue?: string | undefined;
|
|
129
|
+
options?: string[] | undefined;
|
|
130
|
+
multiple: true;
|
|
131
|
+
parse: import("@oclif/core/lib/interfaces/parser").FlagParser<string[] | undefined, string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
132
|
+
defaultHelp?: import("@oclif/core/lib/interfaces/parser").FlagDefaultHelp<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
133
|
+
input: string[];
|
|
134
|
+
default?: import("@oclif/core/lib/interfaces/parser").FlagDefault<(string[] | undefined)[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
135
|
+
};
|
|
32
136
|
junit: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
|
|
33
137
|
'results-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
34
138
|
};
|
|
@@ -25,6 +25,10 @@ const project_1 = require("../../../utils/project");
|
|
|
25
25
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
26
26
|
const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata');
|
|
27
27
|
const exclusiveFlags = ['manifest', 'source-dir', 'metadata', 'metadata-dir'];
|
|
28
|
+
const mdapiFormatFlags = 'Metadata API Format';
|
|
29
|
+
const sourceFormatFlags = 'Source Format';
|
|
30
|
+
const testFlags = 'Test';
|
|
31
|
+
const destructiveFlags = 'Delete';
|
|
28
32
|
class DeployMetadata extends sf_plugins_core_1.SfCommand {
|
|
29
33
|
async run() {
|
|
30
34
|
const { flags } = await this.parse(DeployMetadata);
|
|
@@ -146,21 +150,25 @@ DeployMetadata.flags = {
|
|
|
146
150
|
summary: messages.getMessage('flags.manifest.summary'),
|
|
147
151
|
exclusive: exclusiveFlags.filter((f) => f !== 'manifest'),
|
|
148
152
|
exists: true,
|
|
153
|
+
helpGroup: sourceFormatFlags,
|
|
149
154
|
}),
|
|
150
155
|
metadata: sf_plugins_core_1.Flags.string({
|
|
151
156
|
char: 'm',
|
|
152
157
|
summary: messages.getMessage('flags.metadata.summary'),
|
|
153
158
|
multiple: true,
|
|
154
159
|
exclusive: exclusiveFlags.filter((f) => f !== 'metadata'),
|
|
160
|
+
helpGroup: sourceFormatFlags,
|
|
155
161
|
}),
|
|
156
162
|
'metadata-dir': (0, flags_1.fileOrDirFlag)({
|
|
157
163
|
summary: messages.getMessage('flags.metadata-dir.summary'),
|
|
158
164
|
exclusive: exclusiveFlags.filter((f) => f !== 'metadata-dir'),
|
|
159
165
|
exists: true,
|
|
166
|
+
helpGroup: mdapiFormatFlags,
|
|
160
167
|
}),
|
|
161
168
|
'single-package': sf_plugins_core_1.Flags.boolean({
|
|
162
169
|
summary: messages.getMessage('flags.single-package.summary'),
|
|
163
170
|
dependsOn: ['metadata-dir'],
|
|
171
|
+
helpGroup: mdapiFormatFlags,
|
|
164
172
|
}),
|
|
165
173
|
'source-dir': sf_plugins_core_1.Flags.string({
|
|
166
174
|
char: 'd',
|
|
@@ -168,6 +176,7 @@ DeployMetadata.flags = {
|
|
|
168
176
|
summary: messages.getMessage('flags.source-dir.summary'),
|
|
169
177
|
multiple: true,
|
|
170
178
|
exclusive: exclusiveFlags.filter((f) => f !== 'source-dir'),
|
|
179
|
+
helpGroup: sourceFormatFlags,
|
|
171
180
|
}),
|
|
172
181
|
'target-org': sf_plugins_core_1.Flags.requiredOrg({
|
|
173
182
|
char: 'o',
|
|
@@ -175,11 +184,12 @@ DeployMetadata.flags = {
|
|
|
175
184
|
summary: messages.getMessage('flags.target-org.summary'),
|
|
176
185
|
required: true,
|
|
177
186
|
}),
|
|
178
|
-
tests: flags_1.testsFlag,
|
|
187
|
+
tests: { ...flags_1.testsFlag, helpGroup: testFlags },
|
|
179
188
|
'test-level': (0, flags_1.testLevelFlag)({
|
|
180
189
|
description: messages.getMessage('flags.test-level.description'),
|
|
181
190
|
summary: messages.getMessage('flags.test-level.summary'),
|
|
182
191
|
options: [types_1.TestLevel.NoTestRun, types_1.TestLevel.RunSpecifiedTests, types_1.TestLevel.RunLocalTests, types_1.TestLevel.RunAllTestsInOrg],
|
|
192
|
+
helpGroup: testFlags,
|
|
183
193
|
}),
|
|
184
194
|
verbose: sf_plugins_core_1.Flags.boolean({
|
|
185
195
|
summary: messages.getMessage('flags.verbose.summary'),
|
|
@@ -199,20 +209,28 @@ DeployMetadata.flags = {
|
|
|
199
209
|
summary: messages.getMessage('flags.purge-on-delete.summary'),
|
|
200
210
|
dependsOn: ['manifest'],
|
|
201
211
|
relationships: [{ type: 'some', flags: ['pre-destructive-changes', 'post-destructive-changes'] }],
|
|
212
|
+
helpGroup: destructiveFlags,
|
|
202
213
|
}),
|
|
203
214
|
'pre-destructive-changes': sf_plugins_core_1.Flags.file({
|
|
204
215
|
summary: messages.getMessage('flags.pre-destructive-changes.summary'),
|
|
205
216
|
dependsOn: ['manifest'],
|
|
217
|
+
helpGroup: destructiveFlags,
|
|
206
218
|
}),
|
|
207
219
|
'post-destructive-changes': sf_plugins_core_1.Flags.file({
|
|
208
220
|
summary: messages.getMessage('flags.post-destructive-changes.summary'),
|
|
209
221
|
dependsOn: ['manifest'],
|
|
222
|
+
helpGroup: destructiveFlags,
|
|
223
|
+
}),
|
|
224
|
+
'coverage-formatters': { ...flags_1.coverageFormattersFlag, helpGroup: testFlags },
|
|
225
|
+
junit: sf_plugins_core_1.Flags.boolean({
|
|
226
|
+
summary: messages.getMessage('flags.junit.summary'),
|
|
227
|
+
dependsOn: ['coverage-formatters'],
|
|
228
|
+
helpGroup: testFlags,
|
|
210
229
|
}),
|
|
211
|
-
'coverage-formatters': flags_1.coverageFormattersFlag,
|
|
212
|
-
junit: sf_plugins_core_1.Flags.boolean({ summary: messages.getMessage('flags.junit.summary'), dependsOn: ['coverage-formatters'] }),
|
|
213
230
|
'results-dir': sf_plugins_core_1.Flags.directory({
|
|
214
231
|
dependsOn: ['coverage-formatters'],
|
|
215
232
|
summary: messages.getMessage('flags.results-dir.summary'),
|
|
233
|
+
helpGroup: testFlags,
|
|
216
234
|
}),
|
|
217
235
|
};
|
|
218
236
|
DeployMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.OrgConfigProperties.ORG_API_VERSION, configMeta_1.ConfigVars.ORG_METADATA_REST_DEPLOY);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/start.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,iCAA6B;AAC7B,2CAA+F;AAC/F,iEAA8E;AAC9E,iEAAkE;AAClE,kDAA0D;AAC1D,+FAA4F;AAC5F,qFAAkF;AAClF,4DAA4D;AAC5D,gDAAmE;AACnE,kDAAoG;AACpG,4DAAyD;AACzD,0DAA6E;AAC7E,oDAAiD;AACjD,gDAAuG;AACvG,wDAA8D;AAC9D,oDAA4D;AAE5D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,iBAAiB,CAAC,CAAC;AAEhG,MAAM,cAAc,GAAG,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../../src/commands/project/deploy/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
|
16
16
|
manifest: Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
17
17
|
metadata: Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
18
18
|
'package-name': Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
19
|
+
'output-dir': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
19
20
|
'single-package': Interfaces.BooleanFlag<boolean>;
|
|
20
21
|
'source-dir': Interfaces.OptionFlag<string[] | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
21
22
|
'target-metadata-dir': Interfaces.OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
|
|
@@ -29,4 +30,5 @@ export default class RetrieveMetadata extends SfCommand<RetrieveResultJson> {
|
|
|
29
30
|
protected retrieveResult: RetrieveResult;
|
|
30
31
|
run(): Promise<RetrieveResultJson>;
|
|
31
32
|
protected catch(error: Error | SfError): Promise<SfCommand.Error>;
|
|
33
|
+
private moveResultsForRetrieveTargetDir;
|
|
32
34
|
}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
const promises_1 = require("fs/promises");
|
|
10
10
|
const path_1 = require("path");
|
|
11
|
+
const fs = require("fs");
|
|
11
12
|
const core_1 = require("@salesforce/core");
|
|
12
13
|
const source_deploy_retrieve_1 = require("@salesforce/source-deploy-retrieve");
|
|
13
14
|
const sf_plugins_core_1 = require("@salesforce/sf-plugins-core");
|
|
@@ -19,17 +20,26 @@ const retrieveResultFormatter_1 = require("../../../formatters/retrieveResultFor
|
|
|
19
20
|
const metadataRetrieveResultFormatter_1 = require("../../../formatters/metadataRetrieveResultFormatter");
|
|
20
21
|
const project_1 = require("../../../utils/project");
|
|
21
22
|
const conflicts_1 = require("../../../utils/conflicts");
|
|
23
|
+
const promiseQueue_1 = require("../../../utils/promiseQueue");
|
|
22
24
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
23
|
-
const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.
|
|
25
|
+
const messages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.start');
|
|
24
26
|
const mdTransferMessages = core_1.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer');
|
|
27
|
+
const mdapiFlagGroup = 'Metadata API Format';
|
|
25
28
|
class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
26
29
|
async run() {
|
|
27
30
|
const { flags } = await this.parse(RetrieveMetadata);
|
|
31
|
+
let resolvedTargetDir;
|
|
32
|
+
if (flags['output-dir']) {
|
|
33
|
+
resolvedTargetDir = (0, path_1.resolve)(flags['output-dir']);
|
|
34
|
+
if (core_1.SfProject.getInstance()?.getPackageNameFromPath(resolvedTargetDir)) {
|
|
35
|
+
throw messages.createError('retrieveTargetDirOverlapsPackage', [flags['output-dir']]);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
28
38
|
const format = flags['target-metadata-dir'] ? 'metadata' : 'source';
|
|
29
39
|
const zipFileName = flags['zip-file-name'] ?? flags_1.DEFAULT_ZIP_FILE_NAME;
|
|
30
40
|
this.spinner.start(messages.getMessage('spinner.start'));
|
|
31
41
|
const { componentSetFromNonDeletes, fileResponsesFromDelete = [] } = await buildRetrieveAndDeleteTargets(flags, format);
|
|
32
|
-
const retrieveOpts = await buildRetrieveOptions(flags, format, zipFileName);
|
|
42
|
+
const retrieveOpts = await buildRetrieveOptions(flags, format, zipFileName, resolvedTargetDir);
|
|
33
43
|
this.spinner.status = messages.getMessage('spinner.sending', [
|
|
34
44
|
componentSetFromNonDeletes.sourceApiVersion ?? componentSetFromNonDeletes.apiVersion,
|
|
35
45
|
]);
|
|
@@ -51,6 +61,10 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
51
61
|
this.retrieveResult = await retrieve.pollStatus(500, flags.wait.seconds);
|
|
52
62
|
}
|
|
53
63
|
this.spinner.stop();
|
|
64
|
+
// flags['output-dir'] will set resolvedTargetDir var, so this check is redundant, but allows for nice typings in the moveResultsForRetrieveTargetDir method
|
|
65
|
+
if (flags['output-dir'] && resolvedTargetDir) {
|
|
66
|
+
await this.moveResultsForRetrieveTargetDir(flags['output-dir'], resolvedTargetDir);
|
|
67
|
+
}
|
|
54
68
|
// reference the flag instead of `format` so we get correct type
|
|
55
69
|
const formatter = flags['target-metadata-dir']
|
|
56
70
|
? new metadataRetrieveResultFormatter_1.MetadataRetrieveResultFormatter(this.retrieveResult, {
|
|
@@ -92,6 +106,45 @@ class RetrieveMetadata extends sf_plugins_core_1.SfCommand {
|
|
|
92
106
|
}
|
|
93
107
|
return super.catch(error);
|
|
94
108
|
}
|
|
109
|
+
async moveResultsForRetrieveTargetDir(targetDir, resolvedTargetDir) {
|
|
110
|
+
async function mv(src) {
|
|
111
|
+
let directories = [];
|
|
112
|
+
let files = [];
|
|
113
|
+
const srcStat = await fs.promises.stat(src);
|
|
114
|
+
if (srcStat.isDirectory()) {
|
|
115
|
+
const contents = await fs.promises.readdir(src, { withFileTypes: true });
|
|
116
|
+
[directories, files] = contents.reduce((acc, dirent) => {
|
|
117
|
+
if (dirent.isDirectory()) {
|
|
118
|
+
acc[0].push(dirent.name);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
acc[1].push(dirent.name);
|
|
122
|
+
}
|
|
123
|
+
return acc;
|
|
124
|
+
}, [[], []]);
|
|
125
|
+
directories = directories.map((dir) => (0, path_1.join)(src, dir));
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
files.push(src);
|
|
129
|
+
}
|
|
130
|
+
await (0, promiseQueue_1.promisesQueue)(files, async (file) => {
|
|
131
|
+
const dest = (0, path_1.join)(src.replace((0, path_1.join)('main', 'default'), ''), file);
|
|
132
|
+
const destDir = (0, path_1.dirname)(dest);
|
|
133
|
+
await fs.promises.mkdir(destDir, { recursive: true });
|
|
134
|
+
await fs.promises.rename((0, path_1.join)(src, file), dest);
|
|
135
|
+
return dest;
|
|
136
|
+
}, 50);
|
|
137
|
+
return directories;
|
|
138
|
+
}
|
|
139
|
+
// getFileResponses fails once the files have been moved, calculate where they're moved to, and then move them
|
|
140
|
+
this.retrieveResult.getFileResponses().forEach((fileResponse) => {
|
|
141
|
+
fileResponse.filePath = fileResponse.filePath?.replace((0, path_1.join)('main', 'default'), '');
|
|
142
|
+
});
|
|
143
|
+
// move contents of 'main/default' to 'retrievetargetdir'
|
|
144
|
+
await (0, promiseQueue_1.promisesQueue)([(0, path_1.join)(resolvedTargetDir, 'main', 'default')], mv, 5, true);
|
|
145
|
+
// remove 'main/default'
|
|
146
|
+
await fs.promises.rm((0, path_1.join)(targetDir, 'main'), { recursive: true });
|
|
147
|
+
}
|
|
95
148
|
}
|
|
96
149
|
exports.default = RetrieveMetadata;
|
|
97
150
|
RetrieveMetadata.summary = messages.getMessage('summary');
|
|
@@ -129,10 +182,17 @@ RetrieveMetadata.flags = {
|
|
|
129
182
|
summary: messages.getMessage('flags.package-name.summary'),
|
|
130
183
|
multiple: true,
|
|
131
184
|
}),
|
|
185
|
+
'output-dir': sf_plugins_core_1.Flags.directory({
|
|
186
|
+
char: 'r',
|
|
187
|
+
summary: messages.getMessage('flags.output-dir.summary'),
|
|
188
|
+
description: messages.getMessage('flags.output-dir.description'),
|
|
189
|
+
exclusive: ['package-name', 'source-dir'],
|
|
190
|
+
}),
|
|
132
191
|
'single-package': sf_plugins_core_1.Flags.boolean({
|
|
133
192
|
summary: messages.getMessage('flags.single-package.summary'),
|
|
134
193
|
dependsOn: ['target-metadata-dir'],
|
|
135
194
|
exclusive: ['ignore-conflicts'],
|
|
195
|
+
helpGroup: mdapiFlagGroup,
|
|
136
196
|
}),
|
|
137
197
|
'source-dir': sf_plugins_core_1.Flags.string({
|
|
138
198
|
char: 'd',
|
|
@@ -151,6 +211,7 @@ RetrieveMetadata.flags = {
|
|
|
151
211
|
},
|
|
152
212
|
],
|
|
153
213
|
exclusive: ['ignore-conflicts'],
|
|
214
|
+
helpGroup: mdapiFlagGroup,
|
|
154
215
|
}),
|
|
155
216
|
'target-org': sf_plugins_core_1.Flags.requiredOrg({
|
|
156
217
|
char: 'o',
|
|
@@ -171,11 +232,13 @@ RetrieveMetadata.flags = {
|
|
|
171
232
|
summary: messages.getMessage('flags.unzip.summary'),
|
|
172
233
|
dependsOn: ['target-metadata-dir'],
|
|
173
234
|
exclusive: ['ignore-conflicts'],
|
|
235
|
+
helpGroup: mdapiFlagGroup,
|
|
174
236
|
}),
|
|
175
237
|
'zip-file-name': (0, flags_1.zipFileFlag)({
|
|
176
238
|
summary: messages.getMessage('flags.zip-file-name.summary'),
|
|
177
239
|
dependsOn: ['target-metadata-dir'],
|
|
178
240
|
exclusive: ['ignore-conflicts'],
|
|
241
|
+
helpGroup: mdapiFlagGroup,
|
|
179
242
|
}),
|
|
180
243
|
};
|
|
181
244
|
RetrieveMetadata.configurationVariablesSection = (0, sf_plugins_core_1.toHelpSection)('CONFIGURATION VARIABLES', core_1.OrgConfigProperties.TARGET_ORG, core_1.OrgConfigProperties.ORG_API_VERSION);
|
|
@@ -208,7 +271,7 @@ const buildRetrieveAndDeleteTargets = async (flags, format) => {
|
|
|
208
271
|
manifest: {
|
|
209
272
|
manifestPath: flags.manifest,
|
|
210
273
|
// if mdapi format, there might not be a project
|
|
211
|
-
directoryPaths: format === 'metadata' ? [] : await (0, project_1.getPackageDirs)(),
|
|
274
|
+
directoryPaths: format === 'metadata' || flags['output-dir'] ? [] : await (0, project_1.getPackageDirs)(),
|
|
212
275
|
},
|
|
213
276
|
}
|
|
214
277
|
: {}),
|
|
@@ -217,7 +280,7 @@ const buildRetrieveAndDeleteTargets = async (flags, format) => {
|
|
|
217
280
|
metadata: {
|
|
218
281
|
metadataEntries: flags.metadata,
|
|
219
282
|
// if mdapi format, there might not be a project
|
|
220
|
-
directoryPaths: format === 'metadata' ? [] : await (0, project_1.getPackageDirs)(),
|
|
283
|
+
directoryPaths: format === 'metadata' || flags['output-dir'] ? [] : await (0, project_1.getPackageDirs)(),
|
|
221
284
|
},
|
|
222
285
|
}
|
|
223
286
|
: {}),
|
|
@@ -229,11 +292,12 @@ const buildRetrieveAndDeleteTargets = async (flags, format) => {
|
|
|
229
292
|
*
|
|
230
293
|
*
|
|
231
294
|
* @param flags
|
|
232
|
-
* @param project
|
|
233
295
|
* @param format 'metadata' or 'source'
|
|
296
|
+
* @param zipFileName
|
|
297
|
+
* @param output
|
|
234
298
|
* @returns RetrieveSetOptions (an object that can be passed as the options for a ComponentSet retrieve)
|
|
235
299
|
*/
|
|
236
|
-
const buildRetrieveOptions = async (flags, format, zipFileName) => ({
|
|
300
|
+
const buildRetrieveOptions = async (flags, format, zipFileName, output) => ({
|
|
237
301
|
usernameOrConnection: flags['target-org'].getUsername() ?? flags['target-org'].getConnection(flags['api-version']),
|
|
238
302
|
merge: true,
|
|
239
303
|
packageOptions: flags['package-name'],
|
|
@@ -247,7 +311,7 @@ const buildRetrieveOptions = async (flags, format, zipFileName) => ({
|
|
|
247
311
|
output: flags['target-metadata-dir'],
|
|
248
312
|
}
|
|
249
313
|
: {
|
|
250
|
-
output: (await core_1.SfProject.resolve()).getDefaultPackage().fullPath,
|
|
314
|
+
output: output ?? (await core_1.SfProject.resolve()).getDefaultPackage().fullPath,
|
|
251
315
|
}),
|
|
252
316
|
});
|
|
253
317
|
//# sourceMappingURL=start.js.map
|
|
@@ -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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"}
|
|
@@ -12,7 +12,7 @@ const core_1 = require("@oclif/core");
|
|
|
12
12
|
const core_2 = require("@salesforce/core");
|
|
13
13
|
const output_1 = require("../utils/output");
|
|
14
14
|
core_2.Messages.importMessagesDirectory(__dirname);
|
|
15
|
-
exports.retrieveMessages = core_2.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.
|
|
15
|
+
exports.retrieveMessages = core_2.Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.start');
|
|
16
16
|
class MetadataRetrieveResultFormatter {
|
|
17
17
|
constructor(result, opts) {
|
|
18
18
|
this.result = result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataRetrieveResultFormatter.js","sourceRoot":"","sources":["../../src/formatters/metadataRetrieveResultFormatter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6BAA6B;AAC7B,sCAAiC;AAEjC,2CAA4C;AAE5C,4CAAqE;AAErE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC/B,QAAA,gBAAgB,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,
|
|
1
|
+
{"version":3,"file":"metadataRetrieveResultFormatter.js","sourceRoot":"","sources":["../../src/formatters/metadataRetrieveResultFormatter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6BAA6B;AAC7B,sCAAiC;AAEjC,2CAA4C;AAE5C,4CAAqE;AAErE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC/B,QAAA,gBAAgB,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,gBAAgB,CAAC,CAAC;AAE9G,MAAa,+BAA+B;IAG1C,YACU,MAAsB,EACtB,IAAgF;QADhF,WAAM,GAAN,MAAM,CAAgB;QACtB,SAAI,GAAJ,IAAI,CAA4E;QAExF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,KAAK,GAAG,IAAA,0BAAiB,EAAC,IAAA,wBAAe,EAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACxF,CAAC;IAEM,OAAO;QACZ,6DAA6D;QAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,sBAAsB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;QACpE,OAAO,EAAE,GAAG,sBAAsB,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IACzF,CAAC;IAED,4DAA4D;IACrD,KAAK,CAAC,OAAO;QAClB,SAAE,CAAC,GAAG,CAAC,wBAAgB,CAAC,UAAU,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACnB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,qBAAqB,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YAC7G,SAAE,CAAC,GAAG,CAAC,wBAAgB,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;SAC/F;IACH,CAAC;CACF;AAzBD,0EAyBC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Function to throttle a list of promises.
|
|
3
|
+
*
|
|
4
|
+
* @param sourceQueue - The list of items to process.
|
|
5
|
+
* @param producer - The function to produce a promise from an item.
|
|
6
|
+
* @param concurrency - The number of promises to run at a time.
|
|
7
|
+
* @param queueResults - Whether to queue the results of the promises.
|
|
8
|
+
*/
|
|
9
|
+
export declare function promisesQueue<T>(sourceQueue: T[], producer: (arg0: T) => Promise<T | T[]>, concurrency: number, queueResults?: boolean): Promise<T[]>;
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.promisesQueue = void 0;
|
|
4
|
+
/*
|
|
5
|
+
* Copyright (c) 2022, salesforce.com, inc.
|
|
6
|
+
* All rights reserved.
|
|
7
|
+
* Licensed under the BSD 3-Clause license.
|
|
8
|
+
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
|
+
*/
|
|
10
|
+
const kit_1 = require("@salesforce/kit");
|
|
11
|
+
/**
|
|
12
|
+
* Function to throttle a list of promises.
|
|
13
|
+
*
|
|
14
|
+
* @param sourceQueue - The list of items to process.
|
|
15
|
+
* @param producer - The function to produce a promise from an item.
|
|
16
|
+
* @param concurrency - The number of promises to run at a time.
|
|
17
|
+
* @param queueResults - Whether to queue the results of the promises.
|
|
18
|
+
*/
|
|
19
|
+
async function promisesQueue(sourceQueue, producer, concurrency, queueResults = false) {
|
|
20
|
+
const results = [];
|
|
21
|
+
let queue = [...sourceQueue];
|
|
22
|
+
while (queue.length > 0) {
|
|
23
|
+
const next = queue.slice(0, concurrency);
|
|
24
|
+
queue = queue.slice(concurrency);
|
|
25
|
+
// eslint-disable-next-line no-await-in-loop
|
|
26
|
+
const nextResults = (await Promise.all((0, kit_1.ensureArray)(next.map(producer))))
|
|
27
|
+
.flat(1)
|
|
28
|
+
.filter((val) => val !== undefined);
|
|
29
|
+
if (queueResults) {
|
|
30
|
+
queue.push(...nextResults);
|
|
31
|
+
}
|
|
32
|
+
results.push(...nextResults);
|
|
33
|
+
}
|
|
34
|
+
return results;
|
|
35
|
+
}
|
|
36
|
+
exports.promisesQueue = promisesQueue;
|
|
37
|
+
//# sourceMappingURL=promiseQueue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"promiseQueue.js","sourceRoot":"","sources":["../../src/utils/promiseQueue.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAA8C;AAE9C;;;;;;;GAOG;AACI,KAAK,UAAU,aAAa,CACjC,WAAgB,EAChB,QAAuC,EACvC,WAAmB,EACnB,YAAY,GAAG,KAAK;IAEpB,MAAM,OAAO,GAAQ,EAAE,CAAC;IACxB,IAAI,KAAK,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;IAC7B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QACzC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACjC,4CAA4C;QAC5C,MAAM,WAAW,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAA,iBAAW,EAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;aACrE,IAAI,CAAC,CAAC,CAAC;aACP,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,SAAS,CAAQ,CAAC;QAC7C,IAAI,YAAY,EAAE;YAChB,KAAK,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;SAC5B;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;KAC9B;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AArBD,sCAqBC"}
|
|
@@ -166,3 +166,17 @@ Wrote retrieve zip file to %s.
|
|
|
166
166
|
# info.ExtractedZipFile
|
|
167
167
|
|
|
168
168
|
Extracted %s to %s.
|
|
169
|
+
|
|
170
|
+
# flags.output-dir.description
|
|
171
|
+
|
|
172
|
+
The root of the directory structure into which the source files are retrieved.
|
|
173
|
+
If the target directory matches one of the package directories in your sfdx-project.json file, the command fails.
|
|
174
|
+
Running the command multiple times with the same target adds new files and overwrites existing files.
|
|
175
|
+
|
|
176
|
+
# flags.output-dir.summary
|
|
177
|
+
|
|
178
|
+
Directory root for the retrieved source files.
|
|
179
|
+
|
|
180
|
+
# retrieveTargetDirOverlapsPackage
|
|
181
|
+
|
|
182
|
+
The retrieve target directory [%s] overlaps one of your package directories. Specify a different retrieve target directory and try again.
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "1.
|
|
2
|
+
"version": "1.10.1",
|
|
3
3
|
"commands": {
|
|
4
4
|
"deploy": {
|
|
5
5
|
"id": "deploy",
|
|
@@ -203,7 +203,7 @@
|
|
|
203
203
|
"char": "d",
|
|
204
204
|
"summary": "Output directory to store the Metadata API–formatted files in.",
|
|
205
205
|
"multiple": false,
|
|
206
|
-
"default": "
|
|
206
|
+
"default": "metadataPackage_1684881612837",
|
|
207
207
|
"deprecateAliases": true,
|
|
208
208
|
"aliases": [
|
|
209
209
|
"outputdir"
|
|
@@ -1164,6 +1164,7 @@
|
|
|
1164
1164
|
"char": "x",
|
|
1165
1165
|
"summary": "Full file path for manifest (package.xml) of components to deploy.",
|
|
1166
1166
|
"description": "All child components are included. If you specify this flag, don’t specify --metadata or --source-dir.",
|
|
1167
|
+
"helpGroup": "Source Format",
|
|
1167
1168
|
"multiple": false,
|
|
1168
1169
|
"exclusive": [
|
|
1169
1170
|
"source-dir",
|
|
@@ -1177,6 +1178,7 @@
|
|
|
1177
1178
|
"type": "option",
|
|
1178
1179
|
"char": "m",
|
|
1179
1180
|
"summary": "Metadata component names to deploy.",
|
|
1181
|
+
"helpGroup": "Source Format",
|
|
1180
1182
|
"multiple": true,
|
|
1181
1183
|
"exclusive": [
|
|
1182
1184
|
"manifest",
|
|
@@ -1189,6 +1191,7 @@
|
|
|
1189
1191
|
"name": "metadata-dir",
|
|
1190
1192
|
"type": "option",
|
|
1191
1193
|
"summary": "Root of directory or zip file of metadata formatted files to deploy.",
|
|
1194
|
+
"helpGroup": "Metadata API Format",
|
|
1192
1195
|
"multiple": false,
|
|
1193
1196
|
"exclusive": [
|
|
1194
1197
|
"manifest",
|
|
@@ -1201,6 +1204,7 @@
|
|
|
1201
1204
|
"name": "single-package",
|
|
1202
1205
|
"type": "boolean",
|
|
1203
1206
|
"summary": "Indicates that the metadata zip file points to a directory structure for a single package.",
|
|
1207
|
+
"helpGroup": "Metadata API Format",
|
|
1204
1208
|
"allowNo": false,
|
|
1205
1209
|
"dependsOn": [
|
|
1206
1210
|
"metadata-dir"
|
|
@@ -1213,6 +1217,7 @@
|
|
|
1213
1217
|
"char": "d",
|
|
1214
1218
|
"summary": "Path to the local source files to deploy.",
|
|
1215
1219
|
"description": "The supplied path can be to a single file (in which case the operation is applied to only one file) or to a folder (in which case the operation is applied to all metadata types in the directory and its subdirectories).\n\nIf you specify this flag, don’t specify --metadata or --manifest.",
|
|
1220
|
+
"helpGroup": "Source Format",
|
|
1216
1221
|
"multiple": true,
|
|
1217
1222
|
"exclusive": [
|
|
1218
1223
|
"manifest",
|
|
@@ -1237,6 +1242,7 @@
|
|
|
1237
1242
|
"char": "t",
|
|
1238
1243
|
"summary": "Apex tests to run when --test-level is RunSpecifiedTests.",
|
|
1239
1244
|
"description": "If a test name contains a space, enclose it in double quotes.\nFor multiple test names, use one of the following formats:\n\n- Repeat the flag for multiple test names: --tests Test1 --tests Test2 --tests \"Test With Space\"\n- Separate the test names with spaces: --tests Test1 Test2 \"Test With Space\"",
|
|
1245
|
+
"helpGroup": "Test",
|
|
1240
1246
|
"multiple": true,
|
|
1241
1247
|
"deprecateAliases": true
|
|
1242
1248
|
},
|
|
@@ -1246,6 +1252,7 @@
|
|
|
1246
1252
|
"char": "l",
|
|
1247
1253
|
"summary": "Deployment Apex testing level.",
|
|
1248
1254
|
"description": "Valid values are:\n\n- NoTestRun — No tests are run. This test level applies only to deployments to development environments, such as sandbox, Developer Edition, or trial orgs. This test level is the default for development environments.\n\n- RunSpecifiedTests — Runs only the tests that you specify with the --tests flag. Code coverage requirements differ from the default coverage requirements when using this test level. Executed tests must comprise a minimum of 75% code coverage for each class and trigger in the deployment package. This coverage is computed for each class and trigger individually and is different than the overall coverage percentage.\n\n- RunLocalTests — All tests in your org are run, except the ones that originate from installed managed and unlocked packages. This test level is the default for production deployments that include Apex classes or triggers.\n\n- RunAllTestsInOrg — All tests in your org are run, including tests of managed packages.\n\n If you don’t specify a test level, the default behavior depends on the contents of your deployment package and target org. For more information, see [Running Tests in a Deployment](https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deploy_running_tests.htm) in the \"Metadata API Developer Guide\".",
|
|
1255
|
+
"helpGroup": "Test",
|
|
1249
1256
|
"multiple": false,
|
|
1250
1257
|
"options": [
|
|
1251
1258
|
"NoTestRun",
|
|
@@ -1286,6 +1293,7 @@
|
|
|
1286
1293
|
"name": "purge-on-delete",
|
|
1287
1294
|
"type": "boolean",
|
|
1288
1295
|
"summary": "Specify that deleted components in the destructive changes manifest file are immediately eligible for deletion rather than being stored in the Recycle Bin.",
|
|
1296
|
+
"helpGroup": "Delete",
|
|
1289
1297
|
"allowNo": false,
|
|
1290
1298
|
"dependsOn": [
|
|
1291
1299
|
"manifest"
|
|
@@ -1305,6 +1313,7 @@
|
|
|
1305
1313
|
"name": "pre-destructive-changes",
|
|
1306
1314
|
"type": "option",
|
|
1307
1315
|
"summary": "File path for a manifest (destructiveChangesPre.xml) of components to delete before the deploy",
|
|
1316
|
+
"helpGroup": "Delete",
|
|
1308
1317
|
"multiple": false,
|
|
1309
1318
|
"dependsOn": [
|
|
1310
1319
|
"manifest"
|
|
@@ -1315,6 +1324,7 @@
|
|
|
1315
1324
|
"name": "post-destructive-changes",
|
|
1316
1325
|
"type": "option",
|
|
1317
1326
|
"summary": "File path for a manifest (destructiveChangesPost.xml) of components to delete after the deploy.",
|
|
1327
|
+
"helpGroup": "Delete",
|
|
1318
1328
|
"multiple": false,
|
|
1319
1329
|
"dependsOn": [
|
|
1320
1330
|
"manifest"
|
|
@@ -1326,6 +1336,7 @@
|
|
|
1326
1336
|
"type": "option",
|
|
1327
1337
|
"summary": "Format of the code coverage results.",
|
|
1328
1338
|
"description": "For multiple formatters, repeat the flag for each formatter.\n--coverage-formatters lcov --coverage-formatters clover",
|
|
1339
|
+
"helpGroup": "Test",
|
|
1329
1340
|
"multiple": true,
|
|
1330
1341
|
"options": [
|
|
1331
1342
|
"clover",
|
|
@@ -1346,6 +1357,7 @@
|
|
|
1346
1357
|
"name": "junit",
|
|
1347
1358
|
"type": "boolean",
|
|
1348
1359
|
"summary": "Output JUnit test results.",
|
|
1360
|
+
"helpGroup": "Test",
|
|
1349
1361
|
"allowNo": false,
|
|
1350
1362
|
"dependsOn": [
|
|
1351
1363
|
"coverage-formatters"
|
|
@@ -1356,6 +1368,7 @@
|
|
|
1356
1368
|
"name": "results-dir",
|
|
1357
1369
|
"type": "option",
|
|
1358
1370
|
"summary": "Output directory for code coverage and JUnit results; defaults to the deploy ID.",
|
|
1371
|
+
"helpGroup": "Test",
|
|
1359
1372
|
"multiple": false,
|
|
1360
1373
|
"dependsOn": [
|
|
1361
1374
|
"coverage-formatters"
|
|
@@ -2045,10 +2058,24 @@
|
|
|
2045
2058
|
"multiple": true,
|
|
2046
2059
|
"deprecateAliases": true
|
|
2047
2060
|
},
|
|
2061
|
+
"output-dir": {
|
|
2062
|
+
"name": "output-dir",
|
|
2063
|
+
"type": "option",
|
|
2064
|
+
"char": "r",
|
|
2065
|
+
"summary": "Directory root for the retrieved source files.",
|
|
2066
|
+
"description": "The root of the directory structure into which the source files are retrieved.\nIf the target directory matches one of the package directories in your sfdx-project.json file, the command fails.\nRunning the command multiple times with the same target adds new files and overwrites existing files.",
|
|
2067
|
+
"multiple": false,
|
|
2068
|
+
"exclusive": [
|
|
2069
|
+
"package-name",
|
|
2070
|
+
"source-dir"
|
|
2071
|
+
],
|
|
2072
|
+
"deprecateAliases": true
|
|
2073
|
+
},
|
|
2048
2074
|
"single-package": {
|
|
2049
2075
|
"name": "single-package",
|
|
2050
2076
|
"type": "boolean",
|
|
2051
2077
|
"summary": "Indicates that the zip file points to a directory structure for a single package.",
|
|
2078
|
+
"helpGroup": "Metadata API Format",
|
|
2052
2079
|
"allowNo": false,
|
|
2053
2080
|
"dependsOn": [
|
|
2054
2081
|
"target-metadata-dir"
|
|
@@ -2076,6 +2103,7 @@
|
|
|
2076
2103
|
"type": "option",
|
|
2077
2104
|
"char": "t",
|
|
2078
2105
|
"summary": "Directory that will contain the retrieved metadata format files or ZIP.",
|
|
2106
|
+
"helpGroup": "Metadata API Format",
|
|
2079
2107
|
"multiple": false,
|
|
2080
2108
|
"relationships": [
|
|
2081
2109
|
{
|
|
@@ -2121,6 +2149,7 @@
|
|
|
2121
2149
|
"type": "boolean",
|
|
2122
2150
|
"char": "z",
|
|
2123
2151
|
"summary": "Extract all files from the retrieved zip file.",
|
|
2152
|
+
"helpGroup": "Metadata API Format",
|
|
2124
2153
|
"allowNo": false,
|
|
2125
2154
|
"dependsOn": [
|
|
2126
2155
|
"target-metadata-dir"
|
|
@@ -2134,6 +2163,7 @@
|
|
|
2134
2163
|
"name": "zip-file-name",
|
|
2135
2164
|
"type": "option",
|
|
2136
2165
|
"summary": "File name to use for the retrieved zip file.",
|
|
2166
|
+
"helpGroup": "Metadata API Format",
|
|
2137
2167
|
"multiple": false,
|
|
2138
2168
|
"dependsOn": [
|
|
2139
2169
|
"target-metadata-dir"
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-deploy-retrieve",
|
|
3
3
|
"description": "deploy and retrieve commands for sf",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.10.1",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"dependencies": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"tslib": "^2"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@oclif/plugin-command-snapshot": "^
|
|
21
|
+
"@oclif/plugin-command-snapshot": "^4.0.1",
|
|
22
22
|
"@salesforce/cli-plugins-testkit": "^3.4.0",
|
|
23
23
|
"@salesforce/dev-config": "^3.1.0",
|
|
24
24
|
"@salesforce/dev-scripts": "^4.3.1",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"eslint-plugin-jsdoc": "^39.9.1",
|
|
50
50
|
"eslint-plugin-sf-plugin": "^1.15.2",
|
|
51
51
|
"husky": "^7.0.4",
|
|
52
|
-
"jsforce": "^2.0.0-beta.
|
|
52
|
+
"jsforce": "^2.0.0-beta.23",
|
|
53
53
|
"mocha": "^10.1.0",
|
|
54
54
|
"nyc": "^15.1.0",
|
|
55
55
|
"oclif": "^3.9.0",
|
|
@@ -271,7 +271,7 @@
|
|
|
271
271
|
}
|
|
272
272
|
},
|
|
273
273
|
"sfdx": {
|
|
274
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.
|
|
275
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.
|
|
274
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.10.1.crt",
|
|
275
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-deploy-retrieve/1.10.1.sig"
|
|
276
276
|
}
|
|
277
277
|
}
|