@salesforce/source-deploy-retrieve 10.5.6 → 10.6.0

package/lib/src/convert/convertContext/nonDecompositionFinalizer.js

@@ -0,0 +1,167 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NonDecompositionFinalizer = 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 node_path_1 = require("node:path");
+const ts_types_1 = require("@salesforce/ts-types");
+const core_1 = require("@salesforce/core");
+const decomposed_1 = require("../../utils/decomposed");
+const constants_1 = require("../../common/constants");
+const componentSet_1 = require("../../collections/componentSet");
+const treeContainers_1 = require("../../resolve/treeContainers");
+const streams_1 = require("../streams");
+const transactionFinalizer_1 = require("./transactionFinalizer");
+/**
+ * Merges child components that share the same parent in the conversion pipeline
+ * into a single file.
+ *
+ * Inserts unclaimed child components into the parent that belongs to the default package
+ */
+class NonDecompositionFinalizer extends transactionFinalizer_1.ConvertTransactionFinalizer {
+    constructor() {
+        super(...arguments);
+        this.transactionState = {
+            childrenByUniqueElement: new Map(),
+            exampleComponent: undefined,
+        };
+        // filename => (childName => childXml)
+        this.mergeMap = new Map();
+        // filename => sourceComponent
+        this.parentComponentMap = new Map();
+    }
+    async finalize(defaultDirectory, tree = new treeContainers_1.NodeFSTreeContainer()) {
+        const writerData = [];
+        if (this.transactionState.childrenByUniqueElement.size === 0) {
+            return writerData;
+        }
+        this.tree = tree;
+        const packageDirectories = core_1.SfProject.getInstance(defaultDirectory).getPackageDirectories();
+        const pkgPaths = packageDirectories.map((pkg) => pkg.fullPath);
+        // nondecomposed metadata types can exist in multiple locations under the same name
+        // so we have to find all components that could potentially match inbound components
+        if (!this.transactionState.exampleComponent) {
+            throw new Error('No example component exists in the transaction state for nondecomposed metadata');
+        }
+        const allNonDecomposed = pkgPaths.includes(defaultDirectory)
+            ? this.getAllComponentsOfType(pkgPaths, this.transactionState.exampleComponent.type.name)
+            : // defaultDirectory isn't a package, assume it's the target output dir for conversion so don't scan folder
+                [];
+        // prepare 3 maps to simplify component merging
+        await this.initMergeMap(allNonDecomposed);
+        this.parentComponentMap = new Map(allNonDecomposed.map((c) => [(0, ts_types_1.ensureString)(c.xml, `no xml file path for ${c.fullName}`), c]));
+        const childNameToParentFilePath = this.initChildMapping();
+        // we'll merge any new labels into the default location
+        const defaultKey = (0, node_path_1.join)(defaultDirectory, getDefaultOutput(this.transactionState.exampleComponent));
+        this.ensureDefaults(defaultKey);
+        // put the incoming components into the mergeMap.  Keep track of any files we need to write
+        const filesToWrite = new Set();
+        this.transactionState.childrenByUniqueElement.forEach((child, childUniqueElement) => {
+            const parentKey = childNameToParentFilePath.get(childUniqueElement) ?? defaultKey;
+            const parentItemMap = this.mergeMap.get(parentKey);
+            parentItemMap?.set(childUniqueElement, child);
+            filesToWrite.add(parentKey);
+        });
+        // use the mergeMap to return the writables
+        this.mergeMap.forEach((children, parentKey) => {
+            if (filesToWrite.has(parentKey)) {
+                const parentSourceComponent = this.parentComponentMap.get(parentKey);
+                if (!parentSourceComponent) {
+                    throw new Error(`No source component found for ${parentKey}`);
+                }
+                const recomposedXmlObj = recompose(children, parentSourceComponent);
+                writerData.push({
+                    component: parentSourceComponent,
+                    writeInfos: [{ source: new streams_1.JsToXml(recomposedXmlObj), output: parentKey }],
+                });
+            }
+        });
+        return writerData;
+    }
+    initChildMapping() {
+        const output = new Map();
+        this.mergeMap.forEach((children, parentKey) => {
+            children.forEach((child, childName) => {
+                output.set(childName, parentKey);
+            });
+        });
+        return output;
+    }
+    /**
+     * check both top-level maps and make sure there are defaults
+     */
+    ensureDefaults(defaultKey) {
+        if (!this.mergeMap.has(defaultKey)) {
+            // If project has no files of this type, there won't be anything from allNonDecomposed.
+            this.mergeMap.set(defaultKey, new Map());
+        }
+        if (!this.parentComponentMap.has(defaultKey)) {
+            // it's possible to get here if there are no files of this type in the project.
+            // we don't have any SourceComponent to reference except the new incoming ones
+            // so this creates a "default" component with the correct path for the xml file
+            this.parentComponentMap.set(defaultKey, {
+                ...this.transactionState.exampleComponent,
+                xml: defaultKey,
+            });
+        }
+    }
+    /**
+     * Returns all the components of the incoming type in the project.
+     *
+     * Some components are not resolved during component resolution.
+     * This typically only happens when a specific source path was resolved. This is problematic for
+     * nondecomposed metadata types (like CustomLabels) because we need to know the location of each
+     * child type before recomposing the final xml.
+     * The labels could belong in any of the files OR need to go in the default location which already contains labels
+     */
+    getAllComponentsOfType(pkgDirs, componentType) {
+        const unprocessedComponents = componentSet_1.ComponentSet.fromSource({
+            fsPaths: pkgDirs,
+            include: new componentSet_1.ComponentSet([{ fullName: '*', type: componentType }]),
+            tree: this.tree,
+        }).getSourceComponents();
+        return unprocessedComponents.toArray();
+    }
+    /**
+     * Populate the mergeMap with all the children of all the local components
+     */
+    async initMergeMap(allComponentsOfType) {
+        // A function we can parallelize since we have to parseXml for each local file
+        const getMappedChildren = async (component) => {
+            const results = await Promise.all(component.getChildren().map(async (child) => {
+                const childXml = await child.parseXml();
+                return [
+                    (0, ts_types_1.getString)(childXml, (0, ts_types_1.ensureString)(child.type.uniqueIdElement), `No uniqueIdElement exists in the registry for ${child.type.name}`),
+                    childXml,
+                ];
+            }));
+            return new Map(results);
+        };
+        const result = await Promise.all(allComponentsOfType.map(async (c) => [
+            (0, ts_types_1.ensureString)(c.xml, `Missing xml file for ${c.type.name}`),
+            await getMappedChildren(c),
+        ]));
+        this.mergeMap = new Map(result);
+    }
+}
+exports.NonDecompositionFinalizer = NonDecompositionFinalizer;
+/** Return a json object that's built up from the mergeMap children */
+const recompose = (children, parentSourceComponent) => ({
+    [parentSourceComponent.type.name]: {
+        [constants_1.XML_NS_KEY]: constants_1.XML_NS_URL,
+        // for CustomLabels, that's `labels`
+        [(0, decomposed_1.getXmlElement)(parentSourceComponent.type)]: Array.from(children.values()),
+    },
+});
+/** Return the default filepath for new metadata of this type */
+const getDefaultOutput = (component) => {
+    const { fullName } = component;
+    const [baseName] = fullName.split('.');
+    const output = `${baseName}.${component.type.suffix}${constants_1.META_XML_SUFFIX}`;
+    return (0, node_path_1.join)(component.getPackageRelativePath('', 'source'), output);
+};
+//# sourceMappingURL=nonDecompositionFinalizer.js.map

