@salesforce/source-deploy-retrieve 6.9.1 → 7.0.1

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

@@ -23,10 +23,12 @@ const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr
     'error_static_resource_missing_resource_file',
 ]);
 class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
+    // allowed to preserve API
+    // eslint-disable-next-line class-methods-use-this
     async toMetadataFormat(component) {
         const { content, type, xml } = component;
         let contentSource;
-        if (await this.componentIsExpandedArchive(component)) {
+        if (await componentIsExpandedArchive(component)) {
             // toolbelt was using level 9 for static resources, so we'll do the same.
             // Otherwise, you'll see errors like https://github.com/forcedotcom/cli/issues/1098
             const zip = (0, archiver_1.create)('zip', { zlib: { level: 9 } });
@@ -53,9 +55,9 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
         if (!content) {
             return [];
         }
-        const componentContentType = await this.getContentType(component);
+        const componentContentType = await getContentType(component);
         const mergeContentPath = mergeWith?.content;
-        const baseContentPath = this.getBaseContentPath(component, mergeWith);
+        const baseContentPath = getBaseContentPath(component, mergeWith);
         // only unzip an archive component if there isn't a merge component, or the merge component is itself expanded
         const shouldUnzipArchive = StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(componentContentType) &&
             (!mergeWith || mergeWith.tree.isDirectory(mergeContentPath));
@@ -83,7 +85,7 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
             : [
                 {
                     source: component.tree.stream(content),
-                    output: `${baseContentPath}.${this.getExtensionFromType(componentContentType)}`,
+                    output: `${baseContentPath}.${getExtensionFromType(componentContentType)}`,
                 },
             ]);
     }
@@ -95,42 +97,11 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
      * @param destination the destination path to be written
      * @private
      */
+    // eslint-disable-next-line class-methods-use-this
     async pipeline(stream, destination) {
         (0, fileSystemHandler_1.ensureFileExists)(destination);
         await (0, streams_1.pipeline)(stream, (0, graceful_fs_1.createWriteStream)(destination));
     }
-    getBaseContentPath(component, mergeWith) {
-        const baseContentPath = mergeWith?.content || component.getPackageRelativePath(component.content, 'source');
-        return (0, path_1.join)((0, path_1.dirname)(baseContentPath), (0, utils_1.baseName)(baseContentPath));
-    }
-    /**
-     * "Expanded" refers to a component whose content file is a zip file, and its current
-     * state is unzipped.
-     */
-    async componentIsExpandedArchive(component) {
-        const { content, tree } = component;
-        if (tree.isDirectory(content)) {
-            const contentType = await this.getContentType(component);
-            if (StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(contentType)) {
-                return true;
-            }
-            throw new core_1.SfError(messages.getMessage('error_static_resource_expected_archive_type', [contentType, component.name]), 'LibraryError');
-        }
-        return false;
-    }
-    async getContentType(component) {
-        const resource = (await component.parseXml()).StaticResource;
-        if (!resource || !Object.prototype.hasOwnProperty.call(resource, 'contentType')) {
-            throw new core_1.SfError(messages.getMessage('error_static_resource_missing_resource_file', [(0, path_1.join)('staticresources', component.name)]), 'LibraryError');
-        }
-        return resource.contentType;
-    }
-    getExtensionFromType(contentType) {
-        // return registered ext, fallback, or the default (application/octet-stream -> bin)
-        return ((0, mime_1.getExtension)(contentType) ||
-            StaticResourceMetadataTransformer.FALLBACK_TYPE_MAP.get(contentType) ||
-            (0, mime_1.getExtension)(StaticResourceMetadataTransformer.DEFAULT_CONTENT_TYPE));
-    }
 }
 exports.StaticResourceMetadataTransformer = StaticResourceMetadataTransformer;
 StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES = new Set([
@@ -138,8 +109,8 @@ StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES = new Set([
     'application/x-zip-compressed',
     'application/jar',
 ]);
-StaticResourceMetadataTransformer.DEFAULT_CONTENT_TYPE = 'application/octet-stream';
-StaticResourceMetadataTransformer.FALLBACK_TYPE_MAP = new Map([
+const DEFAULT_CONTENT_TYPE = 'application/octet-stream';
+const FALLBACK_TYPE_MAP = new Map([
     ['text/javascript', 'js'],
     ['application/x-javascript', 'js'],
     ['application/x-zip-compressed', 'zip'],
@@ -147,4 +118,29 @@ StaticResourceMetadataTransformer.FALLBACK_TYPE_MAP = new Map([
     ['image/x-png', 'png'],
     ['text/xml', 'xml'],
 ]);
+const getContentType = async (component) => {
+    const resource = (await component.parseXml()).StaticResource;
+    if (!resource || !Object.prototype.hasOwnProperty.call(resource, 'contentType')) {
+        throw new core_1.SfError(messages.getMessage('error_static_resource_missing_resource_file', [(0, path_1.join)('staticresources', component.name)]), 'LibraryError');
+    }
+    return resource.contentType;
+};
+const getBaseContentPath = (component, mergeWith) => {
+    const baseContentPath = mergeWith?.content || component.getPackageRelativePath(component.content, 'source');
+    return (0, path_1.join)((0, path_1.dirname)(baseContentPath), (0, utils_1.baseName)(baseContentPath));
+};
+const getExtensionFromType = (contentType) => 
+// return registered ext, fallback, or the default (application/octet-stream -> bin)
+(0, mime_1.getExtension)(contentType) ?? FALLBACK_TYPE_MAP.get(contentType) ?? (0, mime_1.getExtension)(DEFAULT_CONTENT_TYPE);
+const componentIsExpandedArchive = async (component) => {
+    const { content, tree } = component;
+    if (tree.isDirectory(content)) {
+        const contentType = await getContentType(component);
+        if (StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(contentType)) {
+            return true;
+        }
+        throw new core_1.SfError(messages.getMessage('error_static_resource_expected_archive_type', [contentType, component.name]), 'LibraryError');
+    }
+    return false;
+};
 //# sourceMappingURL=staticResourceMetadataTransformer.js.map

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

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

package/lib/src/index.d.ts

@@ -1,4 +1,4 @@
-export { MetadataApiDeploy, MetadataApiDeployOptions, DeployResult, ScopedPreDeploy, ScopedPostDeploy, ScopedPreRetrieve, ScopedPostRetrieve, MetadataApiRetrieve, MetadataApiRetrieveOptions, RetrieveResult, ToolingApi, ToolingDeployOptions, ToolingRetrieveOptions, ComponentDeployment, ComponentRetrieval, ComponentDiagnostic, FileResponse, SourceApiResult, AsyncResult, SourceDeployResult, RequestStatus, MetadataRequestStatus, RetrieveFailure, RetrieveSuccess, SourceRetrieveResult, MetadataApiDeployStatus, DeployDetails, RunTestResult, CodeCoverage, LocationsNotCovered, CodeCoverageWarnings, Failures, Successes, DeployMessage, RetrieveRequest, RetrieveMessage, FileProperties, ComponentStatus, MetadataApiRetrieveStatus, PackageOption, PackageOptions, RetrieveOptions, ContainerAsyncRequest, ToolingDeployStatus, QueryResult, ApexRecord, VFRecord, AuraRecord, LWCRecord, AuraDefinition, LightningComponentResource, } from './client';
+export { MetadataApiDeploy, MetadataApiDeployOptions, DeployResult, ScopedPreDeploy, ScopedPostDeploy, ScopedPreRetrieve, ScopedPostRetrieve, MetadataApiRetrieve, MetadataApiRetrieveOptions, RetrieveResult, ComponentDeployment, ComponentRetrieval, ComponentDiagnostic, FileResponse, AsyncResult, RequestStatus, MetadataRequestStatus, RetrieveFailure, RetrieveSuccess, MetadataApiDeployStatus, DeployDetails, RunTestResult, CodeCoverage, LocationsNotCovered, CodeCoverageWarnings, Failures, Successes, DeployMessage, RetrieveRequest, RetrieveMessage, FileProperties, ComponentStatus, MetadataApiRetrieveStatus, PackageOption, PackageOptions, RetrieveOptions, } from './client';
 export { MetadataConverter, WriteInfo, WriterFormat, DirectoryConfig, ZipConfig, MergeConfig, MetadataTransformer, SfdxFileFormat, ConvertOutputConfig, ConvertResult, } from './convert';
 export { MetadataResolver, ManifestResolver, ConnectionResolver, TreeContainer, NodeFSTreeContainer, VirtualTreeContainer, ZipTreeContainer, SourceComponent, MetadataComponent, MetadataMember, ComponentLike, MetadataXml, VirtualFile, VirtualDirectory, SourceAdapter, ForceIgnore, } from './resolve';
 export { SourcePath, TreeOptions, OptionalTreeRegistryOptions, RegistryOptions } from './common';

package/lib/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentApiVersion = exports.registry = exports.RegistryAccess = exports.DestructiveChangesType = exports.ComponentSetBuilder = exports.ComponentSet = exports.LazyCollection = exports.ForceIgnore = exports.SourceComponent = exports.ZipTreeContainer = exports.VirtualTreeContainer = exports.NodeFSTreeContainer = exports.TreeContainer = exports.ConnectionResolver = exports.ManifestResolver = exports.MetadataResolver = exports.MetadataConverter = exports.ComponentStatus = exports.RequestStatus = exports.ToolingApi = exports.RetrieveResult = exports.MetadataApiRetrieve = exports.DeployResult = exports.MetadataApiDeploy = void 0;
+exports.getCurrentApiVersion = exports.registry = exports.RegistryAccess = exports.DestructiveChangesType = exports.ComponentSetBuilder = exports.ComponentSet = exports.LazyCollection = exports.ForceIgnore = exports.SourceComponent = exports.ZipTreeContainer = exports.VirtualTreeContainer = exports.NodeFSTreeContainer = exports.TreeContainer = exports.ConnectionResolver = exports.ManifestResolver = exports.MetadataResolver = exports.MetadataConverter = exports.ComponentStatus = exports.RequestStatus = exports.RetrieveResult = exports.MetadataApiRetrieve = exports.DeployResult = exports.MetadataApiDeploy = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -12,7 +12,6 @@ Object.defineProperty(exports, "MetadataApiDeploy", { enumerable: true, get: fun
 Object.defineProperty(exports, "DeployResult", { enumerable: true, get: function () { return client_1.DeployResult; } });
 Object.defineProperty(exports, "MetadataApiRetrieve", { enumerable: true, get: function () { return client_1.MetadataApiRetrieve; } });
 Object.defineProperty(exports, "RetrieveResult", { enumerable: true, get: function () { return client_1.RetrieveResult; } });
-Object.defineProperty(exports, "ToolingApi", { enumerable: true, get: function () { return client_1.ToolingApi; } });
 Object.defineProperty(exports, "RequestStatus", { enumerable: true, get: function () { return client_1.RequestStatus; } });
 Object.defineProperty(exports, "ComponentStatus", { enumerable: true, get: function () { return client_1.ComponentStatus; } });
 var convert_1 = require("./convert");

package/lib/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAoDkB;AAnDhB,2GAAA,iBAAiB,OAAA;AAEjB,sGAAA,YAAY,OAAA;AAKZ,6GAAA,mBAAmB,OAAA;AAEnB,wGAAA,cAAc,OAAA;AACd,oGAAA,UAAU,OAAA;AAUV,uGAAA,aAAa,OAAA;AAiBb,yGAAA,eAAe,OAAA;AAejB,qCAWmB;AAVjB,4GAAA,iBAAiB,OAAA;AAWnB,qCAiBmB;AAhBjB,2GAAA,gBAAgB,OAAA;AAChB,2GAAA,gBAAgB,OAAA;AAChB,6GAAA,kBAAkB,OAAA;AAClB,wGAAA,aAAa,OAAA;AACb,8GAAA,mBAAmB,OAAA;AACnB,+GAAA,oBAAoB,OAAA;AACpB,2GAAA,gBAAgB,OAAA;AAChB,0GAAA,eAAe,OAAA;AAQf,sGAAA,WAAW,OAAA;AAGb,6CAYuB;AAXrB,6GAAA,cAAc,OAAA;AACd,2GAAA,YAAY,OAAA;AACZ,kHAAA,mBAAmB,OAAA;AAMnB,qHAAA,sBAAsB,OAAA;AAIxB,uCASoB;AARlB,0GAAA,cAAc,OAAA;AACd,oGAAA,QAAQ,OAAA;AACR,gHAAA,oBAAoB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAqCkB;AApChB,2GAAA,iBAAiB,OAAA;AAEjB,sGAAA,YAAY,OAAA;AAKZ,6GAAA,mBAAmB,OAAA;AAEnB,wGAAA,cAAc,OAAA;AAMd,uGAAA,aAAa,OAAA;AAgBb,yGAAA,eAAe,OAAA;AAMjB,qCAWmB;AAVjB,4GAAA,iBAAiB,OAAA;AAWnB,qCAiBmB;AAhBjB,2GAAA,gBAAgB,OAAA;AAChB,2GAAA,gBAAgB,OAAA;AAChB,6GAAA,kBAAkB,OAAA;AAClB,wGAAA,aAAa,OAAA;AACb,8GAAA,mBAAmB,OAAA;AACnB,+GAAA,oBAAoB,OAAA;AACpB,2GAAA,gBAAgB,OAAA;AAChB,0GAAA,eAAe,OAAA;AAQf,sGAAA,WAAW,OAAA;AAGb,6CAYuB;AAXrB,6GAAA,cAAc,OAAA;AACd,2GAAA,YAAY,OAAA;AACZ,kHAAA,mBAAmB,OAAA;AAMnB,qHAAA,sBAAsB,OAAA;AAIxB,uCASoB;AARlB,0GAAA,cAAc,OAAA;AACd,oGAAA,QAAQ,OAAA;AACR,gHAAA,oBAAoB,OAAA"}

package/lib/src/registry/coverage.js

@@ -25,7 +25,7 @@ exports.getCurrentApiVersion = getCurrentApiVersion;
 const getCoverage = async (apiVersion) => {
     const results = await Promise.allSettled(
     // one of these will match the current version, but they differ during the release cycle
-    [44, 45, 46].map(async (na) => await (0, got_1.default)(getProxiedOptions(`https://na${na}.test1.pc-rnd.salesforce.com/mdcoverage/api.jsp`)).json()));
+    [44, 45, 46].map(async (na) => (0, got_1.default)(getProxiedOptions(`https://na${na}.test1.pc-rnd.salesforce.com/mdcoverage/api.jsp`)).json()));
     for (const result of results) {
         if (result.status === 'fulfilled' && result.value?.apiVersion === apiVersion) {
             return result.value;

package/lib/src/registry/coverage.js.map

@@ -1 +1 @@
-{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../../src/registry/coverage.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,+BAA+B;;;AAG/B,6BAAsB;AACtB,0CAA0C;AAC1C,mDAAgD;AAGhD,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAA6B,EAAE,CAAC,CAAC;IACrE,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IACD,KAAK,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAC;KACvC;IACD,GAAG;CACJ,CAAC,CAAC;AAEI,MAAM,oBAAoB,GAAG,KAAK,IAAqB,EAAE,CAC9D,CACE,MAAM,IAAA,aAAG,EAAC,iBAAiB,CAAC,8DAA8D,CAAC,CAAC,CAAC,IAAI,EAE7F,CACL,CAAC,QAAQ,CAAC,QAAQ,CAAC;AALT,QAAA,oBAAoB,wBAKX;AAEf,MAAM,WAAW,GAAG,KAAK,EAAE,UAAkB,EAA2B,EAAE;IAC/E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU;IACtC,wFAAwF;IACxF,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CACd,KAAK,EAAE,EAAE,EAAE,EAAE,CACX,MAAM,IAAA,aAAG,EACP,iBAAiB,CAAC,aAAa,EAAE,iDAAiD,CAAC,CACpF,CAAC,IAAI,EAAkB,CAC3B,CACF,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE,UAAU,KAAK,UAAU,EAAE;YAC5E,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;KACF;IACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,UAAU,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAhBW,QAAA,WAAW,eAgBtB"}
+{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../../../src/registry/coverage.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;AACH,+BAA+B;;;AAG/B,6BAAsB;AACtB,0CAA0C;AAC1C,mDAAgD;AAGhD,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAA6B,EAAE,CAAC,CAAC;IACrE,OAAO,EAAE;QACP,OAAO,EAAE,KAAK;KACf;IACD,KAAK,EAAE;QACL,KAAK,EAAE,UAAU,CAAC,IAAA,+BAAc,EAAC,GAAG,CAAC,CAAC;KACvC;IACD,GAAG;CACJ,CAAC,CAAC;AAEI,MAAM,oBAAoB,GAAG,KAAK,IAAqB,EAAE,CAC9D,CACE,MAAM,IAAA,aAAG,EAAC,iBAAiB,CAAC,8DAA8D,CAAC,CAAC,CAAC,IAAI,EAE7F,CACL,CAAC,QAAQ,CAAC,QAAQ,CAAC;AALT,QAAA,oBAAoB,wBAKX;AAEf,MAAM,WAAW,GAAG,KAAK,EAAE,UAAkB,EAA2B,EAAE;IAC/E,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU;IACtC,wFAAwF;IACxF,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAC5B,IAAA,aAAG,EAAC,iBAAiB,CAAC,aAAa,EAAE,iDAAiD,CAAC,CAAC,CAAC,IAAI,EAAkB,CAChH,CACF,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,IAAI,MAAM,CAAC,MAAM,KAAK,WAAW,IAAI,MAAM,CAAC,KAAK,EAAE,UAAU,KAAK,UAAU,EAAE;YAC5E,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;KACF;IACD,MAAM,IAAI,KAAK,CAAC,2CAA2C,UAAU,EAAE,CAAC,CAAC;AAC3E,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB"}

package/lib/src/resolve/adapters/baseSourceAdapter.d.ts

@@ -40,7 +40,6 @@ export declare abstract class BaseSourceAdapter implements SourceAdapter {
      * @param path File path of a metadata component
      */
     private parseAsContentMetadataXml;
-    private parseAsFolderMetadataXml;
     private calculateName;
     /**
      * Determine the related root metadata xml when the path given to `getComponent` isn't one.

package/lib/src/resolve/adapters/baseSourceAdapter.js

@@ -82,7 +82,7 @@ class BaseSourceAdapter {
             }
             return isRootMetadataXml ? metaXml : undefined;
         }
-        const folderMetadataXml = this.parseAsFolderMetadataXml(path);
+        const folderMetadataXml = parseAsFolderMetadataXml(path);
         if (folderMetadataXml) {
             return folderMetadataXml;
         }
@@ -90,6 +90,8 @@ class BaseSourceAdapter {
             return this.parseAsContentMetadataXml(path);
         }
     }
+    // allowed to preserve API
+    // eslint-disable-next-line class-methods-use-this
     parseMetadataXml(path) {
         return (0, utils_1.parseMetadataXml)(path);
     }
@@ -125,13 +127,6 @@ class BaseSourceAdapter {
             return { fullName: match[1], suffix: match[2], path };
         }
     }
-    parseAsFolderMetadataXml(fsPath) {
-        const match = new RegExp(/(.+)-meta\.xml$/).exec((0, path_1.basename)(fsPath));
-        const parts = fsPath.split(path_1.sep);
-        if (match && !match[1].includes('.') && parts.length > 1) {
-            return { fullName: match[1], suffix: undefined, path: fsPath };
-        }
-    }
     // Given a MetadataXml, build a fullName from the path and type.
     calculateName(rootMetadata) {
         const { directoryName, inFolder, folderType, folderContentType } = this.type;
@@ -157,4 +152,11 @@ class BaseSourceAdapter {
     }
 }
 exports.BaseSourceAdapter = BaseSourceAdapter;
+const parseAsFolderMetadataXml = (fsPath) => {
+    const match = new RegExp(/(.+)-meta\.xml$/).exec((0, path_1.basename)(fsPath));
+    const parts = fsPath.split(path_1.sep);
+    if (match && !match[1].includes('.') && parts.length > 1) {
+        return { fullName: match[1], suffix: undefined, path: fsPath };
+    }
+};
 //# sourceMappingURL=baseSourceAdapter.js.map

package/lib/src/resolve/adapters/baseSourceAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,2CAAqD;AAErD,uCAAoE;AACpE,gDAA6C;AAC7C,sDAAuE;AACvE,wDAAqD;AAErD,6CAA8D;AAE9D,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,8BAA8B,CAAC,CAAC,CAAC;AAE9G,MAAsB,iBAAiB;IAarC,YACE,IAAkB,EAClB,QAAQ,GAAG,IAAI,yBAAc,EAAE,EAC/B,cAA2B,IAAI,yBAAW,EAAE,EAC5C,OAAsB,IAAI,oCAAmB,EAAE;QAXjD;;;WAGG;QACO,cAAS,GAAG,KAAK,CAAC;QAClB,wBAAmB,GAAG,IAAI,CAAC;QAQnC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,YAAY,CAAC,IAAgB,EAAE,iBAAiB,GAAG,IAAI;QAC5D,IAAI,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QACrD,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,gBAAgB,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC3D,IAAI,gBAAgB,EAAE;gBACpB,YAAY,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;aACxD;SACF;QACD,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YAC9D,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,8BAA8B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAC9E,uBAAuB,CACxB,CAAC;SACH;QAED,IAAI,SAA0B,CAAC;QAC/B,IAAI,YAAY,EAAE;YAChB,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC;gBACtC,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,GAAG,EAAE,YAAY,CAAC,IAAI;gBACtB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS;aACjG,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;;OAEG;IACI,wBAAwB;QAC7B,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAED;;;;;;OAMG;IACO,sBAAsB,CAAC,IAAgB;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,OAAO,EAAE;YACX,IAAI,iBAAiB,GAAG,KAAK,CAAC;YAC9B,IAAI,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBACjC,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,WAAW,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,cAAO,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBACpF,MAAM,iBAAiB,GAAG,IAAA,eAAQ,EAAC,UAAU,CAAC,KAAK,OAAO,CAAC,QAAQ,CAAC;gBACpE,MAAM,SAAS,GAAG,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC;gBAC1D,0EAA0E;gBAC1E,4DAA4D;gBAC5D,iBAAiB,GAAG,iBAAiB,IAAI,SAAS,CAAC;aACpD;iBAAM;gBACL,iBAAiB,GAAG,IAAI,CAAC;aAC1B;YACD,OAAO,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;SAChD;QAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC9D,IAAI,iBAAiB,EAAE;YACrB,OAAO,iBAAiB,CAAC;SAC1B;QAED,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,EAAE;YACpC,OAAO,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;SAC7C;IACH,CAAC;IAES,gBAAgB,CAAC,IAAgB;QACzC,OAAO,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAED;;;;;;;;OAQG;IACK,yBAAyB,CAAC,IAAgB;QAChD,gEAAgE;QAChE,4BAA4B;QAC5B,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YACtB,MAAM,QAAQ,GAAG,IAAA,2BAAmB,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACpE,IAAI,QAAQ,EAAE;gBACZ,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC;aACrD;SACF;QAED,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QACpC,MAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACnE,wFAAwF;QACxF,0EAA0E;QAC1E,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;QAEjG,IAAI,eAAe,KAAK,YAAY,EAAE;YACpC,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,IAAI,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;YAC1C,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;SACvD;IACH,CAAC;IAEO,wBAAwB,CAAC,MAAkB;QACjD,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAC,CAAC;QACnE,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAChC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACxD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;SAChE;IACH,CAAC;IAED,gEAAgE;IACxD,aAAa,CAAC,YAAyB;QAC7C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAE7E,+EAA+E;QAC/E,+EAA+E;QAC/E,IAAI,QAAQ,IAAI,iBAAiB,EAAE;YACjC,OAAO,IAAA,2BAAmB,EAAC,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;SAC9D;QAED,4CAA4C;QAC5C,IAAI,CAAC,UAAU,EAAE;YACf,OAAO,YAAY,CAAC,QAAQ,CAAC;SAC9B;QACD,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAEhE,4HAA4H;QAC5H,IAAI,eAAe,CAAC,UAAU,IAAI,eAAe,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YAC7E,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,QAAQ,EAAE,CAAC;SAChG;QACD,wFAAwF;QACxF,IAAI,eAAe,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;YAC/C,OAAO,YAAY,CAAC,QAAQ,CAAC;SAC9B;IACH,CAAC;CAqBF;AAjMD,8CAiMC"}
+{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}

package/lib/src/resolve/adapters/defaultSourceAdapter.js

@@ -22,12 +22,16 @@ class DefaultSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
         this.metadataWithContent = false;
     }
     /* istanbul ignore next */
+    // retained to preserve API
+    // eslint-disable-next-line class-methods-use-this
     getRootMetadataXmlPath(trigger) {
         // istanbul ignored for code coverage since this return won't ever be hit,
         // unless future changes permit otherwise. Remove the ignore and these comments
         // if this method is expected to be entered.
         return trigger;
     }
+    // retained to preserve API
+    // eslint-disable-next-line class-methods-use-this
     populate(trigger, component) {
         return component;
     }

package/lib/src/resolve/adapters/defaultSourceAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/defaultSourceAdapter.ts"],"names":[],"mappings":";;;AAQA,2DAAwD;AAExD;;;;;;;;;;;;;GAaG;AACH,MAAa,oBAAqB,SAAQ,qCAAiB;IAA3D;;QACY,wBAAmB,GAAG,KAAK,CAAC;IAaxC,CAAC;IAXC,0BAA0B;IAChB,sBAAsB,CAAC,OAAe;QAC9C,0EAA0E;QAC1E,+EAA+E;QAC/E,4CAA4C;QAC5C,OAAO,OAAO,CAAC;IACjB,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAdD,oDAcC"}
+{"version":3,"file":"defaultSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/defaultSourceAdapter.ts"],"names":[],"mappings":";;;AAQA,2DAAwD;AAExD;;;;;;;;;;;;;GAaG;AACH,MAAa,oBAAqB,SAAQ,qCAAiB;IAA3D;;QACY,wBAAmB,GAAG,KAAK,CAAC;IAiBxC,CAAC;IAfC,0BAA0B;IAC1B,2BAA2B;IAC3B,kDAAkD;IACxC,sBAAsB,CAAC,OAAe;QAC9C,0EAA0E;QAC1E,+EAA+E;QAC/E,4CAA4C;QAC5C,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,2BAA2B;IAC3B,kDAAkD;IACxC,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAlBD,oDAkBC"}

package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.d.ts

@@ -37,11 +37,6 @@ import { BundleSourceAdapter } from './bundleSourceAdapter';
  */
 export declare class DigitalExperienceSourceAdapter extends BundleSourceAdapter {
     protected getRootMetadataXmlPath(trigger: string): string;
-    /**
-     * @param contentPath This hook is called only after trimPathToContent() is called. so this will always be a folder strcture
-     * @returns name of type/apiName format
-     */
-    protected calculateNameFromPath(contentPath: string): string;
     protected trimPathToContent(path: string): string;
     protected populate(trigger: string, component?: SourceComponent): SourceComponent;
     protected parseMetadataXml(path: SourcePath): MetadataXml;

package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js

@@ -52,13 +52,6 @@ class DigitalExperienceSourceAdapter extends bundleSourceAdapter_1.BundleSourceA
         }
         return (0, path_1.join)((0, path_1.dirname)(trigger), '_meta.json');
     }
-    /**
-     * @param contentPath This hook is called only after trimPathToContent() is called. so this will always be a folder strcture
-     * @returns name of type/apiName format
-     */
-    calculateNameFromPath(contentPath) {
-        return `${(0, utils_1.parentName)(contentPath)}${path_1.sep}${(0, utils_1.baseName)(contentPath)}`;
-    }
     trimPathToContent(path) {
         if (this.isBundleType()) {
             return;
@@ -78,7 +71,7 @@ class DigitalExperienceSourceAdapter extends bundleSourceAdapter_1.BundleSourceA
             xml: this.getBundleMetadataXmlPath(source.content),
         }, this.tree, this.forceIgnore);
         return new __1.SourceComponent({
-            name: this.calculateNameFromPath(source.content),
+            name: calculateNameFromPath(source.content),
             type: this.type,
             content: source.content,
             parent,
@@ -117,4 +110,9 @@ class DigitalExperienceSourceAdapter extends bundleSourceAdapter_1.BundleSourceA
     }
 }
 exports.DigitalExperienceSourceAdapter = DigitalExperienceSourceAdapter;
+/**
+ * @param contentPath This hook is called only after trimPathToContent() is called. so this will always be a folder structure
+ * @returns name of type/apiName format
+ */
+const calculateNameFromPath = (contentPath) => `${(0, utils_1.parentName)(contentPath)}${path_1.sep}${(0, utils_1.baseName)(contentPath)}`;
 //# sourceMappingURL=digitalExperienceSourceAdapter.js.map

package/lib/src/resolve/adapters/digitalExperienceSourceAdapter.js.map

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

package/lib/src/resolve/adapters/matchingContentSourceAdapter.d.ts

@@ -19,6 +19,5 @@ import { BaseSourceAdapter } from './baseSourceAdapter';
 export declare class MatchingContentSourceAdapter extends BaseSourceAdapter {
     protected getRootMetadataXmlPath(trigger: SourcePath): SourcePath;
     protected populate(trigger: SourcePath, component: SourceComponent): SourceComponent;
-    private removeMetaXmlSuffix;
     private extensionMatchesType;
 }

package/lib/src/resolve/adapters/matchingContentSourceAdapter.js

@@ -32,13 +32,15 @@ const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr
  *```
  */
 class MatchingContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
+    // disabled since used by subclasses
+    // eslint-disable-next-line class-methods-use-this
     getRootMetadataXmlPath(trigger) {
         return `${trigger}${common_1.META_XML_SUFFIX}`;
     }
     populate(trigger, component) {
         let sourcePath;
         if (component.xml === trigger) {
-            const fsPath = this.removeMetaXmlSuffix(trigger);
+            const fsPath = removeMetaXmlSuffix(trigger);
             if (this.tree.exists(fsPath)) {
                 sourcePath = fsPath;
             }
@@ -56,12 +58,10 @@ class MatchingContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter
         component.content = sourcePath;
         return component;
     }
-    removeMetaXmlSuffix(fsPath) {
-        return fsPath.slice(0, fsPath.lastIndexOf(common_1.META_XML_SUFFIX));
-    }
     extensionMatchesType(fsPath) {
         return this.registry.getTypeBySuffix((0, path_1.extName)(fsPath)) === this.type;
     }
 }
 exports.MatchingContentSourceAdapter = MatchingContentSourceAdapter;
+const removeMetaXmlSuffix = (fsPath) => fsPath.slice(0, fsPath.lastIndexOf(common_1.META_XML_SUFFIX));
 //# sourceMappingURL=matchingContentSourceAdapter.js.map

package/lib/src/resolve/adapters/matchingContentSourceAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"matchingContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/matchingContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,yCAA2D;AAC3D,2CAA2C;AAE3C,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE;IAC1E,wBAAwB;IACxB,6BAA6B;CAC9B,CAAC,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,MAAa,4BAA6B,SAAQ,qCAAiB;IACvD,sBAAsB,CAAC,OAAmB;QAClD,OAAO,GAAG,OAAO,GAAG,wBAAe,EAAE,CAAC;IACxC,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,IAAI,UAAsB,CAAC;QAE3B,IAAI,SAAS,CAAC,GAAG,KAAK,OAAO,EAAE;YAC7B,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACjD,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,GAAG,MAAM,CAAC;aACrB;SACF;aAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YAC7C,UAAU,GAAG,OAAO,CAAC;SACtB;QAED,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC7E,0BAA0B,CAC3B,CAAC;YACF,0DAA0D;SAC3D;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAC3E,uBAAuB,CACxB,CAAC;SACH;QAED,SAAS,CAAC,OAAO,GAAG,UAAU,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,mBAAmB,CAAC,MAAkB;QAC5C,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,wBAAe,CAAC,CAAC,CAAC;IAC9D,CAAC;IAEO,oBAAoB,CAAC,MAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;IACtE,CAAC;CACF;AAzCD,oEAyCC"}
+{"version":3,"file":"matchingContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/matchingContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,yCAA2D;AAC3D,2CAA2C;AAE3C,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE;IAC1E,wBAAwB;IACxB,6BAA6B;CAC9B,CAAC,CAAC;AAEH;;;;;;;;;;;;;;GAcG;AACH,MAAa,4BAA6B,SAAQ,qCAAiB;IACjE,oCAAoC;IACpC,kDAAkD;IACxC,sBAAsB,CAAC,OAAmB;QAClD,OAAO,GAAG,OAAO,GAAG,wBAAe,EAAE,CAAC;IACxC,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA0B;QAChE,IAAI,UAAsB,CAAC;QAE3B,IAAI,SAAS,CAAC,GAAG,KAAK,OAAO,EAAE;YAC7B,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;gBAC5B,UAAU,GAAG,MAAM,CAAC;aACrB;SACF;aAAM,IAAI,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;YAC7C,UAAU,GAAG,OAAO,CAAC;SACtB;QAED,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC7E,0BAA0B,CAC3B,CAAC;YACF,0DAA0D;SAC3D;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,EAC3E,uBAAuB,CACxB,CAAC;SACH;QAED,SAAS,CAAC,OAAO,GAAG,UAAU,CAAC;QAC/B,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,oBAAoB,CAAC,MAAkB;QAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC;IACtE,CAAC;CACF;AAvCD,oEAuCC;AAED,MAAM,mBAAmB,GAAG,CAAC,MAAkB,EAAc,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,wBAAe,CAAC,CAAC,CAAC"}

package/lib/src/resolve/connectionResolver.js

@@ -64,9 +64,10 @@ class ConnectionResolver {
             Aggregator.push(...childrenResult);
         }
         return {
-            components: Aggregator.filter(componentFilter).map((component) => {
-                return { fullName: component.fullName, type: this.registry.getTypeByName(component.type) };
-            }),
+            components: Aggregator.filter(componentFilter).map((component) => ({
+                fullName: component.fullName,
+                type: this.registry.getTypeByName(component.type),
+            })),
             apiVersion: this.connection.getApiVersion(),
         };
     }
@@ -126,7 +127,7 @@ class ConnectionResolver {
                     // Example error.message from the library: "All retries failed" or "Met not retryable error"
                     // 'ts-retry-promise' exposes the actual error on `error.lastError`
                     const error = err;
-                    if (error.lastError && error.lastError.message) {
+                    if (error.lastError?.message) {
                         this.logger.debug(error.lastError.message);
                     }
                 }

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

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

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

@@ -22,5 +22,4 @@ export declare class ManifestResolver {
     private registry;
     constructor(tree?: TreeContainer, registry?: RegistryAccess);
     resolve(manifestPath: string): Promise<ResolveManifestResult>;
-    private isNestedInFolder;
 }

package/lib/src/resolve/manifestResolver.js

@@ -34,7 +34,7 @@ class ManifestResolver {
             const members = (0, kit_1.ensureArray)(typeMembers.members);
             for (const fullName of members) {
                 let mdType = type;
-                if (this.isNestedInFolder(fullName, type, parentType, members)) {
+                if (isMemberNestedInFolder(fullName, type, parentType, members)) {
                     mdType = parentType;
                 }
                 components.push({ fullName, type: mdType });
@@ -42,26 +42,26 @@ class ManifestResolver {
         }
         return { components, apiVersion };
     }
-    // Use the folderType instead of the type from the manifest when:
-    //  1. InFolder types: (report, dashboard, emailTemplate, document)
-    //    1a. type.inFolder === true (from metadataRegistry.json) AND
-    //    1b. The fullName doesn't contain a forward slash character AND
-    //    1c. The fullName with a slash appended is contained in another member entry
-    // OR
-    //  2. Non-InFolder, folder types: (territory2, territory2Model, territory2Type, territory2Rule)
-    //    2a. type.inFolder !== true (from metadataRegistry.json) AND
-    //    2b. type.folderType has a value (from metadataRegistry.json) AND
-    //    2c. This type's parent type has a folderType that doesn't match its ID.
-    isNestedInFolder(fullName, type, parentType, members) {
-        // Quick short-circuit for non-folderTypes
-        if (!type.folderType) {
-            return false;
-        }
-        const isInFolderType = type.inFolder;
-        const isNestedInFolder = !fullName.includes('/') || members.some((m) => m.includes(`${fullName}/`));
-        const isNonMatchingFolder = parentType && parentType.folderType !== parentType.id;
-        return (isInFolderType && isNestedInFolder) || (!isInFolderType && isNonMatchingFolder);
-    }
 }
 exports.ManifestResolver = ManifestResolver;
+// Use the folderType instead of the type from the manifest when:
+//  1. InFolder types: (report, dashboard, emailTemplate, document)
+//    1a. type.inFolder === true (from metadataRegistry.json) AND
+//    1b. The fullName doesn't contain a forward slash character AND
+//    1c. The fullName with a slash appended is contained in another member entry
+// OR
+//  2. Non-InFolder, folder types: (territory2, territory2Model, territory2Type, territory2Rule)
+//    2a. type.inFolder !== true (from metadataRegistry.json) AND
+//    2b. type.folderType has a value (from metadataRegistry.json) AND
+//    2c. This type's parent type has a folderType that doesn't match its ID.
+const isMemberNestedInFolder = (fullName, type, parentType, members) => {
+    // Quick short-circuit for non-folderTypes
+    if (!type.folderType) {
+        return false;
+    }
+    const isInFolderType = type.inFolder;
+    const isNestedInFolder = !fullName.includes('/') || members.some((m) => m.includes(`${fullName}/`));
+    const isNonMatchingFolder = parentType && parentType.folderType !== parentType.id;
+    return (isInFolderType && isNestedInFolder) || (!isInFolderType && isNonMatchingFolder);
+};
 //# sourceMappingURL=manifestResolver.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qDAAoD;AACpD,yCAA8C;AAC9C,0CAA2D;AAC3D,qDAAsE;AA6BtE;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAmB,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QACjG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,YAAoB;QACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;QAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEpD,MAAM,cAAc,GAClB,IAAA,uBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YACxB,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CACF,CAAC,OAAO,CAAC;QACV,MAAM,kBAAkB,GAAG,IAAA,iBAAW,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;QAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;YAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9F,MAAM,OAAO,GAAG,IAAA,iBAAW,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAEjD,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;gBAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;gBAClB,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;oBAC9D,MAAM,GAAG,UAAU,CAAC;iBACrB;gBACD,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;aAC7C;SACF;QAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,iEAAiE;IACjE,mEAAmE;IACnE,iEAAiE;IACjE,oEAAoE;IACpE,iFAAiF;IACjF,KAAK;IACL,gGAAgG;IAChG,iEAAiE;IACjE,sEAAsE;IACtE,6EAA6E;IACrE,gBAAgB,CAAC,QAAgB,EAAE,IAAkB,EAAE,UAAwB,EAAE,OAAiB;QACxG,0CAA0C;QAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;QACrC,MAAM,gBAAgB,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC;QACpG,MAAM,mBAAmB,GAAG,UAAU,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;QAElF,OAAO,CAAC,cAAc,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,mBAAmB,CAAC,CAAC;IAC1F,CAAC;CACF;AA9DD,4CA8DC"}
+{"version":3,"file":"manifestResolver.js","sourceRoot":"","sources":["../../../src/resolve/manifestResolver.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,qDAAoD;AACpD,yCAA8C;AAC9C,0CAA2D;AAC3D,qDAAsE;AA6BtE;;GAEG;AACH,MAAa,gBAAgB;IAI3B,YAAmB,OAAsB,IAAI,oCAAmB,EAAE,EAAE,QAAQ,GAAG,IAAI,yBAAc,EAAE;QACjG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,YAAoB;QACvC,MAAM,UAAU,GAAwB,EAAE,CAAC;QAE3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAEpD,MAAM,cAAc,GAClB,IAAA,uBAAQ,EAAC,IAAI,CAAC,QAAQ,EAAE,EAAE;YACxB,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CACF,CAAC,OAAO,CAAC;QACV,MAAM,kBAAkB,GAAG,IAAA,iBAAW,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC7D,MAAM,UAAU,GAAG,cAAc,CAAC,OAAO,CAAC;QAE1C,KAAK,MAAM,WAAW,IAAI,kBAAkB,EAAE;YAC5C,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;YACnD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9F,MAAM,OAAO,GAAG,IAAA,iBAAW,EAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAEjD,KAAK,MAAM,QAAQ,IAAI,OAAO,EAAE;gBAC9B,IAAI,MAAM,GAAG,IAAI,CAAC;gBAClB,IAAI,sBAAsB,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE;oBAC/D,MAAM,GAAG,UAAU,CAAC;iBACrB;gBACD,UAAU,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;aAC7C;SACF;QAED,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACpC,CAAC;CACF;AAvCD,4CAuCC;AAED,iEAAiE;AACjE,mEAAmE;AACnE,iEAAiE;AACjE,oEAAoE;AACpE,iFAAiF;AACjF,KAAK;AACL,gGAAgG;AAChG,iEAAiE;AACjE,sEAAsE;AACtE,6EAA6E;AAC7E,MAAM,sBAAsB,GAAG,CAC7B,QAAgB,EAChB,IAAkB,EAClB,UAAwB,EACxB,OAAiB,EACR,EAAE;IACX,0CAA0C;IAC1C,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;QACpB,OAAO,KAAK,CAAC;KACd;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC;IACrC,MAAM,gBAAgB,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC;IACpG,MAAM,mBAAmB,GAAG,UAAU,IAAI,UAAU,CAAC,UAAU,KAAK,UAAU,CAAC,EAAE,CAAC;IAElF,OAAO,CAAC,cAAc,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,mBAAmB,CAAC,CAAC;AAC1F,CAAC,CAAC"}

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

@@ -29,12 +29,6 @@ export declare class MetadataResolver {
     getComponentsFromPath(fsPath: string, inclusiveFilter?: ComponentSet): SourceComponent[];
     private getComponentsFromPathRecursive;
     private resolveComponent;
-    /**
-     * Any metadata xml file (-meta.xml) is potentially a root metadata file.
-     *
-     * @param fsPath File path of a potential metadata xml file
-     */
-    private parseAsRootMetadataXml;
     private resolveTypeFromStrictFolder;
     private resolveType;
     /**

package/lib/src/resolve/metadataResolver.js

@@ -119,7 +119,7 @@ class MetadataResolver {
             // short circuit the component resolution unless this is a resolve for a
             // source path or allowed content-only path, otherwise the adapter
             // knows how to handle it
-            const shouldResolve = this.parseAsRootMetadataXml(fsPath) ||
+            const shouldResolve = parseAsRootMetadataXml(fsPath) ||
                 isResolvingSource ||
                 !this.parseAsContentMetadataXml(fsPath) ||
                 !adapter.allowMetadataWithContent();
@@ -133,14 +133,6 @@ class MetadataResolver {
         });
         throw new core_1.SfError(messages.getMessage('error_could_not_infer_type', [fsPath]), 'TypeInferenceError');
     }
-    /**
-     * Any metadata xml file (-meta.xml) is potentially a root metadata file.
-     *
-     * @param fsPath File path of a potential metadata xml file
-     */
-    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
@@ -287,4 +279,10 @@ class MetadataResolver {
     }
 }
 exports.MetadataResolver = MetadataResolver;
+/**
+ * Any metadata xml file (-meta.xml) is potentially a root metadata file.
+ *
+ * @param fsPath File path of a potential metadata xml file
+ */
+const parseAsRootMetadataXml = (fsPath) => Boolean((0, utils_1.parseMetadataXml)(fsPath));
 //# sourceMappingURL=metadataResolver.js.map