@salesforce/source-deploy-retrieve 9.8.0 → 9.8.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 +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/registry/metadataRegistry.json +102 -1
- package/lib/src/registry/nonSupportedTypes.js +0 -3
- package/lib/src/registry/nonSupportedTypes.js.map +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
|
@@ -7,8 +7,8 @@ exports.MetadataConverter = 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
|
|
11
|
-
const
|
|
10
|
+
const node_stream_1 = require("node:stream");
|
|
11
|
+
const node_path_1 = require("node:path");
|
|
12
12
|
const core_1 = require("@salesforce/core");
|
|
13
13
|
const graceful_fs_1 = require("graceful-fs");
|
|
14
14
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
@@ -32,9 +32,9 @@ class MetadataConverter {
|
|
|
32
32
|
}
|
|
33
33
|
const targetFormatIsSource = targetFormat === 'source';
|
|
34
34
|
const { packagePath, defaultDirectory, writer, mergeSet, tasks = [], } = await getConvertIngredients(output, cs, targetFormatIsSource);
|
|
35
|
-
const conversionPipeline = (0, streams_1.pipeline)(
|
|
36
|
-
? (await (0, replacements_1.getReplacementMarkingStream)(cs.projectDirectory)) ?? new
|
|
37
|
-
: new
|
|
35
|
+
const conversionPipeline = (0, streams_1.pipeline)(node_stream_1.Readable.from(components), !targetFormatIsSource && (process.env.SF_APPLY_REPLACEMENTS_ON_CONVERT === 'true' || output.type === 'zip')
|
|
36
|
+
? (await (0, replacements_1.getReplacementMarkingStream)(cs.projectDirectory)) ?? new node_stream_1.PassThrough({ objectMode: true })
|
|
37
|
+
: new node_stream_1.PassThrough({ objectMode: true }), new streams_1.ComponentConverter(targetFormat, this.registry, mergeSet, defaultDirectory), writer);
|
|
38
38
|
await Promise.all([conversionPipeline, ...tasks]);
|
|
39
39
|
const result = { packagePath };
|
|
40
40
|
if (output.type === 'zip' && !packagePath) {
|
|
@@ -69,17 +69,17 @@ function getPackagePath(outputConfig) {
|
|
|
69
69
|
const { genUniqueDir = true, outputDirectory, packageName, type } = outputConfig;
|
|
70
70
|
if (outputDirectory) {
|
|
71
71
|
if (packageName) {
|
|
72
|
-
packagePath = (0,
|
|
72
|
+
packagePath = (0, node_path_1.join)(outputDirectory, packageName);
|
|
73
73
|
}
|
|
74
74
|
else if (genUniqueDir) {
|
|
75
|
-
packagePath = (0,
|
|
75
|
+
packagePath = (0, node_path_1.join)(outputDirectory, `${MetadataConverter.DEFAULT_PACKAGE_PREFIX}_${Date.now()}`);
|
|
76
76
|
}
|
|
77
77
|
else {
|
|
78
|
-
packagePath = (0,
|
|
78
|
+
packagePath = (0, node_path_1.normalize)(outputDirectory);
|
|
79
79
|
}
|
|
80
80
|
if (type === 'zip') {
|
|
81
81
|
packagePath += '.zip';
|
|
82
|
-
(0, fileSystemHandler_1.ensureDirectoryExists)((0,
|
|
82
|
+
(0, fileSystemHandler_1.ensureDirectoryExists)((0, node_path_1.dirname)(packagePath));
|
|
83
83
|
}
|
|
84
84
|
else {
|
|
85
85
|
(0, fileSystemHandler_1.ensureDirectoryExists)(packagePath);
|
|
@@ -151,11 +151,11 @@ async function getDirectoryConfigOutputs(output, targetFormatIsSource, cs) {
|
|
|
151
151
|
tasks: targetFormatIsSource
|
|
152
152
|
? []
|
|
153
153
|
: [
|
|
154
|
-
graceful_fs_1.promises.writeFile((0,
|
|
154
|
+
graceful_fs_1.promises.writeFile((0, node_path_1.join)(packagePath, MetadataConverter.PACKAGE_XML_FILE), await cs.getPackageXml()),
|
|
155
155
|
...cs.getTypesOfDestructiveChanges().map(async (destructiveChangesType) =>
|
|
156
156
|
// for each of the destructive changes in the component set, convert and write the correct metadata
|
|
157
157
|
// to each manifest
|
|
158
|
-
graceful_fs_1.promises.writeFile((0,
|
|
158
|
+
graceful_fs_1.promises.writeFile((0, node_path_1.join)(packagePath, getDestructiveManifest(destructiveChangesType)), await cs.getPackageXml(4, destructiveChangesType))),
|
|
159
159
|
],
|
|
160
160
|
};
|
|
161
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { Transform, Readable } from 'stream';
|
|
3
|
+
import { Transform, Readable } from 'node:stream';
|
|
4
4
|
import { SourcePath } from '../common';
|
|
5
5
|
import { SourceComponent } from '../resolve/sourceComponent';
|
|
6
6
|
import { MarkedReplacement, ReplacementConfig } from './types';
|
|
@@ -7,9 +7,9 @@ exports.posixifyPaths = exports.stringToRegex = exports.matchesFile = exports.ge
|
|
|
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 promises_1 = require("fs/promises");
|
|
11
|
-
const
|
|
12
|
-
const
|
|
10
|
+
const promises_1 = require("node:fs/promises");
|
|
11
|
+
const node_stream_1 = require("node:stream");
|
|
12
|
+
const node_path_1 = require("node:path");
|
|
13
13
|
const core_1 = require("@salesforce/core");
|
|
14
14
|
const minimatch = require("minimatch");
|
|
15
15
|
const kit_1 = require("@salesforce/kit");
|
|
@@ -27,7 +27,7 @@ exports.getReplacementStreamForReadable = getReplacementStreamForReadable;
|
|
|
27
27
|
* A stream for replacing the contents of a single SourceComponent.
|
|
28
28
|
*
|
|
29
29
|
*/
|
|
30
|
-
class ReplacementStream extends
|
|
30
|
+
class ReplacementStream extends node_stream_1.Transform {
|
|
31
31
|
constructor(replacements) {
|
|
32
32
|
super({ objectMode: true });
|
|
33
33
|
this.replacements = replacements;
|
|
@@ -82,7 +82,7 @@ exports.getReplacementMarkingStream = getReplacementMarkingStream;
|
|
|
82
82
|
* Returns a mutated component with a `replacements` property if any replacements are found.
|
|
83
83
|
* Throws if any replacements reference a file or env that does not exist
|
|
84
84
|
*/
|
|
85
|
-
class ReplacementMarkingStream extends
|
|
85
|
+
class ReplacementMarkingStream extends node_stream_1.Transform {
|
|
86
86
|
constructor(replacementConfigs) {
|
|
87
87
|
super({ objectMode: true });
|
|
88
88
|
this.replacementConfigs = replacementConfigs;
|
|
@@ -185,6 +185,6 @@ const stringToRegex = (input) =>
|
|
|
185
185
|
// eslint-disable-next-line no-useless-escape
|
|
186
186
|
new RegExp(input.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'), 'g');
|
|
187
187
|
exports.stringToRegex = stringToRegex;
|
|
188
|
-
const posixifyPaths = (f) => f.split(
|
|
188
|
+
const posixifyPaths = (f) => f.split(node_path_1.sep).join(node_path_1.posix.sep);
|
|
189
189
|
exports.posixifyPaths = posixifyPaths;
|
|
190
190
|
//# sourceMappingURL=replacements.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacements.js","sourceRoot":"","sources":["../../../src/convert/replacements.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,
|
|
1
|
+
{"version":3,"file":"replacements.js","sourceRoot":"","sources":["../../../src/convert/replacements.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
/// <reference types="node" />
|
|
3
|
-
import { pipeline as cbPipeline, Readable, Stream, Transform, Writable } from 'stream';
|
|
3
|
+
import { pipeline as cbPipeline, Readable, Stream, Transform, Writable } from 'node:stream';
|
|
4
4
|
import { JsonMap } from '@salesforce/ts-types';
|
|
5
5
|
import { Logger } from '@salesforce/core';
|
|
6
6
|
import { MetadataResolver, SourceComponent } from '../resolve';
|
|
@@ -7,9 +7,9 @@ exports.JsToXml = exports.ZipWriter = exports.StandardWriter = exports.Component
|
|
|
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
|
|
11
|
-
const
|
|
12
|
-
const
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
11
|
+
const node_stream_1 = require("node:stream");
|
|
12
|
+
const node_util_1 = require("node:util");
|
|
13
13
|
const core_1 = require("@salesforce/core");
|
|
14
14
|
const JSZip = require("jszip");
|
|
15
15
|
const graceful_fs_1 = require("graceful-fs");
|
|
@@ -21,7 +21,7 @@ const fileSystemHandler_1 = require("../utils/fileSystemHandler");
|
|
|
21
21
|
const transformers_1 = require("./transformers");
|
|
22
22
|
const convertContext_1 = require("./convertContext");
|
|
23
23
|
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>"]]));
|
|
24
|
-
exports.pipeline = (0,
|
|
24
|
+
exports.pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
|
|
25
25
|
const stream2buffer = async (stream) => new Promise((resolve, reject) => {
|
|
26
26
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
27
27
|
const buf = Array();
|
|
@@ -31,7 +31,7 @@ const stream2buffer = async (stream) => new Promise((resolve, reject) => {
|
|
|
31
31
|
stream.on('error', (err) => reject(`error converting stream - ${err}`));
|
|
32
32
|
});
|
|
33
33
|
exports.stream2buffer = stream2buffer;
|
|
34
|
-
class ComponentConverter extends
|
|
34
|
+
class ComponentConverter extends node_stream_1.Transform {
|
|
35
35
|
constructor(targetFormat, registry, mergeSet, defaultDirectory) {
|
|
36
36
|
super({ objectMode: true });
|
|
37
37
|
this.targetFormat = targetFormat;
|
|
@@ -94,7 +94,7 @@ class ComponentConverter extends stream_1.Transform {
|
|
|
94
94
|
}
|
|
95
95
|
}
|
|
96
96
|
exports.ComponentConverter = ComponentConverter;
|
|
97
|
-
class ComponentWriter extends
|
|
97
|
+
class ComponentWriter extends node_stream_1.Writable {
|
|
98
98
|
constructor(rootDestination) {
|
|
99
99
|
super({ objectMode: true });
|
|
100
100
|
this.forceIgnoredPaths = new Set();
|
|
@@ -118,14 +118,11 @@ class StandardWriter extends ComponentWriter {
|
|
|
118
118
|
// every component has been written to the destination. This await ensures the microtask
|
|
119
119
|
// queue is empty when that call exits and overall less memory is consumed.
|
|
120
120
|
await Promise.all(chunk.writeInfos.map((info) => {
|
|
121
|
-
|
|
122
|
-
// the eslint comment should remain until strictMode is fully implemented
|
|
123
|
-
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
|
|
124
|
-
const fullDest = (0, path_1.isAbsolute)(info.output) ? info.output : (0, path_1.join)(this.rootDestination, info.output);
|
|
121
|
+
const fullDest = (0, node_path_1.isAbsolute)(info.output) ? info.output : (0, node_path_1.join)(this.rootDestination, info.output);
|
|
125
122
|
if (!(0, graceful_fs_1.existsSync)(fullDest)) {
|
|
126
123
|
for (const ignoredPath of this.forceIgnoredPaths) {
|
|
127
|
-
if ((0,
|
|
128
|
-
(0,
|
|
124
|
+
if ((0, node_path_1.dirname)(ignoredPath).includes((0, node_path_1.dirname)(fullDest)) &&
|
|
125
|
+
(0, node_path_1.basename)(ignoredPath).includes((0, node_path_1.basename)(fullDest))) {
|
|
129
126
|
return;
|
|
130
127
|
}
|
|
131
128
|
}
|
|
@@ -214,7 +211,7 @@ exports.ZipWriter = ZipWriter;
|
|
|
214
211
|
* to be used as a valid source for ComponentWriters in the conversion pipeline,
|
|
215
212
|
* even though it's not beneficial in the typical way a stream is.
|
|
216
213
|
*/
|
|
217
|
-
class JsToXml extends
|
|
214
|
+
class JsToXml extends node_stream_1.Readable {
|
|
218
215
|
constructor(xmlObject) {
|
|
219
216
|
super();
|
|
220
217
|
this.xmlObject = xmlObject;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.DecomposedMetadataTransformer = 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 kit_1 = require("@salesforce/kit");
|
|
12
12
|
const core_1 = require("@salesforce/core");
|
|
13
13
|
const streams_1 = require("../streams");
|
|
@@ -117,6 +117,14 @@ class DecomposedMetadataTransformer extends baseMetadataTransformer_1.BaseMetada
|
|
|
117
117
|
});
|
|
118
118
|
this.setDecomposedState(childComponent, { foundMerge: true });
|
|
119
119
|
}
|
|
120
|
+
// If we have a parent and the child is unaddressable without the parent, keep them
|
|
121
|
+
// together on the file system, meaning a new child will not be written to the default dir.
|
|
122
|
+
else if (childType.unaddressableWithoutParent) {
|
|
123
|
+
// get output path from parent
|
|
124
|
+
const childFileName = `${entryName}.${childComponent.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
125
|
+
const output = (0, node_path_1.join)((0, node_path_1.dirname)(mergeWith.xml), childFileName);
|
|
126
|
+
writeInfos.push({ source, output });
|
|
127
|
+
}
|
|
120
128
|
// if no child component is found to merge with yet, mark it as so in
|
|
121
129
|
// the state
|
|
122
130
|
else if (!this.getDecomposedState(childComponent)?.foundMerge) {
|
|
@@ -199,8 +207,8 @@ const getDefaultOutput = (component) => {
|
|
|
199
207
|
const baseComponent = (parent ?? component);
|
|
200
208
|
let output = `${childName ?? baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
|
|
201
209
|
if (parent?.type.strategies?.decomposition === "folderPerType" /* DecompositionStrategy.FolderPerType */) {
|
|
202
|
-
output = (0,
|
|
210
|
+
output = (0, node_path_1.join)(type.directoryName, output);
|
|
203
211
|
}
|
|
204
|
-
return (0,
|
|
212
|
+
return (0, node_path_1.join)(baseComponent.getPackageRelativePath(baseName, 'source'), output);
|
|
205
213
|
};
|
|
206
214
|
//# sourceMappingURL=decomposedMetadataTransformer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"decomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/decomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ exports.DefaultMetadataTransformer = 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 common_1 = require("../../common");
|
|
13
13
|
const utils_1 = require("../../utils");
|
|
@@ -50,8 +50,8 @@ const getWriteInfos = (component, targetFormat, mergeWith) => component
|
|
|
50
50
|
const getContentSourceDestination = (source, targetFormat, component, mergeWith) => {
|
|
51
51
|
if (mergeWith?.content) {
|
|
52
52
|
if (component.content && component.tree.isDirectory(component.content)) {
|
|
53
|
-
const relative = (0, utils_1.trimUntil)(source, (0,
|
|
54
|
-
return (0,
|
|
53
|
+
const relative = (0, utils_1.trimUntil)(source, (0, node_path_1.basename)(component.content));
|
|
54
|
+
return (0, node_path_1.join)((0, node_path_1.dirname)(mergeWith.content), relative);
|
|
55
55
|
}
|
|
56
56
|
return mergeWith.content;
|
|
57
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ exports.StaticResourceMetadataTransformer = 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
|
|
11
|
-
const
|
|
10
|
+
const node_path_1 = require("node:path");
|
|
11
|
+
const node_stream_1 = require("node:stream");
|
|
12
12
|
const JSZip = require("jszip");
|
|
13
13
|
const mime_1 = require("mime");
|
|
14
14
|
const graceful_fs_1 = require("graceful-fs");
|
|
@@ -46,7 +46,7 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
|
|
|
46
46
|
// have to walk the component content. Replacements only happen if set on the component.
|
|
47
47
|
for (const path of component.walkContent()) {
|
|
48
48
|
const replacementStream = (0, replacements_1.getReplacementStreamForReadable)(component, path);
|
|
49
|
-
const relPath = (0,
|
|
49
|
+
const relPath = (0, node_path_1.relative)(content, path);
|
|
50
50
|
const relPosixPath = relPath.replace(/\\/g, '/');
|
|
51
51
|
zip.file(relPosixPath, replacementStream);
|
|
52
52
|
}
|
|
@@ -55,7 +55,7 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
|
|
|
55
55
|
if ((0, kit_1.isEmpty)(zip.files)) {
|
|
56
56
|
throw messages.createError('noContentFound', [component.fullName, component.type.name]);
|
|
57
57
|
}
|
|
58
|
-
return new
|
|
58
|
+
return new node_stream_1.Readable().wrap(zip
|
|
59
59
|
.generateNodeStream({
|
|
60
60
|
compression: 'DEFLATE',
|
|
61
61
|
compressionOptions: { level: 9 },
|
|
@@ -70,11 +70,11 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
|
|
|
70
70
|
source: (await componentIsExpandedArchive(component))
|
|
71
71
|
? zipIt()
|
|
72
72
|
: (0, replacements_1.getReplacementStreamForReadable)(component, content),
|
|
73
|
-
output: (0,
|
|
73
|
+
output: (0, node_path_1.join)(type.directoryName, `${(0, utils_1.baseName)(content)}.${type.suffix}`),
|
|
74
74
|
},
|
|
75
75
|
{
|
|
76
76
|
source: (0, replacements_1.getReplacementStreamForReadable)(component, xml),
|
|
77
|
-
output: (0,
|
|
77
|
+
output: (0, node_path_1.join)(type.directoryName, (0, node_path_1.basename)(xml)),
|
|
78
78
|
},
|
|
79
79
|
];
|
|
80
80
|
}
|
|
@@ -97,11 +97,11 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
|
|
|
97
97
|
for (const filePath of Object.keys(srZip.files)) {
|
|
98
98
|
const zipObj = srZip.file(filePath);
|
|
99
99
|
if (zipObj && !zipObj.dir) {
|
|
100
|
-
const path = (0,
|
|
101
|
-
const fullDest = (0,
|
|
100
|
+
const path = (0, node_path_1.join)(baseContentPath, filePath);
|
|
101
|
+
const fullDest = (0, node_path_1.isAbsolute)(path)
|
|
102
102
|
? path
|
|
103
|
-
: (0,
|
|
104
|
-
pipelinePromises.push(this.pipeline(new
|
|
103
|
+
: (0, node_path_1.join)(this.defaultDirectory ?? component.getPackageRelativePath('', 'source'), path);
|
|
104
|
+
pipelinePromises.push(this.pipeline(new node_stream_1.Readable().wrap(zipObj.nodeStream()), fullDest));
|
|
105
105
|
}
|
|
106
106
|
}
|
|
107
107
|
await Promise.all(pipelinePromises);
|
|
@@ -112,7 +112,7 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
|
|
|
112
112
|
return [
|
|
113
113
|
{
|
|
114
114
|
source: component.tree.stream(xml),
|
|
115
|
-
output: mergeWith?.xml ?? component.getPackageRelativePath((0,
|
|
115
|
+
output: mergeWith?.xml ?? component.getPackageRelativePath((0, node_path_1.basename)(xml), 'source'),
|
|
116
116
|
},
|
|
117
117
|
].concat(shouldUnzipArchive
|
|
118
118
|
? []
|
|
@@ -156,7 +156,7 @@ const getContentType = async (component) => {
|
|
|
156
156
|
const resource = (await component.parseXml()).StaticResource;
|
|
157
157
|
if (!resource || !Object.keys(resource).includes('contentType')) {
|
|
158
158
|
throw new core_1.SfError(messages.getMessage('error_static_resource_missing_resource_file', [
|
|
159
|
-
(0,
|
|
159
|
+
(0, node_path_1.join)('staticresources', component.name ?? component.xml ?? component.type.name),
|
|
160
160
|
]), 'LibraryError');
|
|
161
161
|
}
|
|
162
162
|
const output = resource.contentType ?? DEFAULT_CONTENT_TYPE;
|
|
@@ -167,11 +167,11 @@ const getContentType = async (component) => {
|
|
|
167
167
|
};
|
|
168
168
|
const getBaseContentPath = (component, mergeWith) => {
|
|
169
169
|
if (mergeWith?.content) {
|
|
170
|
-
return (0,
|
|
170
|
+
return (0, node_path_1.join)((0, node_path_1.dirname)(mergeWith.content), (0, utils_1.baseName)(mergeWith?.content));
|
|
171
171
|
}
|
|
172
172
|
if (typeof component.content === 'string') {
|
|
173
173
|
const baseContentPath = component.getPackageRelativePath(component.content, 'source');
|
|
174
|
-
return (0,
|
|
174
|
+
return (0, node_path_1.join)((0, node_path_1.dirname)(baseContentPath), (0, utils_1.baseName)(baseContentPath));
|
|
175
175
|
}
|
|
176
176
|
throw new core_1.SfError(`Expected a content path for ${component.name} (${component.xml})`);
|
|
177
177
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH
|
|
1
|
+
{"version":3,"file":"staticResourceMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/staticResourceMetadataTransformer.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/types';
|
|
5
5
|
import { MetadataComponent, SourceComponent } from '../resolve';
|
|
6
6
|
export type WriteInfo = {
|