@salesforce/source-deploy-retrieve 7.15.1 → 8.0.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/lib/src/client/diagnosticUtil.js +16 -3
- package/lib/src/client/diagnosticUtil.js.map +1 -1
- package/lib/src/client/metadataApiDeploy.d.ts +5 -5
- package/lib/src/client/metadataApiDeploy.js +59 -45
- package/lib/src/client/metadataApiDeploy.js.map +1 -1
- package/lib/src/client/metadataApiRetrieve.d.ts +2 -2
- package/lib/src/client/metadataApiRetrieve.js +26 -33
- package/lib/src/client/metadataApiRetrieve.js.map +1 -1
- package/lib/src/client/metadataTransfer.d.ts +4 -4
- package/lib/src/client/metadataTransfer.js +3 -3
- package/lib/src/client/metadataTransfer.js.map +1 -1
- package/lib/src/client/types.d.ts +2 -2
- package/lib/src/collections/componentSet.d.ts +2 -2
- package/lib/src/collections/componentSet.js +28 -30
- package/lib/src/collections/componentSet.js.map +1 -1
- package/lib/src/collections/componentSetBuilder.js +16 -10
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/collections/lazyCollection.d.ts +1 -1
- package/lib/src/convert/convertContext.d.ts +24 -26
- package/lib/src/convert/convertContext.js +52 -40
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/metadataConverter.js +81 -65
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/replacements.d.ts +1 -1
- package/lib/src/convert/replacements.js +18 -13
- package/lib/src/convert/replacements.js.map +1 -1
- package/lib/src/convert/streams.d.ts +4 -4
- package/lib/src/convert/streams.js +4 -1
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +30 -28
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +8 -2
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/metadataTransformerFactory.js +2 -2
- package/lib/src/convert/transformers/metadataTransformerFactory.js.map +1 -1
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js +19 -6
- package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js +44 -15
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js.map +1 -1
- package/lib/src/registry/nonSupportedTypes.js +3 -2
- package/lib/src/registry/nonSupportedTypes.js.map +1 -1
- package/lib/src/registry/registryAccess.d.ts +6 -4
- package/lib/src/registry/registryAccess.js +7 -9
- package/lib/src/registry/registryAccess.js.map +1 -1
- package/lib/src/registry/types.d.ts +1 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.d.ts +5 -5
- package/lib/src/resolve/adapters/baseSourceAdapter.js +7 -4
- package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/bundleSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.d.ts +2 -2
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js +5 -5
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.d.ts +1 -1
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js +13 -3
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.js +1 -5
- package/lib/src/resolve/adapters/matchingContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.d.ts +8 -2
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js +11 -5
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/sourceAdapterFactory.js +1 -1
- package/lib/src/resolve/adapters/sourceAdapterFactory.js.map +1 -1
- package/lib/src/resolve/connectionResolver.js +19 -5
- package/lib/src/resolve/connectionResolver.js.map +1 -1
- package/lib/src/resolve/forceIgnore.d.ts +2 -2
- package/lib/src/resolve/forceIgnore.js +4 -0
- package/lib/src/resolve/forceIgnore.js.map +1 -1
- package/lib/src/resolve/manifestResolver.js +1 -1
- package/lib/src/resolve/manifestResolver.js.map +1 -1
- package/lib/src/resolve/metadataResolver.d.ts +2 -2
- package/lib/src/resolve/metadataResolver.js +6 -8
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.d.ts +6 -6
- package/lib/src/resolve/sourceComponent.js +38 -21
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/resolve/treeContainers.js +30 -11
- package/lib/src/resolve/treeContainers.js.map +1 -1
- package/lib/src/resolve/types.d.ts +2 -2
- package/lib/src/utils/collections.d.ts +1 -1
- package/lib/src/utils/collections.js +1 -4
- package/lib/src/utils/collections.js.map +1 -1
- package/lib/src/utils/filePathGenerator.js +18 -6
- package/lib/src/utils/filePathGenerator.js.map +1 -1
- package/lib/src/utils/path.d.ts +1 -1
- package/lib/src/utils/path.js +2 -0
- package/lib/src/utils/path.js.map +1 -1
- package/messages/sdr.md +57 -89
- package/package.json +7 -6
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA2D;AAC3D,mCAAuF;AACvF,+BAAiC;AACjC,2CAAqD;AACrD,uCAA6D;AAC7D,6CAA4D;AAE5D,qDAA6C;AAC7C,2CAA0C;AAC1C,wCAA+D;AAC/D,sCAAiD;AAGjD,kEAA8D;AAC9D,iDAA4D;AAC5D,qDAAkD;AAGlD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,40 +9,35 @@ exports.DecomposedMetadataTransformer = void 0;
|
|
|
9
9
|
*/
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const kit_1 = require("@salesforce/kit");
|
|
12
|
+
const core_1 = require("@salesforce/core");
|
|
12
13
|
const streams_1 = require("../streams");
|
|
13
14
|
const common_1 = require("../../common");
|
|
14
15
|
const collections_1 = require("../../collections");
|
|
15
16
|
const baseMetadataTransformer_1 = require("./baseMetadataTransformer");
|
|
17
|
+
core_1.Messages.importMessagesDirectory(__dirname);
|
|
18
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
16
19
|
class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
|
|
17
20
|
// eslint-disable-next-line @typescript-eslint/require-await
|
|
18
21
|
async toMetadataFormat(component) {
|
|
19
22
|
if (component.parent) {
|
|
20
23
|
const { fullName: parentName } = component.parent;
|
|
21
|
-
this.context.recomposition.
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
component: component.parent,
|
|
28
|
-
children: new collections_1.ComponentSet([component], this.registry),
|
|
29
|
-
};
|
|
30
|
-
}
|
|
31
|
-
});
|
|
24
|
+
const stateForParent = this.context.recomposition.transactionState.get(parentName) ?? {
|
|
25
|
+
component: component.parent,
|
|
26
|
+
children: new collections_1.ComponentSet([], this.registry),
|
|
27
|
+
};
|
|
28
|
+
stateForParent.children?.add(component);
|
|
29
|
+
this.context.recomposition.transactionState.set(parentName, stateForParent);
|
|
32
30
|
}
|
|
33
31
|
else {
|
|
34
32
|
const { fullName } = component;
|
|
35
|
-
this.context.recomposition.
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
children.map((child) => {
|
|
42
|
-
state[fullName].children.add(child);
|
|
43
|
-
});
|
|
44
|
-
}
|
|
33
|
+
const existing = this.context.recomposition.transactionState.get(fullName) ?? {
|
|
34
|
+
component,
|
|
35
|
+
children: new collections_1.ComponentSet([], this.registry),
|
|
36
|
+
};
|
|
37
|
+
(component.getChildren() ?? []).map((child) => {
|
|
38
|
+
existing.children?.add(child);
|
|
45
39
|
});
|
|
40
|
+
this.context.recomposition.transactionState.set(fullName, existing);
|
|
46
41
|
}
|
|
47
42
|
// noop since the finalizer will push the writes to the component writer
|
|
48
43
|
return [];
|
|
@@ -55,9 +50,12 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
55
50
|
let parentXmlObject;
|
|
56
51
|
const composedMetadata = await getComposedMetadataEntries(component);
|
|
57
52
|
for (const [tagKey, tagValue] of composedMetadata) {
|
|
58
|
-
const childTypeId = type.children?.directories[tagKey];
|
|
53
|
+
const childTypeId = type.children?.directories?.[tagKey];
|
|
59
54
|
if (childTypeId) {
|
|
60
|
-
const childType = type.children
|
|
55
|
+
const childType = type.children?.types[childTypeId];
|
|
56
|
+
if (!childType) {
|
|
57
|
+
throw messages.createError('error_missing_child_type_definition', [type.name, childTypeId]);
|
|
58
|
+
}
|
|
61
59
|
const tagValues = (0, kit_1.ensureArray)(tagValue);
|
|
62
60
|
for (const value of tagValues) {
|
|
63
61
|
const entryName = value.fullName || value.name;
|
|
@@ -104,6 +102,9 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
104
102
|
// operation now and mark it as merged in the state
|
|
105
103
|
else if (childrenOfMergeComponent.has(childComponent)) {
|
|
106
104
|
const mergeChild = childrenOfMergeComponent.getSourceComponents(childComponent).first();
|
|
105
|
+
if (!mergeChild?.xml) {
|
|
106
|
+
throw messages.createError('error_parsing_xml', [childComponent.fullName, childComponent.type.name]);
|
|
107
|
+
}
|
|
107
108
|
writeInfos.push({
|
|
108
109
|
source,
|
|
109
110
|
output: mergeChild.xml,
|
|
@@ -149,7 +150,7 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
149
150
|
});
|
|
150
151
|
this.setDecomposedState(component, { foundMerge: true });
|
|
151
152
|
}
|
|
152
|
-
else
|
|
153
|
+
else {
|
|
153
154
|
this.setDecomposedState(component, {
|
|
154
155
|
foundMerge: false,
|
|
155
156
|
writeInfo: {
|
|
@@ -170,13 +171,14 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
170
171
|
setDecomposedState(forComponent, props = {}) {
|
|
171
172
|
const key = `${forComponent.type.name}#${forComponent.fullName}`;
|
|
172
173
|
const withOrigin = Object.assign({ origin: forComponent.parent ?? forComponent }, props);
|
|
173
|
-
this.context.decomposition.
|
|
174
|
-
|
|
174
|
+
this.context.decomposition.transactionState.set(key, {
|
|
175
|
+
...(this.context.decomposition.transactionState.get(key) ?? {}),
|
|
176
|
+
...withOrigin,
|
|
175
177
|
});
|
|
176
178
|
}
|
|
177
179
|
getDecomposedState(forComponent) {
|
|
178
180
|
const key = `${forComponent.type.name}#${forComponent.fullName}`;
|
|
179
|
-
return this.context.decomposition.
|
|
181
|
+
return this.context.decomposition.transactionState.get(key);
|
|
180
182
|
}
|
|
181
183
|
}
|
|
182
184
|
exports.DecomposedMetadataTransformer = DecomposedMetadataTransformer;
|
|
@@ -190,7 +192,7 @@ const getDefaultOutput = (component) => {
|
|
|
190
192
|
const [baseName, childName] = fullName.split('.');
|
|
191
193
|
const baseComponent = (parent ?? component);
|
|
192
194
|
let output = `${childName ?? baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
193
|
-
if (parent?.type.strategies
|
|
195
|
+
if (parent?.type.strategies?.decomposition === "folderPerType" /* DecompositionStrategy.FolderPerType */) {
|
|
194
196
|
output = (0, path_1.join)(type.directoryName, output);
|
|
195
197
|
}
|
|
196
198
|
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":";;;AAAA;;;;;GAKG;AACH,+BAA4B;AAE5B,yCAA8C;
|
|
1
|
+
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ exports.DefaultMetadataTransformer = void 0;
|
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
10
|
const path_1 = require("path");
|
|
11
|
+
const core_1 = require("@salesforce/core");
|
|
11
12
|
const common_1 = require("../../common");
|
|
12
13
|
const utils_1 = require("../../utils");
|
|
13
14
|
const replacements_1 = require("../replacements");
|
|
@@ -48,7 +49,7 @@ const getWriteInfos = (component, targetFormat, mergeWith) => component
|
|
|
48
49
|
// assumes component has content
|
|
49
50
|
const getContentSourceDestination = (source, targetFormat, component, mergeWith) => {
|
|
50
51
|
if (mergeWith?.content) {
|
|
51
|
-
if (component.tree.isDirectory(component.content)) {
|
|
52
|
+
if (component.content && component.tree.isDirectory(component.content)) {
|
|
52
53
|
const relative = (0, utils_1.trimUntil)(source, (0, path_1.basename)(component.content));
|
|
53
54
|
return (0, path_1.join)((0, path_1.dirname)(mergeWith.content), relative);
|
|
54
55
|
}
|
|
@@ -62,6 +63,11 @@ const getXmlDestination = (targetFormat, component, mergeWith) => {
|
|
|
62
63
|
return mergeWith.xml;
|
|
63
64
|
}
|
|
64
65
|
const { folderContentType, suffix, legacySuffix } = component.type;
|
|
66
|
+
if (!component.xml) {
|
|
67
|
+
core_1.Messages.importMessagesDirectory(__dirname);
|
|
68
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
69
|
+
throw messages.createError('error_parsing_xml', [component.fullName, component.type.name]);
|
|
70
|
+
}
|
|
65
71
|
let xmlDestination = component.getPackageRelativePath(component.xml, targetFormat);
|
|
66
72
|
// quirks:
|
|
67
73
|
// - append or strip the -meta.xml suffix to the path if there's no content and if it's not DigitalExperienceBundle
|
|
@@ -81,7 +87,7 @@ const getXmlDestination = (targetFormat, component, mergeWith) => {
|
|
|
81
87
|
}
|
|
82
88
|
}
|
|
83
89
|
else if (suffix) {
|
|
84
|
-
if (component.type.name === 'Document' && targetFormat === 'metadata') {
|
|
90
|
+
if (component.type.name === 'Document' && targetFormat === 'metadata' && component.content) {
|
|
85
91
|
xmlDestination = xmlDestination.replace(new RegExp('.' + suffix + common_1.META_XML_SUFFIX + '$'), '.' + (0, utils_1.extName)(component.content) + common_1.META_XML_SUFFIX);
|
|
86
92
|
}
|
|
87
93
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA+C;AAC/C,yCAA2D;AAG3D,uCAAiD;AACjD,kDAAkE;AAClE,uEAAoE;AAEpE,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,iBAAiB,GAAG,wBAAe,GAAG,IAAI,CAAC,CAAC;AAErF;;;;;;GAMG;AACH,MAAa,0BAA2B,SAAQ,iDAAuB;IACrE,oFAAoF;IAC7E,KAAK,CAAC,gBAAgB,CAAC,SAA0B;QACtD,OAAO,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IAED,oFAAoF;IAC7E,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,OAAO,aAAa,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACvD,CAAC;CACF;AAVD,gEAUC;AAED,MAAM,aAAa,GAAG,CACpB,SAA0B,EAC1B,YAA4B,EAC5B,SAA2B,EACd,EAAE,CACf,SAAS;KACN,WAAW,EAAE;KACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACd,MAAM,EAAE,IAAA,8CAA+B,EAAC,SAAS,EAAE,IAAI,CAAC;IACxD,MAAM,EAAE,2BAA2B,CAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC;CAC9E,CAAC,CAAC;KACF,MAAM,CACL,SAAS,CAAC,GAAG;IACX,CAAC,CAAC;QACE;YACE,MAAM,EAAE,IAAA,8CAA+B,EAAC,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC;YACjE,MAAM,EAAE,iBAAiB,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC;SAC9D;KACF;IACH,CAAC,CAAC,EAAE,CACP,CAAC;AAEN,gCAAgC;AAChC,MAAM,2BAA2B,GAAG,CAClC,MAAkB,EAClB,YAA4B,EAC5B,SAA0B,EAC1B,SAA2B,EACf,EAAE;IACd,IAAI,SAAS,EAAE,OAAO,EAAE;QACtB,IAAI,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ const decomposedMetadataTransformer_1 = require("./decomposedMetadataTransformer
|
|
|
14
14
|
const staticResourceMetadataTransformer_1 = require("./staticResourceMetadataTransformer");
|
|
15
15
|
const nonDecomposedMetadataTransformer_1 = require("./nonDecomposedMetadataTransformer");
|
|
16
16
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
17
|
-
const messages = core_1.Messages.
|
|
17
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
18
18
|
class MetadataTransformerFactory {
|
|
19
19
|
constructor(registry, context = new convertContext_1.ConvertContext()) {
|
|
20
20
|
this.registry = registry;
|
|
@@ -35,7 +35,7 @@ class MetadataTransformerFactory {
|
|
|
35
35
|
case "nonDecomposed" /* TransformerStrategy.NonDecomposed */:
|
|
36
36
|
return new nonDecomposedMetadataTransformer_1.NonDecomposedMetadataTransformer(this.registry, this.context);
|
|
37
37
|
default:
|
|
38
|
-
throw
|
|
38
|
+
throw messages.createError('error_missing_transformer', [type.name, transformerId]);
|
|
39
39
|
}
|
|
40
40
|
}
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataTransformerFactory.js","sourceRoot":"","sources":["../../../../src/convert/transformers/metadataTransformerFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"metadataTransformerFactory.js","sourceRoot":"","sources":["../../../../src/convert/transformers/metadataTransformerFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA4C;AAG5C,sDAAmD;AAEnD,6EAA0E;AAC1E,mFAAgF;AAChF,2FAAwF;AACxF,yFAAsF;AAEtF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AAEpF,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,QAAQ,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC,CAAC;SACvF;IACH,CAAC;CACF;AA3BD,gEA2BC"}
|
|
@@ -9,7 +9,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
9
9
|
exports.NonDecomposedMetadataTransformer = void 0;
|
|
10
10
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
11
11
|
const kit_1 = require("@salesforce/kit");
|
|
12
|
+
const core_1 = require("@salesforce/core");
|
|
12
13
|
const decomposedMetadataTransformer_1 = require("./decomposedMetadataTransformer");
|
|
14
|
+
core_1.Messages.importMessagesDirectory(__dirname);
|
|
15
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
13
16
|
/**
|
|
14
17
|
* Metadata Transformer for metadata types with children types that are NOT decomposed into separate files.
|
|
15
18
|
*
|
|
@@ -20,21 +23,31 @@ class NonDecomposedMetadataTransformer extends decomposedMetadataTransformer_1.D
|
|
|
20
23
|
// streams uses mergeWith for all types. Removing it would break the interface
|
|
21
24
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
22
25
|
async toSourceFormat(component, mergeWith) {
|
|
26
|
+
var _a;
|
|
23
27
|
// this will only include the incoming (retrieved) labels, not the local file
|
|
24
28
|
const parentXml = await component.parseXml();
|
|
25
29
|
const xmlPathToChildren = `${component.type.name}.${component.type.directoryName}`;
|
|
26
30
|
const incomingChildrenXml = (0, kit_1.ensureArray)((0, ts_types_1.get)(parentXml, xmlPathToChildren));
|
|
31
|
+
if (!component.type.children) {
|
|
32
|
+
throw messages.createError('noChildTypes', [component.type.name, component.fullName, component.xml]);
|
|
33
|
+
}
|
|
27
34
|
// presumes they only have 1 child!
|
|
28
35
|
const [childTypeId] = Object.keys(component.type.children.types);
|
|
29
36
|
const { uniqueIdElement } = component.type.children.types[childTypeId];
|
|
30
|
-
this.context.nonDecomposition.
|
|
31
|
-
state.exampleComponent ?? (state.exampleComponent = component);
|
|
32
|
-
});
|
|
37
|
+
(_a = this.context.nonDecomposition.transactionState).exampleComponent ?? (_a.exampleComponent = component);
|
|
33
38
|
incomingChildrenXml.map((child) => {
|
|
39
|
+
if (!uniqueIdElement) {
|
|
40
|
+
throw messages.createError('uniqueIdElementNotInRegistry', [
|
|
41
|
+
component.type.name,
|
|
42
|
+
component.fullName,
|
|
43
|
+
component.xml,
|
|
44
|
+
]);
|
|
45
|
+
}
|
|
34
46
|
const childName = (0, ts_types_1.getString)(child, uniqueIdElement);
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
47
|
+
if (!childName) {
|
|
48
|
+
throw messages.createError('uniqueIdElementNotInChild', [uniqueIdElement, component.fullName, component.xml]);
|
|
49
|
+
}
|
|
50
|
+
this.context.nonDecomposition.transactionState.childrenByUniqueElement.set(childName, child);
|
|
38
51
|
});
|
|
39
52
|
return [];
|
|
40
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAC/D,yCAA8C;
|
|
1
|
+
{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAC/D,yCAA8C;AAC9C,2CAA4C;AAG5C,mFAAgF;AAChF,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AACpF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;IACjF,+EAA+E;IAC/E,6DAA6D;IACtD,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;;QACjF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,iBAAiB,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnF,MAAM,mBAAmB,GAAG,IAAA,iBAAW,EAAC,IAAA,cAAG,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAc,CAAC;QACxF,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;YAC5B,MAAM,QAAQ,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;SACtG;QACD,mCAAmC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvE,MAAA,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,EAAC,gBAAgB,QAAhB,gBAAgB,GAAK,SAAS,EAAC;QAE9E,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,eAAe,EAAE;gBACpB,MAAM,QAAQ,CAAC,WAAW,CAAC,8BAA8B,EAAE;oBACzD,SAAS,CAAC,IAAI,CAAC,IAAI;oBACnB,SAAS,CAAC,QAAQ;oBAClB,SAAS,CAAC,GAAG;iBACd,CAAC,CAAC;aACJ;YACD,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACpD,IAAI,CAAC,SAAS,EAAE;gBACd,MAAM,QAAQ,CAAC,WAAW,CAAC,2BAA2B,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;aAC/G;YACD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC/F,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAlCD,4EAkCC"}
|
|
@@ -19,15 +19,18 @@ const streams_1 = require("../streams");
|
|
|
19
19
|
const replacements_1 = require("../replacements");
|
|
20
20
|
const baseMetadataTransformer_1 = require("./baseMetadataTransformer");
|
|
21
21
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
22
|
-
const messages = core_1.Messages.
|
|
23
|
-
'error_static_resource_expected_archive_type',
|
|
24
|
-
'error_static_resource_missing_resource_file',
|
|
25
|
-
]);
|
|
22
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
26
23
|
class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
|
|
27
24
|
// allowed to preserve API
|
|
28
25
|
// eslint-disable-next-line class-methods-use-this
|
|
29
26
|
async toMetadataFormat(component) {
|
|
30
27
|
const { content, type, xml } = component;
|
|
28
|
+
if (!content) {
|
|
29
|
+
throw messages.createError('noContentFound', [component.fullName, component.type.name]);
|
|
30
|
+
}
|
|
31
|
+
if (!xml) {
|
|
32
|
+
throw messages.createError('error_parsing_xml', [component.fullName, component.type.name]);
|
|
33
|
+
}
|
|
31
34
|
// archiver/zip.finalize looks like it is async, because it extends streams, but it is not meant to be used that way
|
|
32
35
|
// the typings on it are misleading and unintended. More info https://github.com/archiverjs/node-archiver/issues/476
|
|
33
36
|
// If you await it, bad things happen, like the convert process exiting silently. https://github.com/forcedotcom/cli/issues/1791
|
|
@@ -74,25 +77,28 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
|
|
|
74
77
|
const baseContentPath = getBaseContentPath(component, mergeWith);
|
|
75
78
|
// only unzip an archive component if there isn't a merge component, or the merge component is itself expanded
|
|
76
79
|
const shouldUnzipArchive = StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(componentContentType) &&
|
|
77
|
-
(!mergeWith || mergeWith.tree.isDirectory(mergeContentPath));
|
|
80
|
+
(!mergeWith || (mergeContentPath && mergeWith.tree.isDirectory(mergeContentPath)));
|
|
78
81
|
if (shouldUnzipArchive) {
|
|
79
82
|
// for the bulk of static resource writing we'll start writing ASAP
|
|
80
83
|
// we'll still defer writing the resource-meta.xml file by pushing it onto the writeInfos
|
|
81
|
-
await Promise.all((await
|
|
84
|
+
await Promise.all((await openZipFile(component, content)).files
|
|
82
85
|
.filter((f) => f.type === 'File')
|
|
83
86
|
.map(async (f) => {
|
|
84
87
|
const path = (0, path_1.join)(baseContentPath, f.path);
|
|
85
88
|
const fullDest = (0, path_1.isAbsolute)(path)
|
|
86
89
|
? path
|
|
87
|
-
: (0, path_1.join)(this.defaultDirectory
|
|
90
|
+
: (0, path_1.join)(this.defaultDirectory ?? component.getPackageRelativePath('', 'source'), path);
|
|
88
91
|
// push onto the pipeline and start writing now
|
|
89
92
|
return this.pipeline(f.stream(), fullDest);
|
|
90
93
|
}));
|
|
91
94
|
}
|
|
95
|
+
if (!xml) {
|
|
96
|
+
throw messages.createError('error_parsing_xml', [component.fullName, component.type.name]);
|
|
97
|
+
}
|
|
92
98
|
return [
|
|
93
99
|
{
|
|
94
100
|
source: component.tree.stream(xml),
|
|
95
|
-
output: mergeWith?.xml
|
|
101
|
+
output: mergeWith?.xml ?? component.getPackageRelativePath((0, path_1.basename)(xml), 'source'),
|
|
96
102
|
},
|
|
97
103
|
].concat(shouldUnzipArchive
|
|
98
104
|
? []
|
|
@@ -134,21 +140,33 @@ const FALLBACK_TYPE_MAP = new Map([
|
|
|
134
140
|
]);
|
|
135
141
|
const getContentType = async (component) => {
|
|
136
142
|
const resource = (await component.parseXml()).StaticResource;
|
|
137
|
-
if (!resource || !Object.
|
|
138
|
-
throw new core_1.SfError(messages.getMessage('error_static_resource_missing_resource_file', [
|
|
143
|
+
if (!resource || !Object.keys(resource).includes('contentType')) {
|
|
144
|
+
throw new core_1.SfError(messages.getMessage('error_static_resource_missing_resource_file', [
|
|
145
|
+
(0, path_1.join)('staticresources', component.name ?? component.xml ?? component.type.name),
|
|
146
|
+
]), 'LibraryError');
|
|
147
|
+
}
|
|
148
|
+
const output = resource.contentType ?? DEFAULT_CONTENT_TYPE;
|
|
149
|
+
if (typeof output !== 'string') {
|
|
150
|
+
throw new core_1.SfError(`Expected a string for contentType in ${component.name} (${component.xml}) but got ${output?.toString()}`);
|
|
139
151
|
}
|
|
140
|
-
return
|
|
152
|
+
return output;
|
|
141
153
|
};
|
|
142
154
|
const getBaseContentPath = (component, mergeWith) => {
|
|
143
|
-
|
|
144
|
-
|
|
155
|
+
if (mergeWith?.content) {
|
|
156
|
+
return (0, path_1.join)((0, path_1.dirname)(mergeWith.content), (0, utils_1.baseName)(mergeWith?.content));
|
|
157
|
+
}
|
|
158
|
+
if (typeof component.content === 'string') {
|
|
159
|
+
const baseContentPath = component.getPackageRelativePath(component.content, 'source');
|
|
160
|
+
return (0, path_1.join)((0, path_1.dirname)(baseContentPath), (0, utils_1.baseName)(baseContentPath));
|
|
161
|
+
}
|
|
162
|
+
throw new core_1.SfError(`Expected a content path for ${component.name} (${component.xml})`);
|
|
145
163
|
};
|
|
146
164
|
const getExtensionFromType = (contentType) =>
|
|
147
165
|
// return registered ext, fallback, or the default (application/octet-stream -> bin)
|
|
148
|
-
(0, mime_1.getExtension)(contentType) ?? FALLBACK_TYPE_MAP.get(contentType) ?? (0, mime_1.getExtension)(DEFAULT_CONTENT_TYPE);
|
|
166
|
+
(0, mime_1.getExtension)(contentType) ?? FALLBACK_TYPE_MAP.get(contentType) ?? (0, mime_1.getExtension)(DEFAULT_CONTENT_TYPE) ?? 'bin';
|
|
149
167
|
const componentIsExpandedArchive = async (component) => {
|
|
150
168
|
const { content, tree } = component;
|
|
151
|
-
if (tree.isDirectory(content)) {
|
|
169
|
+
if (content && tree.isDirectory(content)) {
|
|
152
170
|
const contentType = await getContentType(component);
|
|
153
171
|
if (StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(contentType)) {
|
|
154
172
|
return true;
|
|
@@ -157,4 +175,15 @@ const componentIsExpandedArchive = async (component) => {
|
|
|
157
175
|
}
|
|
158
176
|
return false;
|
|
159
177
|
};
|
|
178
|
+
/** wrapper around the Open command so we can emit a nicer error for bad zip files */
|
|
179
|
+
async function openZipFile(component, content) {
|
|
180
|
+
try {
|
|
181
|
+
return await unzipper_1.Open.buffer(await component.tree.readFile(content));
|
|
182
|
+
}
|
|
183
|
+
catch (e) {
|
|
184
|
+
throw new core_1.SfError(`Unable to open zip file ${content} for ${component.name} (${component.xml})`, 'BadZipFile', [
|
|
185
|
+
'Check that your file really is a valid zip archive',
|
|
186
|
+
]);
|
|
187
|
+
}
|
|
188
|
+
}
|
|
160
189
|
//# sourceMappingURL=staticResourceMetadataTransformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAqE;AAErE,uCAA6D;AAC7D,+BAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,10 +74,11 @@ const hasUnsupportedFeatures = (type) => {
|
|
|
74
74
|
return true;
|
|
75
75
|
}
|
|
76
76
|
if (type.orgShapes.developer.features?.length &&
|
|
77
|
-
exports.features.some((feature) => type.orgShapes?.developer.features
|
|
77
|
+
exports.features.some((feature) => type.orgShapes?.developer.features?.includes(feature))) {
|
|
78
78
|
return true;
|
|
79
79
|
}
|
|
80
|
-
return
|
|
80
|
+
return (Boolean(type.orgShapes?.developer.settings) &&
|
|
81
|
+
exports.settings.some((setting) => type.orgShapes?.developer.settings?.[setting]));
|
|
81
82
|
};
|
|
82
83
|
exports.hasUnsupportedFeatures = hasUnsupportedFeatures;
|
|
83
84
|
//# sourceMappingURL=nonSupportedTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nonSupportedTypes.js","sourceRoot":"","sources":["../../../src/registry/nonSupportedTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;;;KAKK;AACQ,QAAA,QAAQ,GAAG;IACtB,mEAAmE;IACnE,gBAAgB;IAChB,mBAAmB;IACnB,cAAc;IACd,8BAA8B;IAC9B,2BAA2B;IAC3B,oBAAoB;IACpB,gBAAgB;IAChB,iBAAiB;IACjB,0BAA0B;IAC1B,sBAAsB;IACtB,mBAAmB;IACnB,2BAA2B;IAC3B,0BAA0B;IAC1B,wBAAwB;IACxB,yBAAyB;IACzB,sCAAsC;IACtC,WAAW;IACX,kCAAkC;IAClC,qBAAqB;IAErB,gBAAgB,EAAE,uDAAuD;CAC1E,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,0FAA0F;CAC1G,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,eAAe;IACf,iCAAiC;IACjC,aAAa;IACb,eAAe;IAEf,0GAA0G;IAC1G,gBAAgB;IAChB,yBAAyB;IACzB,4BAA4B;IAC5B,YAAY;IACZ,oBAAoB;IAEpB,8DAA8D;IAC9D,kIAAkI;IAClI,qBAAqB;IACrB,6BAA6B;IAE7B,mEAAmE;IACnE,0BAA0B;IAE1B,4CAA4C;IAC5C,2BAA2B;IAE3B,0CAA0C;IAC1C,8BAA8B;IAE9B,qDAAqD;IACrD,uBAAuB;IACvB,wBAAwB;IAExB,gDAAgD;IAChD,2BAA2B;IAE3B,4CAA4C;IAC5C,gBAAgB;CACjB,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,IAAwB,EAAW,EAAE;IAC1E,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IAED,IACE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM;QACzC,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"nonSupportedTypes.js","sourceRoot":"","sources":["../../../src/registry/nonSupportedTypes.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAIH;;;;;KAKK;AACQ,QAAA,QAAQ,GAAG;IACtB,mEAAmE;IACnE,gBAAgB;IAChB,mBAAmB;IACnB,cAAc;IACd,8BAA8B;IAC9B,2BAA2B;IAC3B,oBAAoB;IACpB,gBAAgB;IAChB,iBAAiB;IACjB,0BAA0B;IAC1B,sBAAsB;IACtB,mBAAmB;IACnB,2BAA2B;IAC3B,0BAA0B;IAC1B,wBAAwB;IACxB,yBAAyB;IACzB,sCAAsC;IACtC,WAAW;IACX,kCAAkC;IAClC,qBAAqB;IAErB,gBAAgB,EAAE,uDAAuD;CAC1E,CAAC;AAEW,QAAA,QAAQ,GAAG;IACtB,aAAa,EAAE,0FAA0F;CAC1G,CAAC;AACW,QAAA,aAAa,GAAG;IAC3B,+CAA+C;IAC/C,eAAe;IACf,iCAAiC;IACjC,aAAa;IACb,eAAe;IAEf,0GAA0G;IAC1G,gBAAgB;IAChB,yBAAyB;IACzB,4BAA4B;IAC5B,YAAY;IACZ,oBAAoB;IAEpB,8DAA8D;IAC9D,kIAAkI;IAClI,qBAAqB;IACrB,6BAA6B;IAE7B,mEAAmE;IACnE,0BAA0B;IAE1B,4CAA4C;IAC5C,2BAA2B;IAE3B,0CAA0C;IAC1C,8BAA8B;IAE9B,qDAAqD;IACrD,uBAAuB;IACvB,wBAAwB;IAExB,gDAAgD;IAChD,2BAA2B;IAE3B,4CAA4C;IAC5C,gBAAgB;CACjB,CAAC;AAEK,MAAM,sBAAsB,GAAG,CAAC,IAAwB,EAAW,EAAE;IAC1E,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IAED,IACE,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM;QACzC,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,EACjF;QACA,OAAO,IAAI,CAAC;KACb;IACD,OAAO,CACL,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC;QAC3C,gBAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,CAC1E,CAAC;AACJ,CAAC,CAAC;AAfW,QAAA,sBAAsB,0BAejC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { MetadataRegistry, MetadataType } from './types';
|
|
2
2
|
export declare class RegistryAccess {
|
|
3
3
|
private registry;
|
|
4
|
-
private strictFolderTypes
|
|
5
|
-
private folderContentTypes
|
|
6
|
-
private aliasTypes
|
|
4
|
+
private strictFolderTypes?;
|
|
5
|
+
private folderContentTypes?;
|
|
6
|
+
private aliasTypes?;
|
|
7
7
|
constructor(registry?: MetadataRegistry);
|
|
8
8
|
/**
|
|
9
9
|
* Query a metadata type by its name.
|
|
@@ -23,10 +23,12 @@ export declare class RegistryAccess {
|
|
|
23
23
|
* Searches for the first metadata type in the registry that returns `true`
|
|
24
24
|
* for the given predicate function.
|
|
25
25
|
*
|
|
26
|
+
* Can return undefined if no type matches the predicate.
|
|
27
|
+
*
|
|
26
28
|
* @param predicate - Predicate to test types with
|
|
27
29
|
* @returns The first metadata type object that fulfills the predicate
|
|
28
30
|
*/
|
|
29
|
-
findType(predicate: (type: MetadataType) => boolean): MetadataType;
|
|
31
|
+
findType(predicate: (type: MetadataType) => boolean): MetadataType | undefined;
|
|
30
32
|
/**
|
|
31
33
|
* Query the types that require a strict parent directory
|
|
32
34
|
*
|
|
@@ -13,10 +13,7 @@ const registry_1 = require("./registry");
|
|
|
13
13
|
* Container for querying metadata registry data.
|
|
14
14
|
*/
|
|
15
15
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
16
|
-
const messages = core_1.Messages.
|
|
17
|
-
'error_missing_child_type_definition',
|
|
18
|
-
'error_missing_type_definition',
|
|
19
|
-
]);
|
|
16
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
20
17
|
class RegistryAccess {
|
|
21
18
|
constructor(registry = registry_1.registry) {
|
|
22
19
|
this.registry = registry;
|
|
@@ -40,10 +37,9 @@ class RegistryAccess {
|
|
|
40
37
|
if (!this.registry.types[lower]) {
|
|
41
38
|
throw new core_1.SfError(messages.getMessage('error_missing_type_definition', [lower]), 'RegistryError');
|
|
42
39
|
}
|
|
40
|
+
const alias = this.registry.types[lower].aliasFor;
|
|
43
41
|
// redirect via alias
|
|
44
|
-
return this.registry.types[lower]
|
|
45
|
-
? this.registry.types[this.registry.types[lower].aliasFor]
|
|
46
|
-
: this.registry.types[lower];
|
|
42
|
+
return alias ? this.registry.types[alias] : this.registry.types[lower];
|
|
47
43
|
}
|
|
48
44
|
/**
|
|
49
45
|
* Query a metadata type by its file suffix.
|
|
@@ -52,7 +48,7 @@ class RegistryAccess {
|
|
|
52
48
|
* @returns The corresponding metadata type object
|
|
53
49
|
*/
|
|
54
50
|
getTypeBySuffix(suffix) {
|
|
55
|
-
if (this.registry.suffixes[suffix]) {
|
|
51
|
+
if (this.registry.suffixes?.[suffix]) {
|
|
56
52
|
const typeId = this.registry.suffixes[suffix];
|
|
57
53
|
return this.getTypeByName(typeId);
|
|
58
54
|
}
|
|
@@ -61,12 +57,14 @@ class RegistryAccess {
|
|
|
61
57
|
* Searches for the first metadata type in the registry that returns `true`
|
|
62
58
|
* for the given predicate function.
|
|
63
59
|
*
|
|
60
|
+
* Can return undefined if no type matches the predicate.
|
|
61
|
+
*
|
|
64
62
|
* @param predicate - Predicate to test types with
|
|
65
63
|
* @returns The first metadata type object that fulfills the predicate
|
|
66
64
|
*/
|
|
67
65
|
findType(predicate) {
|
|
68
66
|
const firstMatch = Object.values(this.registry.types).find(predicate);
|
|
69
|
-
return firstMatch
|
|
67
|
+
return firstMatch?.aliasFor ? this.registry.types[firstMatch.aliasFor] : firstMatch;
|
|
70
68
|
}
|
|
71
69
|
/**
|
|
72
70
|
* Query the types that require a strict parent directory
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AACrD,yCAAyD;AAGzD;;GAEG;AAEH,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"registryAccess.js","sourceRoot":"","sources":["../../../src/registry/registryAccess.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AACrD,yCAAyD;AAGzD;;GAEG;AAEH,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AAEpF,MAAa,cAAc;IAOzB,YAAmB,WAA6B,mBAAe;QAC7D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,IAAY;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QACxC,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YAC3E,IAAI,SAAS,EAAE;gBACb,OAAO,SAAS,CAAC;aAClB;YACD,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,qCAAqC,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,EACjF,eAAe,CAChB,CAAC;SACH;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,+BAA+B,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;SACnG;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QAClD,qBAAqB;QACrB,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACzE,CAAC;IAED;;;;;OAKG;IACI,eAAe,CAAC,MAAc;QACnC,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,EAAE;YACpC,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;IAED;;;;;;;;OAQG;IACI,QAAQ,CAAC,SAA0C;QACxD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACtE,OAAO,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IACtF,CAAC;IAED;;;;;;OAMG;IACI,oBAAoB;QACzB,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;YAC3B,IAAI,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAC5E,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CACxC,CAAC;SACH;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC;IAED;;;;;;;OAOG;IACI,qBAAqB;QAC1B,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CACjE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,IAAI,CAAC,QAAQ,CACnD,CAAC;SACH;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC;IACjC,CAAC;IAED;;;;;;;OAOG;IACI,aAAa;QAClB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtF;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED;;;;;OAKG;IACI,aAAa,CAAC,SAAiB;QACpC,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC;QAC7C,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;YACnC,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;SAC1C;IACH,CAAC;CACF;AA9HD,wCA8HC"}
|