@salesforce/source-deploy-retrieve 7.15.0 → 8.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/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 +5 -4
- 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 +6 -5
|
@@ -16,7 +16,7 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
|
|
|
16
16
|
protected ownFolder: boolean;
|
|
17
17
|
protected metadataWithContent: boolean;
|
|
18
18
|
constructor(type: MetadataType, registry?: RegistryAccess, forceIgnore?: ForceIgnore, tree?: TreeContainer);
|
|
19
|
-
getComponent(path: SourcePath, isResolvingSource?: boolean): SourceComponent;
|
|
19
|
+
getComponent(path: SourcePath, isResolvingSource?: boolean): SourceComponent | undefined;
|
|
20
20
|
/**
|
|
21
21
|
* Control whether metadata and content metadata files are allowed for an adapter.
|
|
22
22
|
*/
|
|
@@ -28,8 +28,8 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
|
|
|
28
28
|
*
|
|
29
29
|
* @param path File path of a metadata component
|
|
30
30
|
*/
|
|
31
|
-
protected parseAsRootMetadataXml(path: SourcePath): MetadataXml;
|
|
32
|
-
protected parseMetadataXml(path: SourcePath): MetadataXml;
|
|
31
|
+
protected parseAsRootMetadataXml(path: SourcePath): MetadataXml | undefined;
|
|
32
|
+
protected parseMetadataXml(path: SourcePath): MetadataXml | undefined;
|
|
33
33
|
/**
|
|
34
34
|
* If the path given to `getComponent` serves as the sole definition (metadata and content)
|
|
35
35
|
* for a component, parse the name and return it. This allows matching files in metadata
|
|
@@ -46,7 +46,7 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
|
|
|
46
46
|
*
|
|
47
47
|
* @param trigger Path that `getComponent` was called with
|
|
48
48
|
*/
|
|
49
|
-
protected abstract getRootMetadataXmlPath(trigger: SourcePath): SourcePath;
|
|
49
|
+
protected abstract getRootMetadataXmlPath(trigger: SourcePath): SourcePath | undefined;
|
|
50
50
|
/**
|
|
51
51
|
* Populate additional properties on a SourceComponent, such as source files and child components.
|
|
52
52
|
* The component passed to `populate` has its fullName, xml, and type properties already set.
|
|
@@ -54,5 +54,5 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
|
|
|
54
54
|
* @param component Component to populate properties on
|
|
55
55
|
* @param trigger Path that `getComponent` was called with
|
|
56
56
|
*/
|
|
57
|
-
protected abstract populate(trigger: SourcePath, component?: SourceComponent, isResolvingSource?: boolean): SourceComponent;
|
|
57
|
+
protected abstract populate(trigger: SourcePath, component?: SourceComponent, isResolvingSource?: boolean): SourceComponent | undefined;
|
|
58
58
|
}
|
|
@@ -9,13 +9,14 @@ exports.BaseSourceAdapter = void 0;
|
|
|
9
9
|
*/
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const core_1 = require("@salesforce/core");
|
|
12
|
+
const ts_types_1 = require("@salesforce/ts-types");
|
|
12
13
|
const utils_1 = require("../../utils");
|
|
13
14
|
const forceIgnore_1 = require("../forceIgnore");
|
|
14
15
|
const treeContainers_1 = require("../treeContainers");
|
|
15
16
|
const sourceComponent_1 = require("../sourceComponent");
|
|
16
17
|
const registry_1 = require("../../registry");
|
|
17
18
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
18
|
-
const messages = core_1.Messages.
|
|
19
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
19
20
|
class BaseSourceAdapter {
|
|
20
21
|
constructor(type, registry = new registry_1.RegistryAccess(), forceIgnore = new forceIgnore_1.ForceIgnore(), tree = new treeContainers_1.NodeFSTreeContainer()) {
|
|
21
22
|
/**
|
|
@@ -42,8 +43,9 @@ class BaseSourceAdapter {
|
|
|
42
43
|
}
|
|
43
44
|
let component;
|
|
44
45
|
if (rootMetadata) {
|
|
46
|
+
const name = this.calculateName(rootMetadata);
|
|
45
47
|
component = new sourceComponent_1.SourceComponent({
|
|
46
|
-
name
|
|
48
|
+
name,
|
|
47
49
|
type: this.type,
|
|
48
50
|
xml: rootMetadata.path,
|
|
49
51
|
parentType: this.type.folderType ? this.registry.getTypeByName(this.type.folderType) : undefined,
|
|
@@ -109,7 +111,7 @@ class BaseSourceAdapter {
|
|
|
109
111
|
// associated directoryName.
|
|
110
112
|
if (this.type.inFolder) {
|
|
111
113
|
const fullName = (0, utils_1.parseNestedFullName)(path, this.type.directoryName);
|
|
112
|
-
if (fullName) {
|
|
114
|
+
if (fullName && this.type.suffix) {
|
|
113
115
|
return { fullName, suffix: this.type.suffix, path };
|
|
114
116
|
}
|
|
115
117
|
}
|
|
@@ -133,7 +135,7 @@ class BaseSourceAdapter {
|
|
|
133
135
|
// inFolder types (report, dashboard, emailTemplate, document) and their folder
|
|
134
136
|
// container types (reportFolder, dashboardFolder, emailFolder, documentFolder)
|
|
135
137
|
if (inFolder || folderContentType) {
|
|
136
|
-
return (0, utils_1.parseNestedFullName)(rootMetadata.path, directoryName);
|
|
138
|
+
return (0, ts_types_1.ensureString)((0, utils_1.parseNestedFullName)(rootMetadata.path, directoryName), `Unable to calculate fullName from component at path: ${rootMetadata.path} (${this.type.name})`);
|
|
137
139
|
}
|
|
138
140
|
// not using folders? then name is fullname
|
|
139
141
|
if (!folderType) {
|
|
@@ -149,6 +151,7 @@ class BaseSourceAdapter {
|
|
|
149
151
|
if (grandparentType.folderType === this.type.id) {
|
|
150
152
|
return rootMetadata.fullName;
|
|
151
153
|
}
|
|
154
|
+
throw messages.createError('cantGetName', [rootMetadata.path, this.type.name]);
|
|
152
155
|
}
|
|
153
156
|
}
|
|
154
157
|
exports.BaseSourceAdapter = BaseSourceAdapter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,2CAAqD;
|
|
1
|
+
{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,5 +39,5 @@ export declare class BundleSourceAdapter extends MixedContentSourceAdapter {
|
|
|
39
39
|
* @param component Component to populate properties on
|
|
40
40
|
* @protected
|
|
41
41
|
*/
|
|
42
|
-
protected populate(trigger: SourcePath, component?: SourceComponent): SourceComponent;
|
|
42
|
+
protected populate(trigger: SourcePath, component?: SourceComponent): SourceComponent | undefined;
|
|
43
43
|
}
|
|
@@ -32,11 +32,11 @@ import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
|
|
|
32
32
|
export declare class DecomposedSourceAdapter extends MixedContentSourceAdapter {
|
|
33
33
|
protected ownFolder: boolean;
|
|
34
34
|
protected metadataWithContent: boolean;
|
|
35
|
-
getComponent(path: SourcePath, isResolvingSource?: boolean): SourceComponent;
|
|
35
|
+
getComponent(path: SourcePath, isResolvingSource?: boolean): SourceComponent | undefined;
|
|
36
36
|
/**
|
|
37
37
|
* If the trigger turns out to be part of a child component, `populate` will build
|
|
38
38
|
* the child component, set its parent property to the one created by the
|
|
39
39
|
* `BaseSourceAdapter`, and return the child component instead.
|
|
40
40
|
*/
|
|
41
|
-
protected populate(trigger: SourcePath, component?: SourceComponent, isResolvingSource?: boolean): SourceComponent;
|
|
41
|
+
protected populate(trigger: SourcePath, component?: SourceComponent, isResolvingSource?: boolean): SourceComponent | undefined;
|
|
42
42
|
}
|
|
@@ -12,7 +12,7 @@ const sourceComponent_1 = require("../sourceComponent");
|
|
|
12
12
|
const utils_1 = require("../../utils");
|
|
13
13
|
const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
|
|
14
14
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
15
|
-
const messages = core_1.Messages.
|
|
15
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
16
16
|
/**
|
|
17
17
|
* Handles decomposed types. A flavor of mixed content where a component can
|
|
18
18
|
* have additional -meta.xml files that represent child components of the main
|
|
@@ -75,12 +75,12 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
|
|
|
75
75
|
*/
|
|
76
76
|
populate(trigger, component, isResolvingSource) {
|
|
77
77
|
const metaXml = (0, utils_1.parseMetadataXml)(trigger);
|
|
78
|
-
if (metaXml) {
|
|
78
|
+
if (metaXml?.suffix) {
|
|
79
79
|
const pathToContent = this.trimPathToContent(trigger);
|
|
80
|
-
const childTypeId = this.type.children
|
|
80
|
+
const childTypeId = this.type.children?.suffixes?.[metaXml.suffix];
|
|
81
81
|
const triggerIsAChild = !!childTypeId;
|
|
82
|
-
const strategy = this.type.strategies
|
|
83
|
-
if (triggerIsAChild && !this.type.children.types[childTypeId].unaddressableWithoutParent) {
|
|
82
|
+
const strategy = this.type.strategies?.decomposition;
|
|
83
|
+
if (triggerIsAChild && this.type.children && !this.type.children.types[childTypeId].unaddressableWithoutParent) {
|
|
84
84
|
if (strategy === "folderPerType" /* DecompositionStrategy.FolderPerType */ || isResolvingSource) {
|
|
85
85
|
let parent = component;
|
|
86
86
|
if (!parent) {
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ export declare class DigitalExperienceSourceAdapter extends BundleSourceAdapter
|
|
|
46
46
|
protected getRootMetadataXmlPath(trigger: string): string;
|
|
47
47
|
protected trimPathToContent(path: string): string;
|
|
48
48
|
protected populate(trigger: string, component?: SourceComponent): SourceComponent;
|
|
49
|
-
protected parseMetadataXml(path: SourcePath): MetadataXml;
|
|
49
|
+
protected parseMetadataXml(path: SourcePath): MetadataXml | undefined;
|
|
50
50
|
private getBundleName;
|
|
51
51
|
private getBundleMetadataXmlPath;
|
|
52
52
|
private isBundleType;
|
|
@@ -8,10 +8,13 @@ exports.DigitalExperienceSourceAdapter = 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 __1 = require("..");
|
|
13
14
|
const utils_1 = require("../../utils");
|
|
14
15
|
const bundleSourceAdapter_1 = require("./bundleSourceAdapter");
|
|
16
|
+
core_1.Messages.importMessagesDirectory(__dirname);
|
|
17
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
15
18
|
/**
|
|
16
19
|
* Source Adapter for DigitalExperience metadata types. This metadata type is a bundled type of the format
|
|
17
20
|
*
|
|
@@ -58,11 +61,14 @@ class DigitalExperienceSourceAdapter extends bundleSourceAdapter_1.BundleSourceA
|
|
|
58
61
|
return this.getBundleMetadataXmlPath(trigger);
|
|
59
62
|
}
|
|
60
63
|
// metafile name = metaFileSuffix for DigitalExperience.
|
|
64
|
+
if (!this.type.metaFileSuffix) {
|
|
65
|
+
throw messages.createError('missingMetaFileSuffix', [this.type.name]);
|
|
66
|
+
}
|
|
61
67
|
return (0, path_1.join)((0, path_1.dirname)(trigger), this.type.metaFileSuffix);
|
|
62
68
|
}
|
|
63
69
|
trimPathToContent(path) {
|
|
64
70
|
if (this.isBundleType()) {
|
|
65
|
-
return;
|
|
71
|
+
return path;
|
|
66
72
|
}
|
|
67
73
|
const pathToContent = (0, path_1.dirname)(path);
|
|
68
74
|
const parts = pathToContent.split(path_1.sep);
|
|
@@ -80,12 +86,16 @@ class DigitalExperienceSourceAdapter extends bundleSourceAdapter_1.BundleSourceA
|
|
|
80
86
|
return pathToContent;
|
|
81
87
|
}
|
|
82
88
|
populate(trigger, component) {
|
|
83
|
-
if (this.isBundleType()) {
|
|
89
|
+
if (this.isBundleType() && component) {
|
|
84
90
|
// for top level types we don't need to resolve parent
|
|
85
91
|
return component;
|
|
86
92
|
}
|
|
87
93
|
const source = super.populate(trigger, component);
|
|
88
94
|
const parentType = this.registry.getParentType(this.type.id);
|
|
95
|
+
// we expect source, parentType and content to be defined.
|
|
96
|
+
if (!source || !parentType || !source.content) {
|
|
97
|
+
throw messages.createError('error_failed_convert', [component?.fullName ?? this.type.name]);
|
|
98
|
+
}
|
|
89
99
|
const parent = new __1.SourceComponent({
|
|
90
100
|
name: this.getBundleName(source.content),
|
|
91
101
|
type: parentType,
|
|
@@ -124,7 +134,7 @@ class DigitalExperienceSourceAdapter extends bundleSourceAdapter_1.BundleSourceA
|
|
|
124
134
|
// 3 because we want 'digitaExperiences' directory, 'baseType' directory and 'bundleName' directory
|
|
125
135
|
const basePath = pathParts.slice(0, typeFolderIndex + 3).join(path_1.sep);
|
|
126
136
|
const bundleFileName = pathParts[typeFolderIndex + 2];
|
|
127
|
-
const suffix = this.isBundleType() ? this.type.suffix : this.registry.getParentType(this.type.id)
|
|
137
|
+
const suffix = this.isBundleType() ? this.type.suffix : this.registry.getParentType(this.type.id)?.suffix;
|
|
128
138
|
return `${basePath}${path_1.sep}${bundleFileName}.${suffix}${common_1.META_XML_SUFFIX}`;
|
|
129
139
|
}
|
|
130
140
|
isBundleType() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"digitalExperienceSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/digitalExperienceSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA0C;AAC1C,yCAA+C;AAC/C,0BAAqC;AAErC,uCAAmD;AAEnD,+DAA4D;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAa,8BAA+B,SAAQ,yCAAmB;IAC3D,sBAAsB,CAAC,OAAe;QAC9C,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YACvB,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;SAC/C;QACD,wDAAwD;QACxD,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAES,iBAAiB,CAAC,IAAY;QACtC,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YACvB,OAAO;
|
|
1
|
+
{"version":3,"file":"digitalExperienceSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/digitalExperienceSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA0C;AAC1C,2CAA4C;AAC5C,yCAA+C;AAC/C,0BAAqC;AAErC,uCAAmD;AAEnD,+DAA4D;AAE5D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AACpF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,MAAa,8BAA+B,SAAQ,yCAAmB;IAC3D,sBAAsB,CAAC,OAAe;QAC9C,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YACvB,OAAO,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;SAC/C;QACD,wDAAwD;QACxD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE;YAC7B,MAAM,QAAQ,CAAC,WAAW,CAAC,uBAAuB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SACvE;QACD,OAAO,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,OAAO,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC1D,CAAC;IAES,iBAAiB,CAAC,IAAY;QACtC,IAAI,IAAI,CAAC,YAAY,EAAE,EAAE;YACvB,OAAO,IAAI,CAAC;SACb;QACD,MAAM,aAAa,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QACpC,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QACvC;;iGAEyF;QACzF,MAAM,uBAAuB,GAAG,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QACpE,IAAI,uBAAuB,GAAG,CAAC,CAAC,EAAE;YAChC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,uBAAuB,GAAG,CAAC,CAAC;YACzD,IAAI,KAAK,KAAK,wCAAwC,EAAE;gBACtD,KAAK,CAAC,GAAG,EAAE,CAAC;gBACZ,OAAO,KAAK,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;aACxB;SACF;QACD,OAAO,aAAa,CAAC;IACvB,CAAC;IAES,QAAQ,CAAC,OAAe,EAAE,SAA2B;QAC7D,IAAI,IAAI,CAAC,YAAY,EAAE,IAAI,SAAS,EAAE;YACpC,sDAAsD;YACtD,OAAO,SAAS,CAAC;SAClB;QACD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC7D,0DAA0D;QAC1D,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YAC7C,MAAM,QAAQ,CAAC,WAAW,CAAC,sBAAsB,EAAE,CAAC,SAAS,EAAE,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC7F;QACD,MAAM,MAAM,GAAG,IAAI,mBAAe,CAChC;YACE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC;YACxC,IAAI,EAAE,UAAU;YAChB,GAAG,EAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC;SACnD,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;QACF,OAAO,IAAI,mBAAe,CACxB;YACE,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC;YAC3C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,MAAM;YACN,UAAU;SACX,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;IACJ,CAAC;IAES,gBAAgB,CAAC,IAAgB;QACzC,MAAM,GAAG,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,GAAG,EAAE;YACP,OAAO;gBACL,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;gBAClC,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,IAAI,EAAE,GAAG,CAAC,IAAI;aACf,CAAC;SACH;IACH,CAAC;IAEO,aAAa,CAAC,WAAmB;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,WAAW,CAAC,CAAC;QAC9D,OAAO,GAAG,IAAA,kBAAU,EAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,IAAI,IAAA,kBAAU,EAAC,UAAU,CAAC,EAAE,CAAC;IACxE,CAAC;IAEO,wBAAwB,CAAC,IAAY;QAC3C,IAAI,IAAI,CAAC,YAAY,EAAE,IAAI,IAAI,CAAC,QAAQ,CAAC,wBAAe,CAAC,EAAE;YACzD,mGAAmG;YACnG,OAAO,IAAI,CAAC;SACb;QACD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,mGAAmG;QACnG,MAAM,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,SAAS,CAAC,eAAe,GAAG,CAAC,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC;QAC1G,OAAO,GAAG,QAAQ,GAAG,UAAG,GAAG,cAAc,IAAI,MAAM,GAAG,wBAAe,EAAE,CAAC;IAC1E,CAAC;IAEO,YAAY;QAClB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,yBAAyB,CAAC;IACpD,CAAC;CACF;AAnGD,wEAmGC;AAED;;;GAGG;AACH,MAAM,qBAAqB,GAAG,CAAC,WAAmB,EAAU,EAAE,CAAC,GAAG,IAAA,kBAAU,EAAC,WAAW,CAAC,IAAI,IAAA,gBAAQ,EAAC,WAAW,CAAC,EAAE,CAAC;AAErH,wFAAwF;AACxF,MAAM,wCAAwC,GAAG,CAAC,CAAC"}
|
|
@@ -12,10 +12,7 @@ const common_1 = require("../../common");
|
|
|
12
12
|
const path_1 = require("../../utils/path");
|
|
13
13
|
const baseSourceAdapter_1 = require("./baseSourceAdapter");
|
|
14
14
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
15
|
-
const messages = core_1.Messages.
|
|
16
|
-
'error_no_source_ignore',
|
|
17
|
-
'error_expected_source_files',
|
|
18
|
-
]);
|
|
15
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
19
16
|
/**
|
|
20
17
|
* Handles types with a single content file with a matching file extension.
|
|
21
18
|
*
|
|
@@ -50,7 +47,6 @@ class MatchingContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter
|
|
|
50
47
|
}
|
|
51
48
|
if (!sourcePath) {
|
|
52
49
|
throw new core_1.SfError(messages.getMessage('error_expected_source_files', [trigger, this.type.name]), 'ExpectedSourceFilesError');
|
|
53
|
-
// throw new ExpectedSourceFilesError(this.type, trigger);
|
|
54
50
|
}
|
|
55
51
|
else if (this.forceIgnore.denies(sourcePath)) {
|
|
56
52
|
throw new core_1.SfError(messages.getMessage('error_no_source_ignore', [this.type.name, sourcePath]), 'UnexpectedForceIgnore');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matchingContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/matchingContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,yCAA2D;AAC3D,2CAA2C;AAE3C,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"matchingContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/matchingContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,yCAA2D;AAC3D,2CAA2C;AAE3C,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AAEpF;;;;;;;;;;;;;;GAcG;AACH,MAAa,4BAA6B,SAAQ,qCAAiB;IACjE,oCAAoC;IACpC,kDAAkD;IACxC,sBAAsB,CAAC,OAAmB;QAClD,OAAO,GAAG,OAAO,GAAG,wBAAe,EAAE,CAAC;IACxC,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,IAAI,UAAkC,CAAC;QAEvC,IAAI,SAAS,CAAC,GAAG,KAAK,OAAO,EAAE;YAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,GAAG,MAAM,CAAC;aACrB;SACF;aAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YAC7C,UAAU,GAAG,OAAO,CAAC;SACtB;QAED,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC7E,0BAA0B,CAC3B,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAC3E,uBAAuB,CACxB,CAAC;SACH;QAED,SAAS,CAAC,OAAO,GAAG,UAAU,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,oBAAoB,CAAC,MAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;IACtE,CAAC;CACF;AAtCD,oEAsCC;AAED,MAAM,mBAAmB,GAAG,CAAC,MAAkB,EAAc,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,wBAAe,CAAC,CAAC,CAAC"}
|
|
@@ -26,8 +26,12 @@ import { BaseSourceAdapter } from './baseSourceAdapter';
|
|
|
26
26
|
*```
|
|
27
27
|
*/
|
|
28
28
|
export declare class MixedContentSourceAdapter extends BaseSourceAdapter {
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
/**
|
|
30
|
+
*
|
|
31
|
+
* Returns undefined if no matching file is found
|
|
32
|
+
*/
|
|
33
|
+
protected getRootMetadataXmlPath(trigger: SourcePath): SourcePath | undefined;
|
|
34
|
+
protected populate(trigger: SourcePath, component?: SourceComponent): SourceComponent | undefined;
|
|
31
35
|
/**
|
|
32
36
|
* Trim a path up until the root of a component's content. If the content is a file,
|
|
33
37
|
* the given path will be returned back. If the content is a folder, the path to that
|
|
@@ -42,6 +46,8 @@ export declare class MixedContentSourceAdapter extends BaseSourceAdapter {
|
|
|
42
46
|
* content. "Content" can either be a single file or an entire directory. If the content
|
|
43
47
|
* is a directory, the path can be files or other directories inside of it.
|
|
44
48
|
*
|
|
49
|
+
* Returns undefined if no matching file is found
|
|
50
|
+
*
|
|
45
51
|
* @param path Path to content or a child of the content
|
|
46
52
|
*/
|
|
47
53
|
private findMetadataFromContent;
|
|
@@ -13,7 +13,7 @@ const path_2 = require("../../utils/path");
|
|
|
13
13
|
const sourceComponent_1 = require("../sourceComponent");
|
|
14
14
|
const baseSourceAdapter_1 = require("./baseSourceAdapter");
|
|
15
15
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
16
|
-
const messages = core_1.Messages.
|
|
16
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
17
17
|
/**
|
|
18
18
|
* Handles types with mixed content. Mixed content means there are one or more additional
|
|
19
19
|
* file(s) associated with a component with any file extension. Even an entire folder
|
|
@@ -39,6 +39,10 @@ const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr
|
|
|
39
39
|
*```
|
|
40
40
|
*/
|
|
41
41
|
class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
|
|
42
|
+
/**
|
|
43
|
+
*
|
|
44
|
+
* Returns undefined if no matching file is found
|
|
45
|
+
*/
|
|
42
46
|
getRootMetadataXmlPath(trigger) {
|
|
43
47
|
if (this.ownFolder) {
|
|
44
48
|
const componentRoot = this.trimPathToContent(trigger);
|
|
@@ -47,10 +51,10 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
|
|
|
47
51
|
return this.findMetadataFromContent(trigger);
|
|
48
52
|
}
|
|
49
53
|
populate(trigger, component) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
+
const trimmedPath = this.trimPathToContent(trigger);
|
|
55
|
+
const contentPath = trimmedPath === component?.xml
|
|
56
|
+
? this.tree.find('content', (0, path_2.baseName)(trimmedPath), (0, path_1.dirname)(trimmedPath))
|
|
57
|
+
: trimmedPath;
|
|
54
58
|
// Content path might be undefined for staticResource where all files are ignored and only the xml is included.
|
|
55
59
|
if (!contentPath || !this.tree.exists(contentPath)) {
|
|
56
60
|
throw new core_1.SfError(messages.getMessage('error_expected_source_files', [trigger, this.type.name]), 'ExpectedSourceFilesError');
|
|
@@ -87,6 +91,8 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
|
|
|
87
91
|
* content. "Content" can either be a single file or an entire directory. If the content
|
|
88
92
|
* is a directory, the path can be files or other directories inside of it.
|
|
89
93
|
*
|
|
94
|
+
* Returns undefined if no matching file is found
|
|
95
|
+
*
|
|
90
96
|
* @param path Path to content or a child of the content
|
|
91
97
|
*/
|
|
92
98
|
findMetadataFromContent(path) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAoD;AACpD,2CAAqD;AACrD,2CAA4C;AAE5C,wDAAqD;AACrD,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAoD;AACpD,2CAAqD;AACrD,2CAA4C;AAE5C,wDAAqD;AACrD,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AACpF;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,yBAA0B,SAAQ,qCAAiB;IAC9D;;;OAGG;IACO,sBAAsB,CAAC,OAAmB;QAClD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA2B;QACjE,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,WAAW,GACf,WAAW,KAAK,SAAS,EAAE,GAAG;YAC5B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC;YACxE,CAAC,CAAC,WAAW,CAAC;QAElB,+GAA+G;QAC/G,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAClD,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC7E,0BAA0B,CAC3B,CAAC;SACH;QAED,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;SACjC;aAAM;YACL,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,WAAW;gBACpB,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,IAAI,IAAA,WAAI,EAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;aAC7E,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACO,iBAAiB,CAAC,IAAgB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;;;OAQG;IACK,uBAAuB,CAAC,IAAgB;QAC9C,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3E,CAAC;CACF;AA5ED,8DA4EC"}
|
|
@@ -25,7 +25,7 @@ var AdapterId;
|
|
|
25
25
|
AdapterId["DigitalExperience"] = "digitalExperience";
|
|
26
26
|
})(AdapterId || (AdapterId = {}));
|
|
27
27
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
28
|
-
const messages = core_1.Messages.
|
|
28
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
29
29
|
class SourceAdapterFactory {
|
|
30
30
|
constructor(registry, tree) {
|
|
31
31
|
this.registry = registry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceAdapterFactory.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/sourceAdapterFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,gDAA6C;AAG7C,+DAA4D;AAC5D,uEAAoE;AACpE,iFAA8E;AAC9E,2EAAwE;AACxE,iEAA8D;AAC9D,qFAAkF;AAElF,IAAK,SAOJ;AAPD,WAAK,SAAS;IACZ,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,gCAAmB,CAAA;IACnB,wDAA2C,CAAA;IAC3C,0CAA6B,CAAA;IAC7B,oDAAuC,CAAA;AACzC,CAAC,EAPI,SAAS,KAAT,SAAS,QAOb;AAED,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"sourceAdapterFactory.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/sourceAdapterFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,gDAA6C;AAG7C,+DAA4D;AAC5D,uEAAoE;AACpE,iFAA8E;AAC9E,2EAAwE;AACxE,iEAA8D;AAC9D,qFAAkF;AAElF,IAAK,SAOJ;AAPD,WAAK,SAAS;IACZ,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,gCAAmB,CAAA;IACnB,wDAA2C,CAAA;IAC3C,0CAA6B,CAAA;IAC7B,oDAAuC,CAAA;AACzC,CAAC,EAPI,SAAS,KAAT,SAAS,QAOb;AAED,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,oCAAoC,EAAE,KAAK,CAAC,CAAC;AAEpF,MAAa,oBAAoB;IAI/B,YAAmB,QAAwB,EAAE,IAAmB;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,UAAU,CAAC,IAAkB,EAAE,WAAW,GAAG,IAAI,yBAAW,EAAE;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,OAAoB,CAAC;QACxD,QAAQ,SAAS,EAAE;YACjB,KAAK,SAAS,CAAC,MAAM;gBACnB,OAAO,IAAI,yCAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9E,KAAK,SAAS,CAAC,UAAU;gBACvB,OAAO,IAAI,iDAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAClF,KAAK,SAAS,CAAC,mBAAmB;gBAChC,OAAO,IAAI,2DAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,KAAK,SAAS,CAAC,YAAY;gBACzB,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACpF,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E,KAAK,SAAS,CAAC,iBAAiB;gBAC9B,OAAO,IAAI,+DAA8B,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACzF,KAAK,SAAS;gBACZ,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E;gBACE,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;SAC5G;IACH,CAAC;CACF;AA9BD,oDA8BC"}
|
|
@@ -10,6 +10,7 @@ exports.ConnectionResolver = void 0;
|
|
|
10
10
|
const core_1 = require("@salesforce/core");
|
|
11
11
|
const kit_1 = require("@salesforce/kit");
|
|
12
12
|
const ts_retry_promise_1 = require("ts-retry-promise");
|
|
13
|
+
const ts_types_1 = require("@salesforce/ts-types");
|
|
13
14
|
const registry_1 = require("../registry");
|
|
14
15
|
const standardvalueset_1 = require("../registry/standardvalueset");
|
|
15
16
|
const utils_1 = require("../utils");
|
|
@@ -22,7 +23,7 @@ class ConnectionResolver {
|
|
|
22
23
|
this.registry = registry;
|
|
23
24
|
this.logger = core_1.Logger.childFromRoot(this.constructor.name);
|
|
24
25
|
}
|
|
25
|
-
async resolve(componentFilter = (component) =>
|
|
26
|
+
async resolve(componentFilter = (component) => (0, ts_types_1.isPlainObject)(component)) {
|
|
26
27
|
const Aggregator = [];
|
|
27
28
|
const childrenPromises = [];
|
|
28
29
|
const componentTypes = new Set();
|
|
@@ -38,7 +39,7 @@ class ConnectionResolver {
|
|
|
38
39
|
}
|
|
39
40
|
else {
|
|
40
41
|
// fix { type: { "$": { "xsi:nil": "true" } } }
|
|
41
|
-
componentType = this.registry.getTypeBySuffix((0, utils_1.extName)(component.fileName));
|
|
42
|
+
componentType = (0, ts_types_1.ensurePlainObject)(this.registry.getTypeBySuffix((0, utils_1.extName)(component.fileName)), `No type found for ${component.fileName} when matching by suffix. Check the file extension.`);
|
|
42
43
|
component.type = componentType.name;
|
|
43
44
|
}
|
|
44
45
|
Aggregator.push(component);
|
|
@@ -65,8 +66,8 @@ class ConnectionResolver {
|
|
|
65
66
|
}
|
|
66
67
|
return {
|
|
67
68
|
components: Aggregator.filter(componentFilter).map((component) => ({
|
|
68
|
-
fullName: component.fullName,
|
|
69
|
-
type: this.registry.getTypeByName(component.type),
|
|
69
|
+
fullName: (0, ts_types_1.ensureString)(component.fullName, `Component fullName was not set for ${component.fileName}`),
|
|
70
|
+
type: this.registry.getTypeByName((0, ts_types_1.ensureString)(component.type, `Component type was not set for ${component.fullName} (${component.fileName})`)),
|
|
70
71
|
})),
|
|
71
72
|
apiVersion: this.connection.getApiVersion(),
|
|
72
73
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/resolve/connectionResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,2CAAsD;AACtD,yCAA8C;AAC9C,uDAAwE;AACxE,0CAAwF;AACxF,mEAAgE;AAEhE,oCAAmC;AAOnC;;GAEG;AACH,MAAa,kBAAkB;IAK7B,YAAmB,UAAsB,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QACxE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,MAAM,GAAG,aAAM,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC5D,CAAC;IAEM,KAAK,CAAC,OAAO,CAClB,kBAAkB,CAAC,SAAkC,EAAW,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"connectionResolver.js","sourceRoot":"","sources":["../../../src/resolve/connectionResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { SourcePath } from '../common';
|
|
2
2
|
export declare class ForceIgnore {
|
|
3
3
|
static readonly FILE_NAME = ".forceignore";
|
|
4
|
-
private readonly parser
|
|
5
|
-
private readonly forceIgnoreDirectory
|
|
4
|
+
private readonly parser?;
|
|
5
|
+
private readonly forceIgnoreDirectory?;
|
|
6
6
|
private DEFAULT_IGNORE;
|
|
7
7
|
constructor(forceIgnorePath?: string);
|
|
8
8
|
/**
|
|
@@ -52,6 +52,8 @@ class ForceIgnore {
|
|
|
52
52
|
return new ForceIgnore(potentialForceIgnorePath);
|
|
53
53
|
}
|
|
54
54
|
denies(fsPath) {
|
|
55
|
+
if (!this.parser || !this.forceIgnoreDirectory)
|
|
56
|
+
return false;
|
|
55
57
|
try {
|
|
56
58
|
return this.parser.ignores((0, path_1.relative)(this.forceIgnoreDirectory, fsPath));
|
|
57
59
|
}
|
|
@@ -60,6 +62,8 @@ class ForceIgnore {
|
|
|
60
62
|
}
|
|
61
63
|
}
|
|
62
64
|
accepts(fsPath) {
|
|
65
|
+
if (!this.parser || !this.forceIgnoreDirectory)
|
|
66
|
+
return true;
|
|
63
67
|
try {
|
|
64
68
|
return !this.parser.ignores((0, path_1.relative)(this.forceIgnoreDirectory, fsPath));
|
|
65
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA+C;AAC/C,wCAA8C;AAC9C,6CAA2C;AAC3C,2CAA6C;AAE7C,kEAAsD;AAEtD,MAAa,WAAW;IAOtB,YAAmB,eAAe,GAAG,EAAE;QAF/B,mBAAc,GAAa,CAAC,UAAU,EAAE,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,CAAC,CAAC;QAGnH,IAAI;YACF,IAAI,QAAQ,GAAG,IAAA,0BAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACtD,sCAAsC;YACtC,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,kDAAkD;gBAClD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC3B,MAAM,SAAS,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;oBAC1C,yCAAyC;oBACzC,KAAK,SAAS,CAAC,WAAW,CACxB,oNAAoN,CACrN,CAAC;oBACF,iEAAiE;oBACjE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBACzC;gBAED,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,IAAA,eAAM,GAAE,CAAC,GAAG,CAAC,GAAG,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7E,IAAI,CAAC,oBAAoB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;aACtD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,4BAA4B;SAC7B;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAA,4BAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;SACpF;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI;YACF,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SACzE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;;
|
|
1
|
+
{"version":3,"file":"forceIgnore.js","sourceRoot":"","sources":["../../../src/resolve/forceIgnore.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA+C;AAC/C,wCAA8C;AAC9C,6CAA2C;AAC3C,2CAA6C;AAE7C,kEAAsD;AAEtD,MAAa,WAAW;IAOtB,YAAmB,eAAe,GAAG,EAAE;QAF/B,mBAAc,GAAa,CAAC,UAAU,EAAE,OAAO,EAAE,6BAA6B,EAAE,2BAA2B,CAAC,CAAC;QAGnH,IAAI;YACF,IAAI,QAAQ,GAAG,IAAA,0BAAY,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC;YACtD,sCAAsC;YACtC,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,kDAAkD;gBAClD,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBAC3B,MAAM,SAAS,GAAG,gBAAS,CAAC,WAAW,EAAE,CAAC;oBAC1C,yCAAyC;oBACzC,KAAK,SAAS,CAAC,WAAW,CACxB,oNAAoN,CACrN,CAAC;oBACF,iEAAiE;oBACjE,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;iBACzC;gBAED,qEAAqE;gBACrE,IAAI,CAAC,MAAM,GAAG,IAAA,eAAM,GAAE,CAAC,GAAG,CAAC,GAAG,QAAQ,KAAK,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC7E,IAAI,CAAC,oBAAoB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;aACtD;SACF;QAAC,OAAO,CAAC,EAAE;YACV,4BAA4B;SAC7B;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,IAAgB;QAC1C,IAAI,wBAAwB,GAAG,EAAE,CAAC;QAClC,MAAM,iBAAiB,GAAG,IAAA,4BAAQ,EAAC,IAAI,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;QAChE,IAAI,iBAAiB,EAAE;YACrB,wBAAwB,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,iBAAiB,CAAC,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;SACpF;QACD,OAAO,IAAI,WAAW,CAAC,wBAAwB,CAAC,CAAC;IACnD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB;YAAE,OAAO,KAAK,CAAC;QAC7D,IAAI;YACF,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SACzE;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,MAAkB;QAC/B,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB;YAAE,OAAO,IAAI,CAAC;QAC5D,IAAI;YACF,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC,CAAC;SAC1E;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;SACb;IACH,CAAC;;AAhEH,kCAiEC;AAhEwB,qBAAS,GAAG,cAAc,CAAC"}
|
|
@@ -47,7 +47,7 @@ class ManifestResolver {
|
|
|
47
47
|
const members = (0, kit_1.ensureArray)(typeMembers.members);
|
|
48
48
|
for (const fullName of members) {
|
|
49
49
|
let mdType = type;
|
|
50
|
-
if (isMemberNestedInFolder(fullName, type, parentType, members)) {
|
|
50
|
+
if (parentType && isMemberNestedInFolder(fullName, type, parentType, members)) {
|
|
51
51
|
mdType = parentType;
|
|
52
52
|
}
|
|
53
53
|
components.push({ fullName, type: mdType });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qDAA4C;AAC5C,yCAA8C;AAC9C,0CAA2D;AAC3D,qDAAsE;AA6BtE;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAmB,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QACjG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,YAAoB;QACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;QAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEpD,MAAM,MAAM,GAAG,IAAI,2BAAS,CAAC;YAC3B,SAAS,EAAE,CAAC,SAAS,CAAC;YACtB,gEAAgE;YAChE,kBAAkB,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE;SAC1E,CAAC,CAAC;QACH,MAAM,cAAc,GAA2B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAwC;aAC7G,OAAO,CAAC;QACX,MAAM,kBAAkB,GAAG,IAAA,iBAAW,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;QAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;YAC5C,IAAI,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;YAChC,uEAAuE;YACvE,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;oBAChC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;iBACrC;gBACD,MAAM,GAAG,GAAG,IAAI,KAAK,CAAC,8CAA8C,YAAY,aAAa,QAAQ,IAAI,EAAE,GAAG,CAAC,CAAC;gBAChH,GAAG,CAAC,IAAI,GAAG,iBAAiB,CAAC;gBAC7B,MAAM,GAAG,CAAC;aACX;YACD,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9F,MAAM,OAAO,GAAG,IAAA,iBAAW,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAEjD,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;gBAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;gBAClB,IAAI,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,9 @@ export declare class MetadataResolver {
|
|
|
12
12
|
private tree;
|
|
13
13
|
private useFsForceIgnore;
|
|
14
14
|
forceIgnoredPaths: Set<string>;
|
|
15
|
-
private forceIgnore
|
|
15
|
+
private forceIgnore?;
|
|
16
16
|
private sourceAdapterFactory;
|
|
17
|
-
private folderContentTypeDirNames
|
|
17
|
+
private folderContentTypeDirNames?;
|
|
18
18
|
/**
|
|
19
19
|
* @param registry Custom registry data
|
|
20
20
|
* @param tree `TreeContainer` to traverse with
|
|
@@ -16,10 +16,7 @@ const sourceAdapterFactory_1 = require("./adapters/sourceAdapterFactory");
|
|
|
16
16
|
const forceIgnore_1 = require("./forceIgnore");
|
|
17
17
|
const treeContainers_1 = require("./treeContainers");
|
|
18
18
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
19
|
-
const messages = core_1.Messages.
|
|
20
|
-
'error_path_not_found',
|
|
21
|
-
'error_could_not_infer_type',
|
|
22
|
-
]);
|
|
19
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
23
20
|
/**
|
|
24
21
|
* Resolver for metadata type and component objects.
|
|
25
22
|
*
|
|
@@ -59,7 +56,7 @@ class MetadataResolver {
|
|
|
59
56
|
const dirQueue = [];
|
|
60
57
|
const components = [];
|
|
61
58
|
const ignore = new Set();
|
|
62
|
-
if (this.forceIgnore
|
|
59
|
+
if (this.forceIgnore?.denies(dir)) {
|
|
63
60
|
return components;
|
|
64
61
|
}
|
|
65
62
|
for (const file of this.tree.readDirectory(dir)) {
|
|
@@ -108,7 +105,7 @@ class MetadataResolver {
|
|
|
108
105
|
return components;
|
|
109
106
|
}
|
|
110
107
|
resolveComponent(fsPath, isResolvingSource) {
|
|
111
|
-
if (this.forceIgnore
|
|
108
|
+
if (this.forceIgnore?.denies(fsPath)) {
|
|
112
109
|
// don't resolve the component if the path is denied
|
|
113
110
|
this.forceIgnoredPaths.add(fsPath);
|
|
114
111
|
return;
|
|
@@ -148,7 +145,8 @@ class MetadataResolver {
|
|
|
148
145
|
.find((type) =>
|
|
149
146
|
// any of the following 3 options is considered a good match
|
|
150
147
|
// mixedContent and bundles don't have a suffix to match
|
|
151
|
-
|
|
148
|
+
(typeof type.strategies?.adapter === 'string' &&
|
|
149
|
+
['mixedContent', 'bundle'].includes(type.strategies.adapter)) ||
|
|
152
150
|
// the file suffix (in source or mdapi format) matches the type suffix we think it is
|
|
153
151
|
(type.suffix && [type.suffix, `${type.suffix}${common_1.META_XML_SUFFIX}`].some((s) => fsPath.endsWith(s))) ||
|
|
154
152
|
// the type has children and the file suffix (in source format) matches a child type suffix of the type we think it is
|
|
@@ -163,7 +161,7 @@ class MetadataResolver {
|
|
|
163
161
|
// attempt 2 - check if it's a metadata xml file
|
|
164
162
|
if (!resolvedType) {
|
|
165
163
|
const parsedMetaXml = (0, utils_1.parseMetadataXml)(fsPath);
|
|
166
|
-
if (parsedMetaXml) {
|
|
164
|
+
if (parsedMetaXml?.suffix) {
|
|
167
165
|
resolvedType = this.registry.getTypeBySuffix(parsedMetaXml.suffix);
|
|
168
166
|
}
|
|
169
167
|
}
|