@salesforce/source-deploy-retrieve 5.9.2 → 5.9.3

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 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)

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":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,mDAAqE;AACrE,sCAAoE;AACpE,gDAA8C;AAC9C,oCAA4C;AAE5C,wCAAoG;AACpG,uCAAoC;AAGpC,MAAe,2BAA2B;IAGjC,QAAQ,CAAC,KAAyB;QACvC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IAED,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;CAGF;AAeD;;;GAGG;AACH,MAAM,sBAAuB,SAAQ,2BAA+C;IAApF;;QACY,qBAAgB,GAAuB,EAAE,CAAC;QAEpD,2FAA2F;QAC3F,gDAAgD;QACxC,mBAAc,GAAG,IAAI,GAAG,EAAmB,CAAC;IA2EtD,CAAC;IAzEQ,KAAK,CAAC,QAAQ;QACnB,MAAM,UAAU,GAAmB,EAAE,CAAC;QACtC,KAAK,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACvE,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAChE,UAAU,CAAC,IAAI,CAAC;gBACd,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE;oBACV;wBACE,MAAM,EAAE,IAAI,iBAAO,CAAC,gBAAgB,CAAC;wBACrC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;qBACpF;iBACF;aACF,CAAC,CAAC;SACJ;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,QAAsB,EAAE,MAAuB;QACrE,8FAA8F;QAC9F,4FAA4F;QAC5F,IAAI,SAAkB,CAAC;QACvB,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,wCAAsC,EAAE;YAC5E,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SAChD;QAED,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,kCAAqC;YACvE,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,CAAC,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE7C,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC5B,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;YAChD,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC;YAC/C,MAAM,oBAAoB,GAAG,KAAwB,CAAC;YAEtD,IAAI,MAAe,CAAC;YACpB,IAAI,SAAS,EAAE;gBACb,mEAAmE;gBACnE,mEAAmE;gBACnE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,EAAE;oBACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;iBACpG;gBACD,MAAM,GAAG,oBAAoB,CAAC,kBAAkB,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;aACrG;iBAAM;gBACL,MAAM,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,CAAC;aAChD;YACD,MAAM,aAAa,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC;YAExD,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE;gBAC7B,YAAY,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,mBAAU,CAAC,EAAE,mBAAU,EAAE,CAAC;aACzD;YAED,sDAAsD;YACtD,IAAI,IAAA,oBAAS,EAAC,aAAa,EAAE,mBAAU,CAAC,EAAE;gBACxC,kGAAkG;gBAClG,OAAQ,aAAyB,CAAC,mBAAU,CAAC,CAAC;aAC/C;YAED,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU,CAAY,CAAC;YAEtD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE;gBACzB,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;aAC3B;YAED,kHAAkH;YAClH,MAAM,KAAK,GAAG,IAAA,wBAAgB,EAAC,SAAS,CAAC,SAAS,CAAC,CAAc,CAAC;YAElE,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;SAC3B;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;CACF;AAUD;;;;GAIG;AACH,MAAM,sBAAuB,SAAQ,2BAA+C;IAApF;;QACY,qBAAgB,GAAuB,EAAE,CAAC;IAgBtD,CAAC;IAdC,4DAA4D;IACrD,KAAK,CAAC,QAAQ;;QACnB,MAAM,UAAU,GAAmB,EAAE,CAAC;QAEtC,KAAK,MAAM,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE;YAC9D,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;gBAC3B,UAAU,CAAC,IAAI,CAAC;oBACd,SAAS,EAAE,MAAA,WAAW,CAAC,MAAM,CAAC,MAAM,mCAAI,WAAW,CAAC,MAAM;oBAC1D,UAAU,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;iBACpC,CAAC,CAAC;aACJ;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAUD;;;;;GAKG;AACH,MAAM,yBAA0B,SAAQ,2BAAkD;IAA1F;;QACY,qBAAgB,GAA0B;YAClD,uBAAuB,EAAE,IAAI,GAAG,EAAE;YAClC,gBAAgB,EAAE,SAAS;SAC5B,CAAC;QAEF,sCAAsC;QAC5B,aAAQ,GAAG,IAAI,GAAG,EAAgC,CAAC;QAE7D,8BAA8B;QACpB,uBAAkB,GAAG,IAAI,GAAG,EAA2B,CAAC;IAiJpE,CAAC;IA9IQ,KAAK,CAAC,QAAQ,CAAC,gBAAwB,EAAE,IAAI,GAAG,IAAI,6BAAmB,EAAE;QAC9E,MAAM,UAAU,GAAmB,EAAE,CAAC;QAEtC,IAAI,IAAI,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,IAAI,KAAK,CAAC,EAAE;YAC5D,OAAO,UAAU,CAAC;SACnB;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,mFAAmF;QACnF,oFAAoF;QACpF,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAClD,gBAAgB,EAChB,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CACjD,CAAC;QAEF,+CAA+C;QAC/C,MAAM,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QAC1C,IAAI,CAAC,kBAAkB,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3E,MAAM,yBAAyB,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE1D,uDAAuD;QACvD,MAAM,UAAU,GAAG,IAAA,WAAI,EAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QACzG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAEhC,2FAA2F;QAC3F,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE;;YACvE,MAAM,SAAS,GAAG,MAAA,yBAAyB,CAAC,GAAG,CAAC,kBAAkB,CAAC,mCAAI,UAAU,CAAC;YAClF,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;YACnD,aAAa,CAAC,GAAG,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;YAC7C,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,2CAA2C;QAC3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;YAC5C,IAAI,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBAC/B,MAAM,qBAAqB,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBACrE,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;gBACzE,UAAU,CAAC,IAAI,CAAC;oBACd,SAAS,EAAE,qBAAqB;oBAChC,UAAU,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,iBAAO,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;iBAC3E,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,gBAAgB;QACtB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;QACzC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE;YAC5C,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE;gBACpC,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACK,cAAc,CAAC,UAAkB;QACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAClC,uFAAuF;YACvF,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,GAAG,EAAmB,CAAC,CAAC;SAC3D;QACD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAC5C,+EAA+E;YAC/E,8EAA8E;YAC9E,+EAA+E;YAC/E,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,UAAU,EAAE;gBACtC,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB;gBACzC,GAAG,EAAE,UAAU;aACG,CAAC,CAAC;SACvB;IACH,CAAC;IAED;;;;;;;;OAQG;IACK,sBAAsB,CAAC,gBAAwB,EAAE,aAAqB;QAC5E,yDAAyD;QACzD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,IAAA,cAAO,EAAC,gBAAgB,CAAC,CAAC,CAAC;QACtD,MAAM,qBAAqB,GAAG,0BAAY,CAAC,UAAU,CAAC;YACpD,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO,EAAE,IAAI,0BAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;YACnE,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAC,CAAC,mBAAmB,EAAE,CAAC;QACzB,OAAO,qBAAqB,CAAC,OAAO,EAAE,CAAC;IACzC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,mBAAsC;QAC/D,8EAA8E;QAC9E,MAAM,iBAAiB,GAAG,KAAK,EAAE,SAA0B,EAAiC,EAAE;YAC5F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,SAAS,CAAC,WAAW,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAA8B,EAAE;gBACtE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACxC,OAAO,CAAC,IAAA,oBAAS,EAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;YACrE,CAAC,CAAC,CACH,CAAC;YACF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1B,CAAC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,mBAAmB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAA2C,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CACnH,CAAC;QAEF,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,SAAS,CAAC,QAA8B,EAAE,qBAAsC;QACtF,oCAAoC;QACpC,MAAM,SAAS,GAAG,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC;QAC3D,OAAO;YACL,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACjC,CAAC,mBAAU,CAAC,EAAE,mBAAU;gBACxB,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;aAC3C;SACF,CAAC;IACJ,CAAC;IAED;;OAEG;IACK,gBAAgB,CAAC,SAA0B;QACjD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,GAAG,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,MAAM,GAAG,wBAAe,EAAE,CAAC;QAExE,OAAO,IAAA,WAAI,EAAC,SAAS,CAAC,sBAAsB,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IACtE,CAAC;CACF;AAED;;GAEG;AACH,MAAa,cAAc;IAA3B;QACkB,kBAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC7C,kBAAa,GAAG,IAAI,sBAAsB,EAAE,CAAC;QAC7C,qBAAgB,GAAG,IAAI,yBAAyB,EAAE,CAAC;IAUrE,CAAC;IARC,4DAA4D;IACrD,KAAK,CAAC,CAAC,iBAAiB,CAAC,gBAAyB;QACvD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACxC,IAAI,MAAM,YAAY,2BAA2B,EAAE;gBACjD,MAAM,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;aACzC;SACF;IACH,CAAC;CACF;AAbD,wCAaC"}

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":";AAAA;;;;;GAKG;;;AAEH,mDAA+D;AAE/D,uCAA+C;AAE/C,mFAAgF;AAEhF;;;;;GAKG;AACH,MAAa,gCAAiC,SAAQ,6DAA6B;IAC1E,KAAK,CAAC,cAAc,CAAC,SAA0B,EAAE,SAA2B;;QACjF,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;QAE7F,MAAM,QAAQ,GAAG,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,WAAW,EAAE,mCAAI,EAAE,CAAC;QAChD,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACpD,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,KAAK,MAAM,KAAK,IAAI,mBAAmB,EAAE;YACvC,MAAM,SAAS,GAAG,IAAA,oBAAS,EAAC,KAAK,EAAE,eAAe,CAAC,CAAC;YACpD,IAAI,eAAe,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;gBACvC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;aACtD;iBAAM;gBACL,IAAI,CAAC,oBAAoB,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;aACxD;SACF;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,kBAAkB,CAAC,MAAuB,EAAE,SAAiB,EAAE,KAAc;QACnF,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;YAC/C,MAAM,gBAAgB,GAAG,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAE,QAAQ,mCAAI,EAAE,CAAC;YACnE,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACpF,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAA,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAI,EAAE,EAAE;gBACzE,MAAM;gBACN,QAAQ,EAAE,eAAe;aAC1B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,oBAAoB,CAAC,MAAuB,EAAE,SAAiB,EAAE,KAAc;QACrF,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;YAC/C,MAAM,gBAAgB,GAAG,MAAA,MAAA,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,0CAAE,QAAQ,mCAAI,EAAE,CAAC;YACrE,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,gBAAgB,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;YACpF,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAI,EAAE,EAAE;gBAC7E,MAAM;gBACN,QAAQ,EAAE,eAAe;aAC1B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA5CD,4EA4CC"}
+{"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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "5.9.2",
+  "version": "5.9.3",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -24,7 +24,7 @@
     "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",
@@ -42,6 +42,7 @@
     "@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",