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

package/lib/src/client/metadataApiDeploy.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.MetadataApiDeploy = exports.DeployResult = void 0;
 /*
@@ -16,16 +7,16 @@ exports.MetadataApiDeploy = exports.DeployResult = 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 convert_1 = require("../convert");
-const diagnosticUtil_1 = require("./diagnosticUtil");
-const types_1 = require("./types");
-const metadataTransfer_1 = require("./metadataTransfer");
 const path_1 = require("path");
+const ts_types_1 = require("@salesforce/ts-types");
+const convert_1 = require("../convert");
 const utils_1 = require("../utils");
 const collections_1 = require("../collections");
 const registry_1 = require("../registry");
-const ts_types_1 = require("@salesforce/ts-types");
 const errors_1 = require("../errors");
+const metadataTransfer_1 = require("./metadataTransfer");
+const types_1 = require("./types");
+const diagnosticUtil_1 = require("./diagnosticUtil");
 class DeployResult {
     constructor(response, components) {
         this.diagnosticUtil = new diagnosticUtil_1.DiagnosticUtil('metadata');
@@ -104,8 +95,8 @@ class DeployResult {
     getDeployMessages(result) {
         const messageMap = new Map();
         const failedComponents = new collections_1.ComponentSet();
-        const failureMessages = utils_1.normalizeToArray(result.details.componentFailures);
-        const successMessages = utils_1.normalizeToArray(result.details.componentSuccesses);
+        const failureMessages = (0, utils_1.normalizeToArray)(result.details.componentFailures);
+        const successMessages = (0, utils_1.normalizeToArray)(result.details.componentSuccesses);
         for (const failure of failureMessages) {
             const sanitized = this.sanitizeDeployMessage(failure);
             const componentLike = {
@@ -146,7 +137,7 @@ class DeployResult {
                 break;
             case registry_1.registry.types.document.name:
                 // strip document extension from fullName
-                message.fullName = path_1.join(path_1.dirname(message.fullName), path_1.basename(message.fullName, path_1.extname(message.fullName)));
+                message.fullName = (0, path_1.join)((0, path_1.dirname)(message.fullName), (0, path_1.basename)(message.fullName, (0, path_1.extname)(message.fullName)));
                 break;
             default:
         }
@@ -161,7 +152,7 @@ exports.DeployResult = DeployResult;
 class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
     constructor(options) {
         super(options);
-        options.apiOptions = Object.assign(Object.assign({}, MetadataApiDeploy.DEFAULT_OPTIONS.apiOptions), options.apiOptions);
+        options.apiOptions = { ...MetadataApiDeploy.DEFAULT_OPTIONS.apiOptions, ...options.apiOptions };
         this.options = Object.assign({}, options);
     }
     /**
@@ -172,41 +163,37 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
      * - The components have been validated successfully for the target environment within the last 10 days.
      * - As part of the validation, Apex tests in the target org have passed.
      * - Code coverage requirements are met.
-     *   - If all tests in the org or all local tests are run, overall code coverage is at least 75%, and Apex triggers have some coverage.
-     *   - If specific tests are run with the RunSpecifiedTests test level, each class and trigger that was deployed is covered by at least 75% individually.
+     * - If all tests in the org or all local tests are run, overall code coverage is at least 75%, and Apex triggers have some coverage.
+     * - If specific tests are run with the RunSpecifiedTests test level, each class and trigger that was deployed is covered by at least 75% individually.
      *
      * See [deployRecentValidation()](https://developer.salesforce.com/docs/atlas.en-us.api_meta.meta/api_meta/meta_deployRecentValidation.htm)
      *
      * @param rest - Set to `true` to use the REST API, otherwise defaults to using SOAP
      * @returns The ID of the quick deployment
      */
