npm - @salesforce/source-deploy-retrieve - Versions diffs - 5.1.0 → 5.2.0 - Mend

@salesforce/source-deploy-retrieve 5.1.0 → 5.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/CHANGELOG.md +18 -2
package/lib/src/client/metadataApiDeploy.d.ts +12 -0
package/lib/src/client/metadataApiDeploy.js +35 -1
package/lib/src/client/metadataApiDeploy.js.map +1 -1
package/lib/src/collections/componentSet.d.ts +8 -0
package/lib/src/collections/componentSet.js +20 -0
package/lib/src/collections/componentSet.js.map +1 -1
package/lib/src/registry/metadataRegistry.json +42 -9
package/lib/src/registry/registry.d.ts +39 -6
package/lib/src/resolve/adapters/decomposedSourceAdapter.js +19 -16
package/lib/src/resolve/adapters/decomposedSourceAdapter.js.map +1 -1
package/lib/src/resolve/metadataResolver.d.ts +1 -0
package/lib/src/resolve/metadataResolver.js +27 -13
package/lib/src/resolve/metadataResolver.js.map +1 -1
package/package.json +1 -1

package/CHANGELOG.md CHANGED Viewed

@@ -2,12 +2,28 @@
 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.1.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.3...v5.1.0) (2021-10-28)