package/lib/src/convert/convertContext/nonDecompositionFinalizer.js.map

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

package/lib/src/convert/convertContext/recompositionFinalizer.d.ts

@@ -0,0 +1,29 @@
+import { JsonMap } from '@salesforce/ts-types';
+import { ComponentSet } from '../../collections/componentSet';
+import { SourceComponent } from '../../resolve/sourceComponent';
+import { WriterFormat } from '../types';
+import { ConvertTransactionFinalizer } from './transactionFinalizer';
+type RecompositionStateValue = {
+    /**
+     * Parent component that children are rolled up into
+     */
+    component?: SourceComponent;
+    /**
+     * Children to be rolled up into the parent file
+     */
+    children?: ComponentSet;
+};
+type RecompositionState = Map<string, RecompositionStateValue>;
+/**
+ * Merges child components that share the same parent in the conversion pipeline into a single file.
+ *
+ * Handles both Decomposed and NonDecomposed strategies.
+ *
+ */
+export declare class RecompositionFinalizer extends ConvertTransactionFinalizer<RecompositionState> {
+    transactionState: RecompositionState;
+    finalize(): Promise<WriterFormat[]>;
+}
+/** composed function, exported from module for test */
+export declare const unwrapAndOmitNS: (outerType: string) => (xml: JsonMap) => JsonMap;
+export {};