-    deployRecentValidation(rest = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                throw new errors_1.MissingJobIdError('deploy');
-            }
-            const conn = yield this.getConnection();
-            const response = (yield conn.deployRecentValidation({
-                id: this.id,
-                rest,
-            }));
-            return ts_types_1.isString(response) ? response : response.id;
-        });
+    async deployRecentValidation(rest = false) {
+        if (!this.id) {
+            throw new errors_1.MissingJobIdError('deploy');
+        }
+        const conn = await this.getConnection();
+        const response = (await conn.deployRecentValidation({
+            id: this.id,
+            rest,
+        }));
+        return (0, ts_types_1.isString)(response) ? response : response.id;
     }
     /**
      * Check the status of the deploy operation.
      *
      * @returns Status of the deploy
      */
-    checkStatus() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                throw new errors_1.MissingJobIdError('deploy');
-            }
-            const connection = yield this.getConnection();
-            // Recasting to use the project's version of the type
-            return connection.metadata.checkDeployStatus(this.id, true);
-        });
+    async checkStatus() {
+        if (!this.id) {
+            throw new errors_1.MissingJobIdError('deploy');
+        }
+        const connection = await this.getConnection();
+        // Recasting to use the project's version of the type
+        return connection.metadata.checkDeployStatus(this.id, true);
     }
     /**
      * Cancel the deploy operation.
@@ -214,42 +201,39 @@ class MetadataApiDeploy extends metadataTransfer_1.MetadataTransfer {
      * Deploys are asynchronously canceled. Once the cancel request is made to the org,
      * check the status of the cancellation with `checkStatus`.
      */
-    cancel() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                throw new errors_1.MissingJobIdError('deploy');
-            }
-            const connection = yield this.getConnection();
-            return new Promise((resolve, reject) => {
-                connection.metadata
-                    // @ts-ignore _invoke is private on the jsforce metadata object, and cancelDeploy is not an exposed method
-                    ._invoke('cancelDeploy', { id: this.id })
-                    .thenCall((result) => {
-                    // this does not return CancelDeployResult as documented in the API.
-                    // a null result seems to indicate the request was successful
-                    if (result) {
-                        reject(result);
-                    }
-                    else {
-                        resolve(result);
-                    }
-                });
+    async cancel() {
+        if (!this.id) {
+            throw new errors_1.MissingJobIdError('deploy');
+        }
+        const connection = await this.getConnection();
+        await new Promise((resolve, reject) => {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,no-underscore-dangle
+            connection.metadata
+                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+                // @ts-ignore _invoke is private on the jsforce metadata object, and cancelDeploy is not an exposed method
+                ._invoke('cancelDeploy', { id: this.id })
+                .thenCall((result) => {
+                // this does not return CancelDeployResult as documented in the API.
+                // a null result seems to indicate the request was successful
+                if (result) {
+                    reject(result);
+                }
+                else {
+                    resolve(result);
+                }
             });
         });
     }
-    pre() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const converter = new convert_1.MetadataConverter();
-            const { zipBuffer } = yield converter.convert(this.components, 'metadata', { type: 'zip' });
-            const connection = yield this.getConnection();
-            yield this.maybeSaveTempDirectory('metadata');
-            return connection.deploy(zipBuffer, this.options.apiOptions);
-        });
+    async pre() {
+        const converter = new convert_1.MetadataConverter();
+        const { zipBuffer } = await converter.convert(this.components, 'metadata', { type: 'zip' });
+        const connection = await this.getConnection();
+        await this.maybeSaveTempDirectory('metadata');
+        return connection.deploy(zipBuffer, this.options.apiOptions);
     }
-    post(result) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return new DeployResult(result, this.components);
-        });
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async post(result) {
+        return new DeployResult(result, this.components);
     }
 }
 exports.MetadataApiDeploy = MetadataApiDeploy;

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

