@salesforce/source-deploy-retrieve 12.10.4-dev-17431548.0 → 12.10.4

package/lib/src/collections/componentSetBuilder.d.ts

@@ -8,18 +8,8 @@ export type ManifestOption = {
     destructiveChangesPost?: string;
 };
 type MetadataOption = {
-    /**
-     * Array of metadata type:name pairs to include in the ComponentSet.
-     */
     metadataEntries: string[];
-    /**
-     * Array of filesystem directory paths to search for local metadata to include in the ComponentSet.
-     */
     directoryPaths: string[];
-    /**
-     * Array of metadata type:name pairs to exclude from the ComponentSet.
-     */
-    excludedEntries?: string[];
     /**
      * Array of metadata type:name pairs to delete before the deploy. Use of wildcards is not allowed.
      */
@@ -54,7 +44,6 @@ export declare class ComponentSetBuilder {
      * @param options: options for creating a ComponentSet
      */
     static build(options: ComponentSetOptions): Promise<ComponentSet>;
-    private static resolveOrgComponents;
 }
 type MetadataTypeAndMetadataName = {
     type: MetadataType;

package/lib/src/collections/componentSetBuilder.js

@@ -44,13 +44,6 @@ const resolve_1 = require("../resolve");
 const types_1 = require("./types");
 ;
 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."], ["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>"], ["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>"]]));
-let logger;
-const getLogger = () => {
-    if (!logger) {
-        logger = core_1.Logger.childFromRoot('ComponentSetBuilder');
-    }
-    return logger;
-};
 class ComponentSetBuilder {
     /**
      * Builds a ComponentSet that can be used for source conversion,
@@ -61,11 +54,12 @@ class ComponentSetBuilder {
      * @param options: options for creating a ComponentSet
      */
     static async build(options) {
+        const logger = core_1.Logger.childFromRoot('componentSetBuilder');
         let componentSet;
         const { sourcepath, manifest, metadata, packagenames, org } = options;
         const registry = new registryAccess_1.RegistryAccess(undefined, options.projectDir);
         if (sourcepath) {
-            getLogger().debug(`Building ComponentSet from sourcepath: ${sourcepath.join(', ')}`);
+            logger.debug(`Building ComponentSet from sourcepath: ${sourcepath.join(', ')}`);
             const fsPaths = sourcepath.map(validateAndResolvePath);
             componentSet = componentSet_1.ComponentSet.fromSource({
                 fsPaths,
@@ -74,14 +68,14 @@ class ComponentSetBuilder {
         }
         // Return empty ComponentSet and use packageNames in the connection via `.retrieve` options
         if (packagenames) {
-            getLogger().debug(`Building ComponentSet for packagenames: ${packagenames.toString()}`);
+            logger.debug(`Building ComponentSet for packagenames: ${packagenames.toString()}`);
             componentSet ??= new componentSet_1.ComponentSet(undefined, registry);
         }
         // Resolve manifest with source in package directories.
         if (manifest) {
-            getLogger().debug(`Building ComponentSet from manifest: ${manifest.manifestPath}`);
+            logger.debug(`Building ComponentSet from manifest: ${manifest.manifestPath}`);
             assertFileExists(manifest.manifestPath);
-            getLogger().debug(`Searching in packageDir: ${manifest.directoryPaths.join(', ')} for matching metadata`);
+            logger.debug(`Searching in packageDir: ${manifest.directoryPaths.join(', ')} for matching metadata`);
             componentSet = await componentSet_1.ComponentSet.fromManifest({
                 manifestPath: manifest.manifestPath,
                 resolveSourcePaths: manifest.directoryPaths,
@@ -91,10 +85,9 @@ class ComponentSetBuilder {
                 registry,
             });
         }
-        // Resolve metadata entries with source in package directories, unless we are building a ComponentSet
-        // from metadata in an org.
-        if (metadata && !org) {
-            getLogger().debug(`Building ComponentSet from metadata: ${metadata.metadataEntries.toString()}`);
+        // Resolve metadata entries with source in package directories.
+        if (metadata) {
+            logger.debug(`Building ComponentSet from metadata: ${metadata.metadataEntries.toString()}`);
             const directoryPaths = metadata.directoryPaths;
             componentSet ??= new componentSet_1.ComponentSet(undefined, registry);
             const componentSetFilter = new componentSet_1.ComponentSet(undefined, registry);
@@ -104,7 +97,7 @@ class ComponentSetBuilder {
                 .flatMap(typeAndNameToMetadataComponents({ directoryPaths, registry }))
                 .map(addToComponentSet(componentSet))
                 .map(addToComponentSet(componentSetFilter));
-            getLogger().debug(`Searching for matching metadata in directories: ${directoryPaths.join(', ')}`);
+            logger.debug(`Searching for matching metadata in directories: ${directoryPaths.join(', ')}`);
             // add destructive changes if defined. Because these are deletes, all entries
             // are resolved to SourceComponents
             if (metadata.destructiveEntriesPre) {
@@ -144,37 +137,26 @@ class ComponentSetBuilder {
         // Resolve metadata entries with an org connection
         if (org) {
             componentSet ??= new componentSet_1.ComponentSet(undefined, registry);
-            const orgComponentSet = await this.resolveOrgComponents(registry, org, metadata);
-            orgComponentSet.toArray().map(addToComponentSet(componentSet));
+            logger.debug(`Building ComponentSet from targetUsername: ${org.username} ${metadata ? `filtered by metadata: ${metadata.metadataEntries.toString()}` : ''}`);
+            const mdMap = metadata
+                ? buildMapFromComponents(metadata.metadataEntries.map((0, exports.entryToTypeAndName)(registry)))
+                : new Map();
+            const fromConnection = await componentSet_1.ComponentSet.fromConnection({
+                usernameOrConnection: (await core_1.StateAggregator.getInstance()).aliases.getUsername(org.username) ?? org.username,
+                componentFilter: getOrgComponentFilter(org, mdMap, metadata),
+                metadataTypes: mdMap.size ? Array.from(mdMap.keys()) : undefined,
+                registry,
+            });
+            fromConnection.toArray().map(addToComponentSet(componentSet));
         }
         // there should have been a componentSet created by this point.
         componentSet = assertComponentSetIsNotUndefined(componentSet);
         componentSet.apiVersion ??= options.apiversion;
         componentSet.sourceApiVersion ??= options.sourceapiversion;
         componentSet.projectDirectory = options.projectDir;
-        logComponents(componentSet);
+        logComponents(logger, componentSet);
         return componentSet;
     }
-    static async resolveOrgComponents(registry, org, metadata) {
-        let mdMap = new Map();
-        let debugMsg = `Building ComponentSet from metadata in an org using targetUsername: ${org.username}`;
-        if (metadata) {
-            if (metadata.metadataEntries?.length) {
-                debugMsg += ` filtering on metadata: ${metadata.metadataEntries.toString()}`;
-            }
-            if (metadata.excludedEntries?.length) {
-                debugMsg += ` excluding metadata: ${metadata.excludedEntries.toString()}`;
-            }
-            mdMap = buildMapFromMetadata(metadata, registry);
-        }
-        getLogger().debug(debugMsg);
-        return componentSet_1.ComponentSet.fromConnection({
-            usernameOrConnection: (await core_1.StateAggregator.getInstance()).aliases.getUsername(org.username) ?? org.username,
-            componentFilter: getOrgComponentFilter(org, mdMap, metadata),
-            metadataTypes: mdMap.size ? Array.from(mdMap.keys()) : undefined,
-            registry,
-        });
-    }
 }
 exports.ComponentSetBuilder = ComponentSetBuilder;
 const addToComponentSet = (cs, deletionType) => (cmp) => {
@@ -202,19 +184,19 @@ const assertNoWildcardInDestructiveEntries = (mdEntry) => {
 };
 /** This is only for debug output of matched files based on the command flags.
  * It will log up to 20 file matches. */
-const logComponents = (componentSet) => {
-    getLogger().debug(`Matching metadata files (${componentSet.size}):`);
+const logComponents = (logger, componentSet) => {
+    logger.debug(`Matching metadata files (${componentSet.size}):`);
     const components = componentSet.getSourceComponents().toArray();
     components
         .slice(0, 20)
         .map((cmp) => cmp.content ?? cmp.xml ?? cmp.fullName)
-        .map((m) => getLogger().debug(m));
+        .map((m) => logger.debug(m));
     if (components.length > 20)
-        getLogger().debug(`(showing 20 of ${componentSet.size} matches)`);
-    getLogger().debug(`ComponentSet apiVersion = ${componentSet.apiVersion ?? '<not set>'}`);
-    getLogger().debug(`ComponentSet sourceApiVersion = ${componentSet.sourceApiVersion ?? '<not set>'}`);
+        logger.debug(`(showing 20 of ${componentSet.size} matches)`);
+    logger.debug(`ComponentSet apiVersion = ${componentSet.apiVersion ?? '<not set>'}`);
+    logger.debug(`ComponentSet sourceApiVersion = ${componentSet.sourceApiVersion ?? '<not set>'}`);
 };
-const getOrgComponentFilter = (org, mdMap, metadata) => metadata?.metadataEntries?.length
+const getOrgComponentFilter = (org, mdMap, metadata) => metadata
     ? (component) => {
         if (component.type && component.fullName) {
             const mdMapEntry = mdMap.get(component.type);
@@ -259,31 +241,12 @@ metadataName?.includes('*') && metadataName.length > 1 && !metadataName.includes
             // using minimatch versus RegExp provides better (more expected) matching results
             .filter((cs) => (0, minimatch_1.minimatch)(cs.fullName, metadataName))
     : [{ type, fullName: metadataName }];
-const buildMapFromMetadata = (mdOption, registry) => {
+// TODO: use Map.groupBy when it's available
+const buildMapFromComponents = (components) => {
     const mdMap = new Map();
-    // Add metadata type entries we were told to include
-    if (mdOption.metadataEntries?.length) {
-        mdOption.metadataEntries.map((0, exports.entryToTypeAndName)(registry)).map((cmp) => {
-            mdMap.set(cmp.type.name, [...(mdMap.get(cmp.type.name) ?? []), cmp.metadataName]);
-        });
-    }
-    // Build an array of excluded types from the options
-    if (mdOption.excludedEntries?.length) {
-        const excludedTypes = [];
-        mdOption.excludedEntries.map((0, exports.entryToTypeAndName)(registry)).map((cmp) => {
-            if (cmp.metadataName === '*') {
-                excludedTypes.push(cmp.type.name);
-            }
-        });
-        if (mdMap.size === 0) {
-            // we are excluding specific metadata types from all supported types
-            Object.values(registry.getRegistry().types).map((t) => {
-                if (!excludedTypes.includes(t.name)) {
-                    mdMap.set(t.name, []);
-                }
-            });
-        }
-    }
+    components.map((cmp) => {
+        mdMap.set(cmp.type.name, [...(mdMap.get(cmp.type.name) ?? []), cmp.metadataName]);
+    });
     return mdMap;
 };
 //# sourceMappingURL=componentSetBuilder.js.map

package/lib/src/collections/componentSetBuilder.js.map

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

package/lib/src/resolve/connectionResolver.d.ts

@@ -7,17 +7,12 @@ export type ResolveConnectionResult = {
     apiVersion: string;
 };
 /**
- * Resolve MetadataComponents from an org connection by making listMetadata API calls
- * for the specified metadata types (`mdTypes` arg) or all supported metadata types
- * in the registry.
+ * Resolve MetadataComponents from an org connection
  */
 export declare class ConnectionResolver {
     private connection;
     private registry;
     private mdTypeNames;
-    private requestBatchSize;
     constructor(connection: Connection, registry?: RegistryAccess, mdTypes?: string[]);
     resolve(componentFilter?: (component: Partial<FileProperties>) => boolean): Promise<ResolveConnectionResult>;
-    private sendBatchedRequests;
-    private sendBatchedQueries;
 }

package/lib/src/resolve/connectionResolver.js

@@ -7,36 +7,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConnectionResolver = void 0;
-const node_util_1 = require("node:util");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
-const kit_1 = require("@salesforce/kit");
 const registryAccess_1 = require("../registry/registryAccess");
 const standardvalueset_1 = require("../registry/standardvalueset");
 const path_1 = require("../utils/path");
 ;
 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."], ["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>"], ["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>"]]));
-let requestCount = 0;
-let shouldQueryStandardValueSets = false;
-let logger;
-const getLogger = () => {
-    if (!logger) {
-        logger = core_1.Logger.childFromRoot('ConnectionResolver');
-    }
-    return logger;
-};
-// ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***
-//
-// NOTE: The `listMetadata` API supports passing 3 metadata types per call but we
-//       can't do this because if 1 of the 3 types is not supported by the org (or
-//       errors in some way) we don't get any data back about the other types. This
-//       means we are forced to make listMetadata calls for individual metadata types.
-//
-// ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***  ***
 /**
- * Resolve MetadataComponents from an org connection by making listMetadata API calls
- * for the specified metadata types (`mdTypes` arg) or all supported metadata types
- * in the registry.
+ * Resolve MetadataComponents from an org connection
  */
 class ConnectionResolver {
     connection;
@@ -44,7 +23,6 @@ class ConnectionResolver {
     // Array of metadata type names to use for listMembers. By default it includes
     // all types defined in the registry.
     mdTypeNames;
-    requestBatchSize;
     constructor(connection, registry = new registryAccess_1.RegistryAccess(), mdTypes) {
         this.connection = connection;
         this.registry = registry;
@@ -52,21 +30,14 @@ class ConnectionResolver {
             ? // ensure the types passed in are valid per the registry
                 mdTypes.filter((t) => this.registry.getTypeByName(t))
             : Object.values(this.registry.getRegistry().types).map((t) => t.name);
-        // To limit the number of concurrent requests, batch them per an env var.
-        // By default there is no batching.
-        this.requestBatchSize = kit_1.env.getNumber('SF_LIST_METADATA_BATCH_SIZE', -1);
     }
     async resolve(componentFilter = (component) => (0, ts_types_1.isPlainObject)(component)) {
-        // Aggregate array of metadata records in the org
         const Aggregator = [];
-        // Folder component type names. Each array value has the form [type::folder]
-        const folderComponentTypes = [];
-        // Child component type names
-        const childComponentTypes = new Set();
+        const childrenPromises = [];
+        const componentTypes = new Set();
         const lifecycle = core_1.Lifecycle.getInstance();
-        // Make batched listMetadata requests for top level metadata
-        const listMetadataResponses = await this.sendBatchedRequests(this.mdTypeNames);
-        for (const component of listMetadataResponses) {
+        const componentFromDescribe = (await Promise.all(this.mdTypeNames.map((type) => listMembers(this.registry)(this.connection)({ type })))).flat();
+        for (const component of componentFromDescribe) {
             let componentType;
             if (isNonEmptyString(component.type)) {
                 componentType = this.registry.getTypeByName(component.type);
@@ -91,28 +62,25 @@ class ConnectionResolver {
                 throw new core_1.SfError(messages.getMessage('error_could_not_infer_type', [component.fullName]), 'TypeInferenceError', [messages.getMessage('suggest_type_more_suggestions')]);
             }
             Aggregator.push(component);
+            componentTypes.add(componentType);
             if (componentType.folderContentType) {
-                const type = this.registry.getTypeByName(componentType.folderContentType).name;
-                const folder = component.fullName;
-                folderComponentTypes.push(`${type}::${folder}`);
+                childrenPromises.push(listMembers(this.registry)(this.connection)({
+                    type: this.registry.getTypeByName(componentType.folderContentType).name,
+                    folder: component.fullName,
+                }));
             }
+        }
+        for (const componentType of componentTypes) {
             const childTypes = componentType.children?.types;
             if (childTypes) {
-                Object.values(childTypes).map((childType) => childComponentTypes.add(childType.name));
+                Object.values(childTypes).map((childType) => {
+                    childrenPromises.push(listMembers(this.registry)(this.connection)({ type: childType.name }));
+                });
             }
         }
-        if (folderComponentTypes.length) {
-            Aggregator.push(...(await this.sendBatchedRequests(folderComponentTypes)));
-        }
-        if (childComponentTypes.size > 0) {
-            Aggregator.push(...(await this.sendBatchedRequests(Array.from(childComponentTypes))));
+        for await (const childrenResult of childrenPromises) {
+            Aggregator.push(...childrenResult);
         }
-        // If we need to query the list of StandardValueSets (i.e., it's included in this.mdTypeNames)
-        // make those requests now.
-        if (shouldQueryStandardValueSets) {
-            Aggregator.push(...(await this.sendBatchedQueries()));
-        }
-        getLogger().debug(`https request count = ${requestCount}`);
         return {
             components: Aggregator.filter(componentFilter).map((component) => ({
                 fullName: (0, ts_types_1.ensureString)(component.fullName, `Component fullName was not set for ${component.fileName ?? '<missing filename>'}`),
@@ -121,109 +89,40 @@ class ConnectionResolver {
             apiVersion: this.connection.getApiVersion(),
         };
     }
-    // Send batched listMetadata requests based on the SF_LIST_METADATA_BATCH_SIZE env var.
-    async sendBatchedRequests(listMdQueries) {
-        const listMetadataResponses = [];
-        let listMetadataRequests = [];
-        const sendIt = async () => {
-            const requestBatch = (await Promise.all(listMetadataRequests)).flat();
-            listMetadataResponses.push(...requestBatch);
-        };
-        // Make batched listMetadata requests
-        for (let i = 0; i < listMdQueries.length; i++) {
-            const q = listMdQueries[i].split('::');
-            const listMdQuery = { type: q[0] };
-            if (q[1]) {
-                listMdQuery.folder = q[1];
-            }
-            listMetadataRequests.push(listMembers(this.registry)(this.connection)(listMdQuery));
-            if (this.requestBatchSize > 0 && i !== 0 && i % this.requestBatchSize === 0) {
-                getLogger().debug(`Awaiting listMetadata requests ${i - this.requestBatchSize + 1} - ${i}`);
-                // We are deliberately awaiting the results of batches to throttle requests.
-                // eslint-disable-next-line no-await-in-loop
-                await sendIt();
-                // Reset the requests for the next batch
-                listMetadataRequests = [];
-            }
-            // Always flush the last batch; or send non-batched requests
-            if (i === listMdQueries.length - 1) {
-                getLogger().debug('Awaiting listMetadata requests');
-                // We are deliberately awaiting the results of batches to throttle requests.
-                // eslint-disable-next-line no-await-in-loop
-                await sendIt();
-            }
-        }
-        return listMetadataResponses;
-    }
-    // Send batched queries for a known subset of StandardValueSets based on the
-    // SF_LIST_METADATA_BATCH_SIZE env var.
-    async sendBatchedQueries() {
-        const mdType = this.registry.getTypeByName('StandardValueSet');
-        const queryResponses = [];
-        let queryRequests = [];
-        const sendIt = async () => {
-            const requestBatch = (await Promise.all(queryRequests)).flat();
-            queryResponses.push(...requestBatch.filter((rb) => !!rb));
-        };
-        // Make batched query requests
-        const svsNames = standardvalueset_1.standardValueSet.fullnames;
-        for (let i = 0; i < svsNames.length; i++) {
-            const svsFullName = svsNames[i];
-            queryRequests.push(querySvs(this.connection)(svsFullName, mdType));
-            if (this.requestBatchSize > 0 && i !== 0 && i % this.requestBatchSize === 0) {
-                getLogger().debug(`Awaiting StandardValueSet queries ${i - this.requestBatchSize + 1} - ${i}`);
-                // We are deliberately awaiting the results of batches to throttle requests.
-                // eslint-disable-next-line no-await-in-loop
-                await sendIt();
-                // Reset the requests for the next batch
-                queryRequests = [];
-            }
-            // Always flush the last batch; or send non-batched requests
-            if (i === svsNames.length - 1) {
-                getLogger().debug('Awaiting StandardValueSet queries');
-                // We are deliberately awaiting the results of batches to throttle requests.
-                // eslint-disable-next-line no-await-in-loop
-                await sendIt();
-            }
-        }
-        return queryResponses;
-    }
 }
 exports.ConnectionResolver = ConnectionResolver;
-const querySvs = (connection) => async (svsFullName, svsType) => {
-    try {
-        requestCount++;
-        getLogger().debug(`StandardValueSet query for ${svsFullName}`);
-        const standardValueSetRecord = await connection.singleRecordQuery(`SELECT Id, MasterLabel, Metadata FROM StandardValueSet WHERE MasterLabel = '${svsFullName}'`, { tooling: true });
-        if (standardValueSetRecord.Metadata.standardValue.length) {
-            return {
-                fullName: standardValueSetRecord.MasterLabel,
-                fileName: `${svsType.directoryName}/${standardValueSetRecord.MasterLabel}.${svsType.suffix ?? ''}`,
-                type: svsType.name,
-            };
-        }
-    }
-    catch (error) {
-        const err = core_1.SfError.wrap(error);
-        getLogger().debug(`[${svsFullName}] ${err.message}`);
-    }
-};
 const listMembers = (registry) => (connection) => async (query) => {
     const mdType = registry.getTypeByName(query.type);
-    // Workaround because metadata.list({ type: 'StandardValueSet' }) returns [].
-    // Query for a subset of known StandardValueSets after all listMetadata calls.
+    // Workaround because metadata.list({ type: 'StandardValueSet' }) returns []
     if (mdType.name === registry.getRegistry().types.standardvalueset.name) {
-        shouldQueryStandardValueSets = true;
-        return [];
+        const members = [];
+        const standardValueSetPromises = standardvalueset_1.standardValueSet.fullnames.map(async (standardValueSetFullName) => {
+            try {
+                const standardValueSetRecord = await connection.singleRecordQuery(`SELECT Id, MasterLabel, Metadata FROM StandardValueSet WHERE MasterLabel = '${standardValueSetFullName}'`, { tooling: true });
+                return (standardValueSetRecord.Metadata.standardValue.length && {
+                    fullName: standardValueSetRecord.MasterLabel,
+                    fileName: `${mdType.directoryName}/${standardValueSetRecord.MasterLabel}.${mdType.suffix ?? ''}`,
+                    type: mdType.name,
+                });
+            }
+            catch (err) {
+                const logger = core_1.Logger.childFromRoot('ConnectionResolver.listMembers');
+                logger.debug(err);
+            }
+        });
+        for await (const standardValueSetResult of standardValueSetPromises) {
+            if (standardValueSetResult) {
+                members.push(standardValueSetResult);
+            }
+        }
+        return members;
     }
     try {
-        requestCount++;
-        getLogger().debug(`listMetadata for ${(0, node_util_1.inspect)(query)}`);
         return (await connection.metadata.list(query)).map(inferFilenamesFromType(mdType));
     }
     catch (error) {
-        const err = core_1.SfError.wrap(error);
-        getLogger().debug(`[${mdType.name}] ${err.message}`);
+        const logger = core_1.Logger.childFromRoot('ConnectionResolver.listMembers');
+        logger.debug(error.message);
         return [];
     }
 };

package/lib/src/resolve/connectionResolver.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "12.10.4-dev-17431548.0",
+  "version": "12.10.4",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -29,7 +29,7 @@
     "@salesforce/kit": "^3.2.2",
     "@salesforce/ts-types": "^2.0.12",
     "fast-levenshtein": "^3.0.0",
-    "fast-xml-parser": "^4.5.0",
+    "fast-xml-parser": "^4.5.1",
     "got": "^11.8.6",
     "graceful-fs": "^4.2.11",
     "ignore": "^5.3.2",
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@jsforce/jsforce-node": "^3.6.3",
-    "@salesforce/cli-plugins-testkit": "^5.3.38",
+    "@salesforce/cli-plugins-testkit": "^5.3.39",
     "@salesforce/dev-scripts": "^10.2.11",
     "@types/deep-equal-in-any-order": "^1.0.1",
     "@types/fast-levenshtein": "^0.0.4",
@@ -49,7 +49,7 @@
     "@types/mime": "2.0.3",
     "@types/minimatch": "^5.1.2",
     "deep-equal-in-any-order": "^1.1.19",
-    "esbuild": "^0.24.0",
+    "esbuild": "^0.24.2",
     "eslint-plugin-sf-plugin": "^1.20.13",
     "mocha-junit-reporter": "^1.23.3",
     "mocha-snap": "^5.0.0",