@salesforce/source-deploy-retrieve 11.1.2 → 11.2.0
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/common/constants.d.ts +1 -0
- package/lib/src/common/constants.js +2 -1
- package/lib/src/common/constants.js.map +1 -1
- package/lib/src/convert/convertContext/recompositionFinalizer.js +1 -0
- package/lib/src/convert/convertContext/recompositionFinalizer.js.map +1 -1
- package/lib/src/convert/streams.js +4 -1
- package/lib/src/convert/streams.js.map +1 -1
- package/lib/src/convert/transformers/defaultMetadataTransformer.js +4 -2
- package/lib/src/convert/transformers/defaultMetadataTransformer.js.map +1 -1
- package/lib/src/resolve/metadataResolver.js +17 -6
- package/lib/src/resolve/metadataResolver.js.map +1 -1
- package/lib/src/resolve/sourceComponent.js +19 -13
- package/lib/src/resolve/sourceComponent.js.map +1 -1
- package/lib/src/utils/path.d.ts +2 -2
- package/lib/src/utils/path.js +4 -7
- package/lib/src/utils/path.js.map +1 -1
- package/package.json +3 -3
|
@@ -3,3 +3,4 @@ export declare const META_XML_SUFFIX = "-meta.xml";
|
|
|
3
3
|
export declare const XML_DECL = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
|
|
4
4
|
export declare const XML_NS_URL = "http://soap.sforce.com/2006/04/metadata";
|
|
5
5
|
export declare const XML_NS_KEY = "@_xmlns";
|
|
6
|
+
export declare const XML_COMMENT_PROP_NAME = "#xml__comment";
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.XML_NS_KEY = exports.XML_NS_URL = exports.XML_DECL = exports.META_XML_SUFFIX = exports.DEFAULT_PACKAGE_ROOT_SFDX = void 0;
|
|
3
|
+
exports.XML_COMMENT_PROP_NAME = exports.XML_NS_KEY = exports.XML_NS_URL = exports.XML_DECL = exports.META_XML_SUFFIX = exports.DEFAULT_PACKAGE_ROOT_SFDX = void 0;
|
|
4
4
|
/*
|
|
5
5
|
* Copyright (c) 2020, salesforce.com, inc.
|
|
6
6
|
* All rights reserved.
|
|
@@ -13,4 +13,5 @@ exports.META_XML_SUFFIX = '-meta.xml';
|
|
|
13
13
|
exports.XML_DECL = '<?xml version="1.0" encoding="UTF-8"?>\n';
|
|
14
14
|
exports.XML_NS_URL = 'http://soap.sforce.com/2006/04/metadata';
|
|
15
15
|
exports.XML_NS_KEY = '@_xmlns';
|
|
16
|
+
exports.XML_COMMENT_PROP_NAME = '#xml__comment';
|
|
16
17
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/constants.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAiC;AAEpB,QAAA,yBAAyB,GAAG,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACpD,QAAA,eAAe,GAAG,WAAW,CAAC;AAC9B,QAAA,QAAQ,GAAG,0CAA0C,CAAC;AACtD,QAAA,UAAU,GAAG,yCAAyC,CAAC;AACvD,QAAA,UAAU,GAAG,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/common/constants.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAiC;AAEpB,QAAA,yBAAyB,GAAG,IAAA,gBAAI,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACpD,QAAA,eAAe,GAAG,WAAW,CAAC;AAC9B,QAAA,QAAQ,GAAG,0CAA0C,CAAC;AACtD,QAAA,UAAU,GAAG,yCAAyC,CAAC;AACvD,QAAA,UAAU,GAAG,SAAS,CAAC;AACvB,QAAA,qBAAqB,GAAG,eAAe,CAAC"}
|
|
@@ -73,6 +73,7 @@ const ensureStateValueWithParent = (stateValue) => {
|
|
|
73
73
|
.map((c) => c.fullName)
|
|
74
74
|
.join(', ')}`);
|
|
75
75
|
};
|
|
76
|
+
/** throw if the child has no parent component */
|
|
76
77
|
const ensureMetadataComponentWithParent = (child) => {
|
|
77
78
|
// all components should be SourceComponent at this point
|
|
78
79
|
if (child instanceof sourceComponent_1.SourceComponent && child.parent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recompositionFinalizer.js","sourceRoot":"","sources":["../../../../src/convert/convertContext/recompositionFinalizer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"recompositionFinalizer.js","sourceRoot":"","sources":["../../../../src/convert/convertContext/recompositionFinalizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -225,14 +225,17 @@ class JsToXml extends node_stream_1.Readable {
|
|
|
225
225
|
indentBy: ' ',
|
|
226
226
|
ignoreAttributes: false,
|
|
227
227
|
cdataPropName: '__cdata',
|
|
228
|
+
commentPropName: constants_1.XML_COMMENT_PROP_NAME,
|
|
228
229
|
});
|
|
229
230
|
const builtXml = String(builder.build(this.xmlObject));
|
|
230
|
-
const xmlContent = constants_1.XML_DECL.concat(handleSpecialEntities(builtXml));
|
|
231
|
+
const xmlContent = correctComments(constants_1.XML_DECL.concat(handleSpecialEntities(builtXml)));
|
|
231
232
|
this.push(xmlContent);
|
|
232
233
|
this.push(null);
|
|
233
234
|
}
|
|
234
235
|
}
|
|
235
236
|
exports.JsToXml = JsToXml;
|
|
237
|
+
/** xmlBuilder likes to add newline and indent before/after the comment (hypothesis: it uses `<` as a hint to newlint/indent) */
|
|
238
|
+
const correctComments = (xml) => xml.includes('<!--') ? xml.replace(/\s+<!--(.*?)-->\s+/g, '<!--$1-->') : xml;
|
|
236
239
|
/**
|
|
237
240
|
* use this function to handle special html entities.
|
|
238
241
|
* XmlBuilder will otherwise replace ex: ` ` with `'&#160;'` (escape the &)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;GAKG;AACH,yCAA6C;AAC7C,6CAA4F;AAC5F,yCAAsC;AACtC,2CAAqD;AACrD,kDAA0B;AAC1B,6CAAoF;AAEpF,qDAA6C;AAC7C,2CAA0C;AAG1C,
|
|
1
|
+
{"version":3,"file":"streams.js","sourceRoot":"","sources":["../../../src/convert/streams.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,8 @@ exports.DefaultMetadataTransformer = void 0;
|
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
10
|
const node_path_1 = require("node:path");
|
|
11
|
-
const
|
|
11
|
+
const messages_1 = require("@salesforce/core/messages");
|
|
12
|
+
const lifecycle_1 = require("@salesforce/core/lifecycle");
|
|
12
13
|
const constants_1 = require("../../common/constants");
|
|
13
14
|
const path_1 = require("../../utils/path");
|
|
14
15
|
const replacements_1 = require("../replacements");
|
|
@@ -65,7 +66,7 @@ const getXmlDestination = (targetFormat, component, mergeWith) => {
|
|
|
65
66
|
const { folderContentType, suffix, legacySuffix } = component.type;
|
|
66
67
|
if (!component.xml) {
|
|
67
68
|
;
|
|
68
|
-
const messages = new
|
|
69
|
+
const messages = new messages_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."], ["missingApiVersion", "Could not determine an API version to use for the generated manifest. Tried looking for sourceApiVersion in sfdx-project.json, apiVersion from config vars, and the highest apiVersion from the APEX REST endpoint. Using API version 58.0 as a last resort."], ["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>"]]));
|
|
69
70
|
throw messages.createError('error_parsing_xml', [component.fullName, component.type.name]);
|
|
70
71
|
}
|
|
71
72
|
let xmlDestination = component.getPackageRelativePath(component.xml, targetFormat);
|
|
@@ -95,6 +96,7 @@ const getXmlDestination = (targetFormat, component, mergeWith) => {
|
|
|
95
96
|
}
|
|
96
97
|
}
|
|
97
98
|
if (legacySuffix && suffix && xmlDestination.includes(legacySuffix)) {
|
|
99
|
+
void lifecycle_1.Lifecycle.getInstance().emitWarning(`The ${component.type.name} component ${component.fullName} uses the legacy suffix ${legacySuffix}. This suffix is deprecated and will be removed in a future release.`);
|
|
98
100
|
xmlDestination = xmlDestination.replace(legacySuffix, suffix);
|
|
99
101
|
}
|
|
100
102
|
return xmlDestination;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"defaultMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/defaultMetadataTransformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -325,15 +325,26 @@ const resolveTypeFromStrictFolder = (registry) => (fsPath) => {
|
|
|
325
325
|
.filter(pathIncludesDirName(pathParts)) // the type's directory is in the path
|
|
326
326
|
.filter(folderTypeFilter(fsPath))
|
|
327
327
|
.find((type) =>
|
|
328
|
-
// any of the following
|
|
329
|
-
isMixedContentOrBundle(type) ||
|
|
328
|
+
// any of the following options is considered a good match
|
|
329
|
+
isMixedContentOrBundle(type) ||
|
|
330
|
+
suffixMatches(type, fsPath) ||
|
|
331
|
+
childSuffixMatches(type, fsPath) ||
|
|
332
|
+
legacySuffixMatches(type, fsPath));
|
|
330
333
|
};
|
|
331
334
|
/** the type has children and the file suffix (in source format) matches a child type suffix of the type we think it is */
|
|
332
|
-
const childSuffixMatches = (type, fsPath) => Object.values(type.children?.types ?? {})
|
|
333
|
-
.map((childType) => `${childType.suffix}${constants_1.META_XML_SUFFIX}`)
|
|
334
|
-
.some((s) => fsPath.endsWith(s));
|
|
335
|
+
const childSuffixMatches = (type, fsPath) => Object.values(type.children?.types ?? {}).some((childType) => suffixMatches(childType, fsPath) || legacySuffixMatches(childType, fsPath));
|
|
335
336
|
/** the file suffix (in source or mdapi format) matches the type suffix we think it is */
|
|
336
|
-
const suffixMatches = (type, fsPath) => typeof type.suffix === 'string' &&
|
|
337
|
+
const suffixMatches = (type, fsPath) => typeof type.suffix === 'string' &&
|
|
338
|
+
(fsPath.endsWith(type.suffix) || fsPath.endsWith(appendMetaXmlSuffix(type.suffix)));
|
|
339
|
+
const legacySuffixMatches = (type, fsPath) => {
|
|
340
|
+
if (typeof type.legacySuffix === 'string' &&
|
|
341
|
+
(fsPath.endsWith(type.legacySuffix) || fsPath.endsWith(appendMetaXmlSuffix(type.legacySuffix)))) {
|
|
342
|
+
void core_1.Lifecycle.getInstance().emitWarning(`The ${type.name} component at ${fsPath} uses the legacy suffix ${type.legacySuffix}. This suffix is deprecated and will be removed in a future release.`);
|
|
343
|
+
return true;
|
|
344
|
+
}
|
|
345
|
+
return false;
|
|
346
|
+
};
|
|
347
|
+
const appendMetaXmlSuffix = (suffix) => `${suffix}${constants_1.META_XML_SUFFIX}`;
|
|
337
348
|
const isMixedContentOrBundle = (type) => typeof type.strategies?.adapter === 'string' && ['mixedContent', 'bundle'].includes(type.strategies.adapter);
|
|
338
349
|
/** types with folders only have folder components living at the top level.
|
|
339
350
|
* if the fsPath is a folder component, let a future strategy deal with it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAAmD;AACnD,2CAAwE;AACxE,wCAA8E;AAC9E,+DAA4D;AAG5D,mDAAsD;AACtD,0EAAuE;AACvE,+CAA4C;AAE5C,qDAAsE;;AAGtE,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6pKAAC,CAAC;AAEpF;;;;GAIG;AACH,MAAa,gBAAgB;IAI3B;;;;OAIG;IACH,YACU,WAAW,IAAI,+BAAc,EAAE,EAC/B,OAAsB,IAAI,oCAAmB,EAAE,EAC/C,mBAAmB,IAAI;QAFvB,aAAQ,GAAR,QAAQ,CAAuB;QAC/B,SAAI,GAAJ,IAAI,CAA2C;QAC/C,qBAAgB,GAAhB,gBAAgB,CAAO;QAE/B,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAU,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACI,qBAAqB,CAAC,MAAc,EAAE,eAA8B;QACzE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC;QACjG,CAAC;QAED,uDAAuD;QACvD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,yBAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,yBAAW,EAAE,CAAC;QAEjG,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;YACpG,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACtD,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtC,CAAC;IAEO,8BAA8B,CAAC,GAAW,EAAE,eAA8B;QAChF,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,UAAU,GAAsB,EAAE,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;QAEzB,6CAA6C;QAC7C,sEAAsE;QACtE,0EAA0E;QAC1E,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YACjE,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAA,aAAM,EAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YACnE,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;gBAClC,IAAI,2BAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;oBAClE,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;oBACtD,IAAI,SAAS,IAAI,CAAC,CAAC,eAAe,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;wBACtE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3B,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;oBAC5B,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;iBAAM,IAAI,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACvD,IAAI,SAAS,EAAE,CAAC;oBACd,IAAI,CAAC,eAAe,IAAI,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;wBACvD,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;wBAC3B,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;oBAChC,CAAC;yBAAM,CAAC;wBACN,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC;4BAC5C,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;gCAC/B,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BACzB,CAAC;wBACH,CAAC;oBACH,CAAC;oBACD,mFAAmF;oBACnF,gFAAgF;oBAChF,MAAM,OAAO,GAAG,IAAA,oBAAQ,EAAC,IAAA,mBAAO,EAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,mBAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;oBACtF,IAAI,SAAS,CAAC,IAAI,CAAC,mBAAmB,IAAI,OAAO,KAAK,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnF,OAAO,UAAU,CAAC;oBACpB,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAC7G,CAAC;IAEO,gBAAgB,CAAC,MAAc,EAAE,iBAA0B;QACjE,IAAI,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,oDAAoD;YACpD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YACnC,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;QAC3D,IAAI,IAAI,EAAE,CAAC;YACT,MAAM,OAAO,GAAG,IAAI,2CAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;YACtG,wEAAwE;YACxE,kEAAkE;YAClE,yBAAyB;YACzB,MAAM,aAAa,GACjB,iBAAiB;gBACjB,sBAAsB,CAAC,MAAM,CAAC;gBAC9B,CAAC,yBAAyB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;gBACjD,CAAC,OAAO,CAAC,wBAAwB,EAAE,CAAC;YACtC,OAAO,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACrF,CAAC;QAED,IAAI,yBAAyB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;YAAE,OAAO,SAAS,CAAC;QAEnE,KAAK,gBAAS,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC;YACzC,SAAS,EAAE,wCAAwC;YACnD,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,kBAAkB;YAC5B,IAAI,EAAE,MAAM;SACb,CAAC,CAAC;QAEH,0CAA0C;QAC1C,4DAA4D;QAC5D,MAAM,OAAO,GAAG,gCAAgC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QAExE,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,4BAA4B,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAChH,CAAC;CACF;AAhID,4CAgIC;AAED,MAAM,yBAAyB,GAC7B,CAAC,IAAmB,EAAE,EAAE,CACxB,CAAC,MAAc,EAAW,EAAE;IAC1B,sEAAsE;IACtE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAAe,CAAC,EAAE,CAAC;QACjE,0EAA0E;QAC1E,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC;YAAE,OAAO,IAAI,CAAC;QAChD,IAAI,CAAC;YACH,6EAA6E;YAC7E,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAAE,OAAO,IAAI,CAAC;QACnF,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,GAAY,CAAC;YAC3B,IAAI,KAAK,CAAC,OAAO,KAAK,wBAAwB,EAAE,CAAC;gBAC/C,iEAAiE;gBACjE,0DAA0D;gBAC1D,aAAM,CAAC,aAAa,CAAC,4CAA4C,CAAC,CAAC,IAAI,CACrE,kCAAkC,MAAM,wDAAwD,CACjG,CAAC;gBACF,OAAO,IAAI,CAAC;YACd,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEJ;;;;;;;;GAQG;AACH,MAAM,2BAA2B,GAC/B,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,IAAmB,EAAE,EAAE,CACxB,CAAC,OAAe,EAAW,EAAE;IAC3B,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC;IAClD,IAAI,IAAI,EAAE,CAAC;QACT,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC;QACjC,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACtC,MAAM,kBAAkB,GAAG,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QAC5D,IACE,kBAAkB,KAAK,CAAC,CAAC;YACzB,KAAK,CAAC,MAAM,GAAG,YAAY,IAAI,kBAAkB;YACjD,0BAA0B;YAC1B,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;YACxD,4DAA4D;YAC5D,IAAI,CAAC,QAAQ,EACb,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEJ,MAAM,UAAU,GACd,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,IAAmB,EAAE,EAAE,CACxB,CAAC,MAAc,EAAW,EAAE,CAC1B,CAAC,CAAC,IAAA,uBAAgB,EAAC,MAAM,CAAC;IAC1B,yBAAyB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAC3C,CAAC,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAC5C,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;AAC9C;;;;;;GAMG;AACH,MAAM,gCAAgC,GACpC,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,MAAc,EAAY,EAAE;IAC3B,MAAM,aAAa,GAAG,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,aAAa,EAAE,MAAM,CAAC;IACzC,wCAAwC;IACxC,4CAA4C;IAC5C,MAAM,eAAe,GAAG,IAAI,MAAM,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;IAEvF,IAAI,OAAO,CAAC;IAEZ,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,GAAG,QAAQ,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;IACnD,CAAC;SAAM,IAAI,CAAC,UAAU,IAAI,eAAe,EAAE,CAAC;QAC1C,OAAO,GAAG,QAAQ,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;SAAM,CAAC;QACN,OAAO,GAAG,QAAQ,CAAC,iBAAiB,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC;IAED,sFAAsF;IACtF,OAAO,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAClC,CAAC,CAAC;YACE,QAAQ,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;YAC9D,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACvB,QAAQ,CAAC,UAAU,CAAC,2BAA2B,EAAE;gBAC/C,KAAK,CAAC,WAAW;gBACjB,OAAO,UAAU,KAAK,QAAQ,IAAI,eAAe,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;gBACpE,KAAK,CAAC,iBAAiB,CAAC,IAAI;aAC7B,CAAC,CACH;YACD,EAAE,EAAE,gIAAgI;YACpI,QAAQ,CAAC,UAAU,CAAC,+BAA+B,CAAC;SACrD;QACH,CAAC,CAAC,EAAE,CAAC;AACT,CAAC,CAAC;AAEJ,wEAAwE;AACxE,MAAM,4BAA4B,GAAG,CAAC,QAAwB,EAAY,EAAE,CAC1E,QAAQ,CAAC,qBAAqB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;AAE/D;;;;;;;GAOG;AACH,MAAM,wBAAwB,GAC5B,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,MAAc,EAAsB,EAAE;IACrC,IAAI,UAA8B,CAAC;IACnC,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;IAClE,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC;QAChC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,QAAQ,CAAC,CAAC;YACtE,kEAAkE;YAClE,4DAA4D;YAC5D,sBAAsB,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;gBACtC,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,eAAG,GAAG,OAAO,GAAG,eAAG,EAAE,CAAC,EAAE,CAAC;oBAC9C,UAAU,GAAG,OAAO,CAAC;gBACvB,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEJ,MAAM,WAAW,GACf,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,IAAmB,EAAE,EAAE,CACxB,CAAC,MAAc,EAA4B,EAAE;IAC3C,0FAA0F;IAC1F,IAAI,YAAY,GAAG,2BAA2B,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;IAEjE,gDAAgD;IAChD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,aAAa,GAAG,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC;QAC/C,IAAI,aAAa,EAAE,MAAM,EAAE,CAAC;YAC1B,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAED,iDAAiD;IACjD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,cAAc,GAAG,wBAAwB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;QAClE,IAAI,cAAc,EAAE,CAAC;YACnB,iFAAiF;YACjF,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,cAAc,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtG,CAAC;IACH,CAAC;IAED,+DAA+D;IAC/D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC;QAEzD,oFAAoF;QACpF,6FAA6F;QAC7F,6EAA6E;QAC7E,2EAA2E;QAC3E,4EAA4E;QAC5E,IAAI,YAAY,EAAE,mBAAmB,KAAK,IAAI,EAAE,CAAC;YAC/C,YAAY,GAAG,SAAS,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,mDAAmD;IACnD,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC;QACzD,IAAI,QAAQ,EAAE,CAAC;YACb,YAAY,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AACJ;;;;GAIG;AACH,MAAM,yBAAyB,GAC7B,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,MAAc,EAAW,EAAE,CAC1B,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAEvD;;GAEG;AACH,MAAM,eAAe,GACnB,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,IAAmB,EAAE,EAAE,CACxB,CAAC,MAAc,EAAsB,EAAE;IACrC,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,OAAO;IACT,CAAC;IACD,OAAO,CAAC,mBAAmB,EAAE,8BAA8B,CAAC;SACzD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;SAC3C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC;AAC1E,CAAC,CAAC;AAEJ,MAAM,2BAA2B,GAC/B,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,MAAc,EAA4B,EAAE;IAC3C,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC;IACpC,wDAAwD;IACxD,qDAAqD;IACrD,OAAO,QAAQ;SACZ,oBAAoB,EAAE;SACtB,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,sCAAsC;SAC7E,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;SAChC,IAAI,CACH,CAAC,IAAI,EAAE,EAAE;IACP,4DAA4D;IAC5D,sBAAsB,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAClG,CAAC;AACN,CAAC,CAAC;AAEJ,0HAA0H;AAC1H,MAAM,kBAAkB,GAAG,CAAC,IAAkB,EAAE,MAAc,EAAW,EAAE,CACzE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC;KACtC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,GAAG,2BAAe,EAAE,CAAC;KAC3D,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAErC,yFAAyF;AACzF,MAAM,aAAa,GAAG,CAAC,IAAkB,EAAE,MAAc,EAAW,EAAE,CACpE,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,GAAG,2BAAe,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAEvH,MAAM,sBAAsB,GAAG,CAAC,IAAkB,EAAW,EAAE,CAC7D,OAAO,IAAI,CAAC,UAAU,EAAE,OAAO,KAAK,QAAQ,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAE/G;;GAEG;AACH,MAAM,gBAAgB,GACpB,CAAC,MAAc,EAAE,EAAE,CACnB,CAAC,IAAkB,EAAW,EAAE,CAC9B,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAA,iBAAU,EAAC,MAAM,CAAC,KAAK,IAAI,CAAC,aAAa,CAAC;AAEhE,MAAM,mBAAmB,GACvB,CAAC,KAAe,EAAE,EAAE,CACpB,CAAC,IAAkB,EAAW,EAAE,CAC9B,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AACvC;;;;GAIG;AACH,MAAM,sBAAsB,GAAG,CAAC,MAAc,EAAW,EAAE,CAAC,OAAO,CAAC,IAAA,uBAAgB,EAAC,MAAM,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,13 @@ exports.SourceComponent = void 0;
|
|
|
8
8
|
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
|
|
9
9
|
*/
|
|
10
10
|
const node_path_1 = require("node:path");
|
|
11
|
-
const
|
|
11
|
+
const sfError_1 = require("@salesforce/core/sfError");
|
|
12
|
+
const messages_1 = require("@salesforce/core/messages");
|
|
13
|
+
const lifecycle_1 = require("@salesforce/core/lifecycle");
|
|
12
14
|
const fast_xml_parser_1 = require("fast-xml-parser");
|
|
13
15
|
const ts_types_1 = require("@salesforce/ts-types");
|
|
14
16
|
const kit_1 = require("@salesforce/kit");
|
|
17
|
+
const constants_1 = require("../common/constants");
|
|
15
18
|
const decomposed_1 = require("../utils/decomposed");
|
|
16
19
|
const path_1 = require("../utils/path");
|
|
17
20
|
const replacements_1 = require("../convert/replacements");
|
|
@@ -20,7 +23,7 @@ const filePathGenerator_1 = require("../utils/filePathGenerator");
|
|
|
20
23
|
const treeContainers_1 = require("./treeContainers");
|
|
21
24
|
const forceIgnore_1 = require("./forceIgnore");
|
|
22
25
|
;
|
|
23
|
-
const messages = new
|
|
26
|
+
const messages = new messages_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."], ["missingApiVersion", "Could not determine an API version to use for the generated manifest. Tried looking for sourceApiVersion in sfdx-project.json, apiVersion from config vars, and the highest apiVersion from the APEX REST endpoint. Using API version 58.0 as a last resort."], ["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
27
|
/**
|
|
25
28
|
* Representation of a MetadataComponent in a file tree.
|
|
26
29
|
*/
|
|
@@ -42,7 +45,7 @@ class SourceComponent {
|
|
|
42
45
|
}
|
|
43
46
|
if (this.parent && this.type.ignoreParentName) {
|
|
44
47
|
if (!this.name) {
|
|
45
|
-
throw new
|
|
48
|
+
throw new sfError_1.SfError(`Component was initialized without a name: ${this.xml} (${this.type.name})`);
|
|
46
49
|
}
|
|
47
50
|
return this.name;
|
|
48
51
|
}
|
|
@@ -97,7 +100,7 @@ class SourceComponent {
|
|
|
97
100
|
: treeContainers_1.VirtualTreeContainer.fromFilePaths((0, filePathGenerator_1.filePathsFromMetadataComponent)({ fullName: props.name, type: props.type }));
|
|
98
101
|
return new SourceComponent(props, tree, forceIgnore);
|
|
99
102
|
}
|
|
100
|
-
throw new
|
|
103
|
+
throw new sfError_1.SfError(`Virtual Components must be constructed with a name: ${props.type.name}`);
|
|
101
104
|
}
|
|
102
105
|
walkContent() {
|
|
103
106
|
const sources = [];
|
|
@@ -127,7 +130,7 @@ class SourceComponent {
|
|
|
127
130
|
children
|
|
128
131
|
.filter((child) => !validChildTypes.has(child.type?.id))
|
|
129
132
|
.map((child) => {
|
|
130
|
-
throw new
|
|
133
|
+
throw new sfError_1.SfError(messages.getMessage('error_unexpected_child_type', [child.xml ?? child.content, this.type.name]), 'TypeInferenceError');
|
|
131
134
|
});
|
|
132
135
|
return children;
|
|
133
136
|
}
|
|
@@ -175,7 +178,7 @@ class SourceComponent {
|
|
|
175
178
|
const uniqueElement = this.type.uniqueIdElement;
|
|
176
179
|
const matched = uniqueElement ? children.find((c) => (0, ts_types_1.getString)(c, uniqueElement) === this.name) : undefined;
|
|
177
180
|
if (!matched) {
|
|
178
|
-
throw new
|
|
181
|
+
throw new sfError_1.SfError(`Unable to find matching parent xml file for ${this.xml}`);
|
|
179
182
|
}
|
|
180
183
|
return matched;
|
|
181
184
|
}
|
|
@@ -214,6 +217,7 @@ class SourceComponent {
|
|
|
214
217
|
cdataPropName: '__cdata',
|
|
215
218
|
ignoreDeclaration: true,
|
|
216
219
|
numberParseOptions: { leadingZeros: false, hex: false },
|
|
220
|
+
commentPropName: constants_1.XML_COMMENT_PROP_NAME,
|
|
217
221
|
});
|
|
218
222
|
const parsed = parser.parse(String(contents));
|
|
219
223
|
const [firstElement] = Object.keys(parsed);
|
|
@@ -235,7 +239,7 @@ class SourceComponent {
|
|
|
235
239
|
// only attempt validating once there's an error to avoid the performance hit of validating every file
|
|
236
240
|
const validation = fast_xml_parser_1.XMLValidator.validate(contents);
|
|
237
241
|
if (validation !== true) {
|
|
238
|
-
throw new
|
|
242
|
+
throw new sfError_1.SfError(messages.getMessage('invalid_xml_parsing', [
|
|
239
243
|
path,
|
|
240
244
|
validation.err.msg,
|
|
241
245
|
validation.err.line.toString(),
|
|
@@ -249,13 +253,15 @@ class SourceComponent {
|
|
|
249
253
|
const children = [];
|
|
250
254
|
for (const fsPath of this.walk(dirPath)) {
|
|
251
255
|
const childXml = (0, path_1.parseMetadataXml)(fsPath);
|
|
252
|
-
const fileIsRootXml = childXml?.suffix === this.type.suffix;
|
|
256
|
+
const fileIsRootXml = childXml?.suffix === this.type.suffix || childXml?.suffix === this.type.legacySuffix;
|
|
253
257
|
if (childXml && !fileIsRootXml && this.type.children && childXml.suffix) {
|
|
254
|
-
// TODO: Log warning if missing child type definition
|
|
255
258
|
const childTypeId = this.type.children?.suffixes[childXml.suffix];
|
|
256
|
-
const
|
|
259
|
+
const childType = this.type.children.types[childTypeId];
|
|
260
|
+
if (!childTypeId || !childType) {
|
|
261
|
+
void lifecycle_1.Lifecycle.getInstance().emitWarning(`${fsPath}: Expected a child type for ${childXml.suffix} in ${this.type.name} but none was found.`);
|
|
262
|
+
}
|
|
257
263
|
const childComponent = new SourceComponent({
|
|
258
|
-
name:
|
|
264
|
+
name: childType?.suffix ? (0, path_1.baseWithoutSuffixes)(fsPath, childType) : (0, path_1.baseName)(fsPath),
|
|
259
265
|
type: this.type.children.types[childTypeId],
|
|
260
266
|
xml: fsPath,
|
|
261
267
|
parent: this,
|
|
@@ -271,7 +277,7 @@ class SourceComponent {
|
|
|
271
277
|
getNonDecomposedChildren() {
|
|
272
278
|
const parsed = this.parseXmlSync();
|
|
273
279
|
if (!this.type.children) {
|
|
274
|
-
throw new
|
|
280
|
+
throw new sfError_1.SfError(`There are no child types for ${this.type.name}`);
|
|
275
281
|
}
|
|
276
282
|
return Object.values(this.type.children.types).flatMap((childType) => {
|
|
277
283
|
const uniqueIdElement = childType.uniqueIdElement;
|
|
@@ -283,7 +289,7 @@ class SourceComponent {
|
|
|
283
289
|
return elements.map((element) => {
|
|
284
290
|
const name = (0, ts_types_1.getString)(element, uniqueIdElement);
|
|
285
291
|
if (!name) {
|
|
286
|
-
throw new
|
|
292
|
+
throw new sfError_1.SfError(`Missing ${uniqueIdElement} on ${childType.name} in ${this.xml}`);
|
|
287
293
|
}
|
|
288
294
|
return new SourceComponent({
|
|
289
295
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,yCAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"sourceComponent.js","sourceRoot":"","sources":["../../../src/resolve/sourceComponent.ts"],"names":[],"mappings":"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"}
|
package/lib/src/utils/path.d.ts
CHANGED
|
@@ -12,11 +12,11 @@ import { MetadataType } from '../registry/types';
|
|
|
12
12
|
export declare function baseName(fsPath: SourcePath): string;
|
|
13
13
|
/**
|
|
14
14
|
* the above baseName function doesn't handle components whose names have a `.` in them.
|
|
15
|
-
* this will handle that, but requires you to specify the
|
|
15
|
+
* this will handle that, but requires you to specify the mdType to check suffixes for.
|
|
16
16
|
*
|
|
17
17
|
* @param fsPath The path to evaluate
|
|
18
18
|
*/
|
|
19
|
-
export declare function baseWithoutSuffixes(fsPath: SourcePath,
|
|
19
|
+
export declare function baseWithoutSuffixes(fsPath: SourcePath, mdType: MetadataType): string;
|
|
20
20
|
/**
|
|
21
21
|
* Get the name of file path extension. Different from path.extname in that it
|
|
22
22
|
* does not include the '.' in the extension name. Returns an empty string if
|
package/lib/src/utils/path.js
CHANGED
|
@@ -21,18 +21,15 @@ function baseName(fsPath) {
|
|
|
21
21
|
exports.baseName = baseName;
|
|
22
22
|
/**
|
|
23
23
|
* the above baseName function doesn't handle components whose names have a `.` in them.
|
|
24
|
-
* this will handle that, but requires you to specify the
|
|
24
|
+
* this will handle that, but requires you to specify the mdType to check suffixes for.
|
|
25
25
|
*
|
|
26
26
|
* @param fsPath The path to evaluate
|
|
27
27
|
*/
|
|
28
|
-
function baseWithoutSuffixes(fsPath,
|
|
29
|
-
return (0, node_path_1.basename)(fsPath)
|
|
30
|
-
.replace(constants_1.META_XML_SUFFIX, '')
|
|
31
|
-
.split('.')
|
|
32
|
-
.filter((part) => part !== suffix)
|
|
33
|
-
.join('.');
|
|
28
|
+
function baseWithoutSuffixes(fsPath, mdType) {
|
|
29
|
+
return (0, node_path_1.basename)(fsPath).replace(constants_1.META_XML_SUFFIX, '').split('.').filter(stringIsNotSuffix(mdType)).join('.');
|
|
34
30
|
}
|
|
35
31
|
exports.baseWithoutSuffixes = baseWithoutSuffixes;
|
|
32
|
+
const stringIsNotSuffix = (type) => (part) => part !== type.suffix && (!type.legacySuffix || part !== type.legacySuffix);
|
|
36
33
|
/**
|
|
37
34
|
* Get the name of file path extension. Different from path.extname in that it
|
|
38
35
|
* does not include the '.' in the extension name. Returns an empty string if
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,yCAAkE;AAIlE,mDAAiF;AAIjF;;;;;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;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,MAAkB,EAAE,
|
|
1
|
+
{"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/source-deploy-retrieve",
|
|
3
|
-
"version": "11.
|
|
3
|
+
"version": "11.2.0",
|
|
4
4
|
"description": "JavaScript library to run Salesforce metadata deploys and retrieves",
|
|
5
5
|
"main": "lib/src/index.js",
|
|
6
6
|
"author": "Salesforce",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
"proxy-agent": "^6.4.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@jsforce/jsforce-node": "^3.
|
|
43
|
-
"@salesforce/cli-plugins-testkit": "^5.
|
|
42
|
+
"@jsforce/jsforce-node": "^3.2.0",
|
|
43
|
+
"@salesforce/cli-plugins-testkit": "^5.3.1",
|
|
44
44
|
"@salesforce/dev-scripts": "^9.0.0",
|
|
45
45
|
"@types/deep-equal-in-any-order": "^1.0.1",
|
|
46
46
|
"@types/fast-levenshtein": "^0.0.4",
|