@salesforce/source-deploy-retrieve 5.13.1 → 6.0.0

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

@@ -12,11 +12,16 @@ const archiver_1 = require("archiver");
 const mime_1 = require("mime");
 const unzipper_1 = require("unzipper");
 const graceful_fs_1 = require("graceful-fs");
+const core_1 = require("@salesforce/core");
 const utils_1 = require("../../utils");
-const errors_1 = require("../../errors");
 const fileSystemHandler_1 = require("../../utils/fileSystemHandler");
 const streams_1 = require("../streams");
 const baseMetadataTransformer_1 = require("./baseMetadataTransformer");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', [
+    'error_static_resource_expected_archive_type',
+    'error_static_resource_missing_resource_file',
+]);
 class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMetadataTransformer {
     async toMetadataFormat(component) {
         const { content, type, xml } = component;
@@ -109,14 +114,14 @@ class StaticResourceMetadataTransformer extends baseMetadataTransformer_1.BaseMe
             if (StaticResourceMetadataTransformer.ARCHIVE_MIME_TYPES.has(contentType)) {
                 return true;
             }
-            throw new errors_1.LibraryError('error_static_resource_expected_archive_type', [contentType, component.name]);
+            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 errors_1.LibraryError('error_static_resource_missing_resource_file', [(0, path_1.join)('staticresources', component.name)]);
+            throw new core_1.SfError(messages.getMessage('error_static_resource_missing_resource_file', [(0, path_1.join)('staticresources', component.name)]), 'LibraryError');
         }
         return resource.contentType;
     }

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,6 +1,6 @@
-export { MetadataApiDeploy, MetadataApiDeployOptions, DeployResult, 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, ToolingCreateResult, AuraDefinition, LightningComponentResource, } from './client';
+export { MetadataApiDeploy, MetadataApiDeployOptions, DeployResult, 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 { 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';
 export { LazyCollection, ComponentSet, ComponentSetBuilder, ComponentSetOptions, DeploySetOptions, RetrieveSetOptions, PackageTypeMembers, PackageManifestObject, DestructiveChangesType, FromSourceOptions, FromManifestOptions, } from './collections';
-export { RegistryAccess, registry, MetadataRegistry, MetadataType, DecompositionStrategy, RecompositionStrategy, TransformerStrategy, } from './registry';
+export { RegistryAccess, registry, getCurrentApiVersion, MetadataRegistry, MetadataType, DecompositionStrategy, RecompositionStrategy, TransformerStrategy, } from './registry';

package/lib/src/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.ToolingApi = exports.RetrieveResult = exports.MetadataApiRetrieve = exports.DeployResult = exports.MetadataApiDeploy = void 0;
 /*
  * Copyright (c) 2020, salesforce.com, inc.
  * All rights reserved.
@@ -35,4 +35,5 @@ Object.defineProperty(exports, "DestructiveChangesType", { enumerable: true, get
 var registry_1 = require("./registry");
 Object.defineProperty(exports, "RegistryAccess", { enumerable: true, get: function () { return registry_1.RegistryAccess; } });
 Object.defineProperty(exports, "registry", { enumerable: true, get: function () { return registry_1.registry; } });
+Object.defineProperty(exports, "getCurrentApiVersion", { enumerable: true, get: function () { return registry_1.getCurrentApiVersion; } });
 //# sourceMappingURL=index.js.map

package/lib/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAiDkB;AAhDhB,2GAAA,iBAAiB,OAAA;AAEjB,sGAAA,YAAY,OAAA;AACZ,6GAAA,mBAAmB,OAAA;AAEnB,wGAAA,cAAc,OAAA;AACd,oGAAA,UAAU,OAAA;AAUV,uGAAA,aAAa,OAAA;AAiBb,yGAAA,eAAe,OAAA;AAgBjB,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,uCAQoB;AAPlB,0GAAA,cAAc,OAAA;AACd,oGAAA,QAAQ,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,mCAgDkB;AA/ChB,2GAAA,iBAAiB,OAAA;AAEjB,sGAAA,YAAY,OAAA;AACZ,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"}

package/lib/src/registry/index.d.ts

@@ -1,4 +1,5 @@
 export { registry } from './registry';
 export { standardValueSet } from './standardvalueset';
 export { RegistryAccess } from './registryAccess';
+export { getCurrentApiVersion } from './coverage';
 export { MetadataRegistry, MetadataType, DecompositionStrategy, RecompositionStrategy, TransformerStrategy, } from './types';

package/lib/src/registry/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RegistryAccess = exports.standardValueSet = exports.registry = void 0;
+exports.getCurrentApiVersion = exports.RegistryAccess = exports.standardValueSet = exports.registry = void 0;
 /*
  * Copyright (c) 2021, salesforce.com, inc.
  * All rights reserved.
@@ -13,4 +13,6 @@ var standardvalueset_1 = require("./standardvalueset");
 Object.defineProperty(exports, "standardValueSet", { enumerable: true, get: function () { return standardvalueset_1.standardValueSet; } });
 var registryAccess_1 = require("./registryAccess");
 Object.defineProperty(exports, "RegistryAccess", { enumerable: true, get: function () { return registryAccess_1.RegistryAccess; } });
+var coverage_1 = require("./coverage");
+Object.defineProperty(exports, "getCurrentApiVersion", { enumerable: true, get: function () { return coverage_1.getCurrentApiVersion; } });
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/registry/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,mDAAkD;AAAzC,gHAAA,cAAc,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/registry/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,uCAAsC;AAA7B,oGAAA,QAAQ,OAAA;AACjB,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,mDAAkD;AAAzC,gHAAA,cAAc,OAAA;AACvB,uCAAkD;AAAzC,gHAAA,oBAAoB,OAAA"}

package/lib/src/registry/metadataRegistry.json

@@ -1684,7 +1684,7 @@
             "suffix": "xml",
             "directoryName": "emailservices",
             "inFolder": false,
-            "strictDirectoryName": false
+            "strictDirectoryName": true
         },
         "integrationhubsettingstype": {
             "id": "integrationhubsettingstype",
@@ -1837,6 +1837,14 @@
                 "decomposition": "topLevel"
             }
         },
+        "bottemplate": {
+            "id": "bottemplate",
+            "name": "BotTemplate",
+            "suffix": "botTemplate",
+            "directoryName": "botTemplates",
+            "inFolder": false,
+            "strictDirectoryName": true
+        },
         "animationrule": {
             "id": "animationrule",
             "name": "AnimationRule",
@@ -2986,6 +2994,17 @@
             "inFolder": false,
             "strictDirectoryName": false
         },
+        "dataweaveresource": {
+            "id": "dataweaveresource",
+            "name": "DataWeaveResource",
+            "suffix": "dwl",
+            "directoryName": "dw",
+            "inFolder": false,
+            "strictDirectoryName": false,
+            "strategies": {
+                "adapter": "matchingContentFile"
+            }
+        },
         "assessmentquestion": {
             "id": "assessmentquestion",
             "name": "AssessmentQuestion",
@@ -3202,6 +3221,7 @@
         "prompt": "prompt",
         "mlDomain": "mldomain",
         "bot": "bot",
+        "botTemplate": "bottemplate",
         "botVersion": "botversion",
         "animationRule": "animationrule",
         "deployment": "recordactiondeployment",
@@ -3330,6 +3350,7 @@
         "advAcctForecastDimSource": "advacctforecastdimsource",
         "careLimitType": "carelimittype",
         "omniInteractionAccessConfig": "omniinteractionaccessconfig",
+        "dwl": "dataweaveresource",
         "aq": "assessmentquestion",
         "aqs": "assessmentquestionset"
     },
@@ -3341,6 +3362,7 @@
         "waveTemplates": "wavetemplatebundle",
         "objects": "customobject",
         "bots": "bot",
+        "botTemplates": "bottemplate",
         "objectTranslations": "customobjecttranslation",
         "staticresources": "staticresource",
         "sites": "customsite",
@@ -3354,7 +3376,8 @@
         "fieldRestrictionRules": "fieldrestrictionrule",
         "siteDotComSites": "sitedotcom",
         "appointmentSchedulingPolicies": "appointmentschedulingpolicy",
-        "appointmentAssignmentPolicies": "appointmentassignmentpolicy"
+        "appointmentAssignmentPolicies": "appointmentassignmentpolicy",
+        "emailservices": "emailservicesfunction"
     },
     "childTypes": {
         "customlabel": "customlabels",
@@ -3390,6 +3413,5 @@
         "customfieldtranslation": "customobjecttranslation",
         "datamappingfielddefinition": "datamappingobjectdefinition",
         "mktdatatranfield": "mktdatatranobject"
-    },
-    "apiVersion": "53.0"
+    }
 }

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

@@ -1840,6 +1840,14 @@ export declare const registry: Readonly<{
                 decomposition: string;
             };
         };
+        bottemplate: {
+            id: string;
+            name: string;
+            suffix: string;
+            directoryName: string;
+            inFolder: boolean;
+            strictDirectoryName: boolean;
+        };
         animationrule: {
             id: string;
             name: string;
@@ -2989,6 +2997,17 @@ export declare const registry: Readonly<{
             inFolder: boolean;
             strictDirectoryName: boolean;
         };
+        dataweaveresource: {
+            id: string;
+            name: string;
+            suffix: string;
+            directoryName: string;
+            inFolder: boolean;
+            strictDirectoryName: boolean;
+            strategies: {
+                adapter: string;
+            };
+        };
         assessmentquestion: {
             id: string;
             name: string;
@@ -3205,6 +3224,7 @@ export declare const registry: Readonly<{
         prompt: string;
         mlDomain: string;
         bot: string;
+        botTemplate: string;
         botVersion: string;
         animationRule: string;
         deployment: string;
@@ -3333,6 +3353,7 @@ export declare const registry: Readonly<{
         advAcctForecastDimSource: string;
         careLimitType: string;
         omniInteractionAccessConfig: string;
+        dwl: string;
         aq: string;
         aqs: string;
     };
@@ -3344,6 +3365,7 @@ export declare const registry: Readonly<{
         waveTemplates: string;
         objects: string;
         bots: string;
+        botTemplates: string;
         objectTranslations: string;
         staticresources: string;
         sites: string;
@@ -3358,6 +3380,7 @@ export declare const registry: Readonly<{
         siteDotComSites: string;
         appointmentSchedulingPolicies: string;
         appointmentAssignmentPolicies: string;
+        emailservices: string;
     };
     childTypes: {
         customlabel: string;
@@ -3394,5 +3417,4 @@ export declare const registry: Readonly<{
         datamappingfielddefinition: string;
         mktdatatranfield: string;
     };
-    apiVersion: string;
 }>;

package/lib/src/registry/registryAccess.d.ts

@@ -1,7 +1,4 @@
 import { MetadataRegistry, MetadataType } from './types';
-/**
- * Container for querying metadata registry data.
- */
 export declare class RegistryAccess {
     private registry;
     private strictFolderTypes;
@@ -56,5 +53,4 @@ export declare class RegistryAccess {
      * @returns An array of metadata type objects that have aliasFor
      */
     getAliasTypes(): MetadataType[];
-    get apiVersion(): string;
 }

package/lib/src/registry/registryAccess.js

@@ -7,11 +7,16 @@ exports.RegistryAccess = void 0;
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const errors_1 = require("../errors");
+const core_1 = require("@salesforce/core");
 const registry_1 = require("./registry");
 /**
  * Container for querying metadata registry data.
  */
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', [
+    'error_missing_child_type_definition',
+    'error_missing_type_definition',
+]);
 class RegistryAccess {
     constructor(registry = registry_1.registry) {
         this.registry = registry;
@@ -30,10 +35,10 @@ class RegistryAccess {
             if (childType) {
                 return childType;
             }
-            throw new errors_1.RegistryError('error_missing_child_type_definition', [parentTypeId, lower]);
+            throw new core_1.SfError(messages.getMessage('error_missing_child_type_definition', [parentTypeId, lower]), 'RegistryError');
         }
         if (!this.registry.types[lower]) {
-            throw new errors_1.RegistryError('error_missing_type_definition', lower);
+            throw new core_1.SfError(messages.getMessage('error_missing_type_definition', [lower]), 'RegistryError');
         }
         // redirect via alias
         return this.registry.types[lower].aliasFor
@@ -104,9 +109,6 @@ class RegistryAccess {
         }
         return this.aliasTypes;
     }
-    get apiVersion() {
-        return this.registry.apiVersion;
-    }
 }
 exports.RegistryAccess = RegistryAccess;
 //# sourceMappingURL=registryAccess.js.map

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

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

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

@@ -11,7 +11,6 @@ export interface MetadataRegistry {
     childTypes: {
         [childTypeId: string]: string;
     };
-    apiVersion: string;
 }
 /**
  * Metadata type definition in the registry.

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

@@ -8,12 +8,14 @@ exports.BaseSourceAdapter = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path_1 = require("path");
+const core_1 = require("@salesforce/core");
 const utils_1 = require("../../utils");
-const errors_1 = require("../../errors");
 const forceIgnore_1 = require("../forceIgnore");
 const treeContainers_1 = require("../treeContainers");
 const sourceComponent_1 = require("../sourceComponent");
 const registry_1 = require("../../registry");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', ['error_no_metadata_xml_ignore']);
 class BaseSourceAdapter {
     constructor(type, registry = new registry_1.RegistryAccess(), forceIgnore = new forceIgnore_1.ForceIgnore(), tree = new treeContainers_1.NodeFSTreeContainer()) {
         /**
@@ -36,7 +38,7 @@ class BaseSourceAdapter {
             }
         }
         if (rootMetadata && this.forceIgnore.denies(rootMetadata.path)) {
-            throw new errors_1.UnexpectedForceIgnore('error_no_metadata_xml_ignore', [rootMetadata.path, path]);
+            throw new core_1.SfError(messages.getMessage('error_no_metadata_xml_ignore', [rootMetadata.path, path]), 'UnexpectedForceIgnore');
         }
         let component;
         if (rootMetadata) {

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;AAE9C,uCAAoE;AACpE,yCAAqD;AACrD,gDAA6C;AAC7C,sDAAuE;AACvE,wDAAqD;AAErD,6CAA8D;AAE9D,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,IAAA,wBAAgB,EAAC,gBAAgB,CAAC,CAAC;aACnD;SACF;QACD,IAAI,YAAY,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE;YAC9D,MAAM,IAAI,8BAAqB,CAAC,8BAA8B,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;SAC5F;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,IAAA,wBAAgB,EAAC,IAAI,CAAC,CAAC;QACvC,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;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;AA1LD,8CA0LC"}
+{"version":3,"file":"baseSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/baseSourceAdapter.ts"],"names":[],"mappings":"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"}

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

@@ -1,10 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DecomposedSourceAdapter = void 0;
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const core_1 = require("@salesforce/core");
 const sourceComponent_1 = require("../sourceComponent");
 const utils_1 = require("../../utils");
-const errors_1 = require("../../errors");
 const mixedContentSourceAdapter_1 = require("./mixedContentSourceAdapter");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', ['error_unexpected_child_type']);
 /**
  * Handles decomposed types. A flavor of mixed content where a component can
  * have additional -meta.xml files that represent child components of the main
@@ -94,7 +102,7 @@ class DecomposedSourceAdapter extends mixedContentSourceAdapter_1.MixedContentSo
                 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]);
+                    throw new core_1.SfError(messages.getMessage('error_unexpected_child_type', [trigger, this.type.name]), 'TypeInferenceError');
                 }
             }
             if (component) {

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

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

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

@@ -7,10 +7,15 @@ exports.MatchingContentSourceAdapter = void 0;
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-const errors_1 = require("../../errors");
+const core_1 = require("@salesforce/core");
 const common_1 = require("../../common");
 const path_1 = require("../../utils/path");
 const baseSourceAdapter_1 = require("./baseSourceAdapter");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', [
+    'error_no_source_ignore',
+    'error_expected_source_files',
+]);
 /**
  * Handles types with a single content file with a matching file extension.
  *
@@ -42,10 +47,11 @@ class MatchingContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter
             sourcePath = trigger;
         }
         if (!sourcePath) {
-            throw new errors_1.ExpectedSourceFilesError(this.type, trigger);
+            throw new core_1.SfError(messages.getMessage('error_expected_source_files', [trigger, this.type.name]), 'ExpectedSourceFilesError');
+            // throw new ExpectedSourceFilesError(this.type, trigger);
         }
         else if (this.forceIgnore.denies(sourcePath)) {
-            throw new errors_1.UnexpectedForceIgnore('error_no_source_ignore', [this.type.name, sourcePath]);
+            throw new core_1.SfError(messages.getMessage('error_no_source_ignore', [this.type.name, sourcePath]), 'UnexpectedForceIgnore');
         }
         component.content = sourcePath;
         return component;

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,yCAA+E;AAC/E,yCAA2D;AAC3D,2CAA2C;AAE3C,2DAAwD;AAExD;;;;;;;;;;;;;;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,iCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACxD;aAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,IAAI,8BAAqB,CAAC,wBAAwB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC;SACzF;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;AAlCD,oEAkCC"}
+{"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"}

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

@@ -8,10 +8,12 @@ exports.MixedContentSourceAdapter = void 0;
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 const path_1 = require("path");
-const errors_1 = require("../../errors");
+const core_1 = require("@salesforce/core");
 const path_2 = require("../../utils/path");
 const sourceComponent_1 = require("../sourceComponent");
 const baseSourceAdapter_1 = require("./baseSourceAdapter");
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', ['error_expected_source_files']);
 /**
  * Handles types with mixed content. Mixed content means there are one or more additional
  * file(s) associated with a component with any file extension. Even an entire folder
@@ -50,7 +52,7 @@ class MixedContentSourceAdapter extends baseSourceAdapter_1.BaseSourceAdapter {
             contentPath = this.tree.find('content', (0, path_2.baseName)(contentPath), (0, path_1.dirname)(contentPath));
         }
         if (!this.tree.exists(contentPath)) {
-            throw new errors_1.ExpectedSourceFilesError(this.type, trigger);
+            throw new core_1.SfError(messages.getMessage('error_expected_source_files', [trigger, this.type.name]), 'ExpectedSourceFilesError');
         }
         if (component) {
             component.content = contentPath;

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

@@ -1 +1 @@
-{"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,yCAAwD;AACxD,2CAA4C;AAE5C,wDAAqD;AACrD,2DAAwD;AAExD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,yBAA0B,SAAQ,qCAAiB;IACpD,sBAAsB,CAAC,OAAmB;QAClD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA2B;QACjE,IAAI,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,WAAW,KAAK,SAAS,EAAE,GAAG,EAAE;YAClC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,CAAC;SACtF;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAClC,MAAM,IAAI,iCAAwB,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;SACxD;QAED,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;SACjC;aAAM;YACL,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,WAAW;aACrB,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACO,iBAAiB,CAAC,IAAgB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACK,uBAAuB,CAAC,IAAgB;QAC9C,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3E,CAAC;CACF;AAhED,8DAgEC"}
+{"version":3,"file":"mixedContentSourceAdapter.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/mixedContentSourceAdapter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA8C;AAC9C,2CAAqD;AACrD,2CAA4C;AAE5C,wDAAqD;AACrD,2DAAwD;AAExD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,6BAA6B,CAAC,CAAC,CAAC;AAC7G;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAa,yBAA0B,SAAQ,qCAAiB;IACpD,sBAAsB,CAAC,OAAmB;QAClD,IAAI,IAAI,CAAC,SAAS,EAAE;YAClB,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACtD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,IAAA,eAAQ,EAAC,aAAa,CAAC,EAAE,aAAa,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAES,QAAQ,CAAC,OAAmB,EAAE,SAA2B;QACjE,IAAI,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,WAAW,KAAK,SAAS,EAAE,GAAG,EAAE;YAClC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,EAAE,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,CAAC;SACtF;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAClC,MAAM,IAAI,cAAO,CACf,QAAQ,CAAC,UAAU,CAAC,6BAA6B,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAC7E,0BAA0B,CAC3B,CAAC;SACH;QAED,IAAI,SAAS,EAAE;YACb,SAAS,CAAC,OAAO,GAAG,WAAW,CAAC;SACjC;aAAM;YACL,SAAS,GAAG,IAAI,iCAAe,CAC7B;gBACE,IAAI,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,WAAW;aACrB,EACD,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,WAAW,CACjB,CAAC;SACH;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;;;OAOG;IACO,iBAAiB,CAAC,IAAgB;QAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,UAAG,CAAC,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACK,uBAAuB,CAAC,IAAgB;QAC9C,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,iBAAiB,GAAG,IAAA,cAAO,EAAC,eAAe,CAAC,CAAC;QACnD,MAAM,eAAe,GAAG,IAAA,eAAQ,EAAC,eAAe,CAAC,CAAC;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,eAAe,EAAE,iBAAiB,CAAC,CAAC;IAC3E,CAAC;CACF;AAnED,8DAmEC"}

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

@@ -1,7 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SourceAdapterFactory = void 0;
-const errors_1 = require("../../errors");
+/*
+ * Copyright (c) 2020, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+const core_1 = require("@salesforce/core");
 const forceIgnore_1 = require("../forceIgnore");
 const bundleSourceAdapter_1 = require("./bundleSourceAdapter");
 const decomposedSourceAdapter_1 = require("./decomposedSourceAdapter");
@@ -16,6 +22,8 @@ var AdapterId;
     AdapterId["MatchingContentFile"] = "matchingContentFile";
     AdapterId["MixedContent"] = "mixedContent";
 })(AdapterId || (AdapterId = {}));
+core_1.Messages.importMessagesDirectory(__dirname);
+const messages = core_1.Messages.load('@salesforce/source-deploy-retrieve', 'sdr', ['error_missing_adapter']);
 class SourceAdapterFactory {
     constructor(registry, tree) {
         this.registry = registry;
@@ -37,7 +45,7 @@ class SourceAdapterFactory {
             case undefined:
                 return new defaultSourceAdapter_1.DefaultSourceAdapter(type, this.registry, forceIgnore, this.tree);
             default:
-                throw new errors_1.RegistryError('error_missing_adapter', [adapterId, type.name]);
+                throw new core_1.SfError(messages.getMessage('error_missing_adapter', [adapterId, type.name]), 'RegistryError');
         }
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"sourceAdapterFactory.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/sourceAdapterFactory.ts"],"names":[],"mappings":";;;AAOA,yCAA6C;AAC7C,gDAA6C;AAG7C,+DAA4D;AAC5D,uEAAoE;AACpE,iFAA8E;AAC9E,2EAAwE;AACxE,iEAA8D;AAE9D,IAAK,SAMJ;AAND,WAAK,SAAS;IACZ,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,gCAAmB,CAAA;IACnB,wDAA2C,CAAA;IAC3C,0CAA6B,CAAA;AAC/B,CAAC,EANI,SAAS,KAAT,SAAS,QAMb;AAED,MAAa,oBAAoB;IAI/B,YAAmB,QAAwB,EAAE,IAAmB;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,UAAU,CAAC,IAAkB,EAAE,WAAW,GAAG,IAAI,yBAAW,EAAE;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,OAAoB,CAAC;QACxD,QAAQ,SAAS,EAAE;YACjB,KAAK,SAAS,CAAC,MAAM;gBACnB,OAAO,IAAI,yCAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9E,KAAK,SAAS,CAAC,UAAU;gBACvB,OAAO,IAAI,iDAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAClF,KAAK,SAAS,CAAC,mBAAmB;gBAChC,OAAO,IAAI,2DAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,KAAK,SAAS,CAAC,YAAY;gBACzB,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACpF,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E,KAAK,SAAS;gBACZ,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E;gBACE,MAAM,IAAI,sBAAa,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;SAC5E;IACH,CAAC;CACF;AA5BD,oDA4BC"}
+{"version":3,"file":"sourceAdapterFactory.js","sourceRoot":"","sources":["../../../../src/resolve/adapters/sourceAdapterFactory.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,2CAAqD;AAErD,gDAA6C;AAG7C,+DAA4D;AAC5D,uEAAoE;AACpE,iFAA8E;AAC9E,2EAAwE;AACxE,iEAA8D;AAE9D,IAAK,SAMJ;AAND,WAAK,SAAS;IACZ,8BAAiB,CAAA;IACjB,sCAAyB,CAAA;IACzB,gCAAmB,CAAA;IACnB,wDAA2C,CAAA;IAC3C,0CAA6B,CAAA;AAC/B,CAAC,EANI,SAAS,KAAT,SAAS,QAMb;AAED,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAC5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,IAAI,CAAC,oCAAoC,EAAE,KAAK,EAAE,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEvG,MAAa,oBAAoB;IAI/B,YAAmB,QAAwB,EAAE,IAAmB;QAC9D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IAEM,UAAU,CAAC,IAAkB,EAAE,WAAW,GAAG,IAAI,yBAAW,EAAE;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,OAAoB,CAAC;QACxD,QAAQ,SAAS,EAAE;YACjB,KAAK,SAAS,CAAC,MAAM;gBACnB,OAAO,IAAI,yCAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC9E,KAAK,SAAS,CAAC,UAAU;gBACvB,OAAO,IAAI,iDAAuB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAClF,KAAK,SAAS,CAAC,mBAAmB;gBAChC,OAAO,IAAI,2DAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvF,KAAK,SAAS,CAAC,YAAY;gBACzB,OAAO,IAAI,qDAAyB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACpF,KAAK,SAAS,CAAC,OAAO;gBACpB,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E,KAAK,SAAS;gBACZ,OAAO,IAAI,2CAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/E;gBACE,MAAM,IAAI,cAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC;SAC5G;IACH,CAAC;CACF;AA5BD,oDA4BC"}

package/lib/src/resolve/connectionResolver.js

@@ -77,6 +77,13 @@ class ConnectionResolver {
             this.logger.debug(error.message);
             members = [];
         }
+        // if the Metadata Type doesn't return a correct fileName then help it out
+        for (const m of members) {
+            if (typeof m.fileName == 'object') {
+                const t = this.registry.getTypeByName(query.type);
+                m.fileName = `${t.directoryName}/${m.fullName}.${t.suffix}`;
+            }
+        }
         // Workaround because metadata.list({ type: 'StandardValueSet' }) returns []
         if (query.type === registry_1.registry.types.standardvalueset.name && members.length === 0) {
             const standardValueSetPromises = standardvalueset_1.standardValueSet.fullnames.map(async (standardValueSetFullName) => {

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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"}