package/lib/src/convert/convertContext/recompositionFinalizer.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unwrapAndOmitNS = exports.RecompositionFinalizer = 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 node_path_1 = require("node:path");
+const core_1 = require("@salesforce/core");
+const decomposed_1 = require("../../utils/decomposed");
+const constants_1 = require("../../common/constants");
+const sourceComponent_1 = require("../../resolve/sourceComponent");
+const streams_1 = require("../streams");
+const transactionFinalizer_1 = require("./transactionFinalizer");
+;
+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>"]]));
+const xmlCache = new Map();
+/**
+ * Merges child components that share the same parent in the conversion pipeline into a single file.
+ *
+ * Handles both Decomposed and NonDecomposed strategies.
+ *
+ */
+class RecompositionFinalizer extends transactionFinalizer_1.ConvertTransactionFinalizer {
+    constructor() {
+        super(...arguments);
+        this.transactionState = new Map();
+    }
+    async finalize() {
+        return Promise.all([...this.transactionState.values()].filter(ensureStateValueWithParent).map(stateValueToWriterFormat));
+    }
+}
+exports.RecompositionFinalizer = RecompositionFinalizer;
+const stateValueToWriterFormat = async (stateValue) => ({
+    component: stateValue.component,
+    writeInfos: [
+        {
+            source: new streams_1.JsToXml(await recompose(stateValue)),
+            output: (0, node_path_1.join)(stateValue.component.type.directoryName, `${stateValue.component.fullName}.${stateValue.component.type.suffix}`),
+        },
+    ],
+});
+const recompose = async (stateValue) => {
+    await getXmlFromCache(stateValue.component);
+    const childXmls = await Promise.all((stateValue.children?.toArray() ?? []).filter(ensureMetadataComponentWithParent).map(async (child) => ({
+        cmp: child,
+        xmlContents: await getXmlFromCache(child),
+        groupName: (0, decomposed_1.getXmlElement)(child.type),
+    })));
+    const parentXmlContents = {
+        [constants_1.XML_NS_KEY]: constants_1.XML_NS_URL,
+        ...(await getStartingXml(stateValue.component)),
+        // group them into an object of arrays by groupName, then merge into parent
+        ...toSortedGroups(childXmls),
+    };
+    return {
+        [stateValue.component.type.name]: parentXmlContents,
+    };
+};
+/** @returns {} if StartEmpty, otherwise gets the parent xml */
+const getStartingXml = async (parent) => parent.type.strategies?.recomposition === "startEmpty" /* RecompositionStrategy.StartEmpty */
+    ? {}
+    : (0, exports.unwrapAndOmitNS)(parent.type.name)(await getXmlFromCache(parent)) ?? {};
+/** throw if the parent component isn't in the state entry */
+const ensureStateValueWithParent = (stateValue) => {
+    if (stateValue.component) {
+        return true;
+    }
+    throw new Error(`The parent component is missing from the recomposition state entry.  The children are ${stateValue.children
+        ?.toArray()
+        .map((c) => c.fullName)
+        .join(', ')}`);
+};
+const ensureMetadataComponentWithParent = (child) => {
+    // all components should be SourceComponent at this point
+    if (child instanceof sourceComponent_1.SourceComponent && child.parent) {
+        return true;
+    }
+    throw messages.createError('noParent', [child.fullName, child.type.name]);
+};
+/** sorts based on the uniqueId / fullname /name property in the xml */
+const childSorter = (a, b) => {
+    const aValue = (0, decomposed_1.extractUniqueElementValue)(a.xmlContents, a.cmp.type.uniqueIdElement) ?? '';
+    const bValue = (0, decomposed_1.extractUniqueElementValue)(b.xmlContents, b.cmp.type.uniqueIdElement) ?? '';
+    return aValue.localeCompare(bValue);
+};
+/** organize into sorted arrays by groupName */
+const toSortedGroups = (items) => {
+    const groupNames = [...new Set(items.map((item) => item.groupName))].sort();
+    return Object.fromEntries(groupNames.map((groupName) => [
+        groupName,
+        items
+            .filter((item) => item.groupName === groupName)
+            // TODO: use asSorted when we can use it on all supported node versions
+            .sort(childSorter)
+            .map((i) => i.xmlContents),
+    ]));
+};
+/** wrapper around the xml cache.  Handles the nonDecomposed "parse from parent" optimization */
+const getXmlFromCache = async (cmp) => {
+    if (!cmp.xml)
+        return {};
+    const key = `${cmp.xml}:${cmp.fullName}`;
+    if (!xmlCache.has(key)) {
+        const parsed = cmp.parent?.type.strategies?.transformer === 'nonDecomposed'
+            ? cmp.parseFromParentXml({ [cmp.parent.type.name]: await getXmlFromCache(cmp.parent) })
+            : (0, exports.unwrapAndOmitNS)(cmp.type.name)(await cmp.parseXml()) ?? {};
+        xmlCache.set(key, parsed);
+    }
+    return xmlCache.get(key) ?? {};
+};
+/** composed function, exported from module for test */
+const unwrapAndOmitNS = (outerType) => (xml) => omitNsKey(unwrapXml(outerType)(xml));
+exports.unwrapAndOmitNS = unwrapAndOmitNS;
+/** Remove the namespace key from the json object.  Only the parent needs one */
+const omitNsKey = (obj) => Object.fromEntries(Object.entries(obj).filter(([key]) => key !== constants_1.XML_NS_KEY));
+const unwrapXml = (outerType) => (xml) => 
+// assert that the outerType is also a metadata type name (ex: CustomObject)
+xml[outerType] ?? xml;
+//# sourceMappingURL=recompositionFinalizer.js.map

