npm - @salesforce/source-deploy-retrieve - Versions diffs - 13.4.1 → 13.4.2 - Mend

@salesforce/source-deploy-retrieve 13.4.1 → 13.4.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.

Files changed (13) hide show

package/lib/src/client/metadataApiDeploy.js +28 -20
package/lib/src/client/metadataApiDeploy.js.map +1 -1
package/lib/src/resolve/adapters/baseSourceAdapter.js +4 -2
package/lib/src/resolve/adapters/baseSourceAdapter.js.map +1 -1
package/lib/src/resolve/metadataResolver.js +4 -2
package/lib/src/resolve/metadataResolver.js.map +1 -1
package/lib/src/resolve/treeContainers.d.ts +1 -0
package/lib/src/resolve/treeContainers.js +29 -10
package/lib/src/resolve/treeContainers.js.map +1 -1
package/lib/src/utils/path.d.ts +0 -7
package/lib/src/utils/path.js +2 -1
package/lib/src/utils/path.js.map +1 -1
package/package.json +1 -1

package/lib/src/client/metadataApiDeploy.js CHANGED Viewed

@@ -54,10 +54,13 @@ class DeployResult {
         // this involves FS operations, so only perform once!
         if (!this.fileResponses) {
             this.fileResponses = [
-                // removes duplicates from the file responses by parsing the object into a string, used as the key of the map
                 ...new Map((this.components
                     ? buildFileResponsesFromComponentSet(this.components)(this.response)
-                    : buildFileResponses(this.response)).map((v) => [JSON.stringify(v), v])).values(),
+                    : buildFileResponses(this.response)).map((v) => {
+                    const base = `${v.type}#${v.fullName}#${v.filePath ?? ''}#${v.state}`;
+                    const key = 'error' in v ? `${base}#${v.error}#${String(v.lineNumber)}#${String(v.columnNumber)}` : base;
+                    return [key, v];
+                })).values(),
             ];
         }
         return this.fileResponses;
@@ -377,24 +380,29 @@ const deleteNotFoundToFileResponses = (cs) => (messageMap) => Array.from(message
         }))
         : [];
 });
