@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
|
@@ -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
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAoD;AACpD,2CAAgE;AAChE,oCAAiE;AACjE,0CAA2D;AAE3D,sCAA4C;AAC5C,0EAAuE;AACvE,+CAA4C;AAE5C,qDAAsE;AAEtE,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,11 +24,11 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
24
24
|
readonly parent?: SourceComponent;
|
|
25
25
|
parentType?: MetadataType;
|
|
26
26
|
content?: string;
|
|
27
|
-
replacements
|
|
27
|
+
replacements?: Record<string, MarkedReplacement[]>;
|
|
28
28
|
private treeContainer;
|
|
29
29
|
private forceIgnore;
|
|
30
30
|
private markedForDelete;
|
|
31
|
-
private destructiveChangesType
|
|
31
|
+
private destructiveChangesType?;
|
|
32
32
|
constructor(props: ComponentProperties, tree?: TreeContainer, forceIgnore?: ForceIgnore);
|
|
33
33
|
get fullName(): string;
|
|
34
34
|
/**
|
|
@@ -38,7 +38,7 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
38
38
|
* @deprecated This function should not be used, use "xml" property instead.
|
|
39
39
|
* @returns The metafile path
|
|
40
40
|
*/
|
|
41
|
-
get metaFilePath(): string;
|
|
41
|
+
get metaFilePath(): string | undefined;
|
|
42
42
|
get tree(): TreeContainer;
|
|
43
43
|
/**
|
|
44
44
|
* Returns whether this component type is supported by the Metadata API
|
|
@@ -73,8 +73,8 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
73
73
|
* @return SourceComponent[] containing valid children
|
|
74
74
|
*/
|
|
75
75
|
getChildren(): SourceComponent[];
|
|
76
|
-
parseXml<T
|
|
77
|
-
parseXmlSync<T
|
|
76
|
+
parseXml<T extends JsonMap>(xmlFilePath?: string): Promise<T>;
|
|
77
|
+
parseXmlSync<T extends JsonMap>(xmlFilePath?: string): T;
|
|
78
78
|
/**
|
|
79
79
|
* will return this instance of the forceignore, or will create one if undefined
|
|
80
80
|
*
|
|
@@ -96,7 +96,7 @@ export declare class SourceComponent implements MetadataComponent {
|
|
|
96
96
|
* @returns whether this component should be part of destructive changes.
|
|
97
97
|
*/
|
|
98
98
|
isMarkedForDelete(): boolean;
|
|
99
|
-
getDestructiveChangesType(): DestructiveChangesType;
|
|
99
|
+
getDestructiveChangesType(): DestructiveChangesType | undefined;
|
|
100
100
|
setMarkedForDelete(destructiveChangeType?: DestructiveChangesType | boolean): void;
|
|
101
101
|
private calculateRelativePath;
|
|
102
102
|
private parse;
|
|
@@ -20,10 +20,7 @@ const filePathGenerator_1 = require("../utils/filePathGenerator");
|
|
|
20
20
|
const treeContainers_1 = require("./treeContainers");
|
|
21
21
|
const forceIgnore_1 = require("./forceIgnore");
|
|
22
22
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
23
|
-
const messages = core_1.Messages.
|
|
24
|
-
'error_unexpected_child_type',
|
|
25
|
-
'invalid_xml_parsing',
|
|
26
|
-
]);
|
|
23
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
27
24
|
/**
|
|
28
25
|
* Representation of a MetadataComponent in a file tree.
|
|
29
26
|
*/
|
|
@@ -44,6 +41,9 @@ class SourceComponent {
|
|
|
44
41
|
return this.type.name;
|
|
45
42
|
}
|
|
46
43
|
if (this.parent && this.type.ignoreParentName) {
|
|
44
|
+
if (!this.name) {
|
|
45
|
+
throw new core_1.SfError(`Component was initialized without a name: ${this.xml} (${this.type.name})`);
|
|
46
|
+
}
|
|
47
47
|
return this.name;
|
|
48
48
|
}
|
|
49
49
|
else {
|
|
@@ -58,7 +58,7 @@ class SourceComponent {
|
|
|
58
58
|
* @returns The metafile path
|
|
59
59
|
*/
|
|
60
60
|
get metaFilePath() {
|
|
61
|
-
if (this.type.id === 'digitalexperience') {
|
|
61
|
+
if (this.type.id === 'digitalexperience' && this.content && this.type.metaFileSuffix) {
|
|
62
62
|
// metaFileName = metaFileSuffix for DigitalExperience.
|
|
63
63
|
return (0, path_1.join)((0, path_1.dirname)(this.content), this.type.metaFileSuffix);
|
|
64
64
|
}
|
|
@@ -91,10 +91,13 @@ class SourceComponent {
|
|
|
91
91
|
* @returns SourceComponent
|
|
92
92
|
*/
|
|
93
93
|
static createVirtualComponent(props, fs, forceIgnore) {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
94
|
+
if (props.name) {
|
|
95
|
+
const tree = fs
|
|
96
|
+
? new treeContainers_1.VirtualTreeContainer(fs)
|
|
97
|
+
: treeContainers_1.VirtualTreeContainer.fromFilePaths((0, filePathGenerator_1.filePathsFromMetadataComponent)({ fullName: props.name, type: props.type }));
|
|
98
|
+
return new SourceComponent(props, tree, forceIgnore);
|
|
99
|
+
}
|
|
100
|
+
throw new core_1.SfError(`Virtual Components must be constructed with a name: ${props.type.name}`);
|
|
98
101
|
}
|
|
99
102
|
walkContent() {
|
|
100
103
|
const sources = [];
|
|
@@ -123,7 +126,7 @@ class SourceComponent {
|
|
|
123
126
|
for (const child of children) {
|
|
124
127
|
// Ensure only valid child types are included with the parent.
|
|
125
128
|
if (!validChildTypes.includes(child.type?.id)) {
|
|
126
|
-
const filePath = child.xml
|
|
129
|
+
const filePath = child.xml ?? child.content;
|
|
127
130
|
throw new core_1.SfError(messages.getMessage('error_unexpected_child_type', [filePath, this.type.name]), 'TypeInferenceError');
|
|
128
131
|
}
|
|
129
132
|
}
|
|
@@ -154,7 +157,7 @@ class SourceComponent {
|
|
|
154
157
|
* @return ForceIgnore
|
|
155
158
|
*/
|
|
156
159
|
getForceIgnore() {
|
|
157
|
-
return this.forceIgnore
|
|
160
|
+
return this.forceIgnore;
|
|
158
161
|
}
|
|
159
162
|
/**
|
|
160
163
|
* As a performance enhancement, use the already parsed parent xml source
|
|
@@ -169,8 +172,13 @@ class SourceComponent {
|
|
|
169
172
|
if (!this.parent) {
|
|
170
173
|
return parentXml;
|
|
171
174
|
}
|
|
172
|
-
const children = (0, kit_1.ensureArray)((0, ts_types_1.get)(parentXml, `${this.parent.type.name}.${this.type.xmlElementName
|
|
173
|
-
|
|
175
|
+
const children = (0, kit_1.ensureArray)((0, ts_types_1.get)(parentXml, `${this.parent.type.name}.${this.type.xmlElementName ?? this.type.directoryName}`));
|
|
176
|
+
const uniqueElement = this.type.uniqueIdElement;
|
|
177
|
+
const matched = uniqueElement ? children.find((c) => (0, ts_types_1.getString)(c, uniqueElement) === this.name) : undefined;
|
|
178
|
+
if (!matched) {
|
|
179
|
+
throw new core_1.SfError(`Unable to find matching parent xml file for ${this.xml}`);
|
|
180
|
+
}
|
|
181
|
+
return matched;
|
|
174
182
|
}
|
|
175
183
|
getPackageRelativePath(fsPath, format) {
|
|
176
184
|
return format === 'source'
|
|
@@ -268,9 +276,9 @@ class SourceComponent {
|
|
|
268
276
|
for (const fsPath of this.walk(dirPath)) {
|
|
269
277
|
const childXml = (0, utils_1.parseMetadataXml)(fsPath);
|
|
270
278
|
const fileIsRootXml = childXml?.suffix === this.type.suffix;
|
|
271
|
-
if (childXml && !fileIsRootXml) {
|
|
279
|
+
if (childXml && !fileIsRootXml && this.type.children && childXml.suffix) {
|
|
272
280
|
// TODO: Log warning if missing child type definition
|
|
273
|
-
const childTypeId = this.type.children
|
|
281
|
+
const childTypeId = this.type.children?.suffixes[childXml.suffix];
|
|
274
282
|
const childComponent = new SourceComponent({
|
|
275
283
|
name: (0, utils_1.baseName)(fsPath),
|
|
276
284
|
type: this.type.children.types[childTypeId],
|
|
@@ -288,18 +296,27 @@ class SourceComponent {
|
|
|
288
296
|
getNonDecomposedChildren() {
|
|
289
297
|
const parsed = this.parseXmlSync();
|
|
290
298
|
const children = [];
|
|
299
|
+
if (!this.type.children) {
|
|
300
|
+
throw new core_1.SfError(`There are no child types for ${this.type.name}`);
|
|
301
|
+
}
|
|
291
302
|
for (const childTypeId of Object.keys(this.type.children.types)) {
|
|
292
303
|
const childType = this.type.children.types[childTypeId];
|
|
293
304
|
const uniqueIdElement = childType.uniqueIdElement;
|
|
294
305
|
if (uniqueIdElement) {
|
|
295
306
|
const xmlPathToChildren = `${this.type.name}.${childType.xmlElementName}`;
|
|
296
307
|
const elements = (0, kit_1.ensureArray)((0, ts_types_1.get)(parsed, xmlPathToChildren, []));
|
|
297
|
-
const childComponents = elements.map((element) =>
|
|
298
|
-
name
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
308
|
+
const childComponents = elements.map((element) => {
|
|
309
|
+
const name = (0, ts_types_1.getString)(element, uniqueIdElement);
|
|
310
|
+
if (!name) {
|
|
311
|
+
throw new core_1.SfError(`Missing ${uniqueIdElement} on ${childType.name} in ${this.xml}`);
|
|
312
|
+
}
|
|
313
|
+
return new SourceComponent({
|
|
314
|
+
name,
|
|
315
|
+
type: childType,
|
|
316
|
+
xml: this.xml,
|
|
317
|
+
parent: this,
|
|
318
|
+
}, this.treeContainer, this.forceIgnore);
|
|
319
|
+
});
|
|
303
320
|
children.push(...childComponents);
|
|
304
321
|
}
|
|
305
322
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA+C;AAC/C,2CAAqD;AACrD,qDAA0D;AAC1D,mDAA+D;AAC/D,yCAA8C;AAC9C,iEAAuE;AACvE,oCAAiE;AACjE,sCAAsD;AAGtD,gDAAwD;AACxD,kEAA4E;AAI5E,qDAA4F;AAC5F,+CAA4C;AAE5C,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,12 +14,7 @@ const unzipper = require("unzipper");
|
|
|
14
14
|
const core_1 = require("@salesforce/core");
|
|
15
15
|
const utils_1 = require("../utils");
|
|
16
16
|
core_1.Messages.importMessagesDirectory(__dirname);
|
|
17
|
-
const messages = core_1.Messages.
|
|
18
|
-
'error_no_directory_stream',
|
|
19
|
-
'error_expected_file_path',
|
|
20
|
-
'error_expected_directory_path',
|
|
21
|
-
'error_path_not_found',
|
|
22
|
-
]);
|
|
17
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
23
18
|
/**
|
|
24
19
|
* A container for interacting with a file system. Operations such as component resolution,
|
|
25
20
|
* conversion, and packaging perform I/O against `TreeContainer` abstractions.
|
|
@@ -110,7 +105,17 @@ class ZipTreeContainer extends TreeContainer {
|
|
|
110
105
|
}
|
|
111
106
|
readFile(fsPath) {
|
|
112
107
|
if (!this.isDirectory(fsPath)) {
|
|
113
|
-
|
|
108
|
+
const matchingFile = this.tree.get(fsPath);
|
|
109
|
+
if (!matchingFile) {
|
|
110
|
+
throw new core_1.SfError(messages.getMessage('error_path_not_found', [matchingFile]), 'LibraryError');
|
|
111
|
+
}
|
|
112
|
+
if (Array.isArray(matchingFile)) {
|
|
113
|
+
throw messages.createError('tooManyFiles', [fsPath]);
|
|
114
|
+
}
|
|
115
|
+
if (matchingFile.buffer) {
|
|
116
|
+
return matchingFile.buffer();
|
|
117
|
+
}
|
|
118
|
+
throw new core_1.SfError(`The file at path ${fsPath} does not have a buffer method.`);
|
|
114
119
|
}
|
|
115
120
|
throw new core_1.SfError(messages.getMessage('error_expected_file_path', [fsPath]), 'LibraryError');
|
|
116
121
|
}
|
|
@@ -120,7 +125,17 @@ class ZipTreeContainer extends TreeContainer {
|
|
|
120
125
|
}
|
|
121
126
|
stream(fsPath) {
|
|
122
127
|
if (!this.isDirectory(fsPath)) {
|
|
123
|
-
|
|
128
|
+
const matchingFile = this.tree.get(fsPath);
|
|
129
|
+
if (!matchingFile) {
|
|
130
|
+
throw new core_1.SfError(messages.getMessage('error_path_not_found', [fsPath]), 'LibraryError');
|
|
131
|
+
}
|
|
132
|
+
if (Array.isArray(matchingFile)) {
|
|
133
|
+
throw messages.createError('tooManyFiles', [fsPath]);
|
|
134
|
+
}
|
|
135
|
+
if (matchingFile.stream) {
|
|
136
|
+
return matchingFile.stream();
|
|
137
|
+
}
|
|
138
|
+
throw new core_1.SfError(`The file at path ${fsPath} does not have a stream method.`);
|
|
124
139
|
}
|
|
125
140
|
throw new core_1.SfError(messages.getMessage('error_no_directory_stream', [this.constructor.name]), 'LibraryError');
|
|
126
141
|
}
|
|
@@ -192,11 +207,11 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
192
207
|
exists(fsPath) {
|
|
193
208
|
const files = this.tree.get((0, path_1.dirname)(fsPath));
|
|
194
209
|
const isFile = files?.has(fsPath);
|
|
195
|
-
return
|
|
210
|
+
return this.tree.has(fsPath) || Boolean(isFile);
|
|
196
211
|
}
|
|
197
212
|
readDirectory(fsPath) {
|
|
198
213
|
if (this.isDirectory(fsPath)) {
|
|
199
|
-
return Array.from(this.tree.get(fsPath)).map((p) => (0, path_1.basename)(p));
|
|
214
|
+
return Array.from(this.tree.get(fsPath) ?? []).map((p) => (0, path_1.basename)(p));
|
|
200
215
|
}
|
|
201
216
|
throw new core_1.SfError(messages.getMessage('error_expected_directory_path', [fsPath]), 'LibraryError');
|
|
202
217
|
}
|
|
@@ -232,7 +247,11 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
232
247
|
childPath = (0, path_1.join)(dirPath, child.name);
|
|
233
248
|
childData = child.data;
|
|
234
249
|
}
|
|
235
|
-
this.tree.get(dirPath)
|
|
250
|
+
const dirPathFromTree = this.tree.get(dirPath);
|
|
251
|
+
if (!dirPathFromTree) {
|
|
252
|
+
throw new core_1.SfError(`The directory at path ${dirPath} does not exist in the virtual file system.`);
|
|
253
|
+
}
|
|
254
|
+
dirPathFromTree.add(childPath);
|
|
236
255
|
if (childData) {
|
|
237
256
|
this.fileContents.set(childPath, childData);
|
|
238
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA2C;AAC3C,+BAA+D;AAE/D,6CAAgG;AAChG,qCAAqC;AACrC,2CAAqD;AACrD,oCAAsD;AAItD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export type ComponentLike = MetadataComponent | MetadataMember;
|
|
|
17
17
|
*/
|
|
18
18
|
export type MetadataXml = {
|
|
19
19
|
fullName: string;
|
|
20
|
-
suffix
|
|
20
|
+
suffix?: string;
|
|
21
21
|
path: SourcePath;
|
|
22
22
|
};
|
|
23
23
|
export type VirtualFile = {
|
|
@@ -38,7 +38,7 @@ export interface SourceAdapter {
|
|
|
38
38
|
* @param fsPath Path to resolve
|
|
39
39
|
* @param isResolvingSource Whether the path to resolve is a single file
|
|
40
40
|
*/
|
|
41
|
-
getComponent(fsPath: SourcePath, isResolvingSource?: boolean): SourceComponent;
|
|
41
|
+
getComponent(fsPath: SourcePath, isResolvingSource?: boolean): SourceComponent | undefined;
|
|
42
42
|
/**
|
|
43
43
|
* Whether the adapter allows content-only metadata definitions.
|
|
44
44
|
*/
|
|
@@ -14,10 +14,7 @@ exports.deepFreeze = void 0;
|
|
|
14
14
|
* @returns A deeply frozen version of the object
|
|
15
15
|
*/
|
|
16
16
|
function deepFreeze(object) {
|
|
17
|
-
const
|
|
18
|
-
for (const name of propNames) {
|
|
19
|
-
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
|
|
20
|
-
const val = object[name];
|
|
17
|
+
for (const val of Object.values(object)) {
|
|
21
18
|
if (val && typeof val === 'object') {
|
|
22
19
|
deepFreeze(val);
|
|
23
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../../src/utils/collections.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH;;;;;GAKG;AACH,SAAgB,UAAU,
|
|
1
|
+
{"version":3,"file":"collections.js","sourceRoot":"","sources":["../../../src/utils/collections.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH;;;;;GAKG;AACH,SAAgB,UAAU,CAAmB,MAAS;IACpD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;QACvC,IAAI,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAClC,UAAU,CAAC,GAAG,CAAC,CAAC;SACjB;KACF;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAPD,gCAOC"}
|
|
@@ -8,9 +8,13 @@ exports.filePathsFromMetadataComponent = 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");
|
|
12
|
+
const ts_types_1 = require("@salesforce/ts-types");
|
|
11
13
|
const constants_1 = require("../common/constants");
|
|
12
14
|
const registryAccess_1 = require("../registry/registryAccess");
|
|
13
15
|
const __1 = require("..");
|
|
16
|
+
core_1.Messages.importMessagesDirectory(__dirname);
|
|
17
|
+
const messages = core_1.Messages.loadMessages('@salesforce/source-deploy-retrieve', 'sdr');
|
|
14
18
|
const registryAccess = new registryAccess_1.RegistryAccess();
|
|
15
19
|
/**
|
|
16
20
|
* Provided a metadata fullName and type pair, return an array of file paths that should
|
|
@@ -94,23 +98,31 @@ const filePathsFromMetadataComponent = ({ fullName, type }, packageDir) => {
|
|
|
94
98
|
['LightningComponentBundle', (0, path_1.join)(packageDirWithTypeDir, `${fullName}${path_1.sep}${fullName}.js${constants_1.META_XML_SUFFIX}`)],
|
|
95
99
|
['AuraDefinitionBundle', (0, path_1.join)(packageDirWithTypeDir, `${fullName}${path_1.sep}${fullName}.cmp${constants_1.META_XML_SUFFIX}`)],
|
|
96
100
|
]);
|
|
97
|
-
|
|
98
|
-
|
|
101
|
+
const matched = mappings.get(type.name);
|
|
102
|
+
if (!matched) {
|
|
103
|
+
throw messages.createError('unsupportedBundleType', [type.name]);
|
|
99
104
|
}
|
|
100
|
-
return [
|
|
105
|
+
return [matched];
|
|
101
106
|
}
|
|
102
|
-
throw
|
|
107
|
+
throw messages.createError('filePathGeneratorNoTypeSupport', [type.name]);
|
|
103
108
|
};
|
|
104
109
|
exports.filePathsFromMetadataComponent = filePathsFromMetadataComponent;
|
|
105
110
|
const generateFolders = ({ fullName, type }, packageDirWithTypeDir) => {
|
|
111
|
+
const folderType = type.folderType;
|
|
112
|
+
if (!folderType) {
|
|
113
|
+
throw messages.createError('missingFolderType', [type.name]);
|
|
114
|
+
}
|
|
106
115
|
// create a folder for each part of the filename between the directory name and the fullname
|
|
107
116
|
const splits = fullName.split('/');
|
|
108
117
|
return splits
|
|
109
118
|
.slice(0, splits.length - 1) // the last one is not a folder
|
|
110
|
-
.map((value, index, originalArray) => (0, path_1.join)(packageDirWithTypeDir, `${originalArray.slice(0, index + 1).join(path_1.sep)}.${registryAccess.getTypeByName(
|
|
119
|
+
.map((value, index, originalArray) => (0, path_1.join)(packageDirWithTypeDir, `${originalArray.slice(0, index + 1).join(path_1.sep)}.${registryAccess.getTypeByName(folderType).suffix}${constants_1.META_XML_SUFFIX}`));
|
|
111
120
|
};
|
|
112
121
|
const getDecomposedChildType = ({ fullName, type }, packageDir) => {
|
|
113
|
-
const topLevelType = registryAccess.findType((t) => t.children && Object.keys(t.children.types).includes(type.id));
|
|
122
|
+
const topLevelType = registryAccess.findType((t) => (0, ts_types_1.isPlainObject)(t.children) && Object.keys(t.children.types).includes(type.id));
|
|
123
|
+
if (!topLevelType) {
|
|
124
|
+
throw messages.createError('noParent', [fullName, type.name]);
|
|
125
|
+
}
|
|
114
126
|
const topLevelTypeDir = packageDir ? (0, path_1.join)(packageDir, topLevelType.directoryName) : topLevelType.directoryName;
|
|
115
127
|
return [
|
|
116
128
|
// parent
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filePathGenerator.js","sourceRoot":"","sources":["../../../src/utils/filePathGenerator.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA2C;
|
|
1
|
+
{"version":3,"file":"filePathGenerator.js","sourceRoot":"","sources":["../../../src/utils/filePathGenerator.ts"],"names":[],"mappings":"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"}
|
package/lib/src/utils/path.d.ts
CHANGED
|
@@ -58,4 +58,4 @@ export declare function parseMetadataXml(fsPath: string): Optional<MetadataXml>;
|
|
|
58
58
|
* @param directoryName - name of directory to use as a parsing index
|
|
59
59
|
* @returns the FullName
|
|
60
60
|
*/
|
|
61
|
-
export declare function parseNestedFullName(fsPath: string, directoryName: string):
|
|
61
|
+
export declare function parseNestedFullName(fsPath: string, directoryName: string): string | undefined;
|
package/lib/src/utils/path.js
CHANGED
|
@@ -96,6 +96,8 @@ function parseNestedFullName(fsPath, directoryName) {
|
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
98
98
|
const pathPrefix = pathSplits.slice(pathSplits.lastIndexOf(directoryName) + 1);
|
|
99
|
+
// the eslint comment should remain until strictMode is fully implemented
|
|
100
|
+
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
|
|
99
101
|
const fileName = pathSplits.pop().replace('-meta.xml', '').split('.')[0];
|
|
100
102
|
pathPrefix[pathPrefix.length - 1] = fileName;
|
|
101
103
|
return pathPrefix.join('/');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAuD;AAKvD;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,MAAkB;IACzC,OAAO,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,4BAEC;AAED;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,MAAkB;IACxC,MAAM,KAAK,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAHD,0BAGC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,MAAkB;IAC3C,OAAO,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC;AACnC,CAAC;AAFD,gCAEC;AAED;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAC,MAAkB,EAAE,IAAY,EAAE,SAAS,GAAG,KAAK;IAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;IAC3F,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;QACpB,OAAO,MAAM,CAAC;KACf;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;AAC1C,CAAC;AAPD,8BAOC;AAED;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;IACxE,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KAC/D;AACH,CAAC;AALD,4CAKC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,mBAAmB,CAAC,MAAc,EAAE,aAAqB;IACvE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;IACrC,8DAA8D;IAC9D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO;KACR;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/E,MAAM,QAAQ,
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAAuD;AAKvD;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,MAAkB;IACzC,OAAO,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAFD,4BAEC;AAED;;;;;;GAMG;AACH,SAAgB,OAAO,CAAC,MAAkB;IACxC,MAAM,KAAK,GAAG,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAChD,CAAC;AAHD,0BAGC;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,MAAkB;IAC3C,OAAO,IAAA,eAAQ,EAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC;AACnC,CAAC;AAFD,gCAEC;AAED;;;;;;;GAOG;AACH,SAAgB,SAAS,CAAC,MAAkB,EAAE,IAAY,EAAE,SAAS,GAAG,KAAK;IAC3E,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;IAC3F,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;QACpB,OAAO,MAAM,CAAC;KACf;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;AAC1C,CAAC;AAPD,8BAOC;AAED;;;;;;GAMG;AACH,SAAgB,gBAAgB,CAAC,MAAc;IAC7C,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;IACxE,IAAI,KAAK,EAAE;QACT,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;KAC/D;AACH,CAAC;AALD,4CAKC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,mBAAmB,CAAC,MAAc,EAAE,aAAqB;IACvE,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;IACrC,8DAA8D;IAC9D,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;QACvC,OAAO;KACR;IACD,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/E,yEAAyE;IACzE,4EAA4E;IAC5E,MAAM,QAAQ,GAAI,UAAU,CAAC,GAAG,EAAa,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrF,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,QAAQ,CAAC;IAC7C,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAZD,kDAYC"}
|