@salesforce/source-deploy-retrieve 5.12.8 → 5.12.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/lib/src/client/diagnosticUtil.js +1 -1
- package/lib/src/client/diagnosticUtil.js.map +1 -1
- package/lib/src/client/metadataApiDeploy.d.ts +1 -0
- package/lib/src/client/metadataApiDeploy.js +34 -0
- package/lib/src/client/metadataApiDeploy.js.map +1 -1
- package/lib/src/client/metadataApiRetrieve.js +8 -10
- package/lib/src/client/metadataApiRetrieve.js.map +1 -1
- package/lib/src/client/metadataTransfer.js +6 -12
- package/lib/src/client/metadataTransfer.js.map +1 -1
- package/lib/src/collections/componentSet.js +5 -6
- package/lib/src/collections/componentSet.js.map +1 -1
- package/lib/src/collections/componentSetBuilder.js +6 -7
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/convert/convertContext.js +3 -5
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/metadataConverter.js +1 -2
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/streams.js +1 -2
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +9 -12
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +2 -2
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/metadataTransformerFactory.js +1 -2
- package/lib/src/convert/transformers/metadataTransformerFactory.js.map +1 -1
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js +1 -2
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js +3 -3
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js.map +1 -1
- package/lib/src/registry/coverage.js +19 -8
- package/lib/src/registry/coverage.js.map +1 -1
- package/lib/src/registry/nonSupportedTypes.js +11 -6
- package/lib/src/registry/nonSupportedTypes.js.map +1 -1
- package/lib/src/registry/registryAccess.js +1 -2
- package/lib/src/registry/registryAccess.js.map +1 -1
- package/lib/src/registry/types.d.ts +1 -0
- package/lib/src/resolve/adapters/bundleSourceAdapter.js +1 -2
- package/lib/src/resolve/adapters/bundleSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js +1 -1
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/sourceAdapterFactory.js +1 -2
- package/lib/src/resolve/adapters/sourceAdapterFactory.js.map +1 -1
- package/lib/src/resolve/connectionResolver.js +1 -2
- package/lib/src/resolve/connectionResolver.js.map +1 -1
- package/lib/src/resolve/metadataResolver.js +11 -13
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.js +6 -8
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/resolve/treeContainers.js +1 -2
- package/lib/src/resolve/treeContainers.js.map +1 -1
- package/lib/src/utils/filePathGenerator.js +6 -7
- package/lib/src/utils/filePathGenerator.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,16 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
### [5.12.11](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.12.10...v5.12.11) (2022-04-21)
|
|
6
|
+
|
|
7
|
+
### [5.12.10](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.12.9...v5.12.10) (2022-04-18)
|
|
8
|
+
|
|
9
|
+
### [5.12.9](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.12.8...v5.12.9) (2022-04-13)
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
- add telemetry to metadata api deploy ([#606](https://github.com/forcedotcom/source-deploy-retrieve/issues/606)) ([c9d584c](https://github.com/forcedotcom/source-deploy-retrieve/commit/c9d584c28aad4f444548b1e4c357f714d82cd669))
|
|
14
|
+
|
|
5
15
|
### [5.12.8](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.12.7...v5.12.8) (2022-04-07)
|
|
6
16
|
|
|
7
17
|
### [5.12.7](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.12.6...v5.12.7) (2022-04-01)
|
|
@@ -34,7 +34,7 @@ class DiagnosticUtil {
|
|
|
34
34
|
};
|
|
35
35
|
if (fileName) {
|
|
36
36
|
const localProblemFile = component.walkContent().find((f) => f.endsWith((0, path_1.basename)(message.fileName)));
|
|
37
|
-
diagnostic.filePath = localProblemFile
|
|
37
|
+
diagnostic.filePath = localProblemFile ?? component.xml;
|
|
38
38
|
}
|
|
39
39
|
if (lineNumber && columnNumber) {
|
|
40
40
|
diagnostic.lineNumber = Number(lineNumber);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnosticUtil.js","sourceRoot":"","sources":["../../../src/client/diagnosticUtil.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAgC;AAGhC,0CAAuC;AAGvC,MAAa,cAAc;IAGzB,YAAmB,GAA2B;QAC5C,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAEM,qBAAqB,CAAC,SAA0B,EAAE,OAA+B;QACtF,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC;QAC1C,QAAQ,QAAQ,EAAE;YAChB,KAAK,mBAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI;gBAC/C,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC3C,KAAK,mBAAQ,CAAC,KAAK,CAAC,oBAAoB,CAAC,IAAI;gBAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YAC5C;gBACE,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAC/B,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;iBAC9C;SACJ;IACH,CAAC;IAEO,YAAY,CAAC,SAA0B,EAAE,OAAsB;QACrE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC;QAC7E,MAAM,UAAU,GAAwB;YACtC,KAAK,EAAE,OAAO;YACd,WAAW;SACZ,CAAC;QAEF,IAAI,QAAQ,EAAE;YACZ,MAAM,gBAAgB,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YACrG,UAAU,CAAC,QAAQ,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"diagnosticUtil.js","sourceRoot":"","sources":["../../../src/client/diagnosticUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ export interface MetadataApiDeployOptions extends MetadataTransferOptions {
|
|
|
48
48
|
export declare class MetadataApiDeploy extends MetadataTransfer<MetadataApiDeployStatus, DeployResult> {
|
|
49
49
|
static readonly DEFAULT_OPTIONS: Partial<MetadataApiDeployOptions>;
|
|
50
50
|
private options;
|
|
51
|
+
private isRestDeploy;
|
|
51
52
|
constructor(options: MetadataApiDeployOptions);
|
|
52
53
|
/**
|
|
53
54
|
* Deploy recently validated components without running Apex tests. Requires the operation to have been
|
|
@@ -11,6 +11,7 @@ const path_1 = require("path");
|
|
|
11
11
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
12
|
const archiver_1 = require("archiver");
|
|
13
13
|
const fs = require("graceful-fs");
|
|
14
|
+
const core_1 = require("@salesforce/core");
|
|
14
15
|
const convert_1 = require("../convert");
|
|
15
16
|
const utils_1 = require("../utils");
|
|
16
17
|
const collections_1 = require("../collections");
|
|
@@ -207,6 +208,7 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
|
|
|
207
208
|
super(options);
|
|
208
209
|
options.apiOptions = { ...MetadataApiDeploy.DEFAULT_OPTIONS.apiOptions, ...options.apiOptions };
|
|
209
210
|
this.options = Object.assign({}, options);
|
|
211
|
+
this.isRestDeploy = !!options.apiOptions?.rest;
|
|
210
212
|
}
|
|
211
213
|
/**
|
|
212
214
|
* Deploy recently validated components without running Apex tests. Requires the operation to have been
|
|
@@ -285,6 +287,38 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
|
|
|
285
287
|
}
|
|
286
288
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
287
289
|
async post(result) {
|
|
290
|
+
try {
|
|
291
|
+
// Creates an array of unique metadata types that were deployed, uses Set to avoid duplicates.
|
|
292
|
+
const listOfMetadataTypesDeployed = Array.from(new Set(this.options.components.map((c) => c.type.name)));
|
|
293
|
+
void core_1.Lifecycle.getInstance().emitTelemetry({
|
|
294
|
+
eventName: 'metadata_api_deploy_result',
|
|
295
|
+
library: 'SDR',
|
|
296
|
+
status: result.status,
|
|
297
|
+
apiVersion: this.options.apiVersion,
|
|
298
|
+
sourceApiVersion: this.options.components?.sourceApiVersion,
|
|
299
|
+
createdDate: result.createdDate,
|
|
300
|
+
startDate: result.startDate,
|
|
301
|
+
completedDate: result.completedDate,
|
|
302
|
+
rollbackOnError: result.rollbackOnError,
|
|
303
|
+
runTestsEnabled: result.runTestsEnabled,
|
|
304
|
+
isRestDeploy: this.isRestDeploy,
|
|
305
|
+
checkOnly: result.checkOnly,
|
|
306
|
+
done: result.done,
|
|
307
|
+
ignoreWarnings: result.ignoreWarnings,
|
|
308
|
+
metadataTypesDeployed: listOfMetadataTypesDeployed.toString(),
|
|
309
|
+
numberComponentErrors: result.numberComponentErrors,
|
|
310
|
+
numberComponentsDeployed: result.numberComponentsDeployed,
|
|
311
|
+
numberComponentsTotal: result.numberComponentsTotal,
|
|
312
|
+
numberTestErrors: result.numberTestErrors,
|
|
313
|
+
numberTestsCompleted: result.numberTestsCompleted,
|
|
314
|
+
numberTestsTotal: result.numberTestsTotal,
|
|
315
|
+
testsTotalTime: result.details?.runTestResult.totalTime,
|
|
316
|
+
});
|
|
317
|
+
}
|
|
318
|
+
catch (err) {
|
|
319
|
+
const error = err;
|
|
320
|
+
this.logger.debug(`Error trying to compile/send deploy telemetry data for deploy ID: ${this.id}\nError: ${error.message}`);
|
|
321
|
+
}
|
|
288
322
|
return new DeployResult(result, this.components);
|
|
289
323
|
}
|
|
290
324
|
async getZipBuffer() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,7 @@ class RetrieveResult {
|
|
|
27
27
|
constructor(response, components, localComponents) {
|
|
28
28
|
this.response = response;
|
|
29
29
|
this.components = components;
|
|
30
|
-
this.localComponents = new collections_1.ComponentSet(localComponents
|
|
30
|
+
this.localComponents = new collections_1.ComponentSet(localComponents?.getSourceComponents());
|
|
31
31
|
}
|
|
32
32
|
getFileResponses() {
|
|
33
33
|
if (this.response && this.fileResponses) {
|
|
@@ -139,7 +139,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
139
139
|
components = await this.extract(zipFileContents);
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
|
-
components
|
|
142
|
+
components ?? (components = new collections_1.ComponentSet(undefined, this.options.registry));
|
|
143
143
|
if (!isMdapiRetrieve) {
|
|
144
144
|
// This should only be done when retrieving source format since retrieving
|
|
145
145
|
// mdapi format has no conversion.
|
|
@@ -149,7 +149,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
149
149
|
}
|
|
150
150
|
async pre() {
|
|
151
151
|
const packageNames = this.getPackageNames();
|
|
152
|
-
if (this.components.size === 0 && !
|
|
152
|
+
if (this.components.size === 0 && !packageNames?.length) {
|
|
153
153
|
throw new errors_1.MetadataApiRetrieveError('error_no_components_to_retrieve');
|
|
154
154
|
}
|
|
155
155
|
const connection = await this.getConnection();
|
|
@@ -159,7 +159,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
159
159
|
};
|
|
160
160
|
// if we're retrieving with packageNames add it
|
|
161
161
|
// otherwise don't - it causes errors if undefined or an empty array
|
|
162
|
-
if (packageNames
|
|
162
|
+
if (packageNames?.length) {
|
|
163
163
|
requestBody.packageNames = packageNames;
|
|
164
164
|
// delete unpackaged when no components and metadata format to prevent
|
|
165
165
|
// sending an empty unpackaged manifest.
|
|
@@ -175,12 +175,11 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
175
175
|
return connection.metadata.retrieve(requestBody);
|
|
176
176
|
}
|
|
177
177
|
getPackageNames() {
|
|
178
|
-
|
|
179
|
-
return (_a = this.getPackageOptions()) === null || _a === void 0 ? void 0 : _a.map((pkg) => pkg.name);
|
|
178
|
+
return this.getPackageOptions()?.map((pkg) => pkg.name);
|
|
180
179
|
}
|
|
181
180
|
getPackageOptions() {
|
|
182
181
|
const { packageOptions } = this.options;
|
|
183
|
-
if (packageOptions
|
|
182
|
+
if (packageOptions?.length) {
|
|
184
183
|
if ((0, ts_types_1.isString)(packageOptions[0])) {
|
|
185
184
|
const packageNames = packageOptions;
|
|
186
185
|
return packageNames.map((pkg) => ({ name: pkg, outputDir: pkg }));
|
|
@@ -193,7 +192,6 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
193
192
|
}
|
|
194
193
|
}
|
|
195
194
|
async extract(zip) {
|
|
196
|
-
var _a;
|
|
197
195
|
const components = [];
|
|
198
196
|
const { merge, output, registry } = this.options;
|
|
199
197
|
const converter = new convert_1.MetadataConverter(registry);
|
|
@@ -201,7 +199,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
201
199
|
const packages = [{ zipTreeLocation: 'unpackaged', outputDir: output }];
|
|
202
200
|
const packageOpts = this.getPackageOptions();
|
|
203
201
|
// eslint-disable-next-line no-unused-expressions
|
|
204
|
-
packageOpts
|
|
202
|
+
packageOpts?.forEach(({ name, outputDir }) => {
|
|
205
203
|
packages.push({ zipTreeLocation: name, outputDir });
|
|
206
204
|
});
|
|
207
205
|
for (const pkg of packages) {
|
|
@@ -210,7 +208,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
|
|
|
210
208
|
type: 'merge',
|
|
211
209
|
mergeWith: this.components.getSourceComponents(),
|
|
212
210
|
defaultDirectory: pkg.outputDir,
|
|
213
|
-
forceIgnoredPaths:
|
|
211
|
+
forceIgnoredPaths: this.components.forceIgnoredPaths ?? new Set(),
|
|
214
212
|
}
|
|
215
213
|
: {
|
|
216
214
|
type: 'directory',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6BAA6B;AAC7B,kCAAkC;AAClC,qCAAqC;AACrC,mDAA2D;AAC3D,wCAAoE;AACpE,gDAA8C;AAC9C,wCAA+D;AAC/D,sCAAwE;AACxE,oCAA4C;AAE5C,yDAA+E;AAC/E,mCAWiB;AAIjB,MAAa,cAAc;IAOzB;;;;OAIG;IACH,YACkB,QAAmC,EACnC,UAAwB,EACxC,eAA8B;QAFd,aAAQ,GAAR,QAAQ,CAA2B;QACnC,eAAU,GAAV,UAAU,CAAc;QAGxC,IAAI,CAAC,eAAe,GAAG,IAAI,0BAAY,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"metadataApiRetrieve.js","sourceRoot":"","sources":["../../../src/client/metadataApiRetrieve.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,6 @@ const kit_1 = require("@salesforce/kit");
|
|
|
14
14
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
15
15
|
const fs = require("graceful-fs");
|
|
16
16
|
const convert_1 = require("../convert");
|
|
17
|
-
const errors_1 = require("../errors");
|
|
18
17
|
const collections_1 = require("../collections");
|
|
19
18
|
const types_1 = require("./types");
|
|
20
19
|
class MetadataTransfer {
|
|
@@ -43,7 +42,6 @@ class MetadataTransfer {
|
|
|
43
42
|
return asyncResult;
|
|
44
43
|
}
|
|
45
44
|
async pollStatus(frequencyOrOptions, timeout) {
|
|
46
|
-
var _a, _b;
|
|
47
45
|
let pollingOptions = {
|
|
48
46
|
frequency: kit_1.Duration.milliseconds(this.calculatePollingFrequency()),
|
|
49
47
|
timeout: kit_1.Duration.minutes(60),
|
|
@@ -61,8 +59,8 @@ class MetadataTransfer {
|
|
|
61
59
|
}
|
|
62
60
|
// from the overloaded methods, there's a possibility frequency/timeout isn't set
|
|
63
61
|
// guarantee frequency and timeout are set
|
|
64
|
-
|
|
65
|
-
|
|
62
|
+
pollingOptions.frequency ?? (pollingOptions.frequency = kit_1.Duration.milliseconds(this.calculatePollingFrequency()));
|
|
63
|
+
pollingOptions.timeout ?? (pollingOptions.timeout = kit_1.Duration.minutes(60));
|
|
66
64
|
const pollingClient = await core_1.PollingClient.create(pollingOptions);
|
|
67
65
|
try {
|
|
68
66
|
this.logger.debug(`Polling for metadata transfer status. ID = ${this.id}`);
|
|
@@ -80,11 +78,8 @@ class MetadataTransfer {
|
|
|
80
78
|
}
|
|
81
79
|
catch (e) {
|
|
82
80
|
const err = e;
|
|
83
|
-
const error = new
|
|
84
|
-
|
|
85
|
-
// append the original stack to this new error
|
|
86
|
-
error.stack += `\nDUE TO:\n${err.stack}`;
|
|
87
|
-
}
|
|
81
|
+
const error = new core_1.SfdxError(`Metadata API request failed: ${err.message}`, 'MetadataTransferError', [], 1, err);
|
|
82
|
+
error.setData({ id: this.id });
|
|
88
83
|
if (this.event.listenerCount('error') === 0) {
|
|
89
84
|
throw error;
|
|
90
85
|
}
|
|
@@ -153,7 +148,7 @@ class MetadataTransfer {
|
|
|
153
148
|
else {
|
|
154
149
|
try {
|
|
155
150
|
mdapiStatus = await this.checkStatus();
|
|
156
|
-
completed = mdapiStatus
|
|
151
|
+
completed = mdapiStatus?.done;
|
|
157
152
|
if (!completed) {
|
|
158
153
|
this.event.emit('update', mdapiStatus);
|
|
159
154
|
}
|
|
@@ -176,8 +171,7 @@ class MetadataTransfer {
|
|
|
176
171
|
* Based on the source components in the component set, it will return a polling frequency in milliseconds
|
|
177
172
|
*/
|
|
178
173
|
calculatePollingFrequency() {
|
|
179
|
-
|
|
180
|
-
const size = ((_a = this.components) === null || _a === void 0 ? void 0 : _a.getSourceComponents().toArray().length) || 0;
|
|
174
|
+
const size = this.components?.getSourceComponents().toArray().length || 0;
|
|
181
175
|
// take a piece-wise approach to encapsulate discrete deployment sizes in polling frequencies that "feel" good when deployed
|
|
182
176
|
if (size === 0) {
|
|
183
177
|
// no component set size is possible for retrieve
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAAsC;AACtC,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"metadataTransfer.js","sourceRoot":"","sources":["../../../src/client/metadataTransfer.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,7 +47,6 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
static fromSource(input) {
|
|
50
|
-
var _a, _b, _c;
|
|
51
50
|
let fsPaths = [];
|
|
52
51
|
let registry;
|
|
53
52
|
let tree;
|
|
@@ -58,10 +57,10 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
|
|
|
58
57
|
}
|
|
59
58
|
else if (typeof input === 'object') {
|
|
60
59
|
fsPaths = input.fsPaths;
|
|
61
|
-
registry =
|
|
62
|
-
tree =
|
|
60
|
+
registry = input.registry ?? registry;
|
|
61
|
+
tree = input.tree ?? tree;
|
|
63
62
|
inclusiveFilter = input.include;
|
|
64
|
-
fsDeletePaths =
|
|
63
|
+
fsDeletePaths = input.fsDeletePaths ?? fsDeletePaths;
|
|
65
64
|
}
|
|
66
65
|
else {
|
|
67
66
|
fsPaths = [input];
|
|
@@ -279,7 +278,7 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
|
|
|
279
278
|
if (member) {
|
|
280
279
|
// filter optimization
|
|
281
280
|
const memberCollection = this.components.get(this.simpleKey(member));
|
|
282
|
-
iter =
|
|
281
|
+
iter = memberCollection?.size > 0 ? memberCollection.values() : [];
|
|
283
282
|
}
|
|
284
283
|
else {
|
|
285
284
|
iter = this;
|
|
@@ -463,7 +462,7 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
|
|
|
463
462
|
}
|
|
464
463
|
sourceKey(component) {
|
|
465
464
|
const { fullName, type, xml, content } = component;
|
|
466
|
-
return `${type.name}${fullName}${xml
|
|
465
|
+
return `${type.name}${fullName}${xml ?? ''}${content ?? ''}`;
|
|
467
466
|
}
|
|
468
467
|
simpleKey(component) {
|
|
469
468
|
const typeName = typeof component.type === 'string' ? component.type.toLowerCase().trim() : component.type.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentSet.js","sourceRoot":"","sources":["../../../src/collections/componentSet.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"componentSet.js","sourceRoot":"","sources":["../../../src/collections/componentSet.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,6 @@ class ComponentSetBuilder {
|
|
|
23
23
|
* @param options: options for creating a ComponentSet
|
|
24
24
|
*/
|
|
25
25
|
static async build(options) {
|
|
26
|
-
var _a, _b;
|
|
27
26
|
const logger = core_1.Logger.childFromRoot('componentSetBuilder');
|
|
28
27
|
let componentSet;
|
|
29
28
|
const { sourcepath, manifest, metadata, packagenames, apiversion, sourceapiversion, org } = options;
|
|
@@ -41,7 +40,7 @@ class ComponentSetBuilder {
|
|
|
41
40
|
// Return empty ComponentSet and use packageNames in the connection via `.retrieve` options
|
|
42
41
|
if (packagenames) {
|
|
43
42
|
logger.debug(`Building ComponentSet for packagenames: ${packagenames.toString()}`);
|
|
44
|
-
componentSet
|
|
43
|
+
componentSet ?? (componentSet = new collections_1.ComponentSet());
|
|
45
44
|
}
|
|
46
45
|
// Resolve manifest with source in package directories.
|
|
47
46
|
if (manifest) {
|
|
@@ -61,7 +60,7 @@ class ComponentSetBuilder {
|
|
|
61
60
|
logger.debug(`Building ComponentSet from metadata: ${metadata.metadataEntries.toString()}`);
|
|
62
61
|
const registry = new registry_1.RegistryAccess();
|
|
63
62
|
const compSetFilter = new collections_1.ComponentSet();
|
|
64
|
-
componentSet
|
|
63
|
+
componentSet ?? (componentSet = new collections_1.ComponentSet());
|
|
65
64
|
// Build a Set of metadata entries
|
|
66
65
|
metadata.metadataEntries.forEach((rawEntry) => {
|
|
67
66
|
const splitEntry = rawEntry.split(':').map((entry) => entry.trim());
|
|
@@ -86,7 +85,7 @@ class ComponentSetBuilder {
|
|
|
86
85
|
}
|
|
87
86
|
// Resolve metadata entries with an org connection
|
|
88
87
|
if (org) {
|
|
89
|
-
componentSet
|
|
88
|
+
componentSet ?? (componentSet = new collections_1.ComponentSet());
|
|
90
89
|
logger.debug(`Building ComponentSet from targetUsername: ${org.username}`);
|
|
91
90
|
const fromConnection = await collections_1.ComponentSet.fromConnection({
|
|
92
91
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
|
|
@@ -95,7 +94,7 @@ class ComponentSetBuilder {
|
|
|
95
94
|
// components with namespacePrefix where org.exclude includes manageableState (to exclude managed packages)
|
|
96
95
|
// components with namespacePrefix where manageableState equals undefined (to exclude components e.g. InstalledPackage)
|
|
97
96
|
// components where org.exclude includes manageableState (to exclude packages without namespacePrefix e.g. unlocked packages)
|
|
98
|
-
componentFilter: (component) => !(org.exclude && org.exclude.includes(component
|
|
97
|
+
componentFilter: (component) => !(org.exclude && org.exclude.includes(component?.manageableState)),
|
|
99
98
|
});
|
|
100
99
|
for (const comp of fromConnection) {
|
|
101
100
|
componentSet.add(comp);
|
|
@@ -119,10 +118,10 @@ class ComponentSetBuilder {
|
|
|
119
118
|
logger.debug(`Matching metadata files (${componentSet.size}):`);
|
|
120
119
|
const components = componentSet.getSourceComponents().toArray();
|
|
121
120
|
for (let i = 0; i < componentSet.size; i++) {
|
|
122
|
-
if (
|
|
121
|
+
if (components[i]?.content) {
|
|
123
122
|
logger.debug(components[i].content);
|
|
124
123
|
}
|
|
125
|
-
else if (
|
|
124
|
+
else if (components[i]?.xml) {
|
|
126
125
|
logger.debug(components[i].xml);
|
|
127
126
|
}
|
|
128
127
|
if (i > 18) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,sCAAsC;AAEtC,6BAA6B;AAC7B,2CAA8D;AAC9D,kCAAkC;AAClC,gDAA8C;AAC9C,0CAA6C;AA6B7C,MAAa,mBAAmB;IAC9B;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,OAA4B
|
|
1
|
+
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ class RecompositionFinalizer extends ConvertTransactionFinalizer {
|
|
|
60
60
|
}
|
|
61
61
|
const parentXmlObj = parent.type.strategies.recomposition === "startEmpty" /* StartEmpty */
|
|
62
62
|
? {}
|
|
63
|
-
: parentXml
|
|
63
|
+
: parentXml ?? (await parent.parseXml());
|
|
64
64
|
for (const child of children) {
|
|
65
65
|
const { directoryName: groupName } = child.type;
|
|
66
66
|
const { name: parentName } = child.parent.type;
|
|
@@ -109,12 +109,11 @@ class DecompositionFinalizer extends ConvertTransactionFinalizer {
|
|
|
109
109
|
}
|
|
110
110
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
111
111
|
async finalize() {
|
|
112
|
-
var _a;
|
|
113
112
|
const writerData = [];
|
|
114
113
|
for (const toDecompose of Object.values(this.transactionState)) {
|
|
115
114
|
if (!toDecompose.foundMerge) {
|
|
116
115
|
writerData.push({
|
|
117
|
-
component:
|
|
116
|
+
component: toDecompose.origin.parent ?? toDecompose.origin,
|
|
118
117
|
writeInfos: [toDecompose.writeInfo],
|
|
119
118
|
});
|
|
120
119
|
}
|
|
@@ -159,8 +158,7 @@ class NonDecompositionFinalizer extends ConvertTransactionFinalizer {
|
|
|
159
158
|
// put the incoming components into the mergeMap. Keep track of any files we need to write
|
|
160
159
|
const filesToWrite = new Set();
|
|
161
160
|
this.state.childrenByUniqueElement.forEach((child, childUniqueElement) => {
|
|
162
|
-
|
|
163
|
-
const parentKey = (_a = childNameToParentFilePath.get(childUniqueElement)) !== null && _a !== void 0 ? _a : defaultKey;
|
|
161
|
+
const parentKey = childNameToParentFilePath.get(childUniqueElement) ?? defaultKey;
|
|
164
162
|
const parentItemMap = this.mergeMap.get(parentKey);
|
|
165
163
|
parentItemMap.set(childUniqueElement, child);
|
|
166
164
|
filesToWrite.add(parentKey);
|