@@ -1 +1 @@
-{"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA;;;;;GAKG;AACH,wCAA+C;AAC/C,qDAAkD;AAClD,mCAQiB;AACjB,yDAA+E;AAC/E,+BAAwD;AAExD,oCAA4C;AAC5C,gDAA8C;AAC9C,0CAAuC;AACvC,mDAAgD;AAChD,sCAA8C;AAE9C,MAAa,YAAY;IAKvB,YAAY,QAAiC,EAAE,UAAwB;QAFtD,mBAAc,GAAG,IAAI,+BAAc,CAAC,UAAU,CAAC,CAAC;QAG/D,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAEM,gBAAgB;QACrB,wDAAwD;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,aAAa,GAAmB,EAAE,CAAC;QAEzC,KAAK,MAAM,iBAAiB,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,EAAE;YACrE,IAAI,iBAAiB,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACnC,KAAK,MAAM,KAAK,IAAI,iBAAiB,CAAC,WAAW,EAAE,EAAE;oBACnD,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;oBACpD,IAAI,aAAa,EAAE;wBACjB,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC;qBACnE;iBACF;aACF;YACD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;YACpE,IAAI,iBAAiB,EAAE;gBACrB,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CAAC,CAAC;aACnF;SACF;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEO,eAAe,CAAC,SAA0B,EAAE,QAAyB;QAC3E,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;QACnD,MAAM,SAAS,GAAmB,EAAE,CAAC;QAErC,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,YAAY,GAA0B;gBAC1C,QAAQ;gBACR,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;aAC9B,CAAC;YAEF,IAAI,YAAY,CAAC,KAAK,KAAK,uBAAe,CAAC,MAAM,EAAE;gBACjD,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;gBACjF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,UAAU,CAAiB,CAAC;gBACzE,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aAC1B;iBAAM;gBACL,2EAA2E;gBAC3E,2CAA2C;gBAC3C,IAAI,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC7B,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,WAAW,EAAE,EAAE;wBAC9C,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,CAAiB,CAAC;wBAC/E,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;qBAC1B;iBACF;gBAED,IAAI,GAAG,EAAE;oBACP,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAiB,CAAC;oBACpF,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;iBAC1B;aACF;SACF;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IAEO,QAAQ,CAAC,OAAsB;QACrC,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;YAC9B,OAAO,uBAAe,CAAC,OAAO,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;YACrC,OAAO,uBAAe,CAAC,OAAO,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,OAAO,KAAK,MAAM,EAAE;YACrC,OAAO,uBAAe,CAAC,OAAO,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,OAAO,KAAK,OAAO,EAAE;YACtC,OAAO,uBAAe,CAAC,MAAM,CAAC;SAC/B;QACD,OAAO,uBAAe,CAAC,SAAS,CAAC;IACnC,CAAC;IAED;;OAEG;IACK,iBAAiB,CAAC,MAA+B;QACvD,MAAM,UAAU,GAAG,IAAI,GAAG,EAA2B,CAAC;QAEtD,MAAM,gBAAgB,GAAG,IAAI,0BAAY,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,wBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QAC3E,MAAM,eAAe,GAAG,wBAAgB,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAE5E,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;YACrC,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,aAAa,GAAkB;gBACnC,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,IAAI,EAAE,SAAS,CAAC,aAAa;aAC9B,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBACxB,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;aACzB;YACD,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACpC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;SACrC;QAED,KAAK,MAAM,OAAO,IAAI,eAAe,EAAE;YACrC,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,aAAa,GAAkB;gBACnC,QAAQ,EAAE,SAAS,CAAC,QAAQ;gBAC5B,IAAI,EAAE,SAAS,CAAC,aAAa;aAC9B,CAAC;YACF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YACpC,uEAAuE;YACvE,8DAA8D;YAC9D,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;gBACxC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;aAClC;SACF;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;OAGG;IACK,qBAAqB,CAAC,OAAsB;QAClD,QAAQ,OAAO,CAAC,aAAa,EAAE;YAC7B,KAAK,mBAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,IAAI;gBAC/C,yCAAyC;gBACzC,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;gBACjE,MAAM;YACR,KAAK,mBAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI;gBAC/B,yCAAyC;gBACzC,OAAO,CAAC,QAAQ,GAAG,WAAI,CACrB,cAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EACzB,eAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,cAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CACtD,CAAC;gBACF,MAAM;YACR,QAAQ;SACT;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,GAAG,CAAC,SAAwB;QAClC,MAAM,IAAI,GAAG,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QACvF,OAAO,GAAG,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;IACzC,CAAC;CACF;AApJD,oCAoJC;AAMD,MAAa,iBAAkB,SAAQ,mCAAuD;IAY5F,YAAY,OAAiC;QAC3C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,OAAO,CAAC,UAAU,mCAAQ,iBAAiB,CAAC,eAAe,CAAC,UAAU,GAAK,OAAO,CAAC,UAAU,CAAE,CAAC;QAChG,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACU,sBAAsB,CAAC,IAAI,GAAG,KAAK;;YAC9C,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBACZ,MAAM,IAAI,0BAAiB,CAAC,QAAQ,CAAC,CAAC;aACvC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACxC,MAAM,QAAQ,GAAI,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC;gBACnD,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,IAAI;aACL,CAAC,CAAqC,CAAC;YACxC,OAAO,mBAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAE,QAAwB,CAAC,EAAE,CAAC;QACtE,CAAC;KAAA;IAED;;;;OAIG;IACU,WAAW;;YACtB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBACZ,MAAM,IAAI,0BAAiB,CAAC,QAAQ,CAAC,CAAC;aACvC;YACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,qDAAqD;YACrD,OAAQ,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAC3C,IAAI,CAAC,EAAE,EACP,IAAI,CACkC,CAAC;QAC3C,CAAC;KAAA;IAED;;;;;OAKG;IACU,MAAM;;YACjB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBACZ,MAAM,IAAI,0BAAiB,CAAC,QAAQ,CAAC,CAAC;aACvC;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACrC,UAAU,CAAC,QAAQ;oBACjB,0GAA0G;qBACzG,OAAO,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;qBACxC,QAAQ,CAAC,CAAC,MAAW,EAAE,EAAE;oBACxB,oEAAoE;oBACpE,6DAA6D;oBAC7D,IAAI,MAAM,EAAE;wBACV,MAAM,CAAC,MAAM,CAAC,CAAC;qBAChB;yBAAM;wBACL,OAAO,CAAC,MAAM,CAAC,CAAC;qBACjB;gBACH,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACL,CAAC;KAAA;IAEe,GAAG;;YACjB,MAAM,SAAS,GAAG,IAAI,2BAAiB,EAAE,CAAC;YAC1C,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5F,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,MAAM,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;YAC9C,OAAO,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/D,CAAC;KAAA;IAEe,IAAI,CAAC,MAA+B;;YAClD,OAAO,IAAI,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,CAAC;KAAA;;AAtGH,8CAuGC;AAtGwB,iCAAe,GAAsC;IAC1E,UAAU,EAAE;QACV,eAAe,EAAE,IAAI;QACrB,cAAc,EAAE,KAAK;QACrB,SAAS,EAAE,KAAK;QAChB,aAAa,EAAE,IAAI;QACnB,IAAI,EAAE,KAAK;KACZ;CACF,CAAC"}
+{"version":3,"file":"metadataApiDeploy.js","sourceRoot":"","sources":["../../../src/client/metadataApiDeploy.ts"],"names":[],"mappings":"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"}

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

