@salesforce/source-deploy-retrieve 10.5.6 → 10.6.1

package/lib/src/registry/registryAccess.js

@@ -9,12 +9,15 @@ exports.RegistryAccess = void 0;
  */
 const core_1 = require("@salesforce/core");
 const Levenshtein = require("fast-levenshtein");
-const registry_1 = require("./registry");
+const variants_1 = require("./variants");
 ;
 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>"]]));
 class RegistryAccess {
-    constructor(registry = registry_1.registry) {
-        this.registry = registry;
+    constructor(registry, projectDir) {
+        this.registry = registry ?? (0, variants_1.getEffectiveRegistry)({ projectDir });
+    }
+    getRegistry() {
+        return this.registry;
     }
     /**
      * Query a metadata type by its name.

package/lib/src/registry/registryAccess.js.map

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

package/lib/src/registry/standardvalueset.js

@@ -7,10 +7,10 @@ exports.standardValueSet = void 0;
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const utils_1 = require("../utils");
+const collections_1 = require("../utils/collections");
 const standardValueSetData = require("./stdValueSetRegistry.json");
 /**
  * The standardValueSet fullNames.
  */
-exports.standardValueSet = (0, utils_1.deepFreeze)(standardValueSetData);
+exports.standardValueSet = (0, collections_1.deepFreeze)(standardValueSetData);
 //# sourceMappingURL=standardvalueset.js.map

package/lib/src/registry/standardvalueset.js.map

@@ -1 +1 @@
-{"version":3,"file":"standardvalueset.js","sourceRoot":"","sources":["../../../src/registry/standardvalueset.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,oCAAsC;AACtC,mEAAmE;AAEnE;;GAEG;AACU,QAAA,gBAAgB,GAAG,IAAA,kBAAU,EAAC,oBAAoB,CAAC,CAAC"}
+{"version":3,"file":"standardvalueset.js","sourceRoot":"","sources":["../../../src/registry/standardvalueset.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,sDAAkD;AAClD,mEAAmE;AAEnE;;GAEG;AACU,QAAA,gBAAgB,GAAG,IAAA,wBAAU,EAAC,oBAAoB,CAAC,CAAC"}

package/lib/src/registry/types.d.ts

@@ -128,7 +128,7 @@ export interface MetadataType {
      * Configuration for resolving and converting components of the type.
      */
     strategies?: {
-        adapter: 'sourceAdapter' | 'mixedContent' | 'matchingContentFile' | 'decomposed' | 'nonDecomposed' | 'digitalExperience' | 'bundle';
+        adapter: 'mixedContent' | 'matchingContentFile' | 'decomposed' | 'digitalExperience' | 'bundle' | 'default';
         transformer?: 'decomposed' | 'staticResource' | 'nonDecomposed' | 'standard';
         decomposition?: 'topLevel' | 'folderPerType';
         recomposition?: 'startEmpty';

package/lib/src/registry/variants.d.ts

@@ -0,0 +1,12 @@
+import { MetadataRegistry } from './types';
+export type RegistryLoadInput = {
+    /** The project directory to look at sfdx-project.json file
+     * will default to the current working directory
+     * if no project file is found, the standard registry will be returned without modifications
+     */
+    projectDir?: string;
+};
+/** combine the standard registration with any overrides specific in the sfdx-project.json */
+export declare const getEffectiveRegistry: (input?: RegistryLoadInput) => MetadataRegistry;
+/** merge the children of the top-level properties (ex: types, suffixes, etc) on 2 registries */
+export declare const firstLevelMerge: (original: MetadataRegistry, overrides: MetadataRegistry) => MetadataRegistry;

package/lib/src/registry/variants.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.firstLevelMerge = exports.getEffectiveRegistry = void 0;
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const fs = require("node:fs");
+const path = require("node:path");
+const core_1 = require("@salesforce/core");
+const collections_1 = require("../utils/collections");
+const registryData = require("./metadataRegistry.json");
+/** combine the standard registration with any overrides specific in the sfdx-project.json */
+const getEffectiveRegistry = (input) => (0, collections_1.deepFreeze)((0, exports.firstLevelMerge)(registryData, loadVariants(input)));
+exports.getEffectiveRegistry = getEffectiveRegistry;
+/** read the project to get additional registry customizations and presets */
+const loadVariants = ({ projectDir } = {}) => {
+    const logger = core_1.Logger.childFromRoot('variants');
+    try {
+        const projJson = core_1.SfProject.getInstance(projectDir ?? process.cwd()).getSfProjectJson();
+        // there might not be any customizations in a project, so we default to the emptyRegistry
+        const customizations = projJson.get('registryCustomizations') ?? emptyRegistry;
+        const presets = projJson.get('registryPresets') ?? [];
+        if (Object.keys(customizations.types).length > 0) {
+            logger.debug(`found registryCustomizations for types [${Object.keys(customizations.types).join(',')}] in ${projJson.getPath()}`);
+        }
+        if (presets.length > 0) {
+            logger.debug(`using registryPresets [${presets.join(',')}] in ${projJson.getPath()}`);
+        }
+        const registryFromPresets = presets.reduce((prev, curr) => (0, exports.firstLevelMerge)(prev, loadPreset(curr)), emptyRegistry);
+        return (0, exports.firstLevelMerge)(registryFromPresets, customizations);
+    }
+    catch (e) {
+        logger.debug('no project found, using standard registry');
+        // there might not be a project at all and that's ok
+        return emptyRegistry;
+    }
+};
+// TODO: this type should maybe live somewhere else and be part of the sfdx-project schema
+// but we don't want circular dependency from sfdx-core to SDR
+// type CustomRegistry = {
+//   registryCustomizations: MetadataRegistry;
+//   registryPresets: string[];
+// };
+const loadPreset = (preset) => {
+    const pathToCheck = path.join(__dirname, 'presets', `${preset}.json`);
+    try {
+        const rawPreset = fs.readFileSync(pathToCheck, 'utf-8');
+        return JSON.parse(rawPreset);
+    }
+    catch (e) {
+        throw new Error(`Failed to load preset ${preset} in ${pathToCheck}`);
+    }
+};
+const emptyRegistry = {
+    types: {},
+    childTypes: {},
+    suffixes: {},
+    strictDirectoryNames: {},
+};
+/** merge the children of the top-level properties (ex: types, suffixes, etc) on 2 registries */
+const firstLevelMerge = (original, overrides) => ({
+    types: { ...original.types, ...(overrides.types ?? {}) },
+    childTypes: { ...original.childTypes, ...(overrides.childTypes ?? {}) },
+    suffixes: { ...original.suffixes, ...(overrides.suffixes ?? {}) },
+    strictDirectoryNames: { ...original.strictDirectoryNames, ...(overrides.strictDirectoryNames ?? {}) },
+});
+exports.firstLevelMerge = firstLevelMerge;
+//# sourceMappingURL=variants.js.map

package/lib/src/registry/variants.js.map

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

package/lib/src/resolve/adapters/baseSourceAdapter.d.ts

@@ -2,8 +2,9 @@ import { MetadataXml, SourceAdapter } from '../types';
 import { ForceIgnore } from '../forceIgnore';
 import { TreeContainer } from '../treeContainers';
 import { SourceComponent } from '../sourceComponent';
-import { SourcePath } from '../../common';
-import { MetadataType, RegistryAccess } from '../../registry';
+import { SourcePath } from '../../common/types';
+import { MetadataType } from '../../registry/types';
+import { RegistryAccess } from '../../registry/registryAccess';
 export declare abstract class BaseSourceAdapter implements SourceAdapter {
     protected type: MetadataType;
     protected registry: RegistryAccess;
@@ -30,17 +31,6 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
      */
     protected parseAsRootMetadataXml(path: SourcePath): MetadataXml | undefined;
     protected parseMetadataXml(path: SourcePath): MetadataXml | undefined;
-    /**
-     * If the path given to `getComponent` serves as the sole definition (metadata and content)
-     * for a component, parse the name and return it. This allows matching files in metadata
-     * format such as:
-     *
-     * .../tabs/MyTab.tab
-     *
-     * @param path File path of a metadata component
-     */
-    private parseAsContentMetadataXml;
-    private calculateName;
     /**
      * Determine the related root metadata xml when the path given to `getComponent` isn't one.
      *

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

@@ -10,15 +10,15 @@ exports.BaseSourceAdapter = void 0;
 const node_path_1 = require("node:path");
 const core_1 = require("@salesforce/core");
 const ts_types_1 = require("@salesforce/ts-types");
-const utils_1 = require("../../utils");
+const path_1 = require("../../utils/path");
 const forceIgnore_1 = require("../forceIgnore");
 const treeContainers_1 = require("../treeContainers");
 const sourceComponent_1 = require("../sourceComponent");
-const registry_1 = require("../../registry");
+const registryAccess_1 = require("../../registry/registryAccess");
 ;
 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>"]]));
 class BaseSourceAdapter {
-    constructor(type, registry = new registry_1.RegistryAccess(), forceIgnore = new forceIgnore_1.ForceIgnore(), tree = new treeContainers_1.NodeFSTreeContainer()) {
+    constructor(type, registry = new registryAccess_1.RegistryAccess(), forceIgnore = new forceIgnore_1.ForceIgnore(), tree = new treeContainers_1.NodeFSTreeContainer()) {
         /**
          * Whether or not an adapter should expect a component to be in its own, self-named
          * folder, including its root metadata xml file.
@@ -43,7 +43,7 @@ class BaseSourceAdapter {
         }
         let component;
         if (rootMetadata) {
-            const name = this.calculateName(rootMetadata);
+            const name = calculateName(this.registry)(this.type)(rootMetadata);
             component = new sourceComponent_1.SourceComponent({
                 name,
                 type: this.type,
@@ -89,72 +89,48 @@ class BaseSourceAdapter {
             return folderMetadataXml;
         }
         if (!this.allowMetadataWithContent()) {
-            return this.parseAsContentMetadataXml(path);
+            return parseAsContentMetadataXml(this.type)(path);
         }
     }
     // allowed to preserve API
     // eslint-disable-next-line class-methods-use-this
     parseMetadataXml(path) {
-        return (0, utils_1.parseMetadataXml)(path);
+        return (0, path_1.parseMetadataXml)(path);
     }
-    /**
-     * If the path given to `getComponent` serves as the sole definition (metadata and content)
-     * for a component, parse the name and return it. This allows matching files in metadata
-     * format such as:
-     *
-     * .../tabs/MyTab.tab
-     *
-     * @param path File path of a metadata component
-     */
-    parseAsContentMetadataXml(path) {
-        // InFolder metadata can be nested more than 1 level beneath its
-        // associated directoryName.
-        if (this.type.inFolder) {
-            const fullName = (0, utils_1.parseNestedFullName)(path, this.type.directoryName);
-            if (fullName && this.type.suffix) {
-                return { fullName, suffix: this.type.suffix, path };
-            }
-        }
-        const parentPath = (0, node_path_1.dirname)(path);
-        const parts = parentPath.split(node_path_1.sep);
-        const typeFolderIndex = parts.lastIndexOf(this.type.directoryName);
-        // nestedTypes (ex: territory2) have a folderType equal to their type but are themselves
-        // in a folder per metadata item, with child folders for rules/territories
-        const allowedIndex = this.type.folderType === this.type.id ? parts.length - 2 : parts.length - 1;
-        if (typeFolderIndex !== allowedIndex) {
-            return undefined;
-        }
-        const match = new RegExp(/(.+)\.(.+)/).exec((0, node_path_1.basename)(path));
-        if (match && this.type.suffix === match[2]) {
-            return { fullName: match[1], suffix: match[2], path };
+}
+exports.BaseSourceAdapter = BaseSourceAdapter;
+/**
+ * If the path given to `getComponent` serves as the sole definition (metadata and content)
+ * for a component, parse the name and return it. This allows matching files in metadata
+ * format such as:
+ *
+ * .../tabs/MyTab.tab
+ *
+ * @param path File path of a metadata component
+ */
+const parseAsContentMetadataXml = (type) => (path) => {
+    // InFolder metadata can be nested more than 1 level beneath its
+    // associated directoryName.
+    if (type.inFolder) {
+        const fullName = (0, path_1.parseNestedFullName)(path, type.directoryName);
+        if (fullName && type.suffix) {
+            return { fullName, suffix: type.suffix, path };
         }
     }
-    // Given a MetadataXml, build a fullName from the path and type.
-    calculateName(rootMetadata) {
-        const { directoryName, inFolder, folderType, folderContentType } = this.type;
-        // inFolder types (report, dashboard, emailTemplate, document) and their folder
-        // container types (reportFolder, dashboardFolder, emailFolder, documentFolder)
-        if (folderContentType ?? inFolder) {
-            return (0, ts_types_1.ensureString)((0, utils_1.parseNestedFullName)(rootMetadata.path, directoryName), `Unable to calculate fullName from component at path: ${rootMetadata.path} (${this.type.name})`);
-        }
-        // not using folders?  then name is fullname
-        if (!folderType) {
-            return rootMetadata.fullName;
-        }
-        const grandparentType = this.registry.getTypeByName(folderType);
-        // type is nested inside another type (ex: Territory2Model).  So the names are modelName.ruleName or modelName.territoryName
-        if (grandparentType.folderType && grandparentType.folderType !== this.type.id) {
-            const splits = rootMetadata.path.split(node_path_1.sep);
-            return `${splits[splits.indexOf(grandparentType.directoryName) + 1]}.${rootMetadata.fullName}`;
-        }
-        // this is the top level of nested types (ex: in a Territory2Model, the Territory2Model)
-        if (grandparentType.folderType === this.type.id) {
-            return rootMetadata.fullName;
-        }
-        throw messages.createError('cantGetName', [rootMetadata.path, this.type.name]);
+    const parentPath = (0, node_path_1.dirname)(path);
+    const parts = parentPath.split(node_path_1.sep);
+    const typeFolderIndex = parts.lastIndexOf(type.directoryName);
+    // nestedTypes (ex: territory2) have a folderType equal to their type but are themselves
+    // in a folder per metadata item, with child folders for rules/territories
+    const allowedIndex = type.folderType === type.id ? parts.length - 2 : parts.length - 1;
+    if (typeFolderIndex !== allowedIndex) {
+        return undefined;
     }
-}
-exports.BaseSourceAdapter = BaseSourceAdapter;
+    const match = new RegExp(/(.+)\.(.+)/).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 parts = fsPath.split(node_path_1.sep);
@@ -162,4 +138,28 @@ const parseAsFolderMetadataXml = (fsPath) => {
         return { fullName: match[1], suffix: undefined, path: fsPath };
     }
 };
+// Given a MetadataXml, build a fullName from the path and type.
+const calculateName = (registry) => (type) => (rootMetadata) => {
+    const { directoryName, inFolder, folderType, folderContentType } = type;
+    // inFolder types (report, dashboard, emailTemplate, document) and their folder
+    // container types (reportFolder, dashboardFolder, emailFolder, documentFolder)
+    if (folderContentType ?? inFolder) {
+        return (0, ts_types_1.ensureString)((0, path_1.parseNestedFullName)(rootMetadata.path, directoryName), `Unable to calculate fullName from component at path: ${rootMetadata.path} (${type.name})`);
+    }
+    // not using folders?  then name is fullname
+    if (!folderType) {
+        return rootMetadata.fullName;
+    }
+    const grandparentType = registry.getTypeByName(folderType);
+    // type is nested inside another type (ex: Territory2Model).  So the names are modelName.ruleName or modelName.territoryName
+    if (grandparentType.folderType && grandparentType.folderType !== type.id) {
+        const splits = rootMetadata.path.split(node_path_1.sep);
+        return `${splits[splits.indexOf(grandparentType.directoryName) + 1]}.${rootMetadata.fullName}`;
+    }
+    // this is the top level of nested types (ex: in a Territory2Model, the Territory2Model)
+    if (grandparentType.folderType === type.id) {
+        return rootMetadata.fullName;
+    }
+    throw messages.createError('cantGetName', [rootMetadata.path, type.name]);
+};
 //# sourceMappingURL=baseSourceAdapter.js.map

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

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

package/lib/src/resolve/adapters/bundleSourceAdapter.d.ts

@@ -1,4 +1,4 @@
-import { SourcePath } from '../../common';
+import { SourcePath } from '../../common/types';
 import { SourceComponent } from '../sourceComponent';
 import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
 /**

package/lib/src/resolve/adapters/decomposedSourceAdapter.d.ts

@@ -1,4 +1,4 @@
-import { SourcePath } from '../../common';
+import { SourcePath } from '../../common/types';
 import { SourceComponent } from '../sourceComponent';
 import { MixedContentSourceAdapter } from './mixedContentSourceAdapter';
 /**
@@ -34,7 +34,7 @@ export declare class DecomposedSourceAdapter extends MixedContentSourceAdapter {
     protected metadataWithContent: boolean;
     getComponent(path: SourcePath, isResolvingSource?: boolean): SourceComponent | undefined;
     /**
-     * If the trigger turns out to be part of a child component, `populate` will build
+     * If the trigger turns out to be part of an addressable child component, `populate` will build
      * the child component, set its parent property to the one created by the
      * `BaseSourceAdapter`, and return the child component instead.
      */

package/lib/src/resolve/adapters/decomposedSourceAdapter.js

@@ -9,7 +9,7 @@ exports.DecomposedSourceAdapter = void 0;
  */
 const core_1 = require("@salesforce/core");
 const sourceComponent_1 = require("../sourceComponent");
-const utils_1 = require("../../utils");
+const path_1 = require("../../utils/path");
 const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
 ;
 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>"]]));
@@ -52,13 +52,13 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
         if (!rootMetadata) {
             const rootMetadataPath = this.getRootMetadataXmlPath(path);
             if (rootMetadataPath) {
-                rootMetadata = (0, utils_1.parseMetadataXml)(rootMetadataPath);
+                rootMetadata = (0, path_1.parseMetadataXml)(rootMetadataPath);
             }
         }
         let component;
         if (rootMetadata) {
             const componentName = this.type.folderType
-                ? `${(0, utils_1.parentName)(rootMetadata.path)}/${rootMetadata.fullName}`
+                ? `${(0, path_1.parentName)(rootMetadata.path)}/${rootMetadata.fullName}`
                 : rootMetadata.fullName;
             component = new sourceComponent_1.SourceComponent({
                 name: componentName,
@@ -69,26 +69,27 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
         return this.populate(path, component, isResolvingSource);
     }
     /**
-     * If the trigger turns out to be part of a child component, `populate` will build
+     * If the trigger turns out to be part of an addressable child component, `populate` will build
      * the child component, set its parent property to the one created by the
      * `BaseSourceAdapter`, and return the child component instead.
      */
     populate(trigger, component, isResolvingSource) {
-        const metaXml = (0, utils_1.parseMetadataXml)(trigger);
+        const metaXml = (0, path_1.parseMetadataXml)(trigger);
         if (metaXml?.suffix) {
             const pathToContent = this.trimPathToContent(trigger);
             const childTypeId = this.type.children?.suffixes?.[metaXml.suffix];
             const triggerIsAChild = !!childTypeId;
             const strategy = this.type.strategies?.decomposition;
-            if (triggerIsAChild && this.type.children && !this.type.children.types[childTypeId].unaddressableWithoutParent) {
-                if (strategy === "folderPerType" /* DecompositionStrategy.FolderPerType */ || isResolvingSource) {
-                    let parent = component;
-                    if (!parent) {
-                        parent = new sourceComponent_1.SourceComponent({
-                            name: (0, utils_1.baseName)(pathToContent),
+            if (triggerIsAChild &&
+                this.type.children &&
+                !this.type.children.types[childTypeId].unaddressableWithoutParent &&
+                this.type.children.types[childTypeId].isAddressable !== false) {
+                if (strategy === 'folderPerType' || strategy === 'topLevel' || isResolvingSource) {
+                    const parent = component ??
+                        new sourceComponent_1.SourceComponent({
+                            name: strategy === 'folderPerType' ? (0, path_1.baseName)(pathToContent) : pathToContent,
                             type: this.type,
                         }, this.tree, this.forceIgnore);
-                    }
                     parent.content = pathToContent;
                     return new sourceComponent_1.SourceComponent({
                         name: metaXml.fullName,

package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map

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

package/lib/src/resolve/adapters/defaultSourceAdapter.d.ts

@@ -1,4 +1,4 @@
-import { SourcePath } from '../../common';
+import { SourcePath } from '../../common/types';
 import { SourceComponent } from '../sourceComponent';
 import { BaseSourceAdapter } from './baseSourceAdapter';
 /**

package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.d.ts

@@ -1,6 +1,6 @@
-import { SourceComponent } from '..';
+import { SourcePath } from '../../common/types';
+import { SourceComponent } from '../sourceComponent';
 import { MetadataXml } from '../types';
-import { SourcePath } from '../../common';
 import { BundleSourceAdapter } from './bundleSourceAdapter';
 /**
  * Source Adapter for DigitalExperience metadata types. This metadata type is a bundled type of the format