@salesforce/source-deploy-retrieve 6.1.0 → 6.2.2
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 +14 -0
- package/lib/src/client/deployStrategies/auraDeploy.js +4 -4
- package/lib/src/client/deployStrategies/auraDeploy.js.map +1 -1
- package/lib/src/client/deployStrategies/containerDeploy.js +2 -2
- package/lib/src/client/deployStrategies/containerDeploy.js.map +1 -1
- package/lib/src/client/deployStrategies/lwcDeploy.js +4 -4
- package/lib/src/client/deployStrategies/lwcDeploy.js.map +1 -1
- package/lib/src/collections/componentSetBuilder.js +1 -2
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/convert/convertContext.js +2 -2
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/streams.d.ts +1 -0
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/metadataTransformerFactory.js +4 -4
- package/lib/src/convert/transformers/metadataTransformerFactory.js.map +1 -1
- package/lib/src/convert/types.d.ts +1 -0
- package/lib/src/registry/coverage.js +10 -4
- package/lib/src/registry/coverage.js.map +1 -1
- package/lib/src/registry/metadataRegistry.json +49 -0
- package/lib/src/registry/registry.d.ts +49 -0
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js +1 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
- package/lib/src/resolve/treeContainers.d.ts +1 -0
- package/package.json +4 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,20 @@
|
|
|
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
|
+
### [6.2.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v6.2.1...v6.2.2) (2022-07-12)
|
|
6
|
+
|
|
7
|
+
### [6.2.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v6.2.0...v6.2.1) (2022-07-07)
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
- proxy support for coverage report ([#659](https://github.com/forcedotcom/source-deploy-retrieve/issues/659)) ([8121a94](https://github.com/forcedotcom/source-deploy-retrieve/commit/8121a94e0ca9d2d96e4c5711c2844eb88500dfac))
|
|
12
|
+
|
|
13
|
+
## [6.2.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v6.1.0...v6.2.0) (2022-06-23)
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
- use StateAggregator ([#646](https://github.com/forcedotcom/source-deploy-retrieve/issues/646)) ([f1d8848](https://github.com/forcedotcom/source-deploy-retrieve/commit/f1d8848c747362594abd519c579f3aebfee48bec))
|
|
18
|
+
|
|
5
19
|
## [6.1.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v6.0.4...v6.1.0) (2022-06-20)
|
|
6
20
|
|
|
7
21
|
### Features
|
|
@@ -19,17 +19,17 @@ class AuraDeploy extends baseDeploy_1.BaseDeploy {
|
|
|
19
19
|
this.namespace = namespace;
|
|
20
20
|
const auraDefinitions = await this.buildDefList();
|
|
21
21
|
const componentDeployment = await this.upsert(auraDefinitions);
|
|
22
|
-
let status = "Completed" /* Completed */;
|
|
22
|
+
let status = "Completed" /* ToolingDeployStatus.Completed */;
|
|
23
23
|
if (componentDeployment.diagnostics.length > 0) {
|
|
24
24
|
status =
|
|
25
25
|
componentDeployment.status !== types_1.ComponentStatus.Failed
|
|
26
|
-
? "CompletedPartial" /* CompletedPartial */
|
|
27
|
-
: "Failed" /* Failed */;
|
|
26
|
+
? "CompletedPartial" /* ToolingDeployStatus.CompletedPartial */
|
|
27
|
+
: "Failed" /* ToolingDeployStatus.Failed */;
|
|
28
28
|
}
|
|
29
29
|
return {
|
|
30
30
|
id: undefined,
|
|
31
31
|
status,
|
|
32
|
-
success: status === "Completed" /* Completed */,
|
|
32
|
+
success: status === "Completed" /* ToolingDeployStatus.Completed */,
|
|
33
33
|
components: [componentDeployment],
|
|
34
34
|
};
|
|
35
35
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auraDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/auraDeploy.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6CAA2C;AAC3C,uCAAgD;AAEhD,oCAMkB;AAClB,8CAA4C;AAE5C,sDAAmD;AACnD,6CAA0C;AAE1C,MAAa,UAAW,SAAQ,uBAAU;IAGjC,KAAK,CAAC,MAAM,CAAC,SAA0B,EAAE,SAAiB;QAC/D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAClD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/D,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"auraDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/auraDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,7 +83,7 @@ class ContainerDeploy extends baseDeploy_1.BaseDeploy {
|
|
|
83
83
|
}
|
|
84
84
|
containerStatus = (await this.connection.tooling.retrieve(ContainerDeploy.CONTAINER_ASYNC_REQUEST, containerId));
|
|
85
85
|
count++;
|
|
86
|
-
} while (containerStatus.State === "Queued" /* Queued */ && count <= 30);
|
|
86
|
+
} while (containerStatus.State === "Queued" /* ToolingDeployStatus.Queued */ && count <= 30);
|
|
87
87
|
return containerStatus;
|
|
88
88
|
}
|
|
89
89
|
buildSourceDeployResult(containerRequest) {
|
|
@@ -134,7 +134,7 @@ class ContainerDeploy extends baseDeploy_1.BaseDeploy {
|
|
|
134
134
|
return {
|
|
135
135
|
id: containerRequest.Id,
|
|
136
136
|
status: containerRequest.State,
|
|
137
|
-
success: containerRequest.State === "Completed" /* Completed */,
|
|
137
|
+
success: containerRequest.State === "Completed" /* ToolingDeployStatus.Completed */,
|
|
138
138
|
components: [componentDeployment],
|
|
139
139
|
};
|
|
140
140
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"containerDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/containerDeploy.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"containerDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/containerDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,17 +20,17 @@ class LwcDeploy extends baseDeploy_1.BaseDeploy {
|
|
|
20
20
|
this.namespace = namespace;
|
|
21
21
|
const lwcResources = await this.buildResourceList();
|
|
22
22
|
const componentDeployment = await this.upsert(lwcResources);
|
|
23
|
-
let status = "Completed" /* Completed */;
|
|
23
|
+
let status = "Completed" /* ToolingDeployStatus.Completed */;
|
|
24
24
|
if (componentDeployment.diagnostics.length > 0) {
|
|
25
25
|
status =
|
|
26
26
|
componentDeployment.status !== types_1.ComponentStatus.Failed
|
|
27
|
-
? "CompletedPartial" /* CompletedPartial */
|
|
28
|
-
: "Failed" /* Failed */;
|
|
27
|
+
? "CompletedPartial" /* ToolingDeployStatus.CompletedPartial */
|
|
28
|
+
: "Failed" /* ToolingDeployStatus.Failed */;
|
|
29
29
|
}
|
|
30
30
|
return {
|
|
31
31
|
id: undefined,
|
|
32
32
|
status,
|
|
33
|
-
success: status === "Completed" /* Completed */,
|
|
33
|
+
success: status === "Completed" /* ToolingDeployStatus.Completed */,
|
|
34
34
|
components: [componentDeployment],
|
|
35
35
|
};
|
|
36
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lwcDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/lwcDeploy.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAiC;AACjC,6CAA2C;AAE3C,oCAMkB;AAClB,uCAAsC;AACtC,8CAA4C;AAC5C,sDAAmD;AACnD,6CAA0C;AAE1C,MAAa,SAAU,SAAQ,uBAAU;IAChC,KAAK,CAAC,MAAM,CAAC,SAA0B,EAAE,SAAiB;QAC/D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAE3B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACpD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5D,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"lwcDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/lwcDeploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,8 +88,7 @@ class ComponentSetBuilder {
|
|
|
88
88
|
componentSet ?? (componentSet = new collections_1.ComponentSet());
|
|
89
89
|
logger.debug(`Building ComponentSet from targetUsername: ${org.username}`);
|
|
90
90
|
const fromConnection = await collections_1.ComponentSet.fromConnection({
|
|
91
|
-
|
|
92
|
-
usernameOrConnection: (await core_1.GlobalInfo.getInstance()).aliases.getUsername(org.username) || org.username,
|
|
91
|
+
usernameOrConnection: (await core_1.StateAggregator.getInstance()).aliases.getUsername(org.username) || org.username,
|
|
93
92
|
// exclude components based on the results of componentFilter function
|
|
94
93
|
// components with namespacePrefix where org.exclude includes manageableState (to exclude managed packages)
|
|
95
94
|
// components with namespacePrefix where manageableState equals undefined (to exclude components e.g. InstalledPackage)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,sCAAsC;AAEtC,6BAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"componentSetBuilder.js","sourceRoot":"","sources":["../../../src/collections/componentSetBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,11 +54,11 @@ class RecompositionFinalizer extends ConvertTransactionFinalizer {
|
|
|
54
54
|
// When recomposing children that are non-decomposed, read and cache the parent XML to prevent
|
|
55
55
|
// reading the parent source file (referenced in all child SourceComponents) multiple times.
|
|
56
56
|
let parentXml;
|
|
57
|
-
if (parent.type.strategies.transformer === "nonDecomposed" /* NonDecomposed */) {
|
|
57
|
+
if (parent.type.strategies.transformer === "nonDecomposed" /* TransformerStrategy.NonDecomposed */) {
|
|
58
58
|
parentXml = await parent.parseXml();
|
|
59
59
|
this.parsedXmlCache.set(parent.xml, parentXml);
|
|
60
60
|
}
|
|
61
|
-
const parentXmlObj = parent.type.strategies.recomposition === "startEmpty" /* StartEmpty */
|
|
61
|
+
const parentXmlObj = parent.type.strategies.recomposition === "startEmpty" /* RecompositionStrategy.StartEmpty */
|
|
62
62
|
? {}
|
|
63
63
|
: parentXml ?? (await parent.parseXml());
|
|
64
64
|
for (const child of children) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertContext.js","sourceRoot":"","sources":["../../../src/convert/convertContext.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,mDAAqE;AACrE,sCAAoE;AACpE,gDAA8C;AAC9C,oCAA4C;AAE5C,wCAAoG;AACpG,uCAAoC;AAGpC,MAAe,2BAA2B;IAGjC,QAAQ,CAAC,KAAyB;QACvC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CAGF;AAeD;;;GAGG;AACH,MAAM,sBAAuB,SAAQ,2BAA+C;IAApF;;QACY,qBAAgB,GAAuB,EAAE,CAAC;QAEpD,2FAA2F;QAC3F,gDAAgD;QACxC,mBAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;IA2EtD,CAAC;IAzEQ,KAAK,CAAC,QAAQ;QACnB,MAAM,UAAU,GAAmB,EAAE,CAAC;QACtC,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACvE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAChE,UAAU,CAAC,IAAI,CAAC;gBACd,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE;oBACV;wBACE,MAAM,EAAE,IAAI,iBAAO,CAAC,gBAAgB,CAAC;wBACrC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;qBACpF;iBACF;aACF,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,QAAsB,EAAE,MAAuB;QACrE,8FAA8F;QAC9F,4FAA4F;QAC5F,IAAI,SAAkB,CAAC;QACvB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"convertContext.js","sourceRoot":"","sources":["../../../src/convert/convertContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -190,7 +190,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
190
190
|
const [baseName, childName] = fullName.split('.');
|
|
191
191
|
const baseComponent = (parent ?? component);
|
|
192
192
|
let output = `${childName ?? baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
193
|
-
if (parent?.type.strategies.decomposition === "folderPerType" /* FolderPerType */) {
|
|
193
|
+
if (parent?.type.strategies.decomposition === "folderPerType" /* DecompositionStrategy.FolderPerType */) {
|
|
194
194
|
output = (0, path_1.join)(type.directoryName, output);
|
|
195
195
|
}
|
|
196
196
|
return (0, path_1.join)(baseComponent.getPackageRelativePath(baseName, 'source'), output);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,14 +25,14 @@ class MetadataTransformerFactory {
|
|
|
25
25
|
const type = component.parent ? component.parent.type : component.type;
|
|
26
26
|
const transformerId = type.strategies?.transformer;
|
|
27
27
|
switch (transformerId) {
|
|
28
|
-
case "standard" /* Standard */:
|
|
28
|
+
case "standard" /* TransformerStrategy.Standard */:
|
|
29
29
|
case undefined:
|
|
30
30
|
return new defaultMetadataTransformer_1.DefaultMetadataTransformer(this.registry, this.context);
|
|
31
|
-
case "decomposed" /* Decomposed */:
|
|
31
|
+
case "decomposed" /* TransformerStrategy.Decomposed */:
|
|
32
32
|
return new decomposedMetadataTransformer_1.DecomposedMetadataTransformer(this.registry, this.context);
|
|
33
|
-
case "staticResource" /* StaticResource */:
|
|
33
|
+
case "staticResource" /* TransformerStrategy.StaticResource */:
|
|
34
34
|
return new staticResourceMetadataTransformer_1.StaticResourceMetadataTransformer(this.registry, this.context);
|
|
35
|
-
case "nonDecomposed" /* NonDecomposed */:
|
|
35
|
+
case "nonDecomposed" /* TransformerStrategy.NonDecomposed */:
|
|
36
36
|
return new nonDecomposedMetadataTransformer_1.NonDecomposedMetadataTransformer(this.registry, this.context);
|
|
37
37
|
default:
|
|
38
38
|
throw new core_1.SfError(messages.getMessage('error_missing_transformer', [type.name, transformerId]), 'RegistryError');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataTransformerFactory.js","sourceRoot":"","sources":["../../../../src/convert/transformers/metadataTransformerFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAGrD,sDAAmD;AAEnD,6EAA0E;AAC1E,mFAAgF;AAChF,2FAAwF;AACxF,yFAAsF;AAEtF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC;AAE3G,MAAa,0BAA0B;IAIrC,YAAmB,QAAwB,EAAE,OAAO,GAAG,IAAI,+BAAc,EAAE;QACzE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,cAAc,CAAC,SAA0B;QAC9C,oEAAoE;QACpE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;QACnD,QAAQ,aAAa,EAAE;YACrB
|
|
1
|
+
{"version":3,"file":"metadataTransformerFactory.js","sourceRoot":"","sources":["../../../../src/convert/transformers/metadataTransformerFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAGrD,sDAAmD;AAEnD,6EAA0E;AAC1E,mFAAgF;AAChF,2FAAwF;AACxF,yFAAsF;AAEtF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,2BAA2B,CAAC,CAAC,CAAC;AAE3G,MAAa,0BAA0B;IAIrC,YAAmB,QAAwB,EAAE,OAAO,GAAG,IAAI,+BAAc,EAAE;QACzE,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,cAAc,CAAC,SAA0B;QAC9C,oEAAoE;QACpE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC;QACvE,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;QACnD,QAAQ,aAAa,EAAE;YACrB,mDAAkC;YAClC,KAAK,SAAS;gBACZ,OAAO,IAAI,uDAA0B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACrE;gBACE,OAAO,IAAI,6DAA6B,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACxE;gBACE,OAAO,IAAI,qEAAiC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC5E;gBACE,OAAO,IAAI,mEAAgC,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3E;gBACE,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,2BAA2B,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,EAC5E,eAAe,CAChB,CAAC;SACL;IACH,CAAC;CACF;AA9BD,gEA8BC"}
|
|
@@ -9,17 +9,23 @@
|
|
|
9
9
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
10
|
exports.getCoverage = exports.getCurrentApiVersion = void 0;
|
|
11
11
|
const got_1 = require("got");
|
|
12
|
-
const
|
|
12
|
+
const ProxyAgent = require("proxy-agent");
|
|
13
|
+
const proxy_from_env_1 = require("proxy-from-env");
|
|
14
|
+
const getProxiedOptions = (url) => ({
|
|
13
15
|
timeout: {
|
|
14
16
|
request: 10000,
|
|
15
17
|
},
|
|
16
|
-
|
|
17
|
-
|
|
18
|
+
agent: {
|
|
19
|
+
https: ProxyAgent((0, proxy_from_env_1.getProxyForUrl)(url)),
|
|
20
|
+
},
|
|
21
|
+
url,
|
|
22
|
+
});
|
|
23
|
+
const getCurrentApiVersion = async () => (await (0, got_1.default)(getProxiedOptions('https://mdcoverage.secure.force.com/services/apexrest/report')).json()).versions.selected;
|
|
18
24
|
exports.getCurrentApiVersion = getCurrentApiVersion;
|
|
19
25
|
const getCoverage = async (apiVersion) => {
|
|
20
26
|
const results = await Promise.allSettled(
|
|
21
27
|
// one of these will match the current version, but they differ during the release cycle
|
|
22
|
-
[44, 45, 46].map(async (na) => await (0, got_1.default)(`https://na${na}.test1.pc-rnd.salesforce.com/mdcoverage/api.jsp
|
|
28
|
+
[44, 45, 46].map(async (na) => await (0, got_1.default)(getProxiedOptions(`https://na${na}.test1.pc-rnd.salesforce.com/mdcoverage/api.jsp`)).json()));
|
|
23
29
|
for (const result of results) {
|
|
24
30
|
if (result.status === 'fulfilled' && result.value?.apiVersion === apiVersion) {
|
|
25
31
|
return result.value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../../src/registry/coverage.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,+BAA+B;;;
|
|
1
|
+
{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../../src/registry/coverage.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,+BAA+B;;;AAG/B,6BAAsB;AACtB,0CAA0C;AAC1C,mDAAgD;AAGhD,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAA6B,EAAE,CAAC,CAAC;IACrE,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IACD,KAAK,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAC;KACvC;IACD,GAAG;CACJ,CAAC,CAAC;AAEI,MAAM,oBAAoB,GAAG,KAAK,IAAqB,EAAE,CAC9D,CACE,MAAM,IAAA,aAAG,EAAC,iBAAiB,CAAC,8DAA8D,CAAC,CAAC,CAAC,IAAI,EAE7F,CACL,CAAC,QAAQ,CAAC,QAAQ,CAAC;AALT,QAAA,oBAAoB,wBAKX;AAEf,MAAM,WAAW,GAAG,KAAK,EAAE,UAAkB,EAA2B,EAAE;IAC/E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU;IACtC,wFAAwF;IACxF,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CACd,KAAK,EAAE,EAAE,EAAE,EAAE,CACX,MAAM,IAAA,aAAG,EACP,iBAAiB,CAAC,aAAa,EAAE,iDAAiD,CAAC,CACpF,CAAC,IAAI,EAAkB,CAC3B,CACF,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE,UAAU,KAAK,UAAU,EAAE;YAC5E,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;KACF;IACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,UAAU,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB"}
|
|
@@ -16,6 +16,14 @@
|
|
|
16
16
|
"inFolder": false,
|
|
17
17
|
"strictDirectoryName": false
|
|
18
18
|
},
|
|
19
|
+
"aiusecasedefinition": {
|
|
20
|
+
"id": "aiusecasedefinition",
|
|
21
|
+
"name": "AIUsecaseDefinition",
|
|
22
|
+
"suffix": "aiUsecaseDefinitions",
|
|
23
|
+
"directoryName": "aiUsecaseDefinitions",
|
|
24
|
+
"inFolder": false,
|
|
25
|
+
"strictDirectoryName": false
|
|
26
|
+
},
|
|
19
27
|
"mlpredictiondefinition": {
|
|
20
28
|
"id": "mlpredictiondefinition",
|
|
21
29
|
"name": "MLPredictionDefinition",
|
|
@@ -2425,6 +2433,41 @@
|
|
|
2425
2433
|
"directoryName": "dataStreamDefinitions",
|
|
2426
2434
|
"strictDirectoryName": false
|
|
2427
2435
|
},
|
|
2436
|
+
"datapackagekitdefinition": {
|
|
2437
|
+
"id": "datapackagekitdefinition",
|
|
2438
|
+
"name": "DataPackageKitDefinition",
|
|
2439
|
+
"suffix": "dataPackageKitDefinition",
|
|
2440
|
+
"directoryName": "dataPackageKitDefinitions",
|
|
2441
|
+
"strictDirectoryName": false
|
|
2442
|
+
},
|
|
2443
|
+
"datasourcebundledefinition": {
|
|
2444
|
+
"id": "datasourcebundledefinition",
|
|
2445
|
+
"name": "DataSourceBundleDefinition",
|
|
2446
|
+
"suffix": "dataSourceBundleDefinition",
|
|
2447
|
+
"directoryName": "dataSourceBundleDefinitions",
|
|
2448
|
+
"strictDirectoryName": false
|
|
2449
|
+
},
|
|
2450
|
+
"datapackagekitobject": {
|
|
2451
|
+
"id": "datapackagekitobject",
|
|
2452
|
+
"name": "DataPackageKitObject",
|
|
2453
|
+
"suffix": "DataPackageKitObject",
|
|
2454
|
+
"directoryName": "DataPackageKitObjects",
|
|
2455
|
+
"strictDirectoryName": false
|
|
2456
|
+
},
|
|
2457
|
+
"datastreamtemplate": {
|
|
2458
|
+
"id": "datastreamtemplate",
|
|
2459
|
+
"name": "DataStreamTemplate",
|
|
2460
|
+
"suffix": "dataStreamTemplate",
|
|
2461
|
+
"directoryName": "dataStreamTemplates",
|
|
2462
|
+
"strictDirectoryName": false
|
|
2463
|
+
},
|
|
2464
|
+
"datasrcdatamodelfieldmap": {
|
|
2465
|
+
"id": "datasrcdatamodelfieldmap",
|
|
2466
|
+
"name": "DataSrcDataModelFieldMap",
|
|
2467
|
+
"suffix": "dataSrcDataModelFieldMap",
|
|
2468
|
+
"directoryName": "dataSrcDataModelFieldMaps",
|
|
2469
|
+
"strictDirectoryName": false
|
|
2470
|
+
},
|
|
2428
2471
|
"mktdatatranobject": {
|
|
2429
2472
|
"id": "mktdatatranobject",
|
|
2430
2473
|
"name": "MktDataTranObject",
|
|
@@ -3025,6 +3068,7 @@
|
|
|
3025
3068
|
"suffixes": {
|
|
3026
3069
|
"ai": "aiapplication",
|
|
3027
3070
|
"aiapplicationconfig": "aiapplicationconfig",
|
|
3071
|
+
"aiUsecaseDefinitions": "aiusecasedefinition",
|
|
3028
3072
|
"mlDataDefinition": "mldatadefinition",
|
|
3029
3073
|
"icon": "icon",
|
|
3030
3074
|
"businessProcessGroup": "businessprocessgroup",
|
|
@@ -3285,6 +3329,11 @@
|
|
|
3285
3329
|
"accountForecastSetting": "accountforecastsettings",
|
|
3286
3330
|
"fieldServiceMobileExtension": "fieldservicemobileextension",
|
|
3287
3331
|
"dataStreamDefinition": "datastreamdefinition",
|
|
3332
|
+
"dataPackageKitDefinition": "datapackagekitdefinition",
|
|
3333
|
+
"dataSourceBundleDefinition": "datasourcebundledefinition",
|
|
3334
|
+
"DataPackageKitObject": "datapackagekitobject",
|
|
3335
|
+
"dataStreamTemplate": "datastreamtemplate",
|
|
3336
|
+
"dataSrcDataModelFieldMap": "datasrcdatamodelfieldmap",
|
|
3288
3337
|
"ChannelObjectLinkingRule": "channelobjectlinkingrule",
|
|
3289
3338
|
"ConversationVendorInformation": "conversationvendorinfo",
|
|
3290
3339
|
"ConversationVendorFieldDefinition": "conversationvendorfielddef",
|
|
@@ -19,6 +19,14 @@ export declare const registry: Readonly<{
|
|
|
19
19
|
inFolder: boolean;
|
|
20
20
|
strictDirectoryName: boolean;
|
|
21
21
|
};
|
|
22
|
+
aiusecasedefinition: {
|
|
23
|
+
id: string;
|
|
24
|
+
name: string;
|
|
25
|
+
suffix: string;
|
|
26
|
+
directoryName: string;
|
|
27
|
+
inFolder: boolean;
|
|
28
|
+
strictDirectoryName: boolean;
|
|
29
|
+
};
|
|
22
30
|
mlpredictiondefinition: {
|
|
23
31
|
id: string;
|
|
24
32
|
name: string;
|
|
@@ -2428,6 +2436,41 @@ export declare const registry: Readonly<{
|
|
|
2428
2436
|
directoryName: string;
|
|
2429
2437
|
strictDirectoryName: boolean;
|
|
2430
2438
|
};
|
|
2439
|
+
datapackagekitdefinition: {
|
|
2440
|
+
id: string;
|
|
2441
|
+
name: string;
|
|
2442
|
+
suffix: string;
|
|
2443
|
+
directoryName: string;
|
|
2444
|
+
strictDirectoryName: boolean;
|
|
2445
|
+
};
|
|
2446
|
+
datasourcebundledefinition: {
|
|
2447
|
+
id: string;
|
|
2448
|
+
name: string;
|
|
2449
|
+
suffix: string;
|
|
2450
|
+
directoryName: string;
|
|
2451
|
+
strictDirectoryName: boolean;
|
|
2452
|
+
};
|
|
2453
|
+
datapackagekitobject: {
|
|
2454
|
+
id: string;
|
|
2455
|
+
name: string;
|
|
2456
|
+
suffix: string;
|
|
2457
|
+
directoryName: string;
|
|
2458
|
+
strictDirectoryName: boolean;
|
|
2459
|
+
};
|
|
2460
|
+
datastreamtemplate: {
|
|
2461
|
+
id: string;
|
|
2462
|
+
name: string;
|
|
2463
|
+
suffix: string;
|
|
2464
|
+
directoryName: string;
|
|
2465
|
+
strictDirectoryName: boolean;
|
|
2466
|
+
};
|
|
2467
|
+
datasrcdatamodelfieldmap: {
|
|
2468
|
+
id: string;
|
|
2469
|
+
name: string;
|
|
2470
|
+
suffix: string;
|
|
2471
|
+
directoryName: string;
|
|
2472
|
+
strictDirectoryName: boolean;
|
|
2473
|
+
};
|
|
2431
2474
|
mktdatatranobject: {
|
|
2432
2475
|
id: string;
|
|
2433
2476
|
name: string;
|
|
@@ -3028,6 +3071,7 @@ export declare const registry: Readonly<{
|
|
|
3028
3071
|
suffixes: {
|
|
3029
3072
|
ai: string;
|
|
3030
3073
|
aiapplicationconfig: string;
|
|
3074
|
+
aiUsecaseDefinitions: string;
|
|
3031
3075
|
mlDataDefinition: string;
|
|
3032
3076
|
icon: string;
|
|
3033
3077
|
businessProcessGroup: string;
|
|
@@ -3288,6 +3332,11 @@ export declare const registry: Readonly<{
|
|
|
3288
3332
|
accountForecastSetting: string;
|
|
3289
3333
|
fieldServiceMobileExtension: string;
|
|
3290
3334
|
dataStreamDefinition: string;
|
|
3335
|
+
dataPackageKitDefinition: string;
|
|
3336
|
+
dataSourceBundleDefinition: string;
|
|
3337
|
+
DataPackageKitObject: string;
|
|
3338
|
+
dataStreamTemplate: string;
|
|
3339
|
+
dataSrcDataModelFieldMap: string;
|
|
3291
3340
|
ChannelObjectLinkingRule: string;
|
|
3292
3341
|
ConversationVendorInformation: string;
|
|
3293
3342
|
ConversationVendorFieldDefinition: string;
|
|
@@ -81,7 +81,7 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
|
|
|
81
81
|
const triggerIsAChild = !!childTypeId;
|
|
82
82
|
const strategy = this.type.strategies.decomposition;
|
|
83
83
|
if (triggerIsAChild) {
|
|
84
|
-
if (strategy === "folderPerType" /* FolderPerType */ || isResolvingSource) {
|
|
84
|
+
if (strategy === "folderPerType" /* DecompositionStrategy.FolderPerType */ || isResolvingSource) {
|
|
85
85
|
let parent = component;
|
|
86
86
|
if (!parent) {
|
|
87
87
|
parent = new sourceComponent_1.SourceComponent({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,wDAAqD;AACrD,uCAAqE;AAErE,2EAAwE;AAExE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC;AAE7G;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAa,uBAAwB,SAAQ,qDAAyB;IAAtE;;QACY,cAAS,GAAG,IAAI,CAAC;QACjB,wBAAmB,GAAG,KAAK,CAAC;IAmFxC,CAAC;IAjFQ,YAAY,CAAC,IAAgB,EAAE,iBAAiB,GAAG,IAAI;QAC5D,IAAI,YAAY,GAAG,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,gBAAgB,EAAE;gBACpB,YAAY,GAAG,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,CAAC;aACnD;SACF;QACD,IAAI,SAA0B,CAAC;QAC/B,IAAI,YAAY,EAAE;YAChB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU;gBACxC,CAAC,CAAC,GAAG,IAAA,kBAAU,EAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE;gBAC7D,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC1B,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,YAAY,CAAC,IAAI;aACvB,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACO,QAAQ,CAAC,OAAmB,EAAE,SAA2B,EAAE,iBAA2B;QAC9F,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,EAAE;YACX,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChE,MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,CAAC;YACtC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;YAEpD,IAAI,eAAe,EAAE;gBACnB,IAAI,QAAQ,
|
|
1
|
+
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "6.
|
|
3
|
+
"version": "6.2.2",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -34,6 +34,8 @@
|
|
|
34
34
|
"graceful-fs": "^4.2.8",
|
|
35
35
|
"ignore": "^5.1.8",
|
|
36
36
|
"mime": "2.6.0",
|
|
37
|
+
"proxy-agent": "^5.0.0",
|
|
38
|
+
"proxy-from-env": "^1.1.0",
|
|
37
39
|
"unzipper": "0.10.11",
|
|
38
40
|
"xmldom-sfdx-encoding": "^0.1.29"
|
|
39
41
|
},
|
|
@@ -46,6 +48,7 @@
|
|
|
46
48
|
"@types/deep-equal-in-any-order": "^1.0.1",
|
|
47
49
|
"@types/mime": "2.0.3",
|
|
48
50
|
"@types/mkdirp": "0.5.2",
|
|
51
|
+
"@types/proxy-from-env": "^1.0.1",
|
|
49
52
|
"@types/shelljs": "^0.8.9",
|
|
50
53
|
"@types/unzipper": "^0.10.3",
|
|
51
54
|
"@typescript-eslint/eslint-plugin": "^4.33.0",
|