+## [5.2.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.3...v5.2.0) (2021-11-02)
+### Features
+* modify fileResponse for not found in org on Deletes ([#472](https://github.com/forcedotcom/source-deploy-retrieve/issues/472)) ([9d258fc](https://github.com/forcedotcom/source-deploy-retrieve/commit/9d258fc3f46989de2a89d429ca4994d5ed756eab))
+### [5.1.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.2...v5.1.3) (2021-11-02)
+### [5.1.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.1...v5.1.2) (2021-10-29)
+### [5.1.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.1.0...v5.1.1) (2021-10-28)
+### Bug Fixes
+- ensure component.content is always assigned ([#485](https://github.com/forcedotcom/source-deploy-retrieve/issues/485)) ([d77f475](https://github.com/forcedotcom/source-deploy-retrieve/commit/d77f47502634206ac59181362b7f17da82ed01e7))
+## [5.1.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.3...v5.1.0) (2021-10-28)
 ### Features
-* construct virtual tree from array of paths ([#480](https://github.com/forcedotcom/source-deploy-retrieve/issues/480)) ([99954dc](https://github.com/forcedotcom/source-deploy-retrieve/commit/99954dc731d078e99283eed940b98ee63688a024))
+- construct virtual tree from array of paths ([#480](https://github.com/forcedotcom/source-deploy-retrieve/issues/480)) ([99954dc](https://github.com/forcedotcom/source-deploy-retrieve/commit/99954dc731d078e99283eed940b98ee63688a024))
 ### [5.0.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/v5.0.2...v5.0.3) (2021-10-28)

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

@@ -13,6 +13,18 @@ export declare class DeployResult implements MetadataTransferResult {
      * Groups messages from the deploy result by component fullName and type
      */
     private getDeployMessages;
+    /**
+     * If a components fails to delete because it doesn't exist in the org, you get a message like
+     * key: 'ApexClass#destructiveChanges.xml'
+     * value:[{
+     * fullName: 'destructiveChanges.xml',
+     * fileName: 'destructiveChanges.xml',
+     * componentType: 'ApexClass',
+     * problem: 'No ApexClass named: test1 found',
+     * problemType: 'Warning'
+     * }]
+     */
+    private deleteNotFoundToFileResponses;
     /**
      * Fix any issues with the deploy message returned by the api.
      * TODO: remove cases if fixes are made in the api.

package/lib/src/client/metadataApiDeploy.js CHANGED Viewed

@@ -41,7 +41,7 @@ class DeployResult {
                 fileResponses.push(...this.createResponses(deployedComponent, componentMessages));
             }
         }
-        return fileResponses;
+        return fileResponses.concat(this.deleteNotFoundToFileResponses(messages));
     }
     createResponses(component, messages) {
         const { fullName, type, xml, content } = component;
@@ -125,6 +125,40 @@ class DeployResult {
         }
         return messageMap;
     }
+    /**
+     * If a components fails to delete because it doesn't exist in the org, you get a message like
+     * key: 'ApexClass#destructiveChanges.xml'
+     * value:[{
+     * fullName: 'destructiveChanges.xml',
+     * fileName: 'destructiveChanges.xml',
+     * componentType: 'ApexClass',
+     * problem: 'No ApexClass named: test1 found',
+     * problemType: 'Warning'
+     * }]
+     */
+    deleteNotFoundToFileResponses(messageMap) {
+        const fileResponses = [];
+        messageMap.forEach((messages, key) => {
+            if (key.includes('destructiveChanges') && key.endsWith('.xml')) {
+                messages.forEach((message) => {
+                    if (message.problemType === 'Warning' && message.problem.startsWith(`No ${message.componentType} named: `)) {
+                        const fullName = message.problem.replace(`No ${message.componentType} named: `, '').replace(' found', '');
+                        this.components
+                            .getComponentFilenamesByNameAndType({ fullName, type: message.componentType })
+                            .forEach((fileName) => {
+                            fileResponses.push({
+                                fullName,
+                                type: message.componentType,
+                                filePath: fileName,
+                                state: types_1.ComponentStatus.Deleted,
+                            });
+                        });
+                    }
+                });
+            }
+        });
+        return fileResponses;
+    }
     /**
      * Fix any issues with the deploy message returned by the api.
      * TODO: remove cases if fixes are made in the api.

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

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAwD;AACxD,mDAAgD;AAChD,wCAA+C;AAE/C,oCAA4C;AAC5C,gDAA8C;AAC9C,0CAAuC;AACvC,sCAA8C;AAC9C,yDAA+E;AAC/E,mCAQiB;AACjB,qDAAkD;AAElD,MAAa,YAAY;IAKvB,YAAmB,QAAiC,EAAE,UAAwB;QAF7D,mBAAc,GAAG,IAAI,+BAAc,CAAC,UAAU,CAAC,CAAC;QAG/D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAEM,gBAAgB;QACrB,wDAAwD;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,aAAa,GAAmB,EAAE,CAAC;QAEzC,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,EAAE;YACrE,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnC,KAAK,MAAM,KAAK,IAAI,iBAAiB,CAAC,WAAW,EAAE,EAAE;oBACnD,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;oBACpD,IAAI,aAAa,EAAE;wBACjB,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;qBACnE;iBACF;aACF;YACD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACpE,IAAI,iBAAiB,EAAE;gBACrB,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;aACnF;SACF;QAED,OAAO,aAAa,CAAC;~~IACvB~~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~~AAjJD~~,~~oCAiJC~~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"}
1	+ {"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}

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

@@ -1,6 +1,7 @@
 import { MetadataApiDeploy, MetadataApiDeployOptions, MetadataApiRetrieve, MetadataApiRetrieveOptions } from '../client';
 import { ComponentLike, MetadataComponent, 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'>;
@@ -137,6 +138,13 @@ export declare class ComponentSet extends LazyCollection<MetadataComponent> {
      * @returns `true` if the component is in the set
      */
     has(component: ComponentLike): boolean;
+    /**
+     * For a fullName and type, this returns the filenames the matching component, or an empty array if the component is not present
+     *
+     * @param param Object with fullName and type properties
+     * @returns string[]
+     */
+    getComponentFilenamesByNameAndType({ fullName, type }: MetadataMember): string[];
     [Symbol.iterator](): Iterator<MetadataComponent>;
     /**
      * If this `ComponentSet` has components marked for delete, this sets

package/lib/src/collections/componentSet.js CHANGED Viewed

@@ -346,6 +346,26 @@ class ComponentSet extends lazyCollection_1.LazyCollection {
         }
         return false;
     }
+    /**
+     * For a fullName and type, this returns the filenames the matching component, or an empty array if the component is not present
+     *
+     * @param param Object with fullName and type properties
+     * @returns string[]
+     */
+    getComponentFilenamesByNameAndType({ fullName, type }) {
+        const key = this.simpleKey({ fullName, type });
+        const componentMap = this.components.get(key);
+        if (!componentMap) {
+            return [];
+        }
+        const output = new Set();
+        componentMap.forEach((component) => {
+            [...component.walkContent(), component.content, component.xml]
+                .filter(Boolean)
+                .map((filename) => output.add(filename));
+        });
+        return Array.from(output);
+    }
     *[Symbol.iterator]() {
         for (const [key, sourceComponents] of this.components.entries()) {
             if (sourceComponents.size === 0) {

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

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

package/lib/src/registry/metadataRegistry.json CHANGED Viewed

@@ -61,10 +61,10 @@
                     }
                 },
                 "suffixes": {
-                    "customLabel": "labels"
+                    "labels": "customlabel"
                 },
                 "directories": {
-                    "customLabels": "labels"
+                    "labels": "customlabel"
                 }
             },
             "strategies": {
@@ -516,6 +516,9 @@
                 },
                 "suffixes": {
                     "formSection": "formsection"
+                },
+                "directories": {
+                    "formSections": "formsection"
                 }
             }
         },
@@ -676,7 +679,7 @@
                     "workflowsend": {
                         "id": "workflowsend",
                         "name": "WorkflowSend",
-                        "xmlElementName": "sends",
+                        "xmlElementName": "send",
                         "uniqueIdElement": "fullName",
                         "directoryName": "workflowSends",
                         "suffix": "workflowSend"
@@ -709,6 +712,7 @@
                 },
                 "directories": {
                     "workflowFieldUpdates": "workflowfieldupdate",
+                    "workflowKnowledgePublishs": "workflowknowledgepublish",
                     "workflowTasks": "workflowtask",
                     "workflowAlerts": "workflowalert",
                     "workflowSends": "workflowsend",
@@ -1072,6 +1076,7 @@
             "name": "WaveTemplateBundle",
             "directoryName": "waveTemplates",
             "inFolder": false,
+            "strictDirectoryName": true,
             "strategies": {
                 "adapter": "bundle"
             }
@@ -1242,7 +1247,9 @@
                 },
                 "directories": {
                     "sharingOwnerRules": "sharingownerrule",
-                    "sharingCriteriaRules": "sharingcriteriarule"
+                    "sharingCriteriaRules": "sharingcriteriarule",
+                    "sharingGuestRules": "sharingguestrule",
+                    "sharingTerritoryRules": "sharingterritoryrule"
                 }
             }
         },
@@ -2086,6 +2093,9 @@
                 },
                 "suffixes": {
                     "workSkillRoutingAttribute": "workskillroutingattribute"
+                },
+                "directories": {
+                    "workSkillRoutingAttributes": "workskillroutingattribute"
                 }
             }
         },
@@ -2605,14 +2615,36 @@
             "strategies": {
                 "adapter": "matchingContentFile"
             }
+        },
+        "svccatalogcategory": {
+            "id": "svccatalogcategory",
+            "name": "SvcCatalogCategory",
+            "suffix": "category",
+            "directoryName": "svcCatalogCategories",
+            "inFolder": false,
+            "strictDirectoryName": false
+        },
+        "svccatalogfulfillmentflow": {
+            "id": "svccatalogfulfillmentflow",
+            "name": "SvcCatalogFulfillmentFlow",
+            "suffix": "fulfillmentFlow",
+            "directoryName": "svcCatalogFulfillmentFlows",
+            "inFolder": false,
+            "strictDirectoryName": false
+        },
+        "svccatalogitemdef": {
+            "id": "svccatalogitemdef",
+            "name": "SvcCatalogItemDef",
+            "suffix": "catalogItem",
+            "directoryName": "svcCatalogItems",
+            "inFolder": false,
+            "strictDirectoryName": false
         }
     },
     "suffixes": {
         "ai": "aiapplication",
         "aiapplicationconfig": "aiapplicationconfig",
-        "mlprediction": "mlPrediction",
         "mlDataDefinition": "mldatadefinition",
-        "sites": "customsite",
         "icon": "icon",
         "businessProcessGroup": "businessprocessgroup",
         "model": "discoveryaimodel",
@@ -2630,7 +2662,6 @@
         "decisionTableDatasetLink": "decisiontabledatasetlink",
         "briefcaseDefinition": "briefcasedefinition",
         "batchProcessJobDefinition": "batchprocessjobdefinition",
-        "webstoretemplate": "webstoretemplate",
         "acctMgrTargetSetting": "acctmgrtargetsettings",
         "dataSourceObject": "datasourceobject",
         "externalDataConnector": "externaldataconnector",
@@ -2642,7 +2673,6 @@
         "installedPackage": "installedpackage",
         "labels": "customlabels",
         "navigationMenu": "navigationmenu",
-        "resource": "staticresource",
         "scf": "scontrol",
         "crt": "certificate",
         "messageChannel": "lightningmessagechannel",
@@ -2897,7 +2927,10 @@
         "callCenterRoutingMap": "callcenterroutingmap",
         "view": "viewdefinition",
         "slackapp": "slackapp",
-        "permissionSetLicenseDefinition": "permissionsetlicensedefinition"
+        "permissionSetLicenseDefinition": "permissionsetlicensedefinition",
+        "category": "svccatalogcategory",
+        "fulfillmentFlow": "svccatalogfulfillmentflow",
+        "catalogItem": "svccatalogitemdef"
     },
     "strictDirectoryNames": {
         "experiences": "experiencebundle",

package/lib/src/registry/registry.d.ts CHANGED Viewed

@@ -64,10 +64,10 @@ export declare const registry: Readonly<{
                     };
                 };
                 suffixes: {
-                    customLabel: string;
+                    labels: string;
                 };
                 directories: {
-                    customLabels: string;
+                    labels: string;
                 };
             };
             strategies: {
@@ -520,6 +520,9 @@ export declare const registry: Readonly<{
                 suffixes: {
                     formSection: string;
                 };
+                directories: {
+                    formSections: string;
+                };
             };
         };
         flexipage: {
@@ -712,6 +715,7 @@ export declare const registry: Readonly<{
                 };
                 directories: {
                     workflowFieldUpdates: string;
+                    workflowKnowledgePublishs: string;
                     workflowTasks: string;
                     workflowAlerts: string;
                     workflowSends: string;
@@ -1075,6 +1079,7 @@ export declare const registry: Readonly<{
             name: string;
             directoryName: string;
             inFolder: boolean;
+            strictDirectoryName: boolean;
             strategies: {
                 adapter: string;
             };
@@ -1246,6 +1251,8 @@ export declare const registry: Readonly<{
                 directories: {
                     sharingOwnerRules: string;
                     sharingCriteriaRules: string;
+                    sharingGuestRules: string;
+                    sharingTerritoryRules: string;
                 };
             };
         };
@@ -2090,6 +2097,9 @@ export declare const registry: Readonly<{
                 suffixes: {
                     workSkillRoutingAttribute: string;
                 };
+                directories: {
+                    workSkillRoutingAttributes: string;
+                };
             };
         };
         timesheettemplate: {
@@ -2609,13 +2619,35 @@ export declare const registry: Readonly<{
                 adapter: string;
             };
         };
+        svccatalogcategory: {
+            id: string;
+            name: string;
+            suffix: string;
+            directoryName: string;
+            inFolder: boolean;
+            strictDirectoryName: boolean;
+        };
+        svccatalogfulfillmentflow: {
+            id: string;
+            name: string;
+            suffix: string;
+            directoryName: string;
+            inFolder: boolean;
+            strictDirectoryName: boolean;
+        };
+        svccatalogitemdef: {
+            id: string;
+            name: string;
+            suffix: string;
+            directoryName: string;
+            inFolder: boolean;
+            strictDirectoryName: boolean;
+        };
     };
     suffixes: {
         ai: string;
         aiapplicationconfig: string;
-        mlprediction: string;
         mlDataDefinition: string;
-        sites: string;
         icon: string;
         businessProcessGroup: string;
         model: string;
@@ -2633,7 +2665,6 @@ export declare const registry: Readonly<{
         decisionTableDatasetLink: string;
         briefcaseDefinition: string;
         batchProcessJobDefinition: string;
-        webstoretemplate: string;
         acctMgrTargetSetting: string;
         dataSourceObject: string;
         externalDataConnector: string;
@@ -2645,7 +2676,6 @@ export declare const registry: Readonly<{
         installedPackage: string;
         labels: string;
         navigationMenu: string;
-        resource: string;
         scf: string;
         crt: string;
         messageChannel: string;
@@ -2901,6 +2931,9 @@ export declare const registry: Readonly<{
         view: string;
         slackapp: string;
         permissionSetLicenseDefinition: string;
+        category: string;
+        fulfillmentFlow: string;
+        catalogItem: string;
     };
     strictDirectoryNames: {
         experiences: string;

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

@@ -70,31 +70,34 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
         if (metaXml) {
             const pathToContent = this.trimPathToContent(trigger);
             const childTypeId = this.type.children.suffixes[metaXml.suffix];
-            // If the child is explicitly not addressable, return the parent SourceComponent.
-            const triggerIsAChild = !!childTypeId && this.type.children.types[childTypeId].isAddressable !== false;
+            const triggerIsAChild = !!childTypeId;
             const strategy = this.type.strategies.decomposition;
-            if (triggerIsAChild && (strategy === "folderPerType" /* FolderPerType */ || isResolvingSource)) {
-                let parent = component;
-                if (!parent) {
-                    parent = new sourceComponent_1.SourceComponent({
-                        name: (0, utils_1.baseName)(pathToContent),
-                        type: this.type,
+            if (triggerIsAChild) {
+                if (strategy === "folderPerType" /* FolderPerType */ || isResolvingSource) {
+                    let parent = component;
+                    if (!parent) {
+                        parent = new sourceComponent_1.SourceComponent({
+                            name: (0, utils_1.baseName)(pathToContent),
+                            type: this.type,
+                        }, this.tree, this.forceIgnore);
+                    }
+                    parent.content = pathToContent;
+                    return new sourceComponent_1.SourceComponent({
+                        name: metaXml.fullName,
+                        type: this.type.children.types[childTypeId],
+                        xml: trigger,
+                        parent,
                     }, this.tree, this.forceIgnore);
                 }
-                parent.content = pathToContent;
-                return new sourceComponent_1.SourceComponent({
-                    name: metaXml.fullName,
-                    type: this.type.children.types[childTypeId],
-                    xml: trigger,
-                    parent,
-                }, this.tree, this.forceIgnore);
             }
-            if (!triggerIsAChild) {
+            else {
                 if (!component) {
                     // This is most likely metadata found within a CustomObject folder that is not a
                     // child type of CustomObject. E.g., Layout, SharingRules, ApexClass.
                     throw new errors_1.TypeInferenceError('error_unexpected_child_type', [trigger, this.type.name]);
                 }
+            }
+            if (component) {
                 component.content = pathToContent;
             }
         }

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

	@@ -1 +1 @@
1	- {"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":";;;AAOA,wDAAqD;AACrD,uCAAqE;AAErE,yCAAkD;AAClD,2EAAwE;AAExE;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,MAAa,uBAAwB,SAAQ,qDAAyB;IAAtE;;QACY,cAAS,GAAG,IAAI,CAAC;QACjB,wBAAmB,GAAG,KAAK,CAAC;~~IA+ExC~~,CAAC;~~IA7EQ~~,YAAY,CAAC,IAAgB,EAAE,iBAAiB,GAAG,IAAI;QAC5D,IAAI,YAAY,GAAG,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,gBAAgB,EAAE;gBACpB,YAAY,GAAG,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,CAAC;aACnD;SACF;~~QAED~~,IAAI,SAA0B,CAAC;QAC/B,IAAI,YAAY,EAAE;YAChB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU;gBACxC,CAAC,CAAC,GAAG,IAAA,kBAAU,EAAC,YAAY,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE;gBAC7D,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC;YAC1B,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,YAAY,CAAC,IAAI;aACvB,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAED;;;;OAIG;IACO,QAAQ,CAAC,OAAmB,EAAE,SAA2B,EAAE,iBAA2B;QAC9F,MAAM,OAAO,GAAG,IAAA,wBAAgB,EAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,EAAE;YACX,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;~~YAEhE~~,~~iFAAiF;YACjF,~~MAAM,eAAe,GAAG,CAAC,CAAC,WAAW,~~IAAI,IAAI,~~CAAC~~,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,aAAa,KAAK,KAAK,CAAC~~;~~YACvG~~,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;~~YACpD~~,IAAI,eAAe,IAAI,~~CAAC,~~QAAQ,wCAAwC,IAAI,iBAAiB,~~CAAC,~~EAAE;~~gBAC9F~~,IAAI,MAAM,GAAG,SAAS,CAAC;~~gBACvB~~,IAAI,CAAC,MAAM,EAAE;~~oBACX~~,MAAM,GAAG,IAAI,iCAAe,CAC1B;~~wBACE~~,IAAI,EAAE,IAAA,gBAAQ,EAAC,aAAa,CAAC;~~wBAC7B~~,IAAI,EAAE,IAAI,CAAC,IAAI;~~qBAChB~~,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;~~iBACH~~;~~gBACD~~,MAAM,CAAC,OAAO,GAAG,aAAa,CAAC;~~gBAC~~/B,OAAO,IAAI,iCAAe,CACxB;~~oBACE~~,IAAI,EAAE,OAAO,CAAC,QAAQ;~~oBACtB~~,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC;~~oBAC3C~~,GAAG,EAAE,OAAO;~~oBACZ~~,MAAM;~~iBACP~~,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;~~aACH~~;~~YACD,IAAI,CAAC,eAAe,EAAE~~;~~gBACpB~~,IAAI,CAAC,SAAS,EAAE;oBACd,gFAAgF;oBAChF,qEAAqE;oBACrE,MAAM,IAAI,2BAAkB,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;iBACxF;~~gBACD~~,SAAS,CAAC,OAAO,GAAG,aAAa,CAAC;aACnC;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;~~AAjFD~~,~~0DAiFC~~"}
1	+ {"version":3,"file":"decomposedSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/decomposedSourceAdapter.ts"],"names":[],"mappings":"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"}

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

@@ -35,6 +35,7 @@ export declare class MetadataResolver {
      * @param fsPath File path of a potential metadata xml file
      */
     private parseAsRootMetadataXml;
+    private resolveTypeFromStrictFolder;
     private resolveType;
     /**
      * Whether or not a directory that represents a single component should be resolved as one,

package/lib/src/resolve/metadataResolver.js CHANGED Viewed

@@ -129,21 +129,35 @@ class MetadataResolver {
     parseAsRootMetadataXml(fsPath) {
         return !!(0, utils_1.parseMetadataXml)(fsPath);
     }
+    resolveTypeFromStrictFolder(fsPath) {
+        const pathParts = fsPath.split(path_1.sep);
+        // first, filter out types that don't appear in the path
+        // then iterate using for/of to allow for early break
+        return this.registry
+            .getStrictFolderTypes()
+            .filter((type) =>
+        // the type's directory is in the path, AND
+        pathParts.includes(type.directoryName) &&
+            // types with folders only have folder components living at the top level.
+            // if the fsPath is a folder component, let a future strategy deal with it
+            (!type.inFolder || (0, utils_1.parentName)(fsPath) !== type.directoryName))
+            .find((type) => {
+            var _a, _b, _c;
+            // any of the following 3 options is considered a good match
+            // mixedContent and bundles don't have a suffix to match
+            return ['mixedContent', 'bundle'].includes((_a = type.strategies) === null || _a === void 0 ? void 0 : _a.adapter) ||
+                // the suffix matches the type we think it is
+                (type.suffix && fsPath.endsWith(`${type.suffix}`)) ||
+                // the type has children and the path also includes THAT directory
+                (((_b = type.children) === null || _b === void 0 ? void 0 : _b.types) &&
+                    Object.values((_c = type.children) === null || _c === void 0 ? void 0 : _c.types)
+                        .map((childType) => childType.directoryName)
+                        .some((dirName) => pathParts.includes(dirName)));
+        });
+    }
     resolveType(fsPath) {
-        let resolvedType;
         // attempt 1 - check if the file is part of a component that requires a strict type folder
-        const pathParts = new Set(fsPath.split(path_1.sep));
-        for (const type of this.registry.getStrictFolderTypes()) {
-            if (pathParts.has(type.directoryName)) {
-                // types with folders only have folder components living at the top level.
-                // if the fsPath is a folder component, let a future strategy deal with it
-                // const isFolderType = this.getTypeFromName(typeId).inFolder;
-                if (!type.inFolder || (0, utils_1.parentName)(fsPath) !== type.directoryName) {
-                    resolvedType = type;
-                }
-                break;
-            }
-        }
+        let resolvedType = this.resolveTypeFromStrictFolder(fsPath);
         // attempt 2 - check if it's a metadata xml file
         if (!resolvedType) {
             const parsedMetaXml = (0, utils_1.parseMetadataXml)(fsPath);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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~~WAAW~~,CAAC,MAAc;~~QAChC~~,~~IAAI,YAA0B,CAAC;QAE/B,0FAA0F;QAC1F,~~MAAM,SAAS,GAAG,~~IAAI,GAAG,CAAC,~~MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC,~~CAAC~~;~~QAC7C~~,~~KAAK~~,~~MAAM~~,IAAI,~~IAAI,IAAI,~~CAAC,QAAQ,CAAC,~~oBAAoB~~,EAAE,EAAE;~~YACvD~~,~~IAAI~~,SAAS,CAAC,~~GAAG~~,CAAC,IAAI,CAAC,aAAa,CAAC~~,EAAE~~;~~gBACrC~~,0EAA0E;~~gBAC1E~~,0EAA0E;~~gBAC1E~~,~~8DAA8D;gBAC9D~~,~~IAAI,~~CAAC,IAAI,CAAC,QAAQ,IAAI,IAAA,kBAAU,EAAC,MAAM,CAAC,KAAK,IAAI,CAAC,aAAa,EAAE;~~oBAC/D~~,~~YAAY~~,GAAG,IAAI,CAAC;~~iBACrB~~;~~gBACD~~,MAAM;~~aACP~~;~~SACF~~;~~QAED~~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~~AA5PD~~,~~4CA4PC~~"}
1	+ {"version":3,"file":"metadataResolver.js","sourceRoot":"","sources":["../../../src/resolve/metadataResolver.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "5.1.0",
+  "version": "5.2.0",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",