@salesforce/source-deploy-retrieve 9.8.0 → 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 +1 -1
- 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 +14 -14
- 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 +1 -1
- package/lib/src/resolve/treeContainers.js +18 -18
- 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 +8 -28
|
@@ -8,8 +8,8 @@ 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
|
|
12
|
-
const
|
|
11
|
+
const node_path_1 = require("node:path");
|
|
12
|
+
const node_stream_1 = require("node:stream");
|
|
13
13
|
const graceful_fs_1 = require("graceful-fs");
|
|
14
14
|
const JSZip = require("jszip");
|
|
15
15
|
const core_1 = require("@salesforce/core");
|
|
@@ -32,12 +32,12 @@ class TreeContainer {
|
|
|
32
32
|
*/
|
|
33
33
|
find(fileType, name, directory) {
|
|
34
34
|
const fileName = this.readDirectory(directory).find((entry) => {
|
|
35
|
-
const parsed = (0, utils_1.parseMetadataXml)((0,
|
|
35
|
+
const parsed = (0, utils_1.parseMetadataXml)((0, node_path_1.join)(directory, entry));
|
|
36
36
|
const metaXmlCondition = fileType === 'metadataXml' ? !!parsed : !parsed;
|
|
37
37
|
return (0, utils_1.baseName)(entry) === name && metaXmlCondition;
|
|
38
38
|
});
|
|
39
39
|
if (fileName) {
|
|
40
|
-
return (0,
|
|
40
|
+
return (0, node_path_1.join)(directory, fileName);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -100,8 +100,8 @@ class ZipTreeContainer extends TreeContainer {
|
|
|
100
100
|
// when comparing we call `dirname()` which does not include them.
|
|
101
101
|
const dirPath = resolvedPath.endsWith('/') ? resolvedPath.slice(0, -1) : resolvedPath;
|
|
102
102
|
return Object.keys(this.zip.files)
|
|
103
|
-
.filter((filePath) => (0,
|
|
104
|
-
.map((filePath) => (0,
|
|
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
|
}
|
|
@@ -125,7 +125,7 @@ class ZipTreeContainer extends TreeContainer {
|
|
|
125
125
|
if (resolvedPath) {
|
|
126
126
|
const jsZipObj = this.zip.file(resolvedPath);
|
|
127
127
|
if (jsZipObj && !jsZipObj.dir) {
|
|
128
|
-
return new
|
|
128
|
+
return new node_stream_1.Readable().wrap(jsZipObj.nodeStream());
|
|
129
129
|
}
|
|
130
130
|
throw new core_1.SfError(messages.getMessage('error_no_directory_stream', [this.constructor.name]), 'LibraryError');
|
|
131
131
|
}
|
|
@@ -139,12 +139,12 @@ class ZipTreeContainer extends TreeContainer {
|
|
|
139
139
|
if (fsPath === '.') {
|
|
140
140
|
return fsPath;
|
|
141
141
|
}
|
|
142
|
-
const fsPathBasename = (0,
|
|
143
|
-
const fsPathDirname = (0,
|
|
142
|
+
const fsPathBasename = (0, node_path_1.basename)(fsPath);
|
|
143
|
+
const fsPathDirname = (0, node_path_1.dirname)(fsPath);
|
|
144
144
|
return Object.keys(this.zip.files).find((filePath) => {
|
|
145
|
-
const normFilePath = (0,
|
|
146
|
-
if ((0,
|
|
147
|
-
return (0,
|
|
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
148
|
}
|
|
149
149
|
});
|
|
150
150
|
}
|
|
@@ -179,9 +179,9 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
179
179
|
// a map to reduce array iterations
|
|
180
180
|
const virtualDirectoryByFullPath = new Map();
|
|
181
181
|
paths.map((filename) => {
|
|
182
|
-
const splits = filename.split(
|
|
182
|
+
const splits = filename.split(node_path_1.sep);
|
|
183
183
|
for (let i = 0; i < splits.length - 1; i++) {
|
|
184
|
-
const fullPathSoFar = splits.slice(0, i + 1).join(
|
|
184
|
+
const fullPathSoFar = splits.slice(0, i + 1).join(node_path_1.sep);
|
|
185
185
|
const existing = virtualDirectoryByFullPath.get(fullPathSoFar);
|
|
186
186
|
virtualDirectoryByFullPath.set(fullPathSoFar, {
|
|
187
187
|
dirPath: fullPathSoFar,
|
|
@@ -199,13 +199,13 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
199
199
|
throw new core_1.SfError(messages.getMessage('error_path_not_found', [fsPath]), 'LibraryError');
|
|
200
200
|
}
|
|
201
201
|
exists(fsPath) {
|
|
202
|
-
const files = this.tree.get((0,
|
|
202
|
+
const files = this.tree.get((0, node_path_1.dirname)(fsPath));
|
|
203
203
|
const isFile = files?.has(fsPath);
|
|
204
204
|
return this.tree.has(fsPath) || Boolean(isFile);
|
|
205
205
|
}
|
|
206
206
|
readDirectory(fsPath) {
|
|
207
207
|
if (this.isDirectory(fsPath)) {
|
|
208
|
-
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));
|
|
209
209
|
}
|
|
210
210
|
throw new core_1.SfError(messages.getMessage('error_expected_directory_path', [fsPath]), 'LibraryError');
|
|
211
211
|
}
|
|
@@ -235,10 +235,10 @@ class VirtualTreeContainer extends TreeContainer {
|
|
|
235
235
|
let childPath;
|
|
236
236
|
let childData;
|
|
237
237
|
if (typeof child === 'string') {
|
|
238
|
-
childPath = (0,
|
|
238
|
+
childPath = (0, node_path_1.join)(dirPath, child);
|
|
239
239
|
}
|
|
240
240
|
else {
|
|
241
|
-
childPath = (0,
|
|
241
|
+
childPath = (0, node_path_1.join)(dirPath, child.name);
|
|
242
242
|
childData = child.data;
|
|
243
243
|
}
|
|
244
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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "9.8.
|
|
3
|
+
"version": "9.8.1",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -25,8 +25,8 @@
|
|
|
25
25
|
"node": ">=16.0.0"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@salesforce/core": "^5.3.
|
|
29
|
-
"@salesforce/kit": "^3.0.
|
|
28
|
+
"@salesforce/core": "^5.3.16",
|
|
29
|
+
"@salesforce/kit": "^3.0.15",
|
|
30
30
|
"@salesforce/ts-types": "^2.0.9",
|
|
31
31
|
"fast-levenshtein": "^3.0.0",
|
|
32
32
|
"fast-xml-parser": "^4.3.2",
|
|
@@ -40,9 +40,7 @@
|
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@salesforce/cli-plugins-testkit": "^4.4.10",
|
|
43
|
-
"@salesforce/dev-
|
|
44
|
-
"@salesforce/dev-scripts": "^5.11.0",
|
|
45
|
-
"@salesforce/prettier-config": "^0.0.3",
|
|
43
|
+
"@salesforce/dev-scripts": "^6.0.3",
|
|
46
44
|
"@salesforce/ts-sinon": "^1.4.18",
|
|
47
45
|
"@types/deep-equal-in-any-order": "^1.0.1",
|
|
48
46
|
"@types/fast-levenshtein": "^0.0.3",
|
|
@@ -51,34 +49,16 @@
|
|
|
51
49
|
"@types/minimatch": "^5.1.2",
|
|
52
50
|
"@types/proxy-from-env": "^1.0.3",
|
|
53
51
|
"@types/shelljs": "^0.8.13",
|
|
54
|
-
"@typescript-eslint/eslint-plugin": "^5.62.0",
|
|
55
|
-
"@typescript-eslint/parser": "^5.62.0",
|
|
56
|
-
"chai": "^4.3.8",
|
|
57
52
|
"deep-equal-in-any-order": "^1.1.19",
|
|
58
53
|
"deepmerge": "^4.3.1",
|
|
59
|
-
"eslint": "^
|
|
60
|
-
"eslint-config-prettier": "^8.10.0",
|
|
61
|
-
"eslint-config-salesforce": "^2.0.2",
|
|
62
|
-
"eslint-config-salesforce-license": "^0.2.0",
|
|
63
|
-
"eslint-config-salesforce-typescript": "^1.1.2",
|
|
64
|
-
"eslint-plugin-header": "^3.1.1",
|
|
65
|
-
"eslint-plugin-import": "^2.28.1",
|
|
66
|
-
"eslint-plugin-jsdoc": "^44.2.7",
|
|
67
|
-
"eslint-plugin-sf-plugin": "^1.16.9",
|
|
68
|
-
"husky": "^7.0.4",
|
|
54
|
+
"eslint-plugin-sf-plugin": "^1.16.13",
|
|
69
55
|
"jsforce": "^2.0.0-beta.28",
|
|
70
|
-
"mocha": "^9.2.2",
|
|
71
56
|
"mocha-junit-reporter": "^1.23.3",
|
|
72
|
-
"nyc": "^15.1.0",
|
|
73
|
-
"prettier": "^2.8.7",
|
|
74
|
-
"pretty-quick": "^3.1.3",
|
|
75
57
|
"shelljs": "0.8.5",
|
|
76
58
|
"shx": "^0.3.4",
|
|
77
|
-
"sinon": "10.0.0",
|
|
78
59
|
"ts-node": "^10.9.1",
|
|
79
|
-
"
|
|
80
|
-
"typescript": "^
|
|
81
|
-
"wireit": "^0.14.1"
|
|
60
|
+
"ts-patch": "^3.0.2",
|
|
61
|
+
"typescript": "^5.2.2"
|
|
82
62
|
},
|
|
83
63
|
"scripts": {
|
|
84
64
|
"build": "wireit",
|
|
@@ -123,7 +103,7 @@
|
|
|
123
103
|
]
|
|
124
104
|
},
|
|
125
105
|
"compile": {
|
|
126
|
-
"command": "
|
|
106
|
+
"command": "tspc -p . --pretty --incremental",
|
|
127
107
|
"files": [
|
|
128
108
|
"src/**/*.ts",
|
|
129
109
|
"src/registry/*.json",
|