@salesforce/source-deploy-retrieve 5.0.0-orb.5 → 5.0.0

package/lib/src/client/metadataApiRetrieve.js

@@ -25,12 +25,21 @@ const errors_1 = require("../errors");
 const utils_1 = require("../utils");
 const ts_types_1 = require("@salesforce/ts-types");
 class RetrieveResult {
-    constructor(response, components) {
+    /**
+     * @param response The metadata retrieve response from the server
+     * @param components The ComponentSet of retrieved source components
+     * @param localComponents The ComponentSet used to create the retrieve request
+     */
+    constructor(response, components, localComponents) {
         this.response = response;
         this.components = components;
+        this.localComponents = new collections_1.ComponentSet(localComponents === null || localComponents === void 0 ? void 0 : localComponents.getSourceComponents());
     }
     getFileResponses() {
-        const responses = [];
+        if (this.response && this.fileResponses) {
+            return this.fileResponses;
+        }
+        this.fileResponses = [];
         // construct failures
         if (this.response.messages) {
             const retrieveMessages = utils_1.normalizeToArray(this.response.messages);
@@ -39,7 +48,7 @@ class RetrieveResult {
                 const matches = message.problem.match(/.+'(.+)'.+'(.+)'/);
                 if (matches) {
                     const [typeName, fullName] = matches.slice(1);
-                    responses.push({
+                    this.fileResponses.push({
                         fullName,
                         type: typeName,
                         state: types_1.ComponentStatus.Failed,
@@ -48,7 +57,7 @@ class RetrieveResult {
                     });
                 }
                 else {
-                    responses.push({
+                    this.fileResponses.push({
                         fullName: '',
                         type: '',
                         problemType: 'Error',
@@ -64,18 +73,20 @@ class RetrieveResult {
             const baseResponse = {
                 fullName,
                 type: type.name,
-                state: types_1.ComponentStatus.Changed,
+                state: this.localComponents.has(retrievedComponent)
+                    ? types_1.ComponentStatus.Changed
+                    : types_1.ComponentStatus.Created,
             };
             if (!type.children) {
                 for (const filePath of retrievedComponent.walkContent()) {
-                    responses.push(Object.assign({}, baseResponse, { filePath }));
+                    this.fileResponses.push(Object.assign({}, baseResponse, { filePath }));
                 }
             }
             if (xml) {
-                responses.push(Object.assign({}, baseResponse, { filePath: xml }));
+                this.fileResponses.push(Object.assign({}, baseResponse, { filePath: xml }));
             }
         }
-        return responses;
+        return this.fileResponses;
     }
 }
 exports.RetrieveResult = RetrieveResult;
@@ -148,7 +159,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
             }
             components = components !== null && components !== void 0 ? components : new collections_1.ComponentSet(undefined, this.options.registry);
             yield this.maybeSaveTempDirectory('source', components);
-            return new RetrieveResult(result, components);
+            return new RetrieveResult(result, components, this.components);
         });
     }
     getPackageNames() {

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/metadataTransfer.js

@@ -25,6 +25,7 @@ const convert_1 = require("../convert");
 const path_1 = require("path");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const fs = require("graceful-fs");
 class MetadataTransfer {
     constructor({ usernameOrConnection, components, apiVersion, id }) {
         this.canceled = false;
@@ -123,7 +124,7 @@ class MetadataTransfer {
                     });
                     if (target === 'source') {
                         // for source convert the package.xml isn't included so write it separately
-                        core_1.fs.writeFileSync(path_1.join(mdapiTempDir, 'package.xml'), source.getPackageXml());
+                        fs.writeFileSync(path_1.join(mdapiTempDir, 'package.xml'), source.getPackageXml());
                     }
                 }
                 catch (e) {

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

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

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

@@ -1,6 +1,6 @@
 import { MetadataApiDeploy, MetadataApiDeployOptions, MetadataApiRetrieve, MetadataApiRetrieveOptions } from '../client';
-import { SourceComponent, MetadataComponent, ComponentLike } from '../resolve';
-import { FromManifestOptions, PackageManifestObject, FromSourceOptions, DestructiveChangesType } from './types';
+import { ComponentLike, MetadataComponent, SourceComponent } from '../resolve';
+import { DestructiveChangesType, FromManifestOptions, FromSourceOptions, PackageManifestObject } from './types';
 import { LazyCollection } from './lazyCollection';
 import { RegistryAccess } from '../registry';
 export declare type DeploySetOptions = Omit<MetadataApiDeployOptions, 'components'>;
@@ -100,10 +100,10 @@ export declare class ComponentSet extends LazyCollection<MetadataComponent> {
     retrieve(options: RetrieveSetOptions): Promise<MetadataApiRetrieve>;
     /**
      * Get an object representation of a package manifest based on the set components.
-     *
+     * @param destructiveType Optional value for generating objects representing destructive change manifests
      * @returns Object representation of a package manifest
      */
-    getObject(forDestructiveChanges?: boolean): PackageManifestObject;
+    getObject(destructiveType?: DestructiveChangesType): PackageManifestObject;
     /**
      * Create a manifest in xml format based on the set components and the
      * type of manifest to create.
@@ -113,7 +113,7 @@ export declare class ComponentSet extends LazyCollection<MetadataComponent> {
      * @param indentation Number of spaces to indent lines by.
      * @param forDestructiveChanges Whether to build a manifest for destructive changes.
      */
-    getPackageXml(indentation?: number, forDestructiveChanges?: boolean): string;
+    getPackageXml(indentation?: number, destructiveType?: DestructiveChangesType): string;
     /**
      * Get only the source-backed metadata components in the set.
      *
@@ -121,7 +121,7 @@ export declare class ComponentSet extends LazyCollection<MetadataComponent> {
      * @returns Collection of source-backed components
      */
     getSourceComponents(member?: ComponentLike): LazyCollection<SourceComponent>;
-    add(component: ComponentLike, asDeletion?: boolean): void;
+    add(component: ComponentLike, deletionType?: DestructiveChangesType): void;
     /**
      * Tests whether or not a `fullName` and `type` pair is present in the set.
      *
@@ -153,6 +153,12 @@ export declare class ComponentSet extends LazyCollection<MetadataComponent> {
      * @returns The type of destructive changes to make; i.e., pre or post deploy.
      */
     getDestructiveChangesType(): DestructiveChangesType;
+    /**
+     * Will return the types of destructive changes in the component set
+     * or an empty array if there aren't destructive components present
+     * @return DestructiveChangesType[]
+     */
+    getTypesOfDestructiveChanges(): DestructiveChangesType[];
     /**
      * Each {@link SourceComponent} counts as an element in the set, even if multiple
      * ones map to the same `fullName` and `type` pair.
@@ -160,10 +166,8 @@ export declare class ComponentSet extends LazyCollection<MetadataComponent> {
      * @returns number of metadata components in the set
      */
     get size(): number;
-    /**
-     * Returns `true` if this `ComponentSet` contains components marked for deletion.
-     */
-    get hasDeletes(): boolean;
+    get destructiveChangesPre(): Map<string, Map<string, SourceComponent>>;
+    get destructiveChangesPost(): Map<string, Map<string, SourceComponent>>;
     private sourceKey;
     private simpleKey;
 }

package/lib/src/collections/componentSet.js

@@ -40,18 +40,20 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
         super();
         this.components = new Map();
         // internal component maps used by this.getObject() when building manifests.
-        this.destructiveComponents = new Map();
+        this.destructiveComponents = {
+            [types_1.DestructiveChangesType.PRE]: new Map(),
+            [types_1.DestructiveChangesType.POST]: new Map(),
+        };
         this.manifestComponents = new Map();
         this.destructiveChangesType = types_1.DestructiveChangesType.POST;
         this.registry = registry;
         this.apiVersion = this.registry.apiVersion;
         this.logger = core_1.Logger.childFromRoot(this.constructor.name);
         for (const component of components) {
-            let asDeletion = false;
-            if (component instanceof resolve_1.SourceComponent) {
-                asDeletion = component.isMarkedForDelete();
-            }
-            this.add(component, asDeletion);
+            const destructiveType = component instanceof resolve_1.SourceComponent
+                ? component.getDestructiveChangesType()
+                : this.destructiveChangesType;
+            this.add(component, destructiveType);
         }
     }
     static fromSource(input) {
@@ -76,15 +78,15 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
         }
         const resolver = new resolve_1.MetadataResolver(registry, tree);
         const set = new ComponentSet([], registry);
-        const buildComponents = (paths, asDeletes) => {
+        const buildComponents = (paths, destructiveType) => {
             for (const path of paths) {
                 for (const component of resolver.getComponentsFromPath(path, inclusiveFilter)) {
-                    set.add(component, asDeletes);
+                    set.add(component, destructiveType);
                 }
             }
         };
-        buildComponents(fsPaths, false);
-        buildComponents(fsDeletePaths, true);
+        buildComponents(fsPaths);
+        buildComponents(fsDeletePaths, types_1.DestructiveChangesType.POST);
         set.forceIgnoredPaths = resolver.forceIgnoredPaths;
         return set;
     }
@@ -100,14 +102,29 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
             const result = new ComponentSet([], options.registry);
             result.apiVersion = manifest.apiVersion;
             result.fullName = manifest.fullName;
-            for (const component of manifest.components) {
+            const addComponent = (component, deletionType) => {
                 if (resolveIncludeSet) {
-                    resolveIncludeSet.add(component);
+                    resolveIncludeSet.add(component, deletionType);
                 }
                 const memberIsWildcard = component.fullName === ComponentSet.WILDCARD;
                 if (!memberIsWildcard || options.forceAddWildcards || !options.resolveSourcePaths) {
-                    result.add(component);
+                    result.add(component, deletionType);
+                }
+            };
+            const resolveDestructiveChanges = (path, destructiveChangeType) => __awaiter(this, void 0, void 0, function* () {
+                const manifest = yield manifestResolver.resolve(path);
+                for (const comp of manifest.components) {
+                    addComponent(new resolve_1.SourceComponent({ type: comp.type, name: comp.fullName }), destructiveChangeType);
                 }
+            });
+            if (options.destructivePre) {
+                yield resolveDestructiveChanges(options.destructivePre, types_1.DestructiveChangesType.PRE);
+            }
+            if (options.destructivePost) {
+                yield resolveDestructiveChanges(options.destructivePost, types_1.DestructiveChangesType.POST);
+            }
+            for (const component of manifest.components) {
+                addComponent(component);
             }
             if (options.resolveSourcePaths) {
                 const components = ComponentSet.fromSource({
@@ -169,33 +186,52 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
     }
     /**
      * Get an object representation of a package manifest based on the set components.
-     *
+     * @param destructiveType Optional value for generating objects representing destructive change manifests
      * @returns Object representation of a package manifest
      */
-    getObject(forDestructiveChanges = false) {
+    getObject(destructiveType) {
         // If this ComponentSet has components marked for delete, we need to
         // only include those components in a destructiveChanges.xml and
         // all other components in the regular manifest.
         let components = this.components;
-        if (this.hasDeletes) {
-            if (forDestructiveChanges) {
-                components = this.destructiveComponents;
-            }
-            else {
-                components = this.manifestComponents;
-            }
+        if (this.getTypesOfDestructiveChanges().length) {
+            components = destructiveType
+                ? this.destructiveComponents[destructiveType]
+                : this.manifestComponents;
         }
         const typeMap = new Map();
+        const addToTypeMap = (type, fullName) => {
+            if (type.isAddressable !== false) {
+                const typeName = type.name;
+                if (!typeMap.has(typeName)) {
+                    typeMap.set(typeName, []);
+                }
+                const typeEntry = typeMap.get(typeName);
+                if (fullName === ComponentSet.WILDCARD && !type.supportsWildcardAndName && !destructiveType) {
+                    // if the type doesn't support mixed wildcards and specific names, overwrite the names to be a wildcard
+                    typeMap.set(typeName, [fullName]);
+                }
+                else if (!typeEntry.includes(fullName) &&
+                    (!typeEntry.includes(ComponentSet.WILDCARD) || type.supportsWildcardAndName)) {
+                    // if the type supports both wildcards and names, add them regardless
+                    typeMap.get(typeName).push(fullName);
+                }
+            }
+        };
         for (const key of components.keys()) {
             const [typeId, fullName] = key.split(ComponentSet.KEY_DELIMITER);
             let type = this.registry.getTypeByName(typeId);
             if (type.folderContentType) {
                 type = this.registry.getTypeByName(type.folderContentType);
             }
-            if (!typeMap.has(type.name)) {
-                typeMap.set(type.name, []);
+            addToTypeMap(type, fullName);
+            // Add children
+            const componentMap = components.get(key);
+            for (const comp of componentMap.values()) {
+                for (const child of comp.getChildren()) {
+                    addToTypeMap(child.type, child.fullName);
+                }
             }
-            typeMap.get(type.name).push(fullName);
         }
         const typeMembers = [];
         for (const [typeName, members] of typeMap.entries()) {
@@ -218,13 +254,13 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
      * @param indentation Number of spaces to indent lines by.
      * @param forDestructiveChanges Whether to build a manifest for destructive changes.
      */
-    getPackageXml(indentation = 4, forDestructiveChanges = false) {
+    getPackageXml(indentation = 4, destructiveType) {
         const j2x = new fast_xml_parser_1.j2xParser({
             format: true,
             indentBy: new Array(indentation + 1).join(' '),
             ignoreAttributes: false,
         });
-        const toParse = this.getObject(forDestructiveChanges);
+        const toParse = this.getObject(destructiveType);
         toParse.Package[common_1.XML_NS_KEY] = common_1.XML_NS_URL;
         return common_1.XML_DECL.concat(j2x.parse(toParse));
     }
@@ -246,29 +282,42 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
         }
         return new lazyCollection_1.LazyCollection(iter).filter((c) => c instanceof resolve_1.SourceComponent);
     }
-    add(component, asDeletion) {
+    add(component, deletionType) {
         const key = this.simpleKey(component);
         if (!this.components.has(key)) {
             this.components.set(key, new Map());
         }
-        if (component instanceof resolve_1.SourceComponent) {
-            this.components.get(key).set(this.sourceKey(component), component);
-            // Build maps of destructive components and regular components as they are added
-            // as an optimization when building manifests.
-            if (asDeletion) {
-                component.setMarkedForDelete(true);
-                this.logger.debug(`Marking component for delete: ${component.fullName}`);
-                if (!this.destructiveComponents.has(key)) {
-                    this.destructiveComponents.set(key, new Map());
-                }
-                this.destructiveComponents.get(key).set(this.sourceKey(component), component);
+        if (!(component instanceof resolve_1.SourceComponent)) {
+            return;
+        }
+        // we're working with SourceComponents now
+        this.components.get(key).set(this.sourceKey(component), component);
+        // Build maps of destructive components and regular components as they are added
+        // as an optimization when building manifests.
+        if (deletionType) {
+            component.setMarkedForDelete(deletionType);
+            this.logger.debug(`Marking component for delete: ${component.fullName}`);
+            const deletions = this.destructiveComponents[deletionType];
+            if (!deletions.has(key)) {
+                deletions.set(key, new Map());
             }
-            else {
-                if (!this.manifestComponents.has(key)) {
-                    this.manifestComponents.set(key, new Map());
-                }
-                this.manifestComponents.get(key).set(this.sourceKey(component), component);
+            deletions.get(key).set(this.sourceKey(component), component);
+        }
+        else {
+            if (!this.manifestComponents.has(key)) {
+                this.manifestComponents.set(key, new Map());
             }
+            this.manifestComponents.get(key).set(this.sourceKey(component), component);
+        }
+        // something could try adding a component meant for deletion improperly, which would be marked as an addition
+        // specifically the ComponentSet.fromManifest with the `resolveSourcePaths` options which calls
+        // ComponentSet.fromSource, and adds everything as an addition
+        if (this.manifestComponents.has(key) &&
+            (this.destructiveChangesPre.has(key) || this.destructiveChangesPost.has(key))) {
+            // if a component is in the manifestComponents, as well as being part of a destructive manifest, keep in the destructive manifest
+            component.setMarkedForDelete(deletionType);
+            this.manifestComponents.delete(key);
+            this.logger.debug(`Component: ${key} was found in both destructive and constructive manifests - keeping as a destructive change`);
         }
     }
     /**
@@ -352,6 +401,21 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
     getDestructiveChangesType() {
         return this.destructiveChangesType;
     }
+    /**
+     * Will return the types of destructive changes in the component set
+     * or an empty array if there aren't destructive components present
+     * @return DestructiveChangesType[]
+     */
+    getTypesOfDestructiveChanges() {
+        const destructiveChangesTypes = [];
+        if (this.destructiveChangesPre.size) {
+            destructiveChangesTypes.push(types_1.DestructiveChangesType.PRE);
+        }
+        if (this.destructiveChangesPost.size) {
+            destructiveChangesTypes.push(types_1.DestructiveChangesType.POST);
+        }
+        return destructiveChangesTypes;
+    }
     /**
      * Each {@link SourceComponent} counts as an element in the set, even if multiple
      * ones map to the same `fullName` and `type` pair.
@@ -366,11 +430,11 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
         }
         return size;
     }
-    /**
-     * Returns `true` if this `ComponentSet` contains components marked for deletion.
-     */
-    get hasDeletes() {
-        return this.destructiveComponents.size > 0;
+    get destructiveChangesPre() {
+        return this.destructiveComponents[types_1.DestructiveChangesType.PRE];
+    }
+    get destructiveChangesPost() {
+        return this.destructiveComponents[types_1.DestructiveChangesType.POST];
     }
     sourceKey(component) {
         const { fullName, type, xml, content } = component;

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

@@ -51,4 +51,12 @@ export interface FromManifestOptions extends OptionalTreeRegistryOptions {
      * conditions.
      */
     forceAddWildcards?: boolean;
+    /**
+     * path to a `destructiveChangesPre.xml` file in XML format
+     */
+    destructivePre?: string;
+    /**
+     * path to a `destructiveChangesPost.xml` file in XML format
+     */
+    destructivePost?: string;
 }

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

@@ -26,6 +26,7 @@ export interface RecompositionState {
  */
 declare class RecompositionFinalizer extends ConvertTransactionFinalizer<RecompositionState> {
     protected _state: RecompositionState;
+    private parsedXmlCache;
     finalize(): Promise<WriterFormat[]>;
     private recompose;
 }

package/lib/src/convert/convertContext.js

@@ -45,6 +45,9 @@ class RecompositionFinalizer extends ConvertTransactionFinalizer {
     constructor() {
         super(...arguments);
         this._state = {};
+        // A cache of SourceComponent xml file paths to parsed contents so that identical child xml
+        // files are not read and parsed multiple times.
+        this.parsedXmlCache = new Map();
     }
     finalize() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -66,23 +69,47 @@ class RecompositionFinalizer extends ConvertTransactionFinalizer {
     }
     recompose(children, parent) {
         return __awaiter(this, void 0, void 0, function* () {
+            // When recomposing children that are non-decomposed, read and cache the parent XML to prevent
+            // reading the parent source file (referenced in all child SourceComponents) multiple times.
+            let parentXml;
+            if (parent.type.strategies.transformer === "nonDecomposed" /* NonDecomposed */) {
+                parentXml = yield parent.parseXml();
+                this.parsedXmlCache.set(parent.xml, parentXml);
+            }
             const parentXmlObj = parent.type.strategies.recomposition === "startEmpty" /* StartEmpty */
                 ? {}
-                : yield parent.parseXml();
+                : parentXml !== null && parentXml !== void 0 ? parentXml : (yield parent.parseXml());
             for (const child of children) {
                 const { directoryName: groupName } = child.type;
                 const { name: parentName } = child.parent.type;
-                const xmlObj = yield child.parseXml();
+                const childSourceComponent = child;
+                let xmlObj;
+                if (parentXml) {
+                    // If the xml file for the child is in the cache, use it. Otherwise
+                    // read and cache the xml file that contains this child and use it.
+                    if (!this.parsedXmlCache.has(childSourceComponent.xml)) {
+                        this.parsedXmlCache.set(childSourceComponent.xml, yield parent.parseXml(childSourceComponent.xml));
+                    }
+                    xmlObj = childSourceComponent.parseFromParentXml(this.parsedXmlCache.get(childSourceComponent.xml));
+                }
+                else {
+                    xmlObj = yield childSourceComponent.parseXml();
+                }
                 const childContents = xmlObj[child.type.name] || xmlObj;
                 if (!parentXmlObj[parentName]) {
                     parentXmlObj[parentName] = { [common_1.XML_NS_KEY]: common_1.XML_NS_URL };
                 }
-                const parent = parentXmlObj[parentName];
-                if (!parent[groupName]) {
-                    parent[groupName] = [];
+                // type safe way of checking childContents for the key
+                if (ts_types_1.getString(childContents, common_1.XML_NS_KEY)) {
+                    // child don't need to be written with `xmlns="http://soap.sforce.com/2006/04/metadata"` attribute
+                    delete childContents[common_1.XML_NS_KEY];
+                }
+                const parentObj = parentXmlObj[parentName];
+                if (!parentObj[groupName]) {
+                    parentObj[groupName] = [];
                 }
                 // it might be an object and not an array.  Example: custom object with a Field property containing a single field
-                const group = collections_2.normalizeToArray(parent[groupName]);
+                const group = collections_2.normalizeToArray(parentObj[groupName]);
                 group.push(childContents);
             }
             return parentXmlObj;