-const warnIfUnmatchedServerResult = (fr) => (messageMap) =>
-// keep the parents and children separated for MPD scenarios where we have a parent in one, children in another package
-[...messageMap.keys()].flatMap((key) => {
-    const [type, fullName] = key.split('#', 2);
-    // UIBundleResource messages are already handled by the parent UIBundle component
-    const consumedByWebApp = type === 'UIBundleResource' && fr.some((c) => c.type === 'UIBundle' && fullName.startsWith(`${c.fullName}/`));
-    if (!consumedByWebApp &&
-        !fr.find((c) => c.type === type && c.fullName === fullName) &&
-        !['package.xml', 'destructiveChanges.xml', 'destructiveChangesPost.xml', 'destructiveChangesPre.xml'].includes(fullName)) {
-        const deployMessage = messageMap.get(key).at(0);
-        // Don't warn for deleted components - not found in the component set (pre-destructiveChanges)
-        if (deployMessage.deleted === 'true' || deployMessage.deleted === true) {
-            return;
+const MANIFEST_FILES = new Set([
+    'package.xml',
+    'destructiveChanges.xml',
+    'destructiveChangesPost.xml',
+    'destructiveChangesPre.xml',
+]);
+const warnIfUnmatchedServerResult = (fr) => (messageMap) => {
+    const frKeys = new Set(fr.map((c) => `${c.type}#${c.fullName}`));
+    return [...messageMap.keys()].flatMap((key) => {
+        const [type, fullName] = key.split('#', 2);
+        // UIBundleResource messages are already handled by the parent UIBundle component
+        const consumedByWebApp = type === 'UIBundleResource' && fr.some((c) => c.type === 'UIBundle' && fullName.startsWith(`${c.fullName}/`));
+        if (!consumedByWebApp && !frKeys.has(key) && !MANIFEST_FILES.has(fullName)) {
+            const deployMessage = messageMap.get(key).at(0);
+            // Don't warn for deleted components - not found in the component set (pre-destructiveChanges)
+            if (deployMessage.deleted === 'true' || deployMessage.deleted === true) {
+                return;
+            }
+            // warn that this component is found in server response, but not in component set
+            void lifecycle_1.Lifecycle.getInstance().emitWarning(`${deployMessage.componentType ?? '<no component type in deploy message>'}, ${deployMessage.fullName}, returned from org, but not found in the local project`);
         }
-        // warn that this component is found in server response, but not in component set
-        void lifecycle_1.Lifecycle.getInstance().emitWarning(`${deployMessage.componentType ?? '<no component type in deploy message>'}, ${deployMessage.fullName}, returned from org, but not found in the local project`);
-    }
-});
+    });
+};
 const buildFileResponses = (response) => (0, kit_1.ensureArray)(response.details?.componentSuccesses)
     .concat((0, kit_1.ensureArray)(response.details?.componentFailures))
     .filter((c) => c.fullName !== 'package.xml')
@@ -414,7 +422,7 @@ const buildFileResponses = (response) => (0, kit_1.ensureArray)(response.details
 }));
 const buildFileResponsesFromComponentSet = (cs) => (response) => {
     const responseMessages = (0, deployMessages_1.getDeployMessages)(response);
-    const fileResponses = (cs.getSourceComponents().toArray() ?? [])
+    const fileResponses = [...cs.getSourceComponents()]
         .flatMap((deployedComponent) => {
         // UIBundle bundles get per-file status via UIBundleResource messages
         if (deployedComponent.type.name === 'UIBundle' &&

package/lib/src/client/metadataApiDeploy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/adapters/baseSourceAdapter.js CHANGED Viewed

@@ -27,6 +27,8 @@ const sourceComponent_1 = require("../sourceComponent");
 const registryAccess_1 = require("../../registry/registryAccess");
 ;
 const messages = new messages_1.Messages('@salesforce/source-deploy-retrieve', 'sdr', new Map([["md_request_fail", "Metadata API request failed: %s"], ["error_retry_limit_exceeded", "Exceeded maximum of %s consecutive retryable errors. Last error: %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_invalid_test_level", "TestLevel cannot be '%s' unless API version is %s or later"], ["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_attempting_zip_slip", "Entry '%s' in static resource '%s' resolves to a location outside the extraction directory ('%s')."], ["error_static_resource_symlink", "Entry '%s' in static resource '%s' would be written through a symbolic link ('%s'). Writing through symbolic links is not allowed because it can place files outside the extraction directory ('%s')."], ["error_retrieve_symlink", "File '%s' would be written through a symbolic link ('%s'). Writing through symbolic links is not allowed during retrieve because it can place files outside the project directory ('%s')."], ["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>"], ["error_directory_name_path_traversal", "The directoryName '%s' for metadata type '%s' contains path segments that resolve outside the project root. Verify your registryCustomizations in sfdx-project.json do not contain directory traversal sequences."], ["error_write_path_outside_root", "The write path '%s' resolves outside the root destination '%s'. This may indicate a path traversal attempt via registryCustomizations."], ["warning_jwt_api_version", "This org uses JWT-based access tokens, which require API version 68.0 or later for SOAP metadata operations. The current API version is %s, so metadata listing may return empty or incomplete results. To resolve, update sourceApiVersion in sfdx-project.json to 68.0 or higher."], ["type_name_suggestions", "Confirm the metadata type name is 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>"]]));
+const NAME_AND_SUFFIX_REGEX = /(.+)\.(.+)/;
+const FOLDER_META_XML_STRICT_REGEX = /(.+)-meta\.xml$/;
 class BaseSourceAdapter {
     type;
     registry;
@@ -143,13 +145,13 @@ const parseAsContentMetadataXml = (type) => (path) => {
     if (typeFolderIndex !== allowedIndex) {
         return undefined;
     }
-    const match = new RegExp(/(.+)\.(.+)/).exec((0, node_path_1.basename)(path));
+    const match = NAME_AND_SUFFIX_REGEX.exec((0, node_path_1.basename)(path));
     if (match && type.suffix === match[2]) {
         return { fullName: match[1], suffix: match[2], path };
     }
 };
 const parseAsFolderMetadataXml = (fsPath) => {
-    const match = new RegExp(/(.+)-meta\.xml$/).exec((0, node_path_1.basename)(fsPath));
+    const match = FOLDER_META_XML_STRICT_REGEX.exec((0, node_path_1.basename)(fsPath));
     const parts = fsPath.split(node_path_1.sep);
     if (match && !match[1].includes('.') && parts.length > 1) {
         return { fullName: match[1], suffix: undefined, path: fsPath };

package/lib/src/resolve/adapters/baseSourceAdapter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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~~IAAI~~,~~MAAM,~~CAAC,~~YAAY,CAAC,CAAC,~~IAAI,CAAC,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;~~IAC5D~~,IAAI,KAAK,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QACtC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;IACxD,CAAC;AACH,CAAC,CAAC;AAEJ,MAAM,wBAAwB,GAAG,CAAC,MAAkB,EAA2B,EAAE;IAC/E,MAAM,KAAK,GAAG,~~IAAI~~,~~MAAM,~~CAAC,~~iBAAiB,CAAC,CAAC,~~IAAI,CAAC,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;~~IACnE~~,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC;IAChC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IACjE,CAAC;AACH,CAAC,CAAC;AAEF,gEAAgE;AAChE,MAAM,aAAa,GACjB,CAAC,QAAwB,EAAE,EAAE,CAC7B,CAAC,IAAkB,EAAE,EAAE,CACvB,CAAC,YAAyB,EAAU,EAAE;IACpC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;IAExE,+EAA+E;IAC/E,+EAA+E;IAC/E,IAAI,iBAAiB,IAAI,QAAQ,EAAE,CAAC;QAClC,OAAO,IAAA,uBAAY,EACjB,IAAA,0BAAmB,EAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,EACrD,wDAAwD,YAAY,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,GAAG,CAC3F,CAAC;IACJ,CAAC;IAED,4CAA4C;IAC5C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC/B,CAAC;IACD,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE3D,4HAA4H;IAC5H,IAAI,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;QACzE,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,eAAG,CAAC,CAAC;QAC5C,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;IACjG,CAAC;IACD,wFAAwF;IACxF,IAAI,eAAe,CAAC,UAAU,KAAK,IAAI,CAAC,EAAE,EAAE,CAAC;QAC3C,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC/B,CAAC;IACD,MAAM,QAAQ,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC5E,CAAC,CAAC"}
1	+ {"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/metadataResolver.js CHANGED Viewed

@@ -29,6 +29,8 @@ const forceIgnore_1 = require("./forceIgnore");
 const treeContainers_1 = require("./treeContainers");
 ;
 const messages = new messages_1.Messages('@salesforce/source-deploy-retrieve', 'sdr', new Map([["md_request_fail", "Metadata API request failed: %s"], ["error_retry_limit_exceeded", "Exceeded maximum of %s consecutive retryable errors. Last error: %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_invalid_test_level", "TestLevel cannot be '%s' unless API version is %s or later"], ["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_attempting_zip_slip", "Entry '%s' in static resource '%s' resolves to a location outside the extraction directory ('%s')."], ["error_static_resource_symlink", "Entry '%s' in static resource '%s' would be written through a symbolic link ('%s'). Writing through symbolic links is not allowed because it can place files outside the extraction directory ('%s')."], ["error_retrieve_symlink", "File '%s' would be written through a symbolic link ('%s'). Writing through symbolic links is not allowed during retrieve because it can place files outside the project directory ('%s')."], ["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>"], ["error_directory_name_path_traversal", "The directoryName '%s' for metadata type '%s' contains path segments that resolve outside the project root. Verify your registryCustomizations in sfdx-project.json do not contain directory traversal sequences."], ["error_write_path_outside_root", "The write path '%s' resolves outside the root destination '%s'. This may indicate a path traversal attempt via registryCustomizations."], ["warning_jwt_api_version", "This org uses JWT-based access tokens, which require API version 68.0 or later for SOAP metadata operations. The current API version is %s, so metadata listing may return empty or incomplete results. To resolve, update sourceApiVersion in sfdx-project.json to 68.0 or higher."], ["type_name_suggestions", "Confirm the metadata type name is 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>"]]));
+const CLOSE_META_SUFFIX_REGEX = /.+\.([^.-]+)(?:-.*)?\.xml/;
+const FOLDER_META_XML_REGEX = /(.+)-meta\.xml/;
 /**
  * Resolver for metadata type and component objects.
  *
@@ -235,7 +237,7 @@ const getSuggestionsForUnresolvedTypes = (registry) => (fsPath) => {
     const metaSuffix = parsedMetaXml?.suffix;
     // Finds close matches for meta suffixes
     // Examples: https://regex101.com/r/vbRjwy/1
-    const closeMetaSuffix = new RegExp(/.+\.([^.-]+)(?:-.*)?\.xml/).exec((0, node_path_1.basename)(fsPath));
+    const closeMetaSuffix = CLOSE_META_SUFFIX_REGEX.exec((0, node_path_1.basename)(fsPath));
     let guesses;
     if (metaSuffix) {
         guesses = registry.guessTypeBySuffix(metaSuffix);
@@ -272,7 +274,7 @@ const getFolderContentTypeDirNames = (registry) => registry.getFolderContentType
  */
 const parseAsFolderMetadataXml = (registry) => (fsPath) => {
     let folderName;
-    const match = new RegExp(/(.+)-meta\.xml/).exec((0, node_path_1.basename)(fsPath));
+    const match = FOLDER_META_XML_REGEX.exec((0, node_path_1.basename)(fsPath));
     if (match && !match[1].includes('.')) {
         const parts = fsPath.split(node_path_1.sep);
         if (parts.length > 1) {

package/lib/src/resolve/metadataResolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/treeContainers.d.ts CHANGED Viewed

@@ -82,6 +82,7 @@ export declare class NodeFSTreeContainer extends TreeContainer {
 export declare class ZipTreeContainer extends TreeContainer {
     private zip;
     private zipKeyMap;
+    private dirChildren;
     private constructor();
     static create(buffer: Buffer): Promise<ZipTreeContainer>;
     exists(fsPath: string): boolean;

package/lib/src/resolve/treeContainers.js CHANGED Viewed

@@ -79,10 +79,15 @@ class NodeFSTreeContainer extends TreeContainer {
         return (0, graceful_fs_1.existsSync)(this.getUpdatedFsPath(fsPath));
     }
     readDirectory(fsPath) {
-        const resolved = this.getUpdatedFsPath(fsPath);
-        if (!(0, graceful_fs_1.statSync)(resolved).isDirectory())
-            return [];
-        return (0, graceful_fs_1.readdirSync)(resolved);
+        try {
+            return (0, graceful_fs_1.readdirSync)(this.getUpdatedFsPath(fsPath));
+        }
+        catch (e) {
+            const code = e.code;
+            if (code === 'ENOTDIR' || code === 'ENOENT')
+                return [];
+            throw e;
+        }
     }
     readFile(fsPath) {
         // significant enough performance increase using sync instead of fs.promise version
@@ -105,15 +110,33 @@ exports.NodeFSTreeContainer = NodeFSTreeContainer;
 class ZipTreeContainer extends TreeContainer {
     zip;
     zipKeyMap = new Map();
+    dirChildren = new Map();
     constructor(zip) {
         super();
         this.zip = zip;
         for (const key of Object.keys(this.zip.files)) {
             if (key.endsWith('/')) {
-                this.zipKeyMap.set(key.slice(0, -1), key);
+                const normalized = key.slice(0, -1);
+                this.zipKeyMap.set(normalized, key);
+                const dir = (0, node_path_1.dirname)(normalized);
+                if (dir !== normalized) {
+                    let children = this.dirChildren.get(dir);
+                    if (!children) {
+                        children = [];
+                        this.dirChildren.set(dir, children);
+                    }
+                    children.push((0, node_path_1.basename)(normalized));
+                }
             }
             else {
                 this.zipKeyMap.set(key, key);
+                const dir = (0, node_path_1.dirname)(key);
+                let children = this.dirChildren.get(dir);
+                if (!children) {
+                    children = [];
+                    this.dirChildren.set(dir, children);
+                }
+                children.push((0, node_path_1.basename)(key));
             }
         }
     }
@@ -134,12 +157,8 @@ class ZipTreeContainer extends TreeContainer {
     readDirectory(fsPath) {
         const resolvedPath = this.match(fsPath);
         if (resolvedPath && this.ensureDirectory(resolvedPath)) {
-            // Remove trailing path sep if it exists. JSZip always adds them for directories but
-            // when comparing we call `dirname()` which does not include them.
             const dirPath = resolvedPath.endsWith('/') ? resolvedPath.slice(0, -1) : resolvedPath;
-            return Object.keys(this.zip.files)
-                .filter((filePath) => (0, node_path_1.dirname)(filePath) === dirPath)
-                .map((filePath) => (0, node_path_1.basename)(filePath));
+            return this.dirChildren.get(dirPath) ?? [];
         }
         throw new sfError_1.SfError(messages.getMessage('error_expected_directory_path', [fsPath]), 'LibraryError');
     }

package/lib/src/resolve/treeContainers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":";;;;;;AAAA;;;;;;;;;;;;;;GAcG;AACH,2CAA2C;AAC3C,yCAAgE;AAChE,6CAAuC;AACvC,6CAAgG;AAChG,kDAA0B;AAC1B,wDAAqD;AACrD,sDAAmD;AACnD,mDAAgD;AAChD,oDAAiD;AACjD,wCAA2D;;AAK3D,MAAM,QAAQ,OAAG,mBAAQ,CAAc,oCAAoC,EAAE,KAAK,6tOAAC,CAAC;AAEpF;;;;;GAKG;AACH,MAAsB,aAAa;IACvB,GAAG,CAAU;IAEvB,0HAA0H;IAC1H,YAAmB,GAAY;QAC7B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IACD;;;;;;;OAOG;IACI,IAAI,CAAC,QAAmC,EAAE,IAAY,EAAE,SAAiB;QAC9E,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5D,MAAM,MAAM,GAAG,IAAA,uBAAgB,EAAC,IAAI,CAAC,gBAAgB,CAAC,IAAA,gBAAI,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/E,MAAM,gBAAgB,GAAG,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACzE,OAAO,IAAA,eAAQ,EAAC,KAAK,CAAC,KAAK,IAAI,IAAI,gBAAgB,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAA,gBAAI,EAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC;IAED,yDAAyD;IAC/C,gBAAgB,CAAC,MAAkB;QAC3C,OAAO,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAA,gBAAI,EAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACpF,CAAC;CA4CF;AAzED,sCAyEC;AAED;;GAEG;AACH,MAAa,mBAAoB,SAAQ,aAAa;IAC7C,WAAW,CAAC,MAAkB;QACnC,+CAA+C;QAC/C,OAAO,IAAA,sBAAQ,EAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/D,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,OAAO,IAAA,wBAAU,EAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;IAEM,aAAa,CAAC,MAAkB;QACrC,~~MAAM~~,~~QAAQ~~,~~GAAG~~,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;~~QAC/C~~,~~IAAI~~,CAAC,~~IAAA~~,~~sBAAQ~~,~~EAAC~~,~~QAAQ~~,CAAC,CAAC,~~WAAW~~,~~EAAE~~;~~YAAE~~,OAAO,EAAE,CAAC;~~QACjD~~,~~OAAO~~,~~IAAA~~,~~yBAAW,EAAC,QAAQ,~~CAAC,CAAC;~~IAC/B~~,CAAC;IAEM,QAAQ,CAAC,MAAkB;QAChC,mFAAmF;QACnF,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,0BAAY,EAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtE,CAAC;IAEM,YAAY,CAAC,MAAkB;QACpC,OAAO,IAAA,0BAAY,EAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,MAAM,CAAC,MAAkB;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,mBAAmB,MAAM,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,IAAA,8BAAgB,EAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;IACzD,CAAC;CACF;~~AA/BD~~,~~kDA+BC~~;AAED;;GAEG;AACH,MAAa,gBAAiB,SAAQ,aAAa;IACzC,GAAG,CAAQ;IACX,SAAS,GAAwB,IAAI,GAAG,EAAkB,CAAC;~~IAEnE~~,YAAoB,GAAU;QAC5B,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9C,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;gBACtB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,~~KAAK~~,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;~~YAC5C~~,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAc;QACvC,MAAM,GAAG,GAAG,MAAM,eAAK,CAAC,SAAS,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QACnE,OAAO,IAAI,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACnC,CAAC;IAEM,MAAM,CAAC,MAAc;QAC1B,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;IAEM,WAAW,CAAC,MAAc;QAC/B,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,YAAY,EAAE,CAAC;YACjB,OAAO,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,IAAI,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC3F,CAAC;IAEM,aAAa,CAAC,MAAc;QACjC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,YAAY,IAAI,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,~~oFAAoF;YACpF,kEAAkE;YAClE,~~MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;YACtF,OAAO,~~MAAM,CAAC,~~IAAI,CAAC,~~IAAI~~,CAAC,GAAG,CAAC,~~KAAK,CAAC;iBAC/B,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,mBAAO,EAAC,QAAQ,CAAC,KAAK,~~OAAO,CAAC~~;iBACnD~~,~~GAAG~~,~~CAAC,CAAC,QAAQ,~~EAAE,~~EAAE,~~CAAC~~,IAAA,oBAAQ,EAAC,QAAQ,CAAC,CAAC,CAAC~~;~~QAC3C~~,CAAC;QACD,MAAM,IAAI,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,+BAA+B,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpG,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,MAAc;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,QAAQ,EAAE,GAAG,KAAK,KAAK,EAAE,CAAC;gBAC5B,OAAO,QAAQ,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,IAAI,iBAAO,CAAC,2BAA2B,MAAM,yBAAyB,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,IAAI,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,0BAA0B,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC/F,CAAC;IAED,6DAA6D;IACtD,YAAY,CAAC,MAAc;QAChC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAEM,MAAM,CAAC,MAAc;QAC1B,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,QAAQ,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;gBAC9B,iFAAiF;gBACjF,mHAAmH;gBACnH,yDAAyD;gBACzD,OAAO,IAAI,sBAAQ,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,MAAM,IAAI,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,2BAA2B,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;QAC/G,CAAC;QACD,MAAM,IAAI,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,0BAA0B,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC/F,CAAC;IAED,kFAAkF;IAClF,gFAAgF;IAChF,uEAAuE;IAC/D,KAAK,CAAC,MAAc;QAC1B,sFAAsF;QACtF,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,iBAAK,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;IAEO,eAAe,CAAC,OAAe;QACrC,IAAI,OAAO,EAAE,CAAC;YACZ,yFAAyF;YACzF,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,OAAO,MAAM,EAAE,GAAG,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;QACzC,CAAC;QACD,MAAM,IAAI,iBAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IAC5F,CAAC;CACF;~~AAjGD~~,~~4CAiGC~~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"}
1	+ {"version":3,"file":"treeContainers.js","sourceRoot":"","sources":["../../../src/resolve/treeContainers.ts"],"names":[],"mappings":"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"}

package/lib/src/utils/path.d.ts CHANGED Viewed

@@ -40,13 +40,6 @@ export declare function parentName(fsPath: SourcePath): string;
  * @param untilLast Trim until the *last* occurrence of `part`
  */
 export declare function trimUntil(fsPath: SourcePath, part: string, untilLast?: boolean): string;
-/**
- * Returns the `MetadataXml` info from a given file path. If the path is not a
- * metadata xml file (-meta.xml), returns `undefined`.
- *
- * @param fsPath - File path to parse
- * @returns MetadataXml info or undefined
- */
 export declare function parseMetadataXml(fsPath: string): Optional<MetadataXml>;
 /**
  * Returns the fullName for a nested metadata source file. This is for metadata

package/lib/src/utils/path.js CHANGED Viewed

@@ -89,8 +89,9 @@ function trimUntil(fsPath, part, untilLast = false) {
  * @param fsPath - File path to parse
  * @returns MetadataXml info or undefined
  */
+const METADATA_XML_REGEX = /(.+)\.(.+)-meta\.xml/;
 function parseMetadataXml(fsPath) {
-    const match = new RegExp(/(.+)\.(.+)-meta\.xml/).exec((0, node_path_1.basename)(fsPath));
+    const match = METADATA_XML_REGEX.exec((0, node_path_1.basename)(fsPath));
     if (match) {
         return { fullName: match[1], suffix: match[2], path: fsPath };
     }

package/lib/src/utils/path.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;AAoBH,4BAEC;AAQD,kDAEC;AAcD,0BAGC;AAOD,gCAEC;AAUD,8BAOC;~~AASD~~,4CAKC;AAqBD,kDAYC;~~AAxHD~~,yCAA6E;AAE7E,2CAA4C;AAG5C,mDAAiF;;AAKjF,MAAM,QAAQ,OAAG,eAAQ,CAAc,oCAAoC,EAAE,KAAK,6tOAAC,CAAC;AAEpF;;;;;GAKG;AACH,SAAgB,QAAQ,CAAC,MAAkB;IACzC,OAAO,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AACxC,CAAC;AAED;;;;;GAKG;AACH,SAAgB,mBAAmB,CAAC,MAAkB,EAAE,MAAoB;IAC1E,OAAO,IAAA,oBAAQ,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC,2BAAe,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9G,CAAC;AAED,MAAM,iBAAiB,GACrB,CAAC,IAAkB,EAAE,EAAE,CACvB,CAAC,IAAY,EAAW,EAAE,CACxB,IAAI,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,KAAK,IAAI,CAAC,YAAY,CAAC,CAAC;AAE/E;;;;;;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;AAED;;;;GAIG;AACH,SAAgB,UAAU,CAAC,MAAkB;IAC3C,OAAO,IAAA,oBAAQ,EAAC,IAAA,mBAAO,EAAC,MAAM,CAAC,CAAC,CAAC;AACnC,CAAC;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,CAAC;QACrB,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,OAAO,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,eAAG,CAAC,CAAC;AAC1C,CAAC;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~~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"}
1	+ {"version":3,"file":"path.js","sourceRoot":"","sources":["../../../src/utils/path.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "13.4.1",
+  "version": "13.4.2",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",