@salesforce/source-deploy-retrieve 5.0.0-orb.2 → 5.0.2

package/lib/src/client/metadataTransfer.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MetadataTransfer = void 0;
 /*
@@ -16,15 +7,16 @@ exports.MetadataTransfer = 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 core_1 = require("@salesforce/core");
 const events_1 = require("events");
-const collections_1 = require("../collections");
-const errors_1 = require("../errors");
-const types_1 = require("./types");
-const convert_1 = require("../convert");
 const path_1 = require("path");
+const core_1 = require("@salesforce/core");
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
+const fs = require("graceful-fs");
+const convert_1 = require("../convert");
+const errors_1 = require("../errors");
+const collections_1 = require("../collections");
+const types_1 = require("./types");
 class MetadataTransfer {
     constructor({ usernameOrConnection, components, apiVersion, id }) {
         this.canceled = false;
@@ -32,69 +24,67 @@ class MetadataTransfer {
         this.usernameOrConnection = usernameOrConnection;
         this.components = components;
         this.apiVersion = apiVersion;
-        this._id = id;
+        this.transferId = id;
         this.logger = core_1.Logger.childFromRoot(this.constructor.name);
     }
     get id() {
-        return this._id;
+        return this.transferId;
     }
     /**
      * Send the metadata transfer request to the org.
      *
      * @returns AsyncResult from the deploy or retrieve response.
      */
-    start() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.canceled = false;
-            const asyncResult = yield this.pre();
-            this._id = asyncResult.id;
-            this.logger.debug(`Started metadata transfer. ID = ${this.id}`);
-            return asyncResult;
-        });
+    async start() {
+        this.canceled = false;
+        const asyncResult = await this.pre();
+        this.transferId = asyncResult.id;
+        this.logger.debug(`Started metadata transfer. ID = ${this.id}`);
+        return asyncResult;
     }
