@salesforce/source-deploy-retrieve 5.0.0 → 5.1.0

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,14 +7,14 @@ 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 {
     /**
      * @param response The metadata retrieve response from the server
@@ -42,10 +33,10 @@ class RetrieveResult {
         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);
                     this.fileResponses.push({
@@ -73,9 +64,7 @@ class RetrieveResult {
             const baseResponse = {
                 fullName,
                 type: type.name,
-                state: this.localComponents.has(retrievedComponent)
-                    ? types_1.ComponentStatus.Changed
-                    : types_1.ComponentStatus.Created,
+                state: this.localComponents.has(retrievedComponent) ? types_1.ComponentStatus.Changed : types_1.ComponentStatus.Created,
             };
             if (!type.children) {
                 for (const filePath of retrievedComponent.walkContent()) {
@@ -100,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.
@@ -126,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, this.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;
@@ -169,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 }));
             }
@@ -180,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":";;;;;;;;;;;;AAAA;;;;;GAKG;AACH,wCAAoE;AACpE,gDAA8C;AAC9C,wCAA+D;AAC/D,mCAWiB;AACjB,yDAA+E;AAC/E,sCAAwE;AACxE,oCAA4C;AAE5C,mDAA2D;AAK3D,MAAa,cAAc;IAOzB;;;;OAIG;IACH,YACkB,QAAmC,EACnC,UAAwB,EACxC,eAA8B;QAFd,aAAQ,GAAR,QAAQ,CAA2B;QACnC,eAAU,GAAV,UAAU,CAAc;QAGxC,IAAI,CAAC,eAAe,GAAG,IAAI,0BAAY,CAAC,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,mBAAmB,GAAG,CAAC;IAClF,CAAC;IAEM,gBAAgB;QACrB,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,aAAa,EAAE;YACvC,OAAO,IAAI,CAAC,aAAa,CAAC;SAC3B;QAED,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QAExB,qBAAqB;QACrB,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE;YAC1B,MAAM,gBAAgB,GAAG,wBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAElE,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE;gBACtC,oDAAoD;gBACpD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;gBAC1D,IAAI,OAAO,EAAE;oBACX,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;oBAC9C,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;wBACtB,QAAQ;wBACR,IAAI,EAAE,QAAQ;wBACd,KAAK,EAAE,uBAAe,CAAC,MAAM;wBAC7B,KAAK,EAAE,OAAO,CAAC,OAAO;wBACtB,WAAW,EAAE,OAAO;qBACrB,CAAC,CAAC;iBACJ;qBAAM;oBACL,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC;wBACtB,QAAQ,EAAE,EAAE;wBACZ,IAAI,EAAE,EAAE;wBACR,WAAW,EAAE,OAAO;wBACpB,KAAK,EAAE,uBAAe,CAAC,MAAM;wBAC7B,KAAK,EAAE,OAAO,CAAC,OAAO;qBACvB,CAAC,CAAC;iBACJ;aACF;SACF;QAED,sBAAsB;QACtB,KAAK,MAAM,kBAAkB,IAAI,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE,EAAE;YACtE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,kBAAkB,CAAC;YACnD,MAAM,YAAY,GAAiB;gBACjC,QAAQ;gBACR,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,kBAAkB,CAAC;oBACjD,CAAC,CAAC,uBAAe,CAAC,OAAO;oBACzB,CAAC,CAAC,uBAAe,CAAC,OAAO;aAC5B,CAAC;YAEF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;gBAClB,KAAK,MAAM,QAAQ,IAAI,kBAAkB,CAAC,WAAW,EAAE,EAAE;oBACvD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;iBACxE;aACF;YAED,IAAI,GAAG,EAAE;gBACP,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;aAC7E;SACF;QAED,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;CACF;AA/ED,wCA+EC;AAED,MAAa,mBAAoB,SAAQ,mCAGxC;IAIC,YAAY,OAAmC;QAC7C,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,mBAAmB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACjF,CAAC;IAED;;;;OAIG;IACU,WAAW;;YACtB,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBACZ,MAAM,IAAI,0BAAiB,CAAC,UAAU,CAAC,CAAC;aACzC;YAED,MAAM,aAAa,GAAG,CAAC,KAAc,EAAW,EAAE;gBAChD,IAAI,mBAAQ,CAAC,KAAK,CAAC,EAAE;oBACnB,OAAO,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC;iBACvC;gBACD,OAAO,oBAAS,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACjC,CAAC,CAAC;YACF,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAE9C,uEAAuE;YACvE,MAAM,MAAM,GAAG,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,mBAAmB,CAC3D,IAAI,CAAC,EAAE,CACR,CAA8B,CAAC;YAChC,MAAM,CAAC,cAAc,GAAG,wBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;YAChE,MAAM,CAAC,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAC/C,MAAM,CAAC,IAAI,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;IAED;;;;;OAKG;IACU,MAAM;;YACjB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;KAAA;IAEe,GAAG;;YACjB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAE5C,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,IAAI,EAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAA,EAAE;gBACvD,MAAM,IAAI,iCAAwB,CAAC,iCAAiC,CAAC,CAAC;aACvE;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9C,MAAM,WAAW,GAAoB;gBACnC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU;gBACtC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,OAAO;aAChD,CAAC;YAEF,+CAA+C;YAC/C,oEAAoE;YACpE,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,EAAE;gBACxB,WAAW,CAAC,YAAY,GAAG,YAAY,CAAC;aACzC;YAED,+BAA+B;YAC/B,OAAO,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACnD,CAAC;KAAA;IAEe,IAAI,CAAC,MAAiC;;YACpD,IAAI,UAAwB,CAAC;YAC7B,IAAI,MAAM,CAAC,MAAM,KAAK,qBAAa,CAAC,SAAS,EAAE;gBAC7C,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;aACxE;YAED,UAAU,GAAG,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,0BAAY,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAE9E,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YAExD,OAAO,IAAI,cAAc,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACjE,CAAC;KAAA;IAEO,eAAe;;QACrB,aAAO,IAAI,CAAC,iBAAiB,EAAE,0CAAE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE;IAC1D,CAAC;IAEO,iBAAiB;QACvB,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACxC,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,MAAM,EAAE;YAC1B,IAAI,mBAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC/B,MAAM,YAAY,GAAG,cAA0B,CAAC;gBAChD,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;aACnE;iBAAM;gBACL,MAAM,IAAI,GAAG,cAAiC,CAAC;gBAC/C,+DAA+D;gBAC/D,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;aACpF;SACF;IACH,CAAC;IAEa,OAAO,CAAC,GAAW;;;YAC/B,MAAM,UAAU,GAAsB,EAAE,CAAC;YACzC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;YACjD,MAAM,SAAS,GAAG,IAAI,2BAAiB,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,IAAI,GAAG,MAAM,0BAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAEhD,MAAM,QAAQ,GAA6B;gBACzC,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE;aACrD,CAAC;YACF,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC7C,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE;gBAC3C,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;YACtD,CAAC,EAAE;YAEH,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE;gBAC1B,MAAM,YAAY,GAAwB,KAAK;oBAC7C,CAAC,CAAC;wBACE,IAAI,EAAE,OAAO;wBACb,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,mBAAmB,EAAE;wBAChD,gBAAgB,EAAE,GAAG,CAAC,SAAS;wBAC/B,iBAAiB,QAAE,IAAI,CAAC,UAAU,CAAC,iBAAiB,mCAAI,IAAI,GAAG,EAAU;qBAC1E;oBACH,CAAC,CAAC;wBACE,IAAI,EAAE,WAAW;wBACjB,eAAe,EAAE,GAAG,CAAC,SAAS;qBAC/B,CAAC;gBACN,MAAM,aAAa,GAAG,0BAAY,CAAC,UAAU,CAAC;oBAC5C,OAAO,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC;oBAC9B,QAAQ;oBACR,IAAI;iBACL,CAAC;qBACC,mBAAmB,EAAE;qBACrB,OAAO,EAAE,CAAC;gBACb,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,aAAa,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;gBACrF,IAAI,aAAa,EAAE;oBACjB,UAAU,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;iBAC7C;aACF;YACD,OAAO,IAAI,0BAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;;KAC/C;;AA/IH,kDAgJC;AA5Ie,mCAAe,GAAwC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC"}
+{"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;

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,16 +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;
@@ -33,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);
@@ -109,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
-                        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>;