@salesforce/source-deploy-retrieve 5.8.5 → 5.9.3

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [5.9.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.2...v5.9.3) (2022-01-20)
+
+### Bug Fixes
+
+- custom label merging ([2d5ded2](https://github.com/forcedotcom/source-deploy-retrieve/commit/2d5ded2f45242535061d545dc7de56d12630bce2))
+
+### [5.9.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.1...v5.9.2) (2022-01-12)
+
+### [5.9.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.9.0...v5.9.1) (2022-01-05)
+
+## [5.9.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.5...v5.9.0) (2022-01-04)
+
+### Features
+
+- add retrieve in mdapi format ([#519](https://github.com/forcedotcom/source-deploy-retrieve/issues/519)) ([4db9b18](https://github.com/forcedotcom/source-deploy-retrieve/commit/4db9b1813712617970c714f30d7d2f1ef2578a2f))
+
 ### [5.8.5](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.8.4...v5.8.5) (2022-01-04)
 
 ### Bug Fixes

package/lib/src/client/metadataApiDeploy.d.ts

@@ -34,6 +34,14 @@ export declare class DeployResult implements MetadataTransferResult {
 }
 export interface MetadataApiDeployOptions extends MetadataTransferOptions {
     apiOptions?: ApiOptions;
+    /**
+     * Path to a zip file containing mdapi-formatted code and a package.xml
+     */
+    zipPath?: string;
+    /**
+     * Path to a directory containing mdapi-formatted code and a package.xml
+     */
+    mdapiPath?: string;
 }
 export declare class MetadataApiDeploy extends MetadataTransfer<MetadataApiDeployStatus, DeployResult> {
     static readonly DEFAULT_OPTIONS: Partial<MetadataApiDeployOptions>;
@@ -71,4 +79,5 @@ export declare class MetadataApiDeploy extends MetadataTransfer<MetadataApiDeplo
     cancel(): Promise<void>;
     protected pre(): Promise<AsyncResult>;
     protected post(result: MetadataApiDeployStatus): Promise<DeployResult>;
+    private getZipBuffer;
 }

package/lib/src/client/metadataApiDeploy.js

@@ -9,11 +9,14 @@ exports.MetadataApiDeploy = exports.DeployResult = void 0;
  */
 const path_1 = require("path");
 const ts_types_1 = require("@salesforce/ts-types");
+const archiver_1 = require("archiver");
+const fs = require("graceful-fs");
 const convert_1 = require("../convert");
 const utils_1 = require("../utils");
 const collections_1 = require("../collections");
 const registry_1 = require("../registry");
 const errors_1 = require("../errors");
+const streams_1 = require("../convert/streams");
 const metadataTransfer_1 = require("./metadataTransfer");
 const types_1 = require("./types");
 const diagnosticUtil_1 = require("./diagnosticUtil");
@@ -259,8 +262,7 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
         });
     }
     async pre() {
-        const converter = new convert_1.MetadataConverter();
-        const { zipBuffer } = await converter.convert(this.components, 'metadata', { type: 'zip' });
+        const zipBuffer = await this.getZipBuffer();
         const connection = await this.getConnection();
         await this.maybeSaveTempDirectory('metadata');
         return connection.deploy(zipBuffer, this.options.apiOptions);
@@ -269,6 +271,33 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
     async post(result) {
         return new DeployResult(result, this.components);
     }
+    async getZipBuffer() {
+        if (this.options.mdapiPath) {
+            if (!fs.existsSync(this.options.mdapiPath) || !fs.lstatSync(this.options.mdapiPath).isDirectory()) {
+                throw new Error(`Deploy directory ${this.options.mdapiPath} does not exist or is not a directory`);
+            }
+            // make a zip from the given directory
+            const zip = (0, archiver_1.create)('zip', { zlib: { level: 9 } });
+            // anywhere not at the root level is fine
+            zip.directory(this.options.mdapiPath, 'zip');
+            await zip.finalize();
+            return (0, streams_1.stream2buffer)(zip);
+        }
+        // read the zip into a buffer
+        if (this.options.zipPath) {
+            if (!fs.existsSync(this.options.zipPath)) {
+                throw new Error(`Zip file ${this.options.zipPath} does not exist`);
+            }
+            // does encoding matter for zip files? I don't know
+            return fs.promises.readFile(this.options.zipPath);
+        }
+        if (this.options.components) {
+            const converter = new convert_1.MetadataConverter();
+            const { zipBuffer } = await converter.convert(this.components, 'metadata', { type: 'zip' });
+            return zipBuffer;
+        }
+        throw new Error('Options should include components, zipPath, or mdapiPath');
+    }
 }
 exports.MetadataApiDeploy = MetadataApiDeploy;
 MetadataApiDeploy.DEFAULT_OPTIONS = {

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

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

package/lib/src/client/metadataApiRetrieve.d.ts

@@ -35,8 +35,8 @@ export declare class MetadataApiRetrieve extends MetadataTransfer<MetadataApiRet
      * checks to the org, unlike {@link MetadataApiDeploy.cancel}.
      */
     cancel(): Promise<void>;
+    post(result: MetadataApiRetrieveStatus): Promise<RetrieveResult>;
     protected pre(): Promise<AsyncResult>;
-    protected post(result: MetadataApiRetrieveStatus): Promise<RetrieveResult>;
     private getPackageNames;
     private getPackageOptions;
     private extract;

package/lib/src/client/metadataApiRetrieve.js

@@ -7,6 +7,9 @@ exports.MetadataApiRetrieve = exports.RetrieveResult = 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 path = require("path");
+const fs = require("graceful-fs");
+const unzipper = require("unzipper");
 const ts_types_1 = require("@salesforce/ts-types");
 const convert_1 = require("../convert");
 const collections_1 = require("../collections");
@@ -117,6 +120,33 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
     async cancel() {
         this.canceled = true;
     }
+    async post(result) {
+        let components;
+        const isMdapiRetrieve = this.options.format === 'metadata';
+        if (result.status === types_1.RequestStatus.Succeeded) {
+            const zipFileContents = Buffer.from(result.zipFile, 'base64');
+            if (isMdapiRetrieve) {
+                const name = this.options.zipFileName || 'unpackaged.zip';
+                const zipFilePath = path.join(this.options.output, name);
+                fs.writeFileSync(zipFilePath, zipFileContents);
+                if (this.options.unzip) {
+                    const dir = await unzipper.Open.buffer(zipFileContents);
+                    const extractPath = path.join(this.options.output, path.parse(name).name);
+                    await dir.extract({ path: extractPath });
+                }
+            }
+            else {
+                components = await this.extract(zipFileContents);
+            }
+        }
+        components !== null && components !== void 0 ? components : (components = new collections_1.ComponentSet(undefined, this.options.registry));
+        if (!isMdapiRetrieve) {
+            // This should only be done when retrieving source format since retrieving
+            // mdapi format has no conversion.
+            await this.maybeSaveTempDirectory('source', components);
+        }
+        return new RetrieveResult(result, components, this.components);
+    }
     async pre() {
         const packageNames = this.getPackageNames();
         if (this.components.size === 0 && !(packageNames === null || packageNames === void 0 ? void 0 : packageNames.length)) {
@@ -131,20 +161,19 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
         // otherwise don't - it causes errors if undefined or an empty array
         if (packageNames === null || packageNames === void 0 ? void 0 : packageNames.length) {
             requestBody.packageNames = packageNames;
+            // delete unpackaged when no components and metadata format to prevent
+            // sending an empty unpackaged manifest.
+            if (this.options.format === 'metadata' && this.components.size === 0) {
+                delete requestBody.unpackaged;
+            }
+        }
+        if (this.options.singlePackage) {
+            requestBody.singlePackage = this.options.singlePackage;
         }
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore required callback
         return connection.metadata.retrieve(requestBody);
     }
-    async post(result) {
-        let components;
-        if (result.status === types_1.RequestStatus.Succeeded) {
-            components = await this.extract(Buffer.from(result.zipFile, 'base64'));
-        }
-        components = components !== null && components !== void 0 ? components : new collections_1.ComponentSet(undefined, this.options.registry);
-        await this.maybeSaveTempDirectory('source', components);
-        return new RetrieveResult(result, components, this.components);
-    }
     getPackageNames() {
         var _a;
         return (_a = this.getPackageOptions()) === null || _a === void 0 ? void 0 : _a.map((pkg) => pkg.name);

package/lib/src/client/metadataApiRetrieve.js.map

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

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

@@ -2,6 +2,7 @@ import { ComponentSet } from '../collections';
 import { PackageTypeMembers } from '../collections/types';
 import { SourcePath } from '../common/types';
 import { MetadataComponent, SourceComponent } from '../resolve';
+import { SfdxFileFormat } from '../convert';
 export declare type RecordId = string;
 export declare enum ComponentStatus {
     Created = "Created",
@@ -272,6 +273,23 @@ export interface RetrieveOptions {
      * A list of package names to retrieve, or package names and their retrieval locations.
      */
     packageOptions?: PackageOptions;
+    /**
+     * The file format desired for the retrieved files.
+     */
+    format?: SfdxFileFormat;
+    /**
+     * Specifies whether only a single package is being retrieved (true) or not (false).
+     * If false, then more than one package is being retrieved.
+     */
+    singlePackage?: boolean;
+    /**
+     * The name of the retrieved zip file containing the source from the org. Only applies when `format: metadata`.
+     */
+    zipFileName?: string;
+    /**
+     * Specifies whether to unzip the retrieved zip file. Only applies when `format: metadata`.
+     */
+    unzip?: boolean;
 }
 export interface MetadataApiDeployOptions {
     allowMissingFiles?: boolean;

package/lib/src/client/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":";;;AAiBA,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACnB,CAAC,EANW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAM1B;AA+DD,IAAY,aAQX;AARD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,sDAAqC,CAAA;IACrC,kCAAiB,CAAA;IACjB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;AACvB,CAAC,EARW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAQxB;AAkJD,IAAK,eASJ;AATD,WAAK,eAAe;IAClB,gCAAa,CAAA;IACb,sCAAmB,CAAA;IACnB,4CAAyB,CAAA;IACzB,4DAAyC,CAAA;IACzC,0CAAuB,CAAA;IACvB,0DAAuC,CAAA;IACvC,wCAAqB,CAAA;IACrB,0CAAuB,CAAA;AACzB,CAAC,EATI,eAAe,KAAf,eAAe,QASnB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":";;;AAkBA,IAAY,eAMX;AAND,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACnB,CAAC,EANW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAM1B;AA+DD,IAAY,aAQX;AARD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,sDAAqC,CAAA;IACrC,kCAAiB,CAAA;IACjB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;AACvB,CAAC,EARW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAQxB;AAkJD,IAAK,eASJ;AATD,WAAK,eAAe;IAClB,gCAAa,CAAA;IACb,sCAAmB,CAAA;IACnB,4CAAyB,CAAA;IACzB,4DAAyC,CAAA;IACzC,0CAAuB,CAAA;IACvB,0DAAuC,CAAA;IACvC,wCAAqB,CAAA;IACrB,0CAAuB,CAAA;AACzB,CAAC,EATI,eAAe,KAAf,eAAe,QASnB"}

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

@@ -1,7 +1,6 @@
 import { MetadataApiDeploy, MetadataApiDeployOptions, MetadataApiRetrieve, MetadataApiRetrieveOptions } from '../client';
-import { ComponentLike, MetadataComponent, SourceComponent } from '../resolve';
+import { ComponentLike, MetadataComponent, MetadataMember, SourceComponent } from '../resolve';
 import { RegistryAccess } from '../registry';
-import { MetadataMember } from '../resolve/types';
 import { DestructiveChangesType, FromManifestOptions, FromSourceOptions, PackageManifestObject } from './types';
 import { LazyCollection } from './lazyCollection';
 export declare type DeploySetOptions = Omit<MetadataApiDeployOptions, 'components'>;

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

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

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

@@ -41,7 +41,7 @@ export interface FromManifestOptions extends OptionalTreeRegistryOptions {
      */
     resolveSourcePaths?: string[];
     /**
-     * By default, wildcard members encoutered in the manifest are added to the set
+     * By default, wildcard members encountered in the manifest are added to the set
      * e.g. `{ fullName: '*', type: 'ApexClass' }`. If `resolveSourcePaths` is set,
      * wildcard components are not added to the final set, but are used in the filter
      * when resolving source-backed components to match all components with the wildcard

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

@@ -1,6 +1,6 @@
 import { JsonMap } from '@salesforce/ts-types';
 import { ComponentSet } from '../collections';
-import { MetadataComponent, SourceComponent } from '../resolve';
+import { MetadataComponent, SourceComponent, NodeFSTreeContainer, TreeContainer } from '../resolve';
 import { WriteInfo, WriterFormat } from './types';
 declare abstract class ConvertTransactionFinalizer<T> {
     protected abstract transactionState: T;
@@ -47,17 +47,9 @@ declare class DecompositionFinalizer extends ConvertTransactionFinalizer<Decompo
     finalize(): Promise<WriterFormat[]>;
 }
 export interface NonDecompositionState {
-    claimed: ChildIndex;
-    unclaimed: ChildIndex;
+    childrenByUniqueElement: Map<string, JsonMap>;
+    exampleComponent: SourceComponent;
 }
-declare type ChildIndex = {
-    [componentKey: string]: {
-        parent: SourceComponent;
-        children: {
-            [childName: string]: JsonMap;
-        };
-    };
-};
 /**
  * Merges child components that share the same parent in the conversion pipeline
  * into a single file.
@@ -66,33 +58,37 @@ declare type ChildIndex = {
  */
 declare class NonDecompositionFinalizer extends ConvertTransactionFinalizer<NonDecompositionState> {
     protected transactionState: NonDecompositionState;
-    finalize(defaultDirectory: string): Promise<WriterFormat[]>;
+    protected mergeMap: Map<string, Map<string, JsonMap>>;
+    protected parentComponentMap: Map<string, SourceComponent>;
+    protected tree: TreeContainer;
+    finalize(defaultDirectory: string, tree?: NodeFSTreeContainer): Promise<WriterFormat[]>;
+    private initChildMapping;
     /**
-     * This method finalizes the state by:
-     * - finding any "unprocessed components" (nondecomposed metadata types can exist in multiple locations under the same name so we have to find all components that could potentially claim children)
-     * - removing any children from the unclaimed state that have been claimed by the unprocessed components
-     * - removing any children from the unclaimed state that have already been claimed by a prent in the claimed state
-     * - merging the remaining unclaimed children into the default parent component (either the component that matches the defaultDirectory or the first parent component)
+     * check both top-level maps and make sure there are defaults
      */
-    private finalizeState;
+    private ensureDefaults;
     /**
-     * Returns the "unprocessed components"
+     * Returns all the components of the incoming type in the project.
      *
-     * An unprocessed component is a component that was not resolved during component resolution.
+     * 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. So in order for each of the children to be properly
-     * claimed, we have to create new ComponentSet that will have all the parent components.
+     * 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
+     */
+    private getAllComponentsOfType;
+    /**
+     * Populate the mergeMap with all the children of all the local components
      */
-    private getUnprocessedComponents;
+    private initMergeMap;
     /**
-     * Returns the children of "unprocessed components"
+     * Return a json object that's built up from the mergeMap children
      */
-    private getChildrenOfUnprocessedComponents;
     private recompose;
+    /**
+     * Return the default filepath for new metadata of this type
+     */
     private getDefaultOutput;
-    private getClaimedChildrenNames;
-    private getParentsOfClaimedChildren;
 }
 /**
  * A state manager over the course of a single metadata conversion call.

package/lib/src/convert/convertContext.js

@@ -9,10 +9,10 @@ exports.ConvertContext = void 0;
  */
 const path_1 = require("path");
 const ts_types_1 = require("@salesforce/ts-types");
-const kit_1 = require("@salesforce/kit");
 const common_1 = require("../common");
 const collections_1 = require("../collections");
 const utils_1 = require("../utils");
+const resolve_1 = require("../resolve");
 const streams_1 = require("./streams");
 class ConvertTransactionFinalizer {
     setState(props) {
@@ -132,142 +132,135 @@ class NonDecompositionFinalizer extends ConvertTransactionFinalizer {
     constructor() {
         super(...arguments);
         this.transactionState = {
-            unclaimed: {},
-            claimed: {},
+            childrenByUniqueElement: new Map(),
+            exampleComponent: undefined,
         };
+        // filename => (childName => childXml)
+        this.mergeMap = new Map();
+        // filename => sourceComponent
+        this.parentComponentMap = new Map();
     }
-    async finalize(defaultDirectory) {
-        await this.finalizeState(defaultDirectory);
+    async finalize(defaultDirectory, tree = new resolve_1.NodeFSTreeContainer()) {
         const writerData = [];
-        for (const { parent, children } of Object.values(this.state.claimed)) {
-            const recomposedXmlObj = await this.recompose(Object.values(children), parent);
-            writerData.push({
-                component: parent,
-                writeInfos: [{ source: new streams_1.JsToXml(recomposedXmlObj), output: parent.xml }],
-            });
-        }
-        for (const { parent, children } of Object.values(this.state.unclaimed)) {
-            const recomposedXmlObj = await this.recompose(Object.values(children), parent);
-            writerData.push({
-                component: parent,
-                writeInfos: [{ source: new streams_1.JsToXml(recomposedXmlObj), output: this.getDefaultOutput(parent) }],
-            });
+        if (this.transactionState.childrenByUniqueElement.size === 0) {
+            return writerData;
         }
+        this.tree = tree;
+        // 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
+        const allNonDecomposed = this.getAllComponentsOfType(defaultDirectory, this.transactionState.exampleComponent.type.name);
+        // prepare 3 maps to simplify component merging
+        await this.initMergeMap(allNonDecomposed);
+        this.parentComponentMap = new Map(allNonDecomposed.map((c) => [c.xml, c]));
+        const childNameToParentFilePath = this.initChildMapping();
+        // we'll merge any new labels into the default location
+        const defaultKey = (0, path_1.join)(defaultDirectory, this.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.state.childrenByUniqueElement.forEach((child, childUniqueElement) => {
+            var _a;
+            const parentKey = (_a = childNameToParentFilePath.get(childUniqueElement)) !== null && _a !== void 0 ? _a : 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);
+                const recomposedXmlObj = this.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;
+    }
     /**
-     * This method finalizes the state by:
-     * - finding any "unprocessed components" (nondecomposed metadata types can exist in multiple locations under the same name so we have to find all components that could potentially claim children)
-     * - removing any children from the unclaimed state that have been claimed by the unprocessed components
-     * - removing any children from the unclaimed state that have already been claimed by a prent in the claimed state
-     * - merging the remaining unclaimed children into the default parent component (either the component that matches the defaultDirectory or the first parent component)
+     * check both top-level maps and make sure there are defaults
      */
-    async finalizeState(defaultDirectory) {
-        if ((0, kit_1.isEmpty)(this.state.claimed)) {
-            return;
+    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());
         }
-        const unprocessedComponents = this.getUnprocessedComponents(defaultDirectory);
-        const parentPaths = Object.keys(this.state.claimed).concat(unprocessedComponents.map((c) => c.xml));
-        const defaultComponentKey = parentPaths.find((p) => p.startsWith(defaultDirectory)) || parentPaths[0];
-        const claimedChildren = [
-            ...this.getClaimedChildrenNames(),
-            ...(await this.getChildrenOfUnprocessedComponents(unprocessedComponents)),
-        ];
-        // merge unclaimed children into default parent component
-        for (const [key, childIndex] of Object.entries(this.state.unclaimed)) {
-            const pruned = Object.entries(childIndex.children).reduce((result, [childName, childXml]) => {
-                return !claimedChildren.includes(childName) ? Object.assign(result, { [childName]: childXml }) : result;
-            }, {});
-            delete this.state.unclaimed[key];
-            if (this.state.claimed[defaultComponentKey]) {
-                this.state.claimed[defaultComponentKey].children = Object.assign({}, this.state.claimed[defaultComponentKey].children, pruned);
-            }
+        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 the "unprocessed components"
+     * Returns all the components of the incoming type in the project.
      *
-     * An unprocessed component is a component that was not resolved during component resolution.
+     * 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. So in order for each of the children to be properly
-     * claimed, we have to create new ComponentSet that will have all the parent components.
+     * 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
      */
-    getUnprocessedComponents(defaultDirectory) {
-        if ((0, kit_1.isEmpty)(this.state.unclaimed)) {
-            return [];
-        }
-        const parents = this.getParentsOfClaimedChildren();
-        const filterSet = new collections_1.ComponentSet(parents);
-        const { tree } = parents[0];
+    getAllComponentsOfType(defaultDirectory, componentType) {
+        // assumes that defaultDir is one level below project dir
         const projectDir = (0, path_1.resolve)((0, path_1.dirname)(defaultDirectory));
-        const parentDirs = Object.keys(this.state.claimed).map((k) => {
-            const parts = k.split(path_1.sep);
-            const partIndex = parts.findIndex((p) => (0, path_1.basename)(projectDir) === p);
-            return parts[partIndex + 1];
-        });
-        const fsPaths = tree
-            .readDirectory(projectDir)
-            .map((p) => (0, path_1.join)(projectDir, p))
-            .filter((p) => {
-            const dirName = (0, path_1.basename)(p);
-            // Only return directories that are likely to be a project directory
-            return (tree.isDirectory(p) &&
-                !dirName.startsWith('.') &&
-                dirName !== 'config' &&
-                dirName !== 'node_modules' &&
-                !parentDirs.includes(dirName));
-        });
-        const unprocessedComponents = collections_1.ComponentSet.fromSource({ fsPaths, include: filterSet })
-            .getSourceComponents()
-            .filter((component) => !this.state.claimed[component.xml]);
+        const unprocessedComponents = collections_1.ComponentSet.fromSource({
+            fsPaths: [projectDir],
+            include: new collections_1.ComponentSet([{ fullName: '*', type: componentType }]),
+            tree: this.tree,
+        }).getSourceComponents();
         return unprocessedComponents.toArray();
     }
     /**
-     * Returns the children of "unprocessed components"
+     * Populate the mergeMap with all the children of all the local components
      */
-    async getChildrenOfUnprocessedComponents(unprocessedComponents) {
-        const childrenOfUnprocessed = [];
-        for (const component of unprocessedComponents) {
-            for (const child of component.getChildren()) {
-                const xml = await child.parseXml();
-                const childName = (0, ts_types_1.getString)(xml, child.type.uniqueIdElement);
-                childrenOfUnprocessed.push(childName);
-            }
-        }
-        return childrenOfUnprocessed;
+    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, child.type.uniqueIdElement), childXml];
+            }));
+            return new Map(results);
+        };
+        const result = await Promise.all(allComponentsOfType.map(async (c) => [c.xml, await getMappedChildren(c)]));
+        this.mergeMap = new Map(result);
     }
-    async recompose(children, parentSourceComponent) {
-        const parentXmlObj = parentSourceComponent.type.strategies.recomposition === "startEmpty" /* StartEmpty */
-            ? {}
-            : await parentSourceComponent.parseXml();
+    /**
+     * Return a json object that's built up from the mergeMap children
+     */
+    recompose(children, parentSourceComponent) {
+        // for CustomLabels, that's `labels`
         const groupName = parentSourceComponent.type.directoryName;
-        const parentName = parentSourceComponent.type.name;
-        for (const child of children) {
-            if (!parentXmlObj[parentName]) {
-                parentXmlObj[parentName] = { [common_1.XML_NS_KEY]: common_1.XML_NS_URL };
-            }
-            const parent = parentXmlObj[parentName];
-            if (!parent[groupName]) {
-                parent[groupName] = [];
-            }
-            const group = (0, utils_1.normalizeToArray)(parent[groupName]);
-            group.push(child);
-        }
-        return parentXmlObj;
+        return {
+            [parentSourceComponent.type.name]: {
+                [common_1.XML_NS_KEY]: common_1.XML_NS_URL,
+                [groupName]: Array.from(children.values()),
+            },
+        };
     }
+    /**
+     * Return the default filepath for new metadata of this type
+     */
     getDefaultOutput(component) {
         const { fullName } = component;
         const [baseName] = fullName.split('.');
         const output = `${baseName}.${component.type.suffix}${common_1.META_XML_SUFFIX}`;
         return (0, path_1.join)(component.getPackageRelativePath('', 'source'), output);
     }
-    getClaimedChildrenNames() {
-        return Object.values(this.state.claimed).reduce((x, y) => x.concat(Object.keys(y.children)), []);
-    }
-    getParentsOfClaimedChildren() {
-        return Object.values(this.state.claimed).reduce((x, y) => x.concat([y.parent]), []);
-    }
 }
 /**
  * A state manager over the course of a single metadata conversion call.

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { pipeline as cbPipeline, Readable, Transform, Writable } from 'stream';
+import { pipeline as cbPipeline, Readable, Transform, Writable, Stream } from 'stream';
 import { JsonMap } from '@salesforce/ts-types';
 import { MetadataResolver, SourceComponent } from '../resolve';
 import { SourcePath } from '../common';
@@ -8,6 +8,7 @@ import { RegistryAccess } from '../registry';
 import { ConvertContext } from './convertContext';
 import { SfdxFileFormat, WriterFormat } from './types';
 export declare const pipeline: typeof cbPipeline.__promisify__;
+export declare const stream2buffer: (stream: Stream) => Promise<Buffer>;
 export declare class ComponentReader extends Readable {
     private iter;
     constructor(components: Iterable<SourceComponent>);

package/lib/src/convert/streams.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsToXml = exports.ZipWriter = exports.StandardWriter = exports.ComponentWriter = exports.ComponentConverter = exports.ComponentReader = exports.pipeline = void 0;
+exports.JsToXml = exports.ZipWriter = exports.StandardWriter = exports.ComponentWriter = exports.ComponentConverter = exports.ComponentReader = exports.stream2buffer = exports.pipeline = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -21,6 +21,17 @@ const errors_1 = require("../errors");
 const transformers_1 = require("./transformers");
 const convertContext_1 = require("./convertContext");
 exports.pipeline = (0, util_1.promisify)(stream_1.pipeline);
+const stream2buffer = async (stream) => {
+    return new Promise((resolve, reject) => {
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const buf = Array();
+        stream.on('data', (chunk) => buf.push(chunk));
+        stream.on('end', () => resolve(Buffer.concat(buf)));
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        stream.on('error', (err) => reject(`error converting stream - ${err}`));
+    });
+};
+exports.stream2buffer = stream2buffer;
 class ComponentReader extends stream_1.Readable {
     constructor(components) {
         super({ objectMode: true });

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

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

package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.d.ts

@@ -9,6 +9,4 @@ import { DecomposedMetadataTransformer } from './decomposedMetadataTransformer';
  */
 export declare class NonDecomposedMetadataTransformer extends DecomposedMetadataTransformer {
     toSourceFormat(component: SourceComponent, mergeWith?: SourceComponent): Promise<WriteInfo[]>;
-    private setStateForClaimed;
-    private setStateForUnclaimed;
 }

package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js

@@ -17,47 +17,27 @@ const decomposedMetadataTransformer_1 = require("./decomposedMetadataTransformer
  * - CustomLabels
  */
 class NonDecomposedMetadataTransformer extends decomposedMetadataTransformer_1.DecomposedMetadataTransformer {
+    // streams uses mergeWith for all types.  Removing it would break the interface
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async toSourceFormat(component, mergeWith) {
-        var _a;
+        // this will only include the incoming (retrieved) labels, not the local file
         const parentXml = await component.parseXml();
         const xmlPathToChildren = `${component.type.name}.${component.type.directoryName}`;
         const incomingChildrenXml = (0, utils_1.normalizeToArray)((0, ts_types_1.get)(parentXml, xmlPathToChildren));
-        const children = (_a = mergeWith === null || mergeWith === void 0 ? void 0 : mergeWith.getChildren()) !== null && _a !== void 0 ? _a : [];
-        const claimedChildren = children.map((c) => c.name);
+        // presumes they only have 1 child!
         const [childTypeId] = Object.keys(component.type.children.types);
         const { uniqueIdElement } = component.type.children.types[childTypeId];
-        for (const child of incomingChildrenXml) {
-            const childName = (0, ts_types_1.getString)(child, uniqueIdElement);
-            if (claimedChildren.includes(childName)) {
-                this.setStateForClaimed(mergeWith, childName, child);
-            }
-            else {
-                this.setStateForUnclaimed(component, childName, child);
-            }
-        }
-        return [];
-    }
-    setStateForClaimed(parent, childName, child) {
         this.context.nonDecomposition.setState((state) => {
-            var _a, _b, _c;
-            const existingChildren = (_b = (_a = state.claimed[parent.xml]) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : {};
-            const updatedChildren = Object.assign({}, existingChildren, { [childName]: child });
-            state.claimed[parent.xml] = Object.assign((_c = state.claimed[parent.xml]) !== null && _c !== void 0 ? _c : {}, {
-                parent,
-                children: updatedChildren,
-            });
+            var _a;
+            (_a = state.exampleComponent) !== null && _a !== void 0 ? _a : (state.exampleComponent = component);
         });
-    }
-    setStateForUnclaimed(parent, childName, child) {
-        this.context.nonDecomposition.setState((state) => {
-            var _a, _b, _c;
-            const existingChildren = (_b = (_a = state.unclaimed[parent.xml]) === null || _a === void 0 ? void 0 : _a.children) !== null && _b !== void 0 ? _b : {};
-            const updatedChildren = Object.assign({}, existingChildren, { [childName]: child });
-            state.unclaimed[parent.xml] = Object.assign((_c = state.unclaimed[parent.xml]) !== null && _c !== void 0 ? _c : {}, {
-                parent,
-                children: updatedChildren,
+        incomingChildrenXml.map((child) => {
+            const childName = (0, ts_types_1.getString)(child, uniqueIdElement);
+            this.context.nonDecomposition.setState((state) => {
+                state.childrenByUniqueElement.set(childName, child);
             });
         });
+        return [];
     }
 }
 exports.NonDecomposedMetadataTransformer = NonDecomposedMetadataTransformer;

package/lib/src/convert/transformers/nonDecomposedMetadataTransformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nonDecomposedMetadataTransformer.js","sourceRoot":"","sources":["../../../../src/convert/transformers/nonDecomposedMetadataTransformer.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAE/D,uCAA+C;AAE/C,mFAAgF;AAEhF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;IACjF,+EAA+E;IAC/E,6DAA6D;IACtD,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;QACjF,6EAA6E;QAC7E,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,iBAAiB,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnF,MAAM,mBAAmB,GAAG,IAAA,wBAAgB,EAAC,IAAA,cAAG,EAAC,SAAS,EAAE,iBAAiB,CAAC,CAAc,CAAC;QAC7F,mCAAmC;QACnC,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACjE,MAAM,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAEvE,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;YAC/C,MAAA,KAAK,CAAC,gBAAgB,oCAAtB,KAAK,CAAC,gBAAgB,GAAK,SAAS,EAAC;QACvC,CAAC,CAAC,CAAC;QAEH,mBAAmB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAChC,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC/C,KAAK,CAAC,uBAAuB,CAAC,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AAzBD,4EAyBC"}

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

@@ -1,4 +1,4 @@
-import { RegistryAccess } from '../registry/registryAccess';
+import { RegistryAccess } from '../registry';
 import { ComponentSet } from '../collections';
 import { SourceComponent } from './sourceComponent';
 import { TreeContainer } from './treeContainers';

package/lib/src/resolve/metadataResolver.js

@@ -11,7 +11,7 @@ const path_1 = require("path");
 const core_1 = require("@salesforce/core");
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
-const registryAccess_1 = require("../registry/registryAccess");
+const registry_1 = require("../registry");
 const common_1 = require("../common");
 const sourceAdapterFactory_1 = require("./adapters/sourceAdapterFactory");
 const forceIgnore_1 = require("./forceIgnore");
@@ -26,7 +26,7 @@ class MetadataResolver {
      * @param registry Custom registry data
      * @param tree `TreeContainer` to traverse with
      */
-    constructor(registry = new registryAccess_1.RegistryAccess(), tree = new treeContainers_1.NodeFSTreeContainer(), useFsForceIgnore = true) {
+    constructor(registry = new registry_1.RegistryAccess(), tree = new treeContainers_1.NodeFSTreeContainer(), useFsForceIgnore = true) {
         this.registry = registry;
         this.tree = tree;
         this.useFsForceIgnore = useFsForceIgnore;

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "5.8.5",
+  "version": "5.9.3",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -24,24 +24,25 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@salesforce/core": "2.31.0",
+    "@salesforce/core": "2.33.1",
     "@salesforce/kit": "^1.5.0",
     "@salesforce/ts-types": "^1.4.2",
     "archiver": "^5.3.0",
     "fast-xml-parser": "^3.17.4",
     "graceful-fs": "^4.2.8",
     "ignore": "^5.1.8",
-    "mime": "2.4.6",
+    "mime": "2.6.0",
     "unzipper": "0.10.11",
     "xmldom-sfdx-encoding": "^0.1.29"
   },
   "devDependencies": {
-    "@salesforce/dev-config": "^2.1.2",
+    "@salesforce/dev-config": "^2.1.3",
     "@salesforce/dev-scripts": "^1.0.2",
     "@salesforce/prettier-config": "^0.0.2",
     "@salesforce/ts-sinon": "^1.1.2",
     "@types/archiver": "^5.1.1",
     "@types/deep-equal-in-any-order": "^1.0.1",
+    "@types/jsforce": "^1.9.38",
     "@types/mime": "2.0.3",
     "@types/mkdirp": "0.5.2",
     "@types/shelljs": "^0.8.9",
@@ -70,7 +71,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
     "pretty-quick": "^3.1.0",
-    "shelljs": "0.8.4",
+    "shelljs": "0.8.5",
     "shx": "^0.3.2",
     "sinon": "10.0.0",
     "ts-node": "^10.3.0",