-    pollStatus(frequencyOrOptions, timeout) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let pollingOptions = {
-                frequency: kit_1.Duration.milliseconds(100),
-                timeout: kit_1.Duration.minutes(60),
-                poll: this.poll.bind(this),
-            };
-            if (ts_types_1.isNumber(frequencyOrOptions)) {
-                pollingOptions.frequency = kit_1.Duration.milliseconds(frequencyOrOptions);
+    async pollStatus(frequencyOrOptions, timeout) {
+        let pollingOptions = {
+            frequency: kit_1.Duration.milliseconds(100),
+            timeout: kit_1.Duration.minutes(60),
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+            poll: this.poll.bind(this),
+        };
+        if ((0, ts_types_1.isNumber)(frequencyOrOptions)) {
+            pollingOptions.frequency = kit_1.Duration.milliseconds(frequencyOrOptions);
+        }
+        else if (frequencyOrOptions !== undefined) {
+            pollingOptions = { ...pollingOptions, ...frequencyOrOptions };
+        }
+        if ((0, ts_types_1.isNumber)(timeout)) {
+            pollingOptions.timeout = kit_1.Duration.seconds(timeout);
+        }
+        const pollingClient = await core_1.PollingClient.create(pollingOptions);
+        try {
+            this.logger.debug(`Polling for metadata transfer status. ID = ${this.id}`);
+            this.logger.debug(`Polling frequency (ms): ${pollingOptions.frequency.milliseconds}`);
+            this.logger.debug(`Polling timeout (min): ${pollingOptions.timeout.minutes}`);
+            const completedMdapiStatus = (await pollingClient.subscribe());
+            const result = await this.post(completedMdapiStatus);
+            if (completedMdapiStatus.status === types_1.RequestStatus.Canceled) {
+                this.event.emit('cancel', completedMdapiStatus);
             }
-            else if (frequencyOrOptions !== undefined) {
-                pollingOptions = Object.assign(Object.assign({}, pollingOptions), frequencyOrOptions);
+            else {
+                this.event.emit('finish', result);
             }
-            if (ts_types_1.isNumber(timeout)) {
-                pollingOptions.timeout = kit_1.Duration.seconds(timeout);
+            return result;
+        }
+        catch (e) {
+            const err = e;
+            const error = new errors_1.MetadataTransferError('md_request_fail', err.message);
+            if (error.stack && err.stack) {
+                // append the original stack to this new error
+                error.stack += `\nDUE TO:\n${err.stack}`;
             }
-            const pollingClient = yield core_1.PollingClient.create(pollingOptions);
-            try {
-                this.logger.debug(`Polling for metadata transfer status. ID = ${this.id}`);
-                this.logger.debug(`Polling frequency (ms): ${pollingOptions.frequency.milliseconds}`);
-                this.logger.debug(`Polling timeout (min): ${pollingOptions.timeout.minutes}`);
-                const completedMdapiStatus = (yield pollingClient.subscribe());
-                const result = yield this.post(completedMdapiStatus);
-                if (completedMdapiStatus.status === types_1.RequestStatus.Canceled) {
-                    this.event.emit('cancel', completedMdapiStatus);
-                }
-                else {
-                    this.event.emit('finish', result);
-                }
-                return result;
+            if (this.event.listenerCount('error') === 0) {
+                throw error;
             }
-            catch (e) {
-                const error = new errors_1.MetadataTransferError('md_request_fail', e.message);
-                if (error.stack && e.stack) {
-                    // append the original stack to this new error
-                    error.stack += `\nDUE TO:\n${e.stack}`;
-                }
-                if (this.event.listenerCount('error') === 0) {
-                    throw error;
-                }
-                this.event.emit('error', error);
-            }
-        });
+            this.event.emit('error', error);
+        }
     }
     onUpdate(subscriber) {
         this.event.on('update', subscriber);
@@ -108,68 +98,62 @@ class MetadataTransfer {
     onError(subscriber) {
         this.event.on('error', subscriber);
     }
-    maybeSaveTempDirectory(target, cs) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const mdapiTempDir = process.env.SFDX_MDAPI_TEMP_DIR;
-            if (mdapiTempDir) {
-                process.emitWarning('The SFDX_MDAPI_TEMP_DIR environment variable is set, which may degrade performance');
-                this.logger.debug(`Converting metadata to: ${mdapiTempDir} because the SFDX_MDAPI_TEMP_DIR environment variable is set`);
-                try {
-                    const source = cs || this.components || new collections_1.ComponentSet();
-                    const converter = new convert_1.MetadataConverter();
-                    yield converter.convert(source, target, {
-                        type: 'directory',
-                        outputDirectory: mdapiTempDir,
-                    });
-                    if (target === 'source') {
-                        // for source convert the package.xml isn't included so write it separately
-                        core_1.fs.writeFileSync(path_1.join(mdapiTempDir, 'package.xml'), source.getPackageXml());
-                    }
-                }
-                catch (e) {
-                    this.logger.debug(e);
+    async maybeSaveTempDirectory(target, cs) {
+        const mdapiTempDir = process.env.SFDX_MDAPI_TEMP_DIR;
+        if (mdapiTempDir) {
+            process.emitWarning('The SFDX_MDAPI_TEMP_DIR environment variable is set, which may degrade performance');
+            this.logger.debug(`Converting metadata to: ${mdapiTempDir} because the SFDX_MDAPI_TEMP_DIR environment variable is set`);
+            try {
+                const source = cs || this.components || new collections_1.ComponentSet();
+                const converter = new convert_1.MetadataConverter();
+                await converter.convert(source, target, {
+                    type: 'directory',
+                    outputDirectory: mdapiTempDir,
+                });
+                if (target === 'source') {
+                    // for source convert the package.xml isn't included so write it separately
+                    fs.writeFileSync((0, path_1.join)(mdapiTempDir, 'package.xml'), source.getPackageXml());
                 }
             }
-        });
+            catch (e) {
+                this.logger.debug(e);
+            }
+        }
     }
-    getConnection() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (typeof this.usernameOrConnection === 'string') {
-                this.usernameOrConnection = yield core_1.Connection.create({
-                    authInfo: yield core_1.AuthInfo.create({ username: this.usernameOrConnection }),
-                });
-                if (this.apiVersion && this.apiVersion !== this.usernameOrConnection.version) {
-                    this.usernameOrConnection.setApiVersion(this.apiVersion);
-                    this.logger.debug(`Overriding apiVersion to: ${this.apiVersion}`);
-                }
+    async getConnection() {
+        if (typeof this.usernameOrConnection === 'string') {
+            this.usernameOrConnection = await core_1.Connection.create({
+                authInfo: await core_1.AuthInfo.create({ username: this.usernameOrConnection }),
+            });
+            if (this.apiVersion && this.apiVersion !== this.usernameOrConnection.version) {
+                this.usernameOrConnection.setApiVersion(this.apiVersion);
+                this.logger.debug(`Overriding apiVersion to: ${this.apiVersion}`);
             }
-            return this.usernameOrConnection;
-        });
+        }
+        return this.usernameOrConnection;
     }
-    poll() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let completed = false;
-            let mdapiStatus;
-            if (this.canceled) {
-                // This only happens for a canceled retrieve. Canceled deploys are
-                // handled via checkStatus response.
-                if (!mdapiStatus) {
-                    mdapiStatus = { id: this.id, success: false, done: true };
-                }
-                mdapiStatus.status = types_1.RequestStatus.Canceled;
-                completed = true;
-                this.canceled = false;
+    async poll() {
+        let completed = false;
+        let mdapiStatus;
+        if (this.canceled) {
+            // This only happens for a canceled retrieve. Canceled deploys are
+            // handled via checkStatus response.
+            if (!mdapiStatus) {
+                mdapiStatus = { id: this.id, success: false, done: true };
             }
-            else {
-                mdapiStatus = yield this.checkStatus();
-                completed = mdapiStatus === null || mdapiStatus === void 0 ? void 0 : mdapiStatus.done;
-                if (!completed) {
-                    this.event.emit('update', mdapiStatus);
-                }
+            mdapiStatus.status = types_1.RequestStatus.Canceled;
+            completed = true;
+            this.canceled = false;
+        }
+        else {
+            mdapiStatus = await this.checkStatus();
+            completed = mdapiStatus === null || mdapiStatus === void 0 ? void 0 : mdapiStatus.done;
+            if (!completed) {
+                this.event.emit('update', mdapiStatus);
             }
-            this.logger.debug(`MDAPI status update: ${mdapiStatus.status}`);
-            return { completed, payload: mdapiStatus };
-        });
+        }
+        this.logger.debug(`MDAPI status update: ${mdapiStatus.status}`);
+        return { completed, payload: mdapiStatus };
     }
 }
 exports.MetadataTransfer = MetadataTransfer;

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

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

package/lib/src/client/retrieveUtil.d.ts

@@ -1,4 +1,4 @@
-import { QueryResult } from './types';
 import { SourceComponent } from '../resolve';
+import { QueryResult } from './types';
 export declare function buildQuery(mdComponent: SourceComponent, namespace?: string): string;
 export declare function queryToFileMap(queryResult: QueryResult, mdComponent: SourceComponent, overrideOutputPath?: string): Map<string, string>;

package/lib/src/client/retrieveUtil.js

@@ -23,8 +23,7 @@ function buildQuery(mdComponent, namespace = '') {
             queryString = `Select Id, ApiVersion, Name, NamespacePrefix, Markup from ${typeName} where Name = '${fullName}' and NamespacePrefix = '${namespace}'`;
             break;
         case 'AuraDefinitionBundle':
-            queryString =
-                'Select Id, AuraDefinitionBundle.ApiVersion, AuraDefinitionBundle.DeveloperName, ';
+            queryString = 'Select Id, AuraDefinitionBundle.ApiVersion, AuraDefinitionBundle.DeveloperName, ';
             queryString += `AuraDefinitionBundle.NamespacePrefix, DefType, Source from AuraDefinition where AuraDefinitionBundle.DeveloperName = '${fullName}' and AuraDefinitionBundle.NamespacePrefix = '${namespace}'`;
             break;
         case 'LightningComponentBundle':
@@ -39,7 +38,7 @@ function buildQuery(mdComponent, namespace = '') {
 }
 exports.buildQuery = buildQuery;
 function getAuraSourceName(componentPath, fileNamePrefix, defType) {
-    const cmpParentName = path_1.join(path_1.dirname(componentPath), fileNamePrefix);
+    const cmpParentName = (0, path_1.join)((0, path_1.dirname)(componentPath), fileNamePrefix);
     switch (defType) {
         case 'APPLICATION':
             return `${cmpParentName}.app`;
@@ -73,26 +72,25 @@ function queryToFileMap(queryResult, mdComponent, overrideOutputPath) {
     const typeName = mdComponent.type.name;
     let apiVersion;
     let status;
+    let record;
     // If output is defined it overrides where the component will be stored
-    const mdSourcePath = overrideOutputPath
-        ? utils_1.trimMetaXmlSuffix(overrideOutputPath)
-        : mdComponent.walkContent()[0];
+    const mdSourcePath = overrideOutputPath ? (0, utils_1.trimMetaXmlSuffix)(overrideOutputPath) : mdComponent.walkContent()[0];
     const saveFilesMap = new Map();
     switch (typeName) {
         case 'ApexClass':
         case 'ApexTrigger':
-            const apexRecord = queryResult.records[0];
-            status = apexRecord.Status;
-            apiVersion = apexRecord.ApiVersion;
-            saveFilesMap.set(mdSourcePath, apexRecord.Body);
+            record = queryResult.records[0];
+            status = record.Status;
+            apiVersion = record.ApiVersion;
+            saveFilesMap.set(mdSourcePath, record.Body);
             break;
         case 'ApexComponent':
         case 'ApexPage':
-            const vfRecord = queryResult.records[0];
-            apiVersion = vfRecord.ApiVersion;
-            saveFilesMap.set(mdSourcePath, vfRecord.Markup);
+            record = queryResult.records[0];
+            apiVersion = record.ApiVersion;
+            saveFilesMap.set(mdSourcePath, record.Markup);
             break;
-        case 'AuraDefinitionBundle':
+        case 'AuraDefinitionBundle': {
             const auraRecord = queryResult.records;
             apiVersion = auraRecord[0].AuraDefinitionBundle.ApiVersion;
             auraRecord.forEach((item) => {
@@ -100,19 +98,21 @@ function queryToFileMap(queryResult, mdComponent, overrideOutputPath) {
                 saveFilesMap.set(cmpName, item.Source);
             });
             break;
-        case 'LightningComponentBundle':
+        }
+        case 'LightningComponentBundle': {
             const lwcRecord = queryResult.records;
             const bundleParentPath = mdSourcePath.substring(0, mdSourcePath.lastIndexOf(`${path_1.sep}lwc`));
             lwcRecord.forEach((item) => {
-                const cmpName = path_1.join(bundleParentPath, item.FilePath);
+                const cmpName = (0, path_1.join)(bundleParentPath, item.FilePath);
                 saveFilesMap.set(cmpName, item.Source);
             });
             break;
+        }
         default:
     }
     // NOTE: LightningComponentBundle query results returns the -meta.xml file
     if (typeName !== 'LightningComponentBundle') {
-        saveFilesMap.set(utils_1.generateMetaXMLPath(mdSourcePath), utils_1.generateMetaXML(typeName, apiVersion, status));
+        saveFilesMap.set((0, utils_1.generateMetaXMLPath)(mdSourcePath), (0, utils_1.generateMetaXML)(typeName, apiVersion, status));
     }
     return saveFilesMap;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"retrieveUtil.js","sourceRoot":"","sources":["../../../src/client/retrieveUtil.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAA0C;AAC1C,oCAAmF;AAInF,SAAgB,UAAU,CAAC,WAA4B,EAAE,SAAS,GAAG,EAAE;IACrE,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;IACvC,MAAM,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;IAEtC,QAAQ,QAAQ,EAAE;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,aAAa;YAChB,WAAW,GAAG,mEAAmE,QAAQ,kBAAkB,QAAQ,4BAA4B,SAAS,GAAG,CAAC;YAC5J,MAAM;QACR,KAAK,eAAe,CAAC;QACrB,KAAK,UAAU;YACb,WAAW,GAAG,6DAA6D,QAAQ,kBAAkB,QAAQ,4BAA4B,SAAS,GAAG,CAAC;YACtJ,MAAM;QACR,KAAK,sBAAsB;YACzB,WAAW;gBACT,kFAAkF,CAAC;YACrF,WAAW,IAAI,yHAAyH,QAAQ,iDAAiD,SAAS,GAAG,CAAC;YAC9M,MAAM;QACR,KAAK,0BAA0B;YAC7B,WAAW;gBACT,gJAAgJ,CAAC;YACnJ,WAAW,IAAI,mDAAmD,QAAQ,qDAAqD,SAAS,GAAG,CAAC;YAC5I,MAAM;QACR;YACE,WAAW,GAAG,EAAE,CAAC;KACpB;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AA7BD,gCA6BC;AAED,SAAS,iBAAiB,CAAC,aAAqB,EAAE,cAAsB,EAAE,OAAe;IACvF,MAAM,aAAa,GAAG,WAAI,CAAC,cAAO,CAAC,aAAa,CAAC,EAAE,cAAc,CAAC,CAAC;IAEnE,QAAQ,OAAO,EAAE;QACf,KAAK,aAAa;YAChB,OAAO,GAAG,aAAa,MAAM,CAAC;QAChC,KAAK,WAAW;YACd,OAAO,GAAG,aAAa,MAAM,CAAC;QAChC,KAAK,eAAe;YAClB,OAAO,GAAG,aAAa,UAAU,CAAC;QACpC,KAAK,OAAO;YACV,OAAO,GAAG,aAAa,MAAM,CAAC;QAChC,KAAK,OAAO;YACV,OAAO,GAAG,aAAa,MAAM,CAAC;QAChC,KAAK,QAAQ;YACX,OAAO,GAAG,aAAa,SAAS,CAAC;QACnC,KAAK,KAAK;YACR,OAAO,GAAG,aAAa,MAAM,CAAC;QAChC,KAAK,YAAY;YACf,OAAO,GAAG,aAAa,eAAe,CAAC;QACzC,KAAK,QAAQ;YACX,OAAO,GAAG,aAAa,WAAW,CAAC;QACrC,KAAK,UAAU;YACb,OAAO,GAAG,aAAa,aAAa,CAAC;QACvC,KAAK,QAAQ;YACX,OAAO,GAAG,aAAa,SAAS,CAAC;QACnC,KAAK,WAAW;YACd,OAAO,GAAG,aAAa,OAAO,CAAC;QACjC;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAED,SAAgB,cAAc,CAC5B,WAAwB,EACxB,WAA4B,EAC5B,kBAA2B;IAE3B,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC;IACvC,IAAI,UAAkB,CAAC;IACvB,IAAI,MAAc,CAAC;IACnB,uEAAuE;IACvE,MAAM,YAAY,GAAG,kBAAkB;QACrC,CAAC,CAAC,yBAAiB,CAAC,kBAAkB,CAAC;QACvC,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;IAC/B,QAAQ,QAAQ,EAAE;QAChB,KAAK,WAAW,CAAC;QACjB,KAAK,aAAa;YAChB,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAe,CAAC;YACxD,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;YAC3B,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;YACnC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YAChD,MAAM;QACR,KAAK,eAAe,CAAC;QACrB,KAAK,UAAU;YACb,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAa,CAAC;YACpD,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;YACjC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM;QACR,KAAK,sBAAsB;YACzB,MAAM,UAAU,GAAG,WAAW,CAAC,OAAuB,CAAC;YACvD,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC;YAC3D,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC1B,MAAM,OAAO,GAAG,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChF,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,MAAM;QACR,KAAK,0BAA0B;YAC7B,MAAM,SAAS,GAAG,WAAW,CAAC,OAAsB,CAAC;YACrD,MAAM,gBAAgB,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,WAAW,CAAC,GAAG,UAAG,KAAK,CAAC,CAAC,CAAC;YAC1F,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACzB,MAAM,OAAO,GAAG,WAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACtD,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC,CAAC,CAAC;YACH,MAAM;QACR,QAAQ;KACT;IAED,0EAA0E;IAC1E,IAAI,QAAQ,KAAK,0BAA0B,EAAE;QAC3C,YAAY,CAAC,GAAG,CACd,2BAAmB,CAAC,YAAY,CAAC,EACjC,uBAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,CAAC,CAC9C,CAAC;KACH;IAED,OAAO,YAAY,CAAC;AACtB,CAAC;AAvDD,wCAuDC"}
+{"version":3,"file":"retrieveUtil.js","sourceRoot":"","sources":["../../../src/client/retrieveUtil.ts"],"names":[],"mappings":"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"}

package/lib/src/client/toolingApi.d.ts

@@ -1,9 +1,9 @@
+import { Connection } from '@salesforce/core';
 import { SourcePath } from '../common';
 import { MetadataResolver, SourceComponent } from '../resolve';
-import { SourceDeployResult, SourceRetrieveResult } from './types';
 import { ComponentSet } from '../collections';
-import { Connection } from '@salesforce/core';
 import { RegistryAccess } from '../registry';
+import { SourceDeployResult, SourceRetrieveResult } from './types';
 declare type WithNamespace = {
     namespace?: string;
 };

package/lib/src/client/toolingApi.js

@@ -1,29 +1,14 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToolingApi = exports.deployTypes = 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 deployStrategies_1 = require("./deployStrategies");
 const errors_1 = require("../errors");
 const i18n_1 = require("../i18n");
-const retrieveUtil_1 = require("./retrieveUtil");
 const utils_1 = require("../utils");
-const types_1 = require("./types");
 const collections_1 = require("../collections");
 const registry_1 = require("../registry");
+const types_1 = require("./types");
+const retrieveUtil_1 = require("./retrieveUtil");
+const deployStrategies_1 = require("./deployStrategies");
 const retrieveTypes = new Set([
     'ApexClass',
     'ApexTrigger',
@@ -46,90 +31,82 @@ class ToolingApi {
         this.resolver = resolver;
         this.registry = registry;
     }
-    retrieveWithPaths(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.retrieve({
-                output: options.output,
-                namespace: options.namespace,
-                components: collections_1.ComponentSet.fromSource({ fsPaths: [options.paths[0]], registry: this.registry }),
-            });
+    async retrieveWithPaths(options) {
+        return this.retrieve({
+            output: options.output,
+            namespace: options.namespace,
+            components: collections_1.ComponentSet.fromSource({ fsPaths: [options.paths[0]], registry: this.registry }),
         });
     }
-    retrieve(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let retrieveResult;
-            if (options.components.size > 1) {
-                const retrieveError = new Error();
-                retrieveError.message = i18n_1.nls.localize('tapi_retrieve_component_limit_error');
-                retrieveError.name = 'MetadataRetrieveLimit';
-                throw retrieveError;
-            }
-            const mdComponent = options.components.getSourceComponents().first();
-            if (!retrieveTypes.has(mdComponent.type.name)) {
-                const retrieveError = new Error();
-                retrieveError.message = i18n_1.nls.localize('beta_tapi_membertype_unsupported_error', mdComponent.type.name);
-                retrieveError.name = 'MetadataTypeUnsupported';
-                throw retrieveError;
-            }
-            try {
-                const queryResult = (yield this.connection.tooling.query(retrieveUtil_1.buildQuery(mdComponent, options.namespace)));
-                if (queryResult && queryResult.records.length === 0) {
-                    return {
-                        status: types_1.RequestStatus.Failed,
-                        success: false,
-                        successes: [],
-                        failures: [
-                            {
-                                component: {
-                                    fullName: mdComponent.fullName,
-                                    type: mdComponent.type,
-                                },
-                                message: i18n_1.nls.localize('error_md_not_present_in_org', mdComponent.fullName),
+    async retrieve(options) {
+        let retrieveResult;
+        if (options.components.size > 1) {
+            const retrieveError = new Error();
+            retrieveError.message = i18n_1.nls.localize('tapi_retrieve_component_limit_error');
+            retrieveError.name = 'MetadataRetrieveLimit';
+            throw retrieveError;
+        }
+        const mdComponent = options.components.getSourceComponents().first();
+        if (!retrieveTypes.has(mdComponent.type.name)) {
+            const retrieveError = new Error();
+            retrieveError.message = i18n_1.nls.localize('beta_tapi_membertype_unsupported_error', mdComponent.type.name);
+            retrieveError.name = 'MetadataTypeUnsupported';
+            throw retrieveError;
+        }
+        try {
+            const queryResult = (await this.connection.tooling.query((0, retrieveUtil_1.buildQuery)(mdComponent, options.namespace)));
+            if (queryResult && queryResult.records.length === 0) {
+                return {
+                    status: types_1.RequestStatus.Failed,
+                    success: false,
+                    successes: [],
+                    failures: [
+                        {
+                            component: {
+                                fullName: mdComponent.fullName,
+                                type: mdComponent.type,
                             },
-                        ],
-                    };
-                }
-                const saveFilesMap = retrieveUtil_1.queryToFileMap(queryResult, mdComponent, options.output);
-                utils_1.createFiles(saveFilesMap);
-                retrieveResult = {
-                    status: types_1.RequestStatus.Succeeded,
-                    success: true,
-                    successes: [{ component: mdComponent }],
-                    failures: [],
+                            message: i18n_1.nls.localize('error_md_not_present_in_org', mdComponent.fullName),
+                        },
+                    ],
                 };
             }
-            catch (err) {
-                throw new Error(i18n_1.nls.localize('error_in_tooling_retrieve', err));
-            }
-            return retrieveResult;
-        });
+            const saveFilesMap = (0, retrieveUtil_1.queryToFileMap)(queryResult, mdComponent, options.output);
+            (0, utils_1.createFiles)(saveFilesMap);
+            retrieveResult = {
+                status: types_1.RequestStatus.Succeeded,
+                success: true,
+                successes: [{ component: mdComponent }],
+                failures: [],
+            };
+        }
+        catch (err) {
+            throw new Error(i18n_1.nls.localize('error_in_tooling_retrieve', err));
+        }
+        return retrieveResult;
     }
-    deploy(components, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let mdComponent;
-            if (Array.isArray(components)) {
-                if (components.length > 1) {
-                    const deployError = new errors_1.SourceClientError('tapi_deploy_component_limit_error');
-                    throw deployError;
-                }
-                mdComponent = components[0];
-            }
-            else {
-                mdComponent = components;
+    async deploy(components, options) {
+        let mdComponent;
+        if (Array.isArray(components)) {
+            if (components.length > 1) {
+                const deployError = new errors_1.SourceClientError('tapi_deploy_component_limit_error');
+                throw deployError;
             }
-            const metadataType = mdComponent.type.name;
-            if (!exports.deployTypes.get(metadataType)) {
-                throw new errors_1.SourceClientError('beta_tapi_membertype_unsupported_error', metadataType);
-            }
-            const deployStrategy = deployStrategies_1.getDeployStrategy(metadataType, this.connection);
-            const namespace = options && options.namespace ? options.namespace : '';
-            return deployStrategy.deploy(mdComponent, namespace);
-        });
+            mdComponent = components[0];
+        }
+        else {
+            mdComponent = components;
+        }
+        const metadataType = mdComponent.type.name;
+        if (!exports.deployTypes.get(metadataType)) {
+            throw new errors_1.SourceClientError('beta_tapi_membertype_unsupported_error', metadataType);
+        }
+        const deployStrategy = (0, deployStrategies_1.getDeployStrategy)(metadataType, this.connection);
+        const namespace = options && options.namespace ? options.namespace : '';
+        return deployStrategy.deploy(mdComponent, namespace);
     }
-    deployWithPaths(path, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.deploy(this.resolver.getComponentsFromPath(path), options);
-        });
+    async deployWithPaths(path, options) {
+        return this.deploy(this.resolver.getComponentsFromPath(path), options);
     }
 }
 exports.ToolingApi = ToolingApi;