@salesforce/source-deploy-retrieve 9.7.29 → 9.8.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 +3 -3
- package/lib/src/client/diagnosticUtil.js.map +1 -1
- package/lib/src/client/metadataApiDeploy.js +9 -9
- package/lib/src/client/metadataApiDeploy.js.map +1 -1
- package/lib/src/client/metadataApiRetrieve.js +17 -4
- package/lib/src/client/metadataApiRetrieve.js.map +1 -1
- package/lib/src/client/metadataTransfer.js +4 -4
- package/lib/src/client/metadataTransfer.js.map +1 -1
- package/lib/src/client/types.js +2 -2
- package/lib/src/client/types.js.map +1 -1
- package/lib/src/collections/componentSet.js.map +1 -1
- package/lib/src/collections/componentSetBuilder.js +1 -1
- package/lib/src/collections/componentSetBuilder.js.map +1 -1
- package/lib/src/collections/types.js +1 -1
- package/lib/src/collections/types.js.map +1 -1
- package/lib/src/common/constants.js +2 -2
- package/lib/src/common/constants.js.map +1 -1
- package/lib/src/convert/convertContext.js +4 -4
- package/lib/src/convert/convertContext.js.map +1 -1
- package/lib/src/convert/metadataConverter.js +11 -11
- package/lib/src/convert/metadataConverter.js.map +1 -1
- package/lib/src/convert/replacements.d.ts +1 -1
- package/lib/src/convert/replacements.js +6 -6
- package/lib/src/convert/replacements.js.map +1 -1
- package/lib/src/convert/streams.d.ts +1 -1
- package/lib/src/convert/streams.js +10 -13
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js +11 -3
- package/lib/src/convert/transformers/decomposedMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +3 -3
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js +26 -24
- package/lib/src/convert/transformers/staticResourceMetadataTransformer.js.map +1 -1
- package/lib/src/convert/types.d.ts +1 -1
- package/lib/src/resolve/adapters/baseSourceAdapter.js +10 -10
- package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js +9 -9
- package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js.map +1 -1
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js +10 -10
- package/lib/src/resolve/adapters/mixedContentSourceAdapter.js.map +1 -1
- package/lib/src/resolve/forceIgnore.js +5 -5
- package/lib/src/resolve/forceIgnore.js.map +1 -1
- package/lib/src/resolve/metadataResolver.js +11 -11
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.js +6 -6
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/resolve/treeContainers.d.ts +5 -12
- package/lib/src/resolve/treeContainers.js +63 -71
- package/lib/src/resolve/treeContainers.js.map +1 -1
- package/lib/src/utils/filePathGenerator.js +21 -21
- package/lib/src/utils/filePathGenerator.js.map +1 -1
- package/lib/src/utils/fileSystemHandler.js +1 -1
- package/lib/src/utils/fileSystemHandler.js.map +1 -1
- package/lib/src/utils/path.js +8 -8
- package/lib/src/utils/path.js.map +1 -1
- package/package.json +10 -32
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { Readable } from 'stream';
|
|
3
|
+
import { Readable } from 'node:stream';
|
|
4
4
|
import { SourcePath } from '../common';
|
|
5
5
|
import { VirtualDirectory } from './types';
|
|
6
6
|
/**
|
|
@@ -74,18 +74,11 @@ export declare class NodeFSTreeContainer extends TreeContainer {
|
|
|
74
74
|
stream(fsPath: SourcePath): Readable;
|
|
75
75
|
}
|
|
76
76
|
/**
|
|
77
|
-
* A {@link TreeContainer} that
|
|
78
|
-
* to perform I/O without unzipping it to the disk first.
|
|
77
|
+
* A {@link TreeContainer} that performs I/O without unzipping it to the disk first.
|
|
79
78
|
*/
|
|
80
79
|
export declare class ZipTreeContainer extends TreeContainer {
|
|
81
|
-
private
|
|
80
|
+
private zip;
|
|
82
81
|
private constructor();
|
|
83
|
-
/**
|
|
84
|
-
* Creates a `ZipTreeContainer` from a Buffer of a zip file.
|
|
85
|
-
*
|
|
86
|
-
* @param buffer - Buffer of the zip file
|
|
87
|
-
* @returns A Promise of a `ZipTreeContainer`
|
|
88
|
-
*/
|
|
89
82
|
static create(buffer: Buffer): Promise<ZipTreeContainer>;
|
|
90
83
|
exists(fsPath: string): boolean;
|
|
91
84
|
isDirectory(fsPath: string): boolean;
|
|
@@ -93,8 +86,8 @@ export declare class ZipTreeContainer extends TreeContainer {
|
|
|
93
86
|
readFile(fsPath: string): Promise<Buffer>;
|
|
94
87
|
readFileSync(fsPath: string): Buffer;
|
|
95
88
|
stream(fsPath: string): Readable;
|
|
96
|
-
private
|
|
97
|
-
private
|
|
89
|
+
private match;
|
|
90
|
+
private ensureDirectory;
|
|
98
91
|
}
|
|
99
92
|
/**
|
|
100
93
|
* A {@link TreeContainer} useful for mocking a file system.
|
|
@@ -8,9 +8,10 @@ exports.VirtualTreeContainer = exports.ZipTreeContainer = exports.NodeFSTreeCont
|
|
|
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
|
/* eslint-disable class-methods-use-this */
|
|
11
|
-
const
|
|
11
|
+
const node_path_1 = require("node:path");
|
|
12
|
+
const node_stream_1 = require("node:stream");
|
|
12
13
|
const graceful_fs_1 = require("graceful-fs");
|
|
13
|
-
const
|
|
14
|
+
const JSZip = require("jszip");
|
|
14
15
|
const core_1 = require("@salesforce/core");
|
|
15
16
|
const utils_1 = require("../utils");
|
|
16
17
|
const messages = new core_1.Messages('@salesforce/source-deploy-retrieve', 'sdr', new Map([["md_request_fail", "Metadata API request failed: %s"], ["error_convert_invalid_format", "Invalid conversion format '%s'"], ["error_could_not_infer_type", "%s: Could not infer a metadata type"], ["error_unexpected_child_type", "Unexpected child metadata [%s] found for parent type [%s]"], ["noParent", "Could not find parent type for %s (%s)"], ["error_expected_source_files", "%s: Expected source files for type '%s'"], ["error_failed_convert", "Component conversion failed: %s"], ["error_merge_metadata_target_unsupported", "Merge convert for metadata target format currently unsupported"], ["error_missing_adapter", "Missing adapter '%s' for metadata type '%s'"], ["error_missing_transformer", "Missing transformer '%s' for metadata type '%s'"], ["error_missing_type_definition", "Missing metadata type definition in registry for id '%s'."], ["error_missing_child_type_definition", "Type %s does not have a child type definition %s."], ["noChildTypes", "No child types found in registry for %s (reading %s at %s)"], ["error_no_metadata_xml_ignore", "Metadata xml file %s is forceignored but is required for %s."], ["noSourceIgnore", "%s metadata types require source files, but %s is forceignored."], ["noSourceIgnore.actions", "- Metadata types with content are composed of two files: a content file (ie MyApexClass.cls) and a -meta.xml file (i.e MyApexClass.cls-meta.xml). You must include both files in your .forceignore file. Or try appending \u201C\\*\u201D to your existing .forceignore entry.\n\nSee <https://developer.salesforce.com/docs/atlas.en-us.sfdx_dev.meta/sfdx_dev/sfdx_dev_exclude_source.htm> for examples"], ["error_path_not_found", "%s: File or folder not found"], ["noContentFound", "SourceComponent %s (metadata type = %s) is missing its content file."], ["noContentFound.actions", ["Ensure the content file exists in the expected location.", "If the content file is in your .forceignore file, ensure the meta-xml file is also ignored to completely exclude it."]], ["error_parsing_xml", "SourceComponent %s (metadata type = %s) does not have an associated metadata xml to parse"], ["error_expected_file_path", "%s: path is to a directory, expected a file"], ["error_expected_directory_path", "%s: path is to a file, expected a directory"], ["error_directory_not_found_or_not_directory", "%s: path is not a directory"], ["error_no_directory_stream", "%s doesn't support readable streams on directories."], ["error_no_source_to_deploy", "No source-backed components present in the package."], ["error_no_components_to_retrieve", "No components in the package to retrieve."], ["error_static_resource_expected_archive_type", "A StaticResource directory must have a content type of application/zip or application/jar - found %s for %s."], ["error_static_resource_missing_resource_file", "A StaticResource must have an associated .resource file, missing %s.resource-meta.xml"], ["error_no_job_id", "The %s operation is missing a job ID. Initialize an operation with an ID, or start a new job."], ["invalid_xml_parsing", "error parsing %s due to:\\n message: %s\\n line: %s\\n code: %s"], ["zipBufferError", "Zip buffer was not created during conversion"], ["undefinedComponentSet", "Unable to construct a componentSet. Check the logs for more information."], ["replacementsFileNotRead", "The file \"%s\" specified in the \"replacements\" property of sfdx-project.json could not be read."], ["unsupportedBundleType", "Unsupported Bundle Type: %s"], ["filePathGeneratorNoTypeSupport", "Type not supported for filepath generation: %s"], ["missingFolderType", "The registry has %s as is inFolder but it does not have a folderType"], ["tooManyFiles", "Multiple files found for path: %s."], ["cantGetName", "Unable to calculate fullName from path: %s (%s)"], ["missingMetaFileSuffix", "The metadata registry is configured incorrectly for %s. Expected a metaFileSuffix."], ["uniqueIdElementNotInRegistry", "No uniqueIdElement found in registry for %s (reading %s at %s)."], ["uniqueIdElementNotInChild", "The uniqueIdElement %s was not found the child (reading %s at %s)."], ["suggest_type_header", "A metadata type lookup for \"%s\" found the following close matches:"], ["suggest_type_did_you_mean", "-- Did you mean \".%s%s\" instead for the \"%s\" metadata type?"], ["suggest_type_more_suggestions", "Additional suggestions:\nConfirm the file name, extension, and directory names are correct. Validate against the registry at:\n<https://github.com/forcedotcom/source-deploy-retrieve/blob/main/src/registry/metadataRegistry.json>\n\nIf the type is not listed in the registry, check that it has Metadata API support via the Metadata Coverage Report:\n<https://developer.salesforce.com/docs/metadata-coverage>\n\nIf the type is available via Metadata API but not in the registry\n\n- Open an issue <https://github.com/forcedotcom/cli/issues>\n- Add the type via PR. Instructions: <https://github.com/forcedotcom/source-deploy-retrieve/blob/main/contributing/metadata.md>"]]));
|
|
@@ -31,12 +32,12 @@ class TreeContainer {
|
|
|
31
32
|
*/
|
|
32
33
|
find(fileType, name, directory) {
|
|
33
34
|
const fileName = this.readDirectory(directory).find((entry) => {
|
|
34
|
-
const parsed = (0, utils_1.parseMetadataXml)((0,
|
|
35
|
+
const parsed = (0, utils_1.parseMetadataXml)((0, node_path_1.join)(directory, entry));
|
|
35
36
|
const metaXmlCondition = fileType === 'metadataXml' ? !!parsed : !parsed;
|
|
36
37
|
return (0, utils_1.baseName)(entry) === name && metaXmlCondition;
|
|
37
38
|
});
|
|
38
39
|
if (fileName) {
|
|
39
|
-
return (0,
|
|
40
|
+
return (0, node_path_1.join)(directory, fileName);
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
43
|
}
|
|
@@ -71,53 +72,47 @@ class NodeFSTreeContainer extends TreeContainer {
|
|
|
71
72
|
}
|
|
72
73
|
exports.NodeFSTreeContainer = NodeFSTreeContainer;
|
|
73
74
|
/**
|
|
74
|
-
* A {@link TreeContainer} that
|
|
75
|
-
* to perform I/O without unzipping it to the disk first.
|
|
75
|
+
* A {@link TreeContainer} that performs I/O without unzipping it to the disk first.
|
|
76
76
|
*/
|
|
77
77
|
class ZipTreeContainer extends TreeContainer {
|
|
78
|
-
constructor(
|
|
78
|
+
constructor(zip) {
|
|
79
79
|
super();
|
|
80
|
-
this.
|
|
81
|
-
this.populate(directory);
|
|
80
|
+
this.zip = zip;
|
|
82
81
|
}
|
|
83
|
-
/**
|
|
84
|
-
* Creates a `ZipTreeContainer` from a Buffer of a zip file.
|
|
85
|
-
*
|
|
86
|
-
* @param buffer - Buffer of the zip file
|
|
87
|
-
* @returns A Promise of a `ZipTreeContainer`
|
|
88
|
-
*/
|
|
89
82
|
static async create(buffer) {
|
|
90
|
-
const
|
|
91
|
-
return new ZipTreeContainer(
|
|
83
|
+
const zip = await JSZip.loadAsync(buffer, { createFolders: true });
|
|
84
|
+
return new ZipTreeContainer(zip);
|
|
92
85
|
}
|
|
93
86
|
exists(fsPath) {
|
|
94
|
-
return this.
|
|
87
|
+
return !!this.match(fsPath);
|
|
95
88
|
}
|
|
96
89
|
isDirectory(fsPath) {
|
|
97
|
-
|
|
98
|
-
|
|
90
|
+
const resolvedPath = this.match(fsPath);
|
|
91
|
+
if (resolvedPath) {
|
|
92
|
+
return this.ensureDirectory(resolvedPath);
|
|
99
93
|
}
|
|
100
94
|
throw new core_1.SfError(messages.getMessage('error_path_not_found', [fsPath]), 'LibraryError');
|
|
101
95
|
}
|
|
102
96
|
readDirectory(fsPath) {
|
|
103
|
-
|
|
104
|
-
|
|
97
|
+
const resolvedPath = this.match(fsPath);
|
|
98
|
+
if (resolvedPath && this.ensureDirectory(resolvedPath)) {
|
|
99
|
+
// Remove trailing path sep if it exists. JSZip always adds them for directories but
|
|
100
|
+
// when comparing we call `dirname()` which does not include them.
|
|
101
|
+
const dirPath = resolvedPath.endsWith('/') ? resolvedPath.slice(0, -1) : resolvedPath;
|
|
102
|
+
return Object.keys(this.zip.files)
|
|
103
|
+
.filter((filePath) => (0, node_path_1.dirname)(filePath) === dirPath)
|
|
104
|
+
.map((filePath) => (0, node_path_1.basename)(filePath));
|
|
105
105
|
}
|
|
106
106
|
throw new core_1.SfError(messages.getMessage('error_expected_directory_path', [fsPath]), 'LibraryError');
|
|
107
107
|
}
|
|
108
|
-
readFile(fsPath) {
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
if (Array.isArray(matchingFile)) {
|
|
115
|
-
throw messages.createError('tooManyFiles', [fsPath]);
|
|
116
|
-
}
|
|
117
|
-
if (matchingFile.buffer) {
|
|
118
|
-
return matchingFile.buffer();
|
|
108
|
+
async readFile(fsPath) {
|
|
109
|
+
const resolvedPath = this.match(fsPath);
|
|
110
|
+
if (resolvedPath) {
|
|
111
|
+
const jsZipObj = this.zip.file(resolvedPath);
|
|
112
|
+
if (jsZipObj?.dir === false) {
|
|
113
|
+
return jsZipObj.async('nodebuffer');
|
|
119
114
|
}
|
|
120
|
-
throw new core_1.SfError(`
|
|
115
|
+
throw new core_1.SfError(`Expected a file at path ${fsPath} but found a directory.`);
|
|
121
116
|
}
|
|
122
117
|
throw new core_1.SfError(messages.getMessage('error_expected_file_path', [fsPath]), 'LibraryError');
|
|
123
118
|
}
|
|
@@ -126,43 +121,40 @@ class ZipTreeContainer extends TreeContainer {
|
|
|
126
121
|
throw new Error('Method not implemented');
|
|
127
122
|
}
|
|
128
123
|
stream(fsPath) {
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
124
|
+
const resolvedPath = this.match(fsPath);
|
|
125
|
+
if (resolvedPath) {
|
|
126
|
+
const jsZipObj = this.zip.file(resolvedPath);
|
|
127
|
+
if (jsZipObj && !jsZipObj.dir) {
|
|
128
|
+
return new node_stream_1.Readable().wrap(jsZipObj.nodeStream());
|
|
133
129
|
}
|
|
134
|
-
|
|
135
|
-
throw messages.createError('tooManyFiles', [fsPath]);
|
|
136
|
-
}
|
|
137
|
-
if (matchingFile.stream) {
|
|
138
|
-
return matchingFile.stream();
|
|
139
|
-
}
|
|
140
|
-
throw new core_1.SfError(`The file at path ${fsPath} does not have a stream method.`);
|
|
130
|
+
throw new core_1.SfError(messages.getMessage('error_no_directory_stream', [this.constructor.name]), 'LibraryError');
|
|
141
131
|
}
|
|
142
|
-
throw new core_1.SfError(messages.getMessage('
|
|
132
|
+
throw new core_1.SfError(messages.getMessage('error_expected_file_path', [fsPath]), 'LibraryError');
|
|
143
133
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
}
|
|
134
|
+
// Finds a matching entry in the zip by first comparing basenames, then dirnames.
|
|
135
|
+
// Note that zip files always use forward slash separators, so paths within the
|
|
136
|
+
// zip files are normalized for the OS file system before comparing.
|
|
137
|
+
match(fsPath) {
|
|
138
|
+
// "dot" has a special meaning as a directory name and always matches. Just return it.
|
|
139
|
+
if (fsPath === '.') {
|
|
140
|
+
return fsPath;
|
|
152
141
|
}
|
|
142
|
+
const fsPathBasename = (0, node_path_1.basename)(fsPath);
|
|
143
|
+
const fsPathDirname = (0, node_path_1.dirname)(fsPath);
|
|
144
|
+
return Object.keys(this.zip.files).find((filePath) => {
|
|
145
|
+
const normFilePath = (0, node_path_1.normalize)(filePath);
|
|
146
|
+
if ((0, node_path_1.basename)(normFilePath) === fsPathBasename) {
|
|
147
|
+
return (0, node_path_1.dirname)(normFilePath) === fsPathDirname;
|
|
148
|
+
}
|
|
149
|
+
});
|
|
153
150
|
}
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
else if (!this.exists(dirPath)) {
|
|
160
|
-
this.tree.set(dirPath, [entry]);
|
|
161
|
-
this.ensureDirPathExists({ path: dirPath });
|
|
162
|
-
}
|
|
163
|
-
else {
|
|
164
|
-
this.tree.get(dirPath).push(entry);
|
|
151
|
+
ensureDirectory(dirPath) {
|
|
152
|
+
if (dirPath) {
|
|
153
|
+
// JSZip can have directory entries or only file entries (with virtual directory entries)
|
|
154
|
+
const zipObj = this.zip.file(dirPath);
|
|
155
|
+
return zipObj?.dir === true || !zipObj;
|
|
165
156
|
}
|
|
157
|
+
throw new core_1.SfError(messages.getMessage('error_path_not_found', [dirPath]), 'LibraryError');
|
|
166
158
|
}
|
|
167
159
|
}
|
|
168
160
|
exports.ZipTreeContainer = ZipTreeContainer;
|
|
@@ -187,9 +179,9 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
187
179
|
// a map to reduce array iterations
|
|
188
180
|
const virtualDirectoryByFullPath = new Map();
|
|
189
181
|
paths.map((filename) => {
|
|
190
|
-
const splits = filename.split(
|
|
182
|
+
const splits = filename.split(node_path_1.sep);
|
|
191
183
|
for (let i = 0; i < splits.length - 1; i++) {
|
|
192
|
-
const fullPathSoFar = splits.slice(0, i + 1).join(
|
|
184
|
+
const fullPathSoFar = splits.slice(0, i + 1).join(node_path_1.sep);
|
|
193
185
|
const existing = virtualDirectoryByFullPath.get(fullPathSoFar);
|
|
194
186
|
virtualDirectoryByFullPath.set(fullPathSoFar, {
|
|
195
187
|
dirPath: fullPathSoFar,
|
|
@@ -207,13 +199,13 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
207
199
|
throw new core_1.SfError(messages.getMessage('error_path_not_found', [fsPath]), 'LibraryError');
|
|
208
200
|
}
|
|
209
201
|
exists(fsPath) {
|
|
210
|
-
const files = this.tree.get((0,
|
|
202
|
+
const files = this.tree.get((0, node_path_1.dirname)(fsPath));
|
|
211
203
|
const isFile = files?.has(fsPath);
|
|
212
204
|
return this.tree.has(fsPath) || Boolean(isFile);
|
|
213
205
|
}
|
|
214
206
|
readDirectory(fsPath) {
|
|
215
207
|
if (this.isDirectory(fsPath)) {
|
|
216
|
-
return Array.from(this.tree.get(fsPath) ?? []).map((p) => (0,
|
|
208
|
+
return Array.from(this.tree.get(fsPath) ?? []).map((p) => (0, node_path_1.basename)(p));
|
|
217
209
|
}
|
|
218
210
|
throw new core_1.SfError(messages.getMessage('error_expected_directory_path', [fsPath]), 'LibraryError');
|
|
219
211
|
}
|
|
@@ -243,10 +235,10 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
243
235
|
let childPath;
|
|
244
236
|
let childData;
|
|
245
237
|
if (typeof child === 'string') {
|
|
246
|
-
childPath = (0,
|
|
238
|
+
childPath = (0, node_path_1.join)(dirPath, child);
|
|
247
239
|
}
|
|
248
240
|
else {
|
|
249
|
-
childPath = (0,
|
|
241
|
+
childPath = (0, node_path_1.join)(dirPath, child.name);
|
|
250
242
|
childData = child.data;
|
|
251
243
|
}
|
|
252
244
|
const dirPathFromTree = this.tree.get(dirPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAA2C;AAC3C
|
|
1
|
+
{"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.filePathsFromMetadataComponent = void 0;
|
|
|
7
7
|
* Licensed under the BSD 3-Clause license.
|
|
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
|
-
const
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
11
11
|
const core_1 = require("@salesforce/core");
|
|
12
12
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
13
13
|
const constants_1 = require("../common/constants");
|
|
@@ -35,22 +35,22 @@ const registryAccess = new registryAccess_1.RegistryAccess();
|
|
|
35
35
|
*/
|
|
36
36
|
// eslint-disable-next-line complexity
|
|
37
37
|
const filePathsFromMetadataComponent = ({ fullName, type }, packageDir) => {
|
|
38
|
-
const packageDirWithTypeDir = packageDir ? (0,
|
|
38
|
+
const packageDirWithTypeDir = packageDir ? (0, node_path_1.join)(packageDir, type.directoryName) : type.directoryName;
|
|
39
39
|
if (type.strategies?.adapter === 'digitalExperience') {
|
|
40
40
|
// child MD Type, the metafile is a JSON, not an XML
|
|
41
41
|
if (type.id === 'digitalexperience') {
|
|
42
42
|
// metafile name = metaFileSuffix for DigitalExperience.
|
|
43
43
|
return [
|
|
44
|
-
(0,
|
|
44
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName.split('.')[0]}${node_path_1.sep}${fullName.split('.')[1]}${node_path_1.sep}${type.metaFileSuffix}`),
|
|
45
45
|
];
|
|
46
46
|
}
|
|
47
47
|
// parent MD Type
|
|
48
48
|
if (type.id === 'digitalexperiencebundle') {
|
|
49
|
-
return [(0,
|
|
49
|
+
return [(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${node_path_1.sep}${(0, node_path_1.basename)(fullName)}.${type.suffix}${constants_1.META_XML_SUFFIX}`)];
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
if (type.strategies?.adapter === 'decomposed') {
|
|
53
|
-
return [(0,
|
|
53
|
+
return [(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${node_path_1.sep}${fullName}.${type.suffix}${constants_1.META_XML_SUFFIX}`)];
|
|
54
54
|
}
|
|
55
55
|
// this needs to be done before the other types because of potential overlaps
|
|
56
56
|
if (!type.children && Object.keys(__1.registry.childTypes).includes(type.id)) {
|
|
@@ -58,44 +58,44 @@ const filePathsFromMetadataComponent = ({ fullName, type }, packageDir) => {
|
|
|
58
58
|
}
|
|
59
59
|
// Non-decomposed parents (i.e., any type that defines children and not a decomposed transformer)
|
|
60
60
|
if (type.children) {
|
|
61
|
-
return [(0,
|
|
61
|
+
return [(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}.${type.suffix}${constants_1.META_XML_SUFFIX}`)];
|
|
62
62
|
}
|
|
63
63
|
// basic metadata (with or without folders)
|
|
64
64
|
if (!type.children && !type.strategies) {
|
|
65
65
|
return (type.inFolder || type.folderType ? generateFolders({ fullName, type }, packageDirWithTypeDir) : []).concat([
|
|
66
|
-
(0,
|
|
66
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}.${type.suffix}${constants_1.META_XML_SUFFIX}`),
|
|
67
67
|
]);
|
|
68
68
|
}
|
|
69
69
|
// matching content (with or without folders)
|
|
70
70
|
if (type.strategies?.adapter === 'matchingContentFile') {
|
|
71
71
|
return (type.inFolder ? generateFolders({ fullName, type }, packageDirWithTypeDir) : []).concat([
|
|
72
|
-
(0,
|
|
73
|
-
(0,
|
|
72
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}.${type.suffix}${constants_1.META_XML_SUFFIX}`),
|
|
73
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}.${type.suffix}`),
|
|
74
74
|
]);
|
|
75
75
|
}
|
|
76
76
|
// mixed content in folder (ex: document)
|
|
77
77
|
if (type.strategies?.adapter === 'mixedContent' && type.inFolder && !type.strategies.transformer) {
|
|
78
78
|
return generateFolders({ fullName, type }, packageDirWithTypeDir).concat([
|
|
79
|
-
(0,
|
|
80
|
-
(0,
|
|
79
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${constants_1.META_XML_SUFFIX}`),
|
|
80
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}`),
|
|
81
81
|
]);
|
|
82
82
|
}
|
|
83
83
|
// mixed content not in folder (ex: staticResource,experienceBundle)
|
|
84
84
|
if (type.strategies?.adapter === 'mixedContent' && !type.inFolder) {
|
|
85
85
|
return [
|
|
86
|
-
(0,
|
|
86
|
+
(0, node_path_1.join)(packageDirWithTypeDir,
|
|
87
87
|
// registry doesn't have a suffix for EB (it comes down inside the mdapi response)
|
|
88
88
|
`${fullName}.${type.strategies?.transformer === 'staticResource' ? type.suffix : 'site'}${constants_1.META_XML_SUFFIX}`),
|
|
89
|
-
(0,
|
|
89
|
+
(0, node_path_1.join)(packageDirWithTypeDir, `${fullName}`),
|
|
90
90
|
];
|
|
91
91
|
}
|
|
92
92
|
// lwc, aura, waveTemplate, experiencePropertyType
|
|
93
93
|
if (type.strategies?.adapter === 'bundle') {
|
|
94
94
|
const mappings = new Map([
|
|
95
|
-
['ExperiencePropertyTypeBundle', (0,
|
|
96
|
-
['WaveTemplateBundle', (0,
|
|
97
|
-
['LightningComponentBundle', (0,
|
|
98
|
-
['AuraDefinitionBundle', (0,
|
|
95
|
+
['ExperiencePropertyTypeBundle', (0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${node_path_1.sep}schema.json`)],
|
|
96
|
+
['WaveTemplateBundle', (0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${node_path_1.sep}template-info.json`)],
|
|
97
|
+
['LightningComponentBundle', (0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${node_path_1.sep}${fullName}.js${constants_1.META_XML_SUFFIX}`)],
|
|
98
|
+
['AuraDefinitionBundle', (0, node_path_1.join)(packageDirWithTypeDir, `${fullName}${node_path_1.sep}${fullName}.cmp${constants_1.META_XML_SUFFIX}`)],
|
|
99
99
|
]);
|
|
100
100
|
const matched = mappings.get(type.name);
|
|
101
101
|
if (!matched) {
|
|
@@ -115,19 +115,19 @@ const generateFolders = ({ fullName, type }, packageDirWithTypeDir) => {
|
|
|
115
115
|
const splits = fullName.split('/');
|
|
116
116
|
return splits
|
|
117
117
|
.slice(0, splits.length - 1) // the last one is not a folder
|
|
118
|
-
.map((value, index, originalArray) => (0,
|
|
118
|
+
.map((value, index, originalArray) => (0, node_path_1.join)(packageDirWithTypeDir, `${originalArray.slice(0, index + 1).join(node_path_1.sep)}.${registryAccess.getTypeByName(folderType).suffix}${constants_1.META_XML_SUFFIX}`));
|
|
119
119
|
};
|
|
120
120
|
const getDecomposedChildType = ({ fullName, type }, packageDir) => {
|
|
121
121
|
const topLevelType = registryAccess.findType((t) => (0, ts_types_1.isPlainObject)(t.children) && Object.keys(t.children.types).includes(type.id));
|
|
122
122
|
if (!topLevelType) {
|
|
123
123
|
throw messages.createError('noParent', [fullName, type.name]);
|
|
124
124
|
}
|
|
125
|
-
const topLevelTypeDir = packageDir ? (0,
|
|
125
|
+
const topLevelTypeDir = packageDir ? (0, node_path_1.join)(packageDir, topLevelType.directoryName) : topLevelType.directoryName;
|
|
126
126
|
return [
|
|
127
127
|
// parent
|
|
128
|
-
(0,
|
|
128
|
+
(0, node_path_1.join)(topLevelTypeDir, `${fullName.split('.')[0]}${node_path_1.sep}${fullName.split('.')[0]}.${topLevelType.suffix}${constants_1.META_XML_SUFFIX}`),
|
|
129
129
|
// child
|
|
130
|
-
(0,
|
|
130
|
+
(0, node_path_1.join)(topLevelTypeDir, fullName.split('.')[0], type.directoryName, `${fullName.split('.')[1]}.${type.suffix}${constants_1.META_XML_SUFFIX}`),
|
|
131
131
|
];
|
|
132
132
|
};
|
|
133
133
|
//# sourceMappingURL=filePathGenerator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filePathGenerator.js","sourceRoot":"","sources":["../../../src/utils/filePathGenerator.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"filePathGenerator.js","sourceRoot":"","sources":["../../../src/utils/filePathGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.searchUp = exports.ensureFileExists = exports.ensureDirectoryExists = void 0;
|
|
10
|
-
const path = require("path");
|
|
10
|
+
const path = require("node:path");
|
|
11
11
|
const fs = require("graceful-fs");
|
|
12
12
|
function ensureDirectoryExists(filePath) {
|
|
13
13
|
if (fs.existsSync(filePath)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileSystemHandler.js","sourceRoot":"","sources":["../../../src/utils/fileSystemHandler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,
|
|
1
|
+
{"version":3,"file":"fileSystemHandler.js","sourceRoot":"","sources":["../../../src/utils/fileSystemHandler.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,kCAAkC;AAClC,kCAAkC;AAGlC,SAAgB,qBAAqB,CAAC,QAAgB;IACpD,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC3B,OAAO;KACR;IACD,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9C,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAND,sDAMC;AAED,SAAgB,gBAAgB,CAAC,QAAgB;IAC/C,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9C,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC;AAC3C,CAAC;AAHD,4CAGC;AAED;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,KAAiB,EAAE,QAAgB;IAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAC5C,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC3B,OAAO,QAAQ,CAAC;KACjB;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzC,IAAI,MAAM,KAAK,KAAK,EAAE;QACpB,OAAO;KACR;IACD,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AACpC,CAAC;AAVD,4BAUC"}
|
package/lib/src/utils/path.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.parseNestedFullName = exports.parseMetadataXml = exports.trimUntil = exports.parentName = exports.extName = exports.baseName = void 0;
|
|
10
|
-
const
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
11
11
|
/**
|
|
12
12
|
* Get the file or directory name at the end of a path. Different from `path.basename`
|
|
13
13
|
* in that it strips anything after the first '.' in the name.
|
|
@@ -15,7 +15,7 @@ const path_1 = require("path");
|
|
|
15
15
|
* @param fsPath The path to evaluate
|
|
16
16
|
*/
|
|
17
17
|
function baseName(fsPath) {
|
|
18
|
-
return (0,
|
|
18
|
+
return (0, node_path_1.basename)(fsPath).split('.')[0];
|
|
19
19
|
}
|
|
20
20
|
exports.baseName = baseName;
|
|
21
21
|
/**
|
|
@@ -26,7 +26,7 @@ exports.baseName = baseName;
|
|
|
26
26
|
* @param fsPath The path to evaluate
|
|
27
27
|
*/
|
|
28
28
|
function extName(fsPath) {
|
|
29
|
-
const split = (0,
|
|
29
|
+
const split = (0, node_path_1.extname)(fsPath).split('.');
|
|
30
30
|
return split.length > 1 ? split[1] : split[0];
|
|
31
31
|
}
|
|
32
32
|
exports.extName = extName;
|
|
@@ -36,7 +36,7 @@ exports.extName = extName;
|
|
|
36
36
|
* @param fsPath The path to evaluate
|
|
37
37
|
*/
|
|
38
38
|
function parentName(fsPath) {
|
|
39
|
-
return (0,
|
|
39
|
+
return (0, node_path_1.basename)((0, node_path_1.dirname)(fsPath));
|
|
40
40
|
}
|
|
41
41
|
exports.parentName = parentName;
|
|
42
42
|
/**
|
|
@@ -48,12 +48,12 @@ exports.parentName = parentName;
|
|
|
48
48
|
* @param untilLast Trim until the *last* occurrence of `part`
|
|
49
49
|
*/
|
|
50
50
|
function trimUntil(fsPath, part, untilLast = false) {
|
|
51
|
-
const parts = fsPath.split(
|
|
51
|
+
const parts = fsPath.split(node_path_1.sep);
|
|
52
52
|
const partIndex = untilLast ? parts.lastIndexOf(part) : parts.findIndex((p) => part === p);
|
|
53
53
|
if (partIndex === -1) {
|
|
54
54
|
return fsPath;
|
|
55
55
|
}
|
|
56
|
-
return parts.slice(partIndex).join(
|
|
56
|
+
return parts.slice(partIndex).join(node_path_1.sep);
|
|
57
57
|
}
|
|
58
58
|
exports.trimUntil = trimUntil;
|
|
59
59
|
/**
|
|
@@ -64,7 +64,7 @@ exports.trimUntil = trimUntil;
|
|
|
64
64
|
* @returns MetadataXml info or undefined
|
|
65
65
|
*/
|
|
66
66
|
function parseMetadataXml(fsPath) {
|
|
67
|
-
const match = new RegExp(/(.+)\.(.+)-meta\.xml/).exec((0,
|
|
67
|
+
const match = new RegExp(/(.+)\.(.+)-meta\.xml/).exec((0, node_path_1.basename)(fsPath));
|
|
68
68
|
if (match) {
|
|
69
69
|
return { fullName: match[1], suffix: match[2], path: fsPath };
|
|
70
70
|
}
|
|
@@ -90,7 +90,7 @@ exports.parseMetadataXml = parseMetadataXml;
|
|
|
90
90
|
* @returns the FullName
|
|
91
91
|
*/
|
|
92
92
|
function parseNestedFullName(fsPath, directoryName) {
|
|
93
|
-
const pathSplits = fsPath.split(
|
|
93
|
+
const pathSplits = fsPath.split(node_path_1.sep);
|
|
94
94
|
// Exit if the directoryName is not included in the file path.
|
|
95
95
|
if (!pathSplits.includes(directoryName)) {
|
|
96
96
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAA4D;AAK5D;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,MAAkB;IACzC,OAAO,IAAA,oBAAQ,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,mBAAO,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,oBAAQ,EAAC,IAAA,mBAAO,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,eAAG,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,eAAG,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,oBAAQ,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,eAAG,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"}
|