package/lib/src/convert/convertContext/recompositionFinalizer.js.map

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

package/lib/src/convert/convertContext/transactionFinalizer.d.ts

@@ -0,0 +1,5 @@
+import { WriterFormat } from '../types';
+export declare abstract class ConvertTransactionFinalizer<T> {
+    protected abstract transactionState: T;
+    abstract finalize(defaultDirectory?: string): Promise<WriterFormat[]>;
+}

package/lib/src/convert/convertContext/transactionFinalizer.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConvertTransactionFinalizer = void 0;
+class ConvertTransactionFinalizer {
+}
+exports.ConvertTransactionFinalizer = ConvertTransactionFinalizer;
+//# sourceMappingURL=transactionFinalizer.js.map

package/lib/src/convert/convertContext/transactionFinalizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transactionFinalizer.js","sourceRoot":"","sources":["../../../../src/convert/convertContext/transactionFinalizer.ts"],"names":[],"mappings":";;;AAQA,MAAsB,2BAA2B;CAIhD;AAJD,kEAIC"}

package/lib/src/convert/metadataConverter.d.ts

@@ -1,6 +1,6 @@
-import { SourceComponent } from '../resolve';
-import { ComponentSet } from '../collections';
-import { RegistryAccess } from '../registry';
+import { SourceComponent } from '../resolve/sourceComponent';
+import { ComponentSet } from '../collections/componentSet';
+import { RegistryAccess } from '../registry/registryAccess';
 import { ConvertOutputConfig, ConvertResult, SfdxFileFormat } from './types';
 export declare class MetadataConverter {
     static readonly PACKAGE_XML_FILE = "package.xml";

package/lib/src/convert/metadataConverter.js

@@ -12,45 +12,33 @@ const node_path_1 = require("node:path");
 const core_1 = require("@salesforce/core");
 const graceful_fs_1 = require("graceful-fs");
 const ts_types_1 = require("@salesforce/ts-types");
+const metadataResolver_1 = require("../resolve/metadataResolver");
 const fileSystemHandler_1 = require("../utils/fileSystemHandler");
-const collections_1 = require("../collections");
-const registry_1 = require("../registry");
+const componentSet_1 = require("../collections/componentSet");
+const types_1 = require("../collections/types");
+const registryAccess_1 = require("../registry/registryAccess");
 const streams_1 = require("./streams");
 const replacements_1 = require("./replacements");
 ;
 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 MetadataConverter {
-    constructor(registry = new registry_1.RegistryAccess()) {
+    constructor(registry = new registryAccess_1.RegistryAccess()) {
         this.registry = registry;
     }
-    // eslint-disable-next-line complexity
     async convert(comps, targetFormat, output) {
         try {
-            const cs = comps instanceof collections_1.ComponentSet ? comps : new collections_1.ComponentSet(comps, this.registry);
-            const components = (comps instanceof collections_1.ComponentSet ? Array.from(comps.getSourceComponents()) : comps).filter((comp) => comp.type.isAddressable !== false);
+            const cs = comps instanceof componentSet_1.ComponentSet ? comps : new componentSet_1.ComponentSet(comps, this.registry);
+            const components = (comps instanceof componentSet_1.ComponentSet ? Array.from(comps.getSourceComponents()) : comps).filter((comp) => comp.type.isAddressable !== false);
             if (output.type !== 'merge' && output.packageName) {
                 cs.fullName = output.packageName;
             }
             const targetFormatIsSource = targetFormat === 'source';
-            const { packagePath, defaultDirectory, writer, mergeSet, tasks = [], } = await getConvertIngredients(output, cs, targetFormatIsSource);
+            const { packagePath, defaultDirectory, writer, mergeSet, tasks = [], } = await getConvertIngredients(output, cs, targetFormatIsSource, this.registry);
             const conversionPipeline = (0, streams_1.pipeline)(node_stream_1.Readable.from(components), !targetFormatIsSource && (process.env.SF_APPLY_REPLACEMENTS_ON_CONVERT === 'true' || output.type === 'zip')
                 ? (await (0, replacements_1.getReplacementMarkingStream)(cs.projectDirectory)) ?? new node_stream_1.PassThrough({ objectMode: true })
                 : new node_stream_1.PassThrough({ objectMode: true }), new streams_1.ComponentConverter(targetFormat, this.registry, mergeSet, defaultDirectory), writer);
             await Promise.all([conversionPipeline, ...tasks]);
-            const result = { packagePath };
-            if (output.type === 'zip') {
-                const buffer = writer.buffer;
-                if (!packagePath) {
-                    result.zipBuffer = buffer;
-                }
-                else if (buffer) {
-                    await graceful_fs_1.promises.writeFile(packagePath, buffer);
-                }
-            }
-            else {
-                result.converted = writer.converted;
-            }
-            return result;
+            return await getResult(this.registry)(packagePath)(writer);
         }
         catch (err) {
             if (!(err instanceof Error) && !(0, ts_types_1.isString)(err)) {
@@ -71,6 +59,28 @@ MetadataConverter.PACKAGE_XML_FILE = 'package.xml';
 MetadataConverter.DESTRUCTIVE_CHANGES_POST_XML_FILE = 'destructiveChangesPost.xml';
 MetadataConverter.DESTRUCTIVE_CHANGES_PRE_XML_FILE = 'destructiveChangesPre.xml';
 MetadataConverter.DEFAULT_PACKAGE_PREFIX = 'metadataPackage';
+const getResult = (registry) => (packagePath) => async (writer) => {
+    // union type discrimination
+    if ('addToZip' in writer) {
+        const buffer = writer.buffer;
+        if (!packagePath) {
+            return { packagePath, zipBuffer: buffer };
+        }
+        else if (buffer) {
+            await graceful_fs_1.promises.writeFile(packagePath, buffer);
+            return { packagePath };
+        }
+    }
+    else if (writer.converted?.length > 0 || writer.deleted?.length > 0) {
+        const resolver = new metadataResolver_1.MetadataResolver(registry);
+        return {
+            packagePath,
+            converted: writer.converted.flatMap((f) => resolver.getComponentsFromPath(f)),
+            deleted: writer.deleted,
+        };
+    }
+    return { packagePath };
+};
 function getPackagePath(outputConfig) {
     let packagePath;
     const { genUniqueDir = true, outputDirectory, packageName, type } = outputConfig;
@@ -96,28 +106,28 @@ function getPackagePath(outputConfig) {
 }
 const getDestructiveManifest = (destructiveChangesType) => {
     switch (destructiveChangesType) {
-        case collections_1.DestructiveChangesType.POST:
+        case types_1.DestructiveChangesType.POST:
             return MetadataConverter.DESTRUCTIVE_CHANGES_POST_XML_FILE;
-        case collections_1.DestructiveChangesType.PRE:
+        case types_1.DestructiveChangesType.PRE:
             return MetadataConverter.DESTRUCTIVE_CHANGES_PRE_XML_FILE;
     }
 };
-async function getConvertIngredients(output, cs, targetFormatIsSource) {
+async function getConvertIngredients(output, cs, targetFormatIsSource, registry) {
     switch (output.type) {
         case 'directory':
             return getDirectoryConfigOutputs(output, targetFormatIsSource, cs);
         case 'zip':
             return getZipConfigOutputs(output, targetFormatIsSource, cs);
         case 'merge':
-            return getMergeConfigOutputs(output, targetFormatIsSource);
+            return getMergeConfigOutputs(output, targetFormatIsSource, registry);
     }
 }
-function getMergeConfigOutputs(output, targetFormatIsSource) {
+function getMergeConfigOutputs(output, targetFormatIsSource, registry) {
     if (!targetFormatIsSource) {
         throw new core_1.SfError(messages.getMessage('error_merge_metadata_target_unsupported'));
     }
     const defaultDirectory = output.defaultDirectory;
-    const mergeSet = new collections_1.ComponentSet();
+    const mergeSet = new componentSet_1.ComponentSet(undefined, registry);
     // since child components are composed in metadata format, we need to merge using the parent
     for (const component of output.mergeWith) {
         mergeSet.add(component.parent ?? component);

package/lib/src/convert/metadataConverter.js.map

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

package/lib/src/convert/replacements.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { Transform, Readable } from 'node:stream';
-import { SourcePath } from '../common';
+import { SourcePath } from '../common/types';
 import { SourceComponent } from '../resolve/sourceComponent';
 import { MarkedReplacement, ReplacementConfig } from './types';
 /** If a component has replacements, you get it piped through the replacementStream

package/lib/src/convert/streams.d.ts

@@ -3,11 +3,12 @@
 import { pipeline as cbPipeline, Readable, Stream, Transform, Writable } from 'node:stream';
 import { JsonMap } from '@salesforce/ts-types';
 import { Logger } from '@salesforce/core';
-import { MetadataResolver, SourceComponent } from '../resolve';
-import { SourcePath } from '../common';
-import { ComponentSet } from '../collections';
-import { RegistryAccess } from '../registry';
-import { ConvertContext } from './convertContext';
+import { SourceComponent } from '../resolve/sourceComponent';
+import { SourcePath } from '../common/types';
+import { ComponentSet } from '../collections/componentSet';
+import { RegistryAccess } from '../registry/registryAccess';
+import { FileResponseSuccess } from '../client/types';
+import { ConvertContext } from './convertContext/convertContext';
 import { SfdxFileFormat, WriterFormat } from './types';
 export declare const pipeline: typeof cbPipeline.__promisify__;
 export declare const stream2buffer: (stream: Stream) => Promise<Buffer>;
@@ -32,9 +33,10 @@ export declare abstract class ComponentWriter extends Writable {
     constructor(rootDestination?: SourcePath);
 }
 export declare class StandardWriter extends ComponentWriter {
-    private resolver;
-    converted: SourceComponent[];
-    constructor(rootDestination: SourcePath, resolver?: MetadataResolver);
+    /** filepaths that converted files were written to */
+    readonly converted: string[];
+    readonly deleted: FileResponseSuccess[];
+    constructor(rootDestination: SourcePath);
     _write(chunk: WriterFormat, encoding: string, callback: (err?: Error) => void): Promise<void>;
 }
 export declare class ZipWriter extends ComponentWriter {