@@ -1,14 +1,21 @@
 import { ComponentSet } from '../collections';
-import { AsyncResult, FileResponse, MetadataApiRetrieveStatus, RetrieveOptions, MetadataTransferResult } from './types';
-import { MetadataTransfer, MetadataTransferOptions } from './metadataTransfer';
 import { RegistryAccess } from '../registry';
+import { MetadataTransfer, MetadataTransferOptions } from './metadataTransfer';
+import { AsyncResult, FileResponse, MetadataApiRetrieveStatus, MetadataTransferResult, RetrieveOptions } from './types';
 export declare type MetadataApiRetrieveOptions = MetadataTransferOptions & RetrieveOptions & {
     registry?: RegistryAccess;
 };
 export declare class RetrieveResult implements MetadataTransferResult {
     readonly response: MetadataApiRetrieveStatus;
     readonly components: ComponentSet;
-    constructor(response: MetadataApiRetrieveStatus, components: ComponentSet);
+    private localComponents;
+    private fileResponses;
+    /**
+     * @param response The metadata retrieve response from the server
+     * @param components The ComponentSet of retrieved source components
+     * @param localComponents The ComponentSet used to create the retrieve request
+     */
+    constructor(response: MetadataApiRetrieveStatus, components: ComponentSet, localComponents?: ComponentSet);
     getFileResponses(): FileResponse[];
 }
 export declare class MetadataApiRetrieve extends MetadataTransfer<MetadataApiRetrieveStatus, RetrieveResult> {

package/lib/src/client/metadataApiRetrieve.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.MetadataApiRetrieve = exports.RetrieveResult = void 0;
 /*
@@ -16,30 +7,39 @@ exports.MetadataApiRetrieve = exports.RetrieveResult = 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 ts_types_1 = require("@salesforce/ts-types");
 const convert_1 = require("../convert");
 const collections_1 = require("../collections");
 const resolve_1 = require("../resolve");
-const types_1 = require("./types");
-const metadataTransfer_1 = require("./metadataTransfer");
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
-const ts_types_1 = require("@salesforce/ts-types");
+const metadataTransfer_1 = require("./metadataTransfer");
+const types_1 = require("./types");
 class RetrieveResult {
-    constructor(response, components) {
+    /**
+     * @param response The metadata retrieve response from the server
+     * @param components The ComponentSet of retrieved source components
+     * @param localComponents The ComponentSet used to create the retrieve request
+     */
+    constructor(response, components, localComponents) {
         this.response = response;
         this.components = components;
+        this.localComponents = new collections_1.ComponentSet(localComponents === null || localComponents === void 0 ? void 0 : localComponents.getSourceComponents());
     }
     getFileResponses() {
-        const responses = [];
+        if (this.response && this.fileResponses) {
+            return this.fileResponses;
+        }
+        this.fileResponses = [];
         // construct failures
         if (this.response.messages) {
-            const retrieveMessages = utils_1.normalizeToArray(this.response.messages);
+            const retrieveMessages = (0, utils_1.normalizeToArray)(this.response.messages);
             for (const message of retrieveMessages) {
                 // match type name and fullname of problem component
-                const matches = message.problem.match(/.+'(.+)'.+'(.+)'/);
+                const matches = new RegExp(/.+'(.+)'.+'(.+)'/).exec(message.problem);
                 if (matches) {
                     const [typeName, fullName] = matches.slice(1);
-                    responses.push({
+                    this.fileResponses.push({
                         fullName,
                         type: typeName,
                         state: types_1.ComponentStatus.Failed,
@@ -48,7 +48,7 @@ class RetrieveResult {
                     });
                 }
                 else {
-                    responses.push({
+                    this.fileResponses.push({
                         fullName: '',
                         type: '',
                         problemType: 'Error',
@@ -64,18 +64,18 @@ class RetrieveResult {
             const baseResponse = {
                 fullName,
                 type: type.name,
-                state: types_1.ComponentStatus.Changed,
+                state: this.localComponents.has(retrievedComponent) ? types_1.ComponentStatus.Changed : types_1.ComponentStatus.Created,
             };
             if (!type.children) {
                 for (const filePath of retrievedComponent.walkContent()) {
-                    responses.push(Object.assign({}, baseResponse, { filePath }));
+                    this.fileResponses.push(Object.assign({}, baseResponse, { filePath }));
                 }
             }
             if (xml) {
-                responses.push(Object.assign({}, baseResponse, { filePath: xml }));
+                this.fileResponses.push(Object.assign({}, baseResponse, { filePath: xml }));
             }
         }
-        return responses;
+        return this.fileResponses;
     }
 }
 exports.RetrieveResult = RetrieveResult;
@@ -89,25 +89,23 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
      *
      * @returns Status of the retrieve
      */
-    checkStatus() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.id) {
-                throw new errors_1.MissingJobIdError('retrieve');
+    async checkStatus() {
+        if (!this.id) {
+            throw new errors_1.MissingJobIdError('retrieve');
+        }
+        const coerceBoolean = (field) => {
+            if ((0, ts_types_1.isString)(field)) {
+                return field.toLowerCase() === 'true';
             }
-            const coerceBoolean = (field) => {
-                if (ts_types_1.isString(field)) {
-                    return field.toLowerCase() === 'true';
-                }
-                return ts_types_1.asBoolean(field, false);
-            };
-            const connection = yield this.getConnection();
-            // Cast RetrieveResult returned by jsForce to MetadataApiRetrieveStatus
-            const status = (yield connection.metadata.checkRetrieveStatus(this.id));
-            status.fileProperties = utils_1.normalizeToArray(status.fileProperties);
-            status.success = coerceBoolean(status.success);
-            status.done = coerceBoolean(status.done);
-            return status;
-        });
+            return (0, ts_types_1.asBoolean)(field, false);
+        };
+        const connection = await this.getConnection();
+        // Cast RetrieveResult returned by jsForce to MetadataApiRetrieveStatus
+        const status = (await connection.metadata.checkRetrieveStatus(this.id));
+        status.fileProperties = (0, utils_1.normalizeToArray)(status.fileProperties);
+        status.success = coerceBoolean(status.success);
+        status.done = coerceBoolean(status.done);
+        return status;
     }
     /**
      * Cancel the retrieve operation.
@@ -115,41 +113,37 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
      * Canceling a retrieve occurs immediately and requires no additional status
      * checks to the org, unlike {@link MetadataApiDeploy.cancel}.
      */
-    cancel() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.canceled = true;
-        });
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async cancel() {
+        this.canceled = true;
     }
-    pre() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const packageNames = this.getPackageNames();
-            if (this.components.size === 0 && !(packageNames === null || packageNames === void 0 ? void 0 : packageNames.length)) {
-                throw new errors_1.MetadataApiRetrieveError('error_no_components_to_retrieve');
-            }
-            const connection = yield this.getConnection();
-            const requestBody = {
-                apiVersion: this.components.apiVersion,
-                unpackaged: this.components.getObject().Package,
-            };
-            // if we're retrieving with packageNames add it
-            // otherwise don't - it causes errors if undefined or an empty array
-            if (packageNames === null || packageNames === void 0 ? void 0 : packageNames.length) {
-                requestBody.packageNames = packageNames;
-            }
-            // @ts-ignore required callback
-            return connection.metadata.retrieve(requestBody);
-        });
+    async pre() {
+        const packageNames = this.getPackageNames();
+        if (this.components.size === 0 && !(packageNames === null || packageNames === void 0 ? void 0 : packageNames.length)) {
+            throw new errors_1.MetadataApiRetrieveError('error_no_components_to_retrieve');
+        }
+        const connection = await this.getConnection();
+        const requestBody = {
+            apiVersion: this.components.apiVersion,
+            unpackaged: this.components.getObject().Package,
+        };
+        // if we're retrieving with packageNames add it
+        // otherwise don't - it causes errors if undefined or an empty array
+        if (packageNames === null || packageNames === void 0 ? void 0 : packageNames.length) {
+            requestBody.packageNames = packageNames;
+        }
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore required callback
+        return connection.metadata.retrieve(requestBody);
     }
-    post(result) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let components;
-            if (result.status === types_1.RequestStatus.Succeeded) {
-                components = yield this.extract(Buffer.from(result.zipFile, 'base64'));
-            }
-            components = components !== null && components !== void 0 ? components : new collections_1.ComponentSet(undefined, this.options.registry);
-            yield this.maybeSaveTempDirectory('source', components);
-            return new RetrieveResult(result, components);
-        });
+    async post(result) {
+        let components;
+        if (result.status === types_1.RequestStatus.Succeeded) {
+            components = await this.extract(Buffer.from(result.zipFile, 'base64'));
+        }
+        components = components !== null && components !== void 0 ? components : new collections_1.ComponentSet(undefined, this.options.registry);
+        await this.maybeSaveTempDirectory('source', components);
+        return new RetrieveResult(result, components, this.components);
     }
     getPackageNames() {
         var _a;
@@ -158,7 +152,7 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
     getPackageOptions() {
         const { packageOptions } = this.options;
         if (packageOptions === null || packageOptions === void 0 ? void 0 : packageOptions.length) {
-            if (ts_types_1.isString(packageOptions[0])) {
+            if ((0, ts_types_1.isString)(packageOptions[0])) {
                 const packageNames = packageOptions;
                 return packageNames.map((pkg) => ({ name: pkg, outputDir: pkg }));
             }
@@ -169,46 +163,43 @@ class MetadataApiRetrieve extends metadataTransfer_1.MetadataTransfer {
             }
         }
     }
-    extract(zip) {
+    async extract(zip) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const components = [];
-            const { merge, output, registry } = this.options;
-            const converter = new convert_1.MetadataConverter(registry);
-            const tree = yield resolve_1.ZipTreeContainer.create(zip);
-            const packages = [
-                { zipTreeLocation: 'unpackaged', outputDir: output },
-            ];
-            const packageOpts = this.getPackageOptions();
-            packageOpts === null || packageOpts === void 0 ? void 0 : packageOpts.forEach(({ name, outputDir }) => {
-                packages.push({ zipTreeLocation: name, outputDir });
-            });
-            for (const pkg of packages) {
-                const outputConfig = merge
-                    ? {
-                        type: 'merge',
-                        mergeWith: this.components.getSourceComponents(),
-                        defaultDirectory: pkg.outputDir,
-                        forceIgnoredPaths: (_a = this.components.forceIgnoredPaths) !== null && _a !== void 0 ? _a : new Set(),
-                    }
-                    : {
-                        type: 'directory',
-                        outputDirectory: pkg.outputDir,
-                    };
-                const zipComponents = collections_1.ComponentSet.fromSource({
-                    fsPaths: [pkg.zipTreeLocation],
-                    registry,
-                    tree,
-                })
-                    .getSourceComponents()
-                    .toArray();
-                const convertResult = yield converter.convert(zipComponents, 'source', outputConfig);
-                if (convertResult) {
-                    components.push(...convertResult.converted);
+        const components = [];
+        const { merge, output, registry } = this.options;
+        const converter = new convert_1.MetadataConverter(registry);
+        const tree = await resolve_1.ZipTreeContainer.create(zip);
+        const packages = [{ zipTreeLocation: 'unpackaged', outputDir: output }];
+        const packageOpts = this.getPackageOptions();
+        // eslint-disable-next-line no-unused-expressions
+        packageOpts === null || packageOpts === void 0 ? void 0 : packageOpts.forEach(({ name, outputDir }) => {
+            packages.push({ zipTreeLocation: name, outputDir });
+        });
+        for (const pkg of packages) {
+            const outputConfig = merge
+                ? {
+                    type: 'merge',
+                    mergeWith: this.components.getSourceComponents(),
+                    defaultDirectory: pkg.outputDir,
+                    forceIgnoredPaths: (_a = this.components.forceIgnoredPaths) !== null && _a !== void 0 ? _a : new Set(),
                 }
+                : {
+                    type: 'directory',
+                    outputDirectory: pkg.outputDir,
+                };
+            const zipComponents = collections_1.ComponentSet.fromSource({
+                fsPaths: [pkg.zipTreeLocation],
+                registry,
+                tree,
+            })
+                .getSourceComponents()
+                .toArray();
+            const convertResult = await converter.convert(zipComponents, 'source', outputConfig);
+            if (convertResult) {
+                components.push(...convertResult.converted);
             }
-            return new collections_1.ComponentSet(components, registry);
-        });
+        }
+        return new collections_1.ComponentSet(components, registry);
     }
 }
 exports.MetadataApiRetrieve = MetadataApiRetrieve;

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

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

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

@@ -1,7 +1,7 @@
 import { Connection, Logger, PollingClient } from '@salesforce/core';
+import { SfdxFileFormat } from '../convert';
 import { ComponentSet } from '../collections';
 import { AsyncResult, MetadataRequestStatus, MetadataTransferResult } from './types';
-import { SfdxFileFormat } from '../convert';
 export interface MetadataTransferOptions {
     usernameOrConnection: string | Connection;
     components?: ComponentSet;
@@ -12,7 +12,7 @@ export declare abstract class MetadataTransfer<Status extends MetadataRequestSta
     protected components: ComponentSet;
     protected logger: Logger;
     protected canceled: boolean;
-    private _id?;
+    private transferId?;
     private event;
     private usernameOrConnection;
     private apiVersion;