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

package/lib/src/client/deployStrategies/auraDeploy.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.AuraDeploy = void 0;
 /*
@@ -16,114 +7,115 @@ exports.AuraDeploy = 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 fs_1 = require("fs");
+const graceful_fs_1 = require("graceful-fs");
 const utils_1 = require("../../utils");
 const types_1 = require("../types");
 const toolingApi_1 = require("../toolingApi");
-const baseDeploy_1 = require("./baseDeploy");
 const diagnosticUtil_1 = require("../diagnosticUtil");
+const baseDeploy_1 = require("./baseDeploy");
 class AuraDeploy extends baseDeploy_1.BaseDeploy {
-    deploy(component, namespace) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.component = component;
-            this.namespace = namespace;
-            const auraDefinitions = yield this.buildDefList();
-            const componentDeployment = yield this.upsert(auraDefinitions);
-            let status = "Completed" /* Completed */;
-            if (componentDeployment.diagnostics.length > 0) {
-                status =
-                    componentDeployment.status !== types_1.ComponentStatus.Failed
-                        ? "CompletedPartial" /* CompletedPartial */
-                        : "Failed" /* Failed */;
+    async deploy(component, namespace) {
+        this.component = component;
+        this.namespace = namespace;
+        const auraDefinitions = await this.buildDefList();
+        const componentDeployment = await this.upsert(auraDefinitions);
+        let status = "Completed" /* Completed */;
+        if (componentDeployment.diagnostics.length > 0) {
+            status =
+                componentDeployment.status !== types_1.ComponentStatus.Failed
+                    ? "CompletedPartial" /* CompletedPartial */
+                    : "Failed" /* Failed */;
+        }
+        return {
+            id: undefined,
+            status,
+            success: status === "Completed" /* Completed */,
+            components: [componentDeployment],
+        };
+    }
+    async buildDefList() {
+        const sourceFiles = this.component.walkContent();
+        const auraDefinitions = [];
+        const existingDefinitions = await this.findAuraDefinitions();
+        const auraBundle = existingDefinitions[0]
+            ? await this.upsertBundle(existingDefinitions[0].AuraDefinitionBundleId)
+            : await this.upsertBundle();
+        const bundleId = auraBundle.id;
+        sourceFiles.forEach((sourceFile) => {
+            const source = (0, graceful_fs_1.readFileSync)(sourceFile, 'utf8');
+            const suffix = (0, utils_1.extName)(sourceFile);
+            const defType = this.getAuraDefType(sourceFile, suffix);
+            const format = this.getAuraFormat(suffix);
+            let match;
+            if (existingDefinitions.length > 0) {
+                match = existingDefinitions.find((definition) => definition.DefType === defType);
             }
-            return {
-                id: undefined,
-                status,
-                success: status === "Completed" /* Completed */,
-                components: [componentDeployment],
+            // If definition exists in org, assign the matching Id
+            // else, assign the id of the bundle it's associated with
+            const auraDef = {
+                FilePath: sourceFile,
+                DefType: defType,
+                Source: source,
+                Format: format,
+                ...(match ? { Id: match.Id } : { AuraDefinitionBundleId: bundleId }),
             };
+            // This is to ensure we return the correct project path when reporting errors
+            // must be the file associated with the specified aura type
+            // eslint-disable-next-line no-unused-expressions
+            AuraDeploy.AURA_DEF_TYPES.includes(auraDef.DefType)
+                ? auraDefinitions.unshift(auraDef)
+                : auraDefinitions.push(auraDef);
         });
+        return auraDefinitions;
     }
-    buildDefList() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const sourceFiles = this.component.walkContent();
-            const auraDefinitions = [];
-            const existingDefinitions = yield this.findAuraDefinitions();
-            const auraBundle = existingDefinitions[0]
-                ? yield this.upsertBundle(existingDefinitions[0].AuraDefinitionBundleId)
-                : yield this.upsertBundle();
-            const bundleId = auraBundle.id;
-            sourceFiles.forEach((sourceFile) => __awaiter(this, void 0, void 0, function* () {
-                const source = fs_1.readFileSync(sourceFile, 'utf8');
-                const suffix = utils_1.extName(sourceFile);
-                const defType = this.getAuraDefType(sourceFile, suffix);
-                const format = this.getAuraFormat(suffix);
-                let match;
-                if (existingDefinitions.length > 0) {
-                    match = existingDefinitions.find((definition) => definition.DefType === defType);
+    async upsert(auraDefinitions) {
+        const type = this.component.type.name;
+        const diagnosticUtil = new diagnosticUtil_1.DiagnosticUtil('tooling');
+        const deployment = {
+            status: types_1.ComponentStatus.Unchanged,
+            component: this.component,
+            diagnostics: [],
+        };
+        let partialSuccess = false;
+        let allCreate = true;
+        const deployPromises = auraDefinitions.map(async (definition) => {
+            try {
+                if (definition.Id) {
+                    const formattedDef = {
+                        Source: definition.Source,
+                        Id: definition.Id,
+                    };
+                    await this.connection.tooling.update(toolingApi_1.deployTypes.get(type), formattedDef);
+                    allCreate = false;
+                    partialSuccess = true;
                 }
-                // If definition exists in org, assign the matching Id
-                // else, assign the id of the bundle it's associated with
-                const auraDef = Object.assign({ FilePath: sourceFile, DefType: defType, Source: source, Format: format }, (match ? { Id: match.Id } : { AuraDefinitionBundleId: bundleId }));
-                // This is to ensure we return the correct project path when reporting errors
-                // must be the file associated with the specified aura type
-                AuraDeploy.AURA_DEF_TYPES.includes(auraDef.DefType)
-                    ? auraDefinitions.unshift(auraDef)
-                    : auraDefinitions.push(auraDef);
-            }));
-            return auraDefinitions;
-        });
-    }
-    upsert(auraDefinitions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const type = this.component.type.name;
-            const diagnosticUtil = new diagnosticUtil_1.DiagnosticUtil('tooling');
-            const deployment = {
-                status: types_1.ComponentStatus.Unchanged,
-                component: this.component,
-                diagnostics: [],
-            };
-            let partialSuccess = false;
-            let allCreate = true;
-            const deployPromises = auraDefinitions.map((definition) => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    if (definition.Id) {
-                        const formattedDef = {
-                            Source: definition.Source,
-                            Id: definition.Id,
-                        };
-                        yield this.connection.tooling.update(toolingApi_1.deployTypes.get(type), formattedDef);
-                        allCreate = false;
-                        partialSuccess = true;
-                    }
-                    else {
-                        const formattedDef = {
-                            AuraDefinitionBundleId: definition.AuraDefinitionBundleId,
-                            DefType: definition.DefType,
-                            Format: definition.Format,
-                            Source: definition.Source,
-                        };
-                        yield this.toolingCreate(toolingApi_1.deployTypes.get(type), formattedDef);
-                        partialSuccess = true;
-                    }
+                else {
+                    const formattedDef = {
+                        AuraDefinitionBundleId: definition.AuraDefinitionBundleId,
+                        DefType: definition.DefType,
+                        Format: definition.Format,
+                        Source: definition.Source,
+                    };
+                    await this.toolingCreate(toolingApi_1.deployTypes.get(type), formattedDef);
+                    partialSuccess = true;
                 }
-                catch (e) {
-                    const diagnostic = diagnosticUtil.parseDeployDiagnostic(this.component, e.message);
-                    deployment.diagnostics.push(diagnostic);
-                }
-            }));
-            yield Promise.all(deployPromises);
-            if (deployment.diagnostics.length > 0) {
-                deployment.status = partialSuccess ? types_1.ComponentStatus.Changed : types_1.ComponentStatus.Failed;
-            }
-            else if (allCreate) {
-                deployment.status = types_1.ComponentStatus.Created;
             }
-            else {
-                deployment.status = types_1.ComponentStatus.Changed;
+            catch (e) {
+                const diagnostic = diagnosticUtil.parseDeployDiagnostic(this.component, e.message);
+                deployment.diagnostics.push(diagnostic);
             }
-            return deployment;
         });
+        await Promise.all(deployPromises);
+        if (deployment.diagnostics.length > 0) {
+            deployment.status = partialSuccess ? types_1.ComponentStatus.Changed : types_1.ComponentStatus.Failed;
+        }
+        else if (allCreate) {
+            deployment.status = types_1.ComponentStatus.Created;
+        }
+        else {
+            deployment.status = types_1.ComponentStatus.Changed;
+        }
+        return deployment;
     }
     getAuraFormat(suffix) {
         switch (suffix) {
@@ -138,7 +130,7 @@ class AuraDeploy extends baseDeploy_1.BaseDeploy {
         }
     }
     getAuraDefType(sourcePath, suffix) {
-        const fileName = utils_1.baseName(sourcePath);
+        const fileName = (0, utils_1.baseName)(sourcePath);
         switch (suffix) {
             case 'app':
                 return 'APPLICATION';
@@ -173,11 +165,9 @@ class AuraDeploy extends baseDeploy_1.BaseDeploy {
                 return '';
         }
     }
-    findAuraDefinitions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const auraDefResult = yield this.connection.tooling.query(`Select AuraDefinitionBundleId, Id, Format, Source, DefType from AuraDefinition where AuraDefinitionBundle.DeveloperName = '${this.component.fullName}' and AuraDefinitionBundle.NamespacePrefix = '${this.namespace}'`);
-            return auraDefResult.records;
-        });
+    async findAuraDefinitions() {
+        const auraDefResult = await this.connection.tooling.query(`Select AuraDefinitionBundleId, Id, Format, Source, DefType from AuraDefinition where AuraDefinitionBundle.DeveloperName = '${this.component.fullName}' and AuraDefinitionBundle.NamespacePrefix = '${this.namespace}'`);
+        return auraDefResult.records;
     }
 }
 exports.AuraDeploy = AuraDeploy;

package/lib/src/client/deployStrategies/auraDeploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"auraDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/auraDeploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auraDeploy.js","sourceRoot":"","sources":["../../../../src/client/deployStrategies/auraDeploy.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,6CAA2C;AAC3C,uCAAgD;AAEhD,oCAMkB;AAClB,8CAA4C;AAE5C,sDAAmD;AACnD,6CAA0C;AAE1C,MAAa,UAAW,SAAQ,uBAAU;IAGjC,KAAK,CAAC,MAAM,CAAC,SAA0B,EAAE,SAAiB;QAC/D,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAClD,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/D,IAAI,MAAM,8BAAgC,CAAC;QAC3C,IAAI,mBAAmB,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9C,MAAM;gBACJ,mBAAmB,CAAC,MAAM,KAAK,uBAAe,CAAC,MAAM;oBACnD,CAAC;oBACD,CAAC,sBAA2B,CAAC;SAClC;QACD,OAAO;YACL,EAAE,EAAE,SAAS;YACb,MAAM;YACN,OAAO,EAAE,MAAM,gCAAkC;YACjD,UAAU,EAAE,CAAC,mBAAmB,CAAC;SAClC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QACjD,MAAM,eAAe,GAAqB,EAAE,CAAC;QAE7C,MAAM,mBAAmB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC7D,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC;YACvC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC;YACxE,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,UAAU,CAAC,EAAE,CAAC;QAE/B,WAAW,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YAC7C,MAAM,MAAM,GAAG,IAAA,0BAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAChD,MAAM,MAAM,GAAG,IAAA,eAAO,EAAC,UAAU,CAAC,CAAC;YACnC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;YAE1C,IAAI,KAAqB,CAAC;YAC1B,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;gBAClC,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC;aAClF;YAED,sDAAsD;YACtD,yDAAyD;YACzD,MAAM,OAAO,GAAG;gBACd,QAAQ,EAAE,UAAU;gBACpB,OAAO,EAAE,OAAO;gBAChB,MAAM,EAAE,MAAM;gBACd,MAAM,EAAE,MAAM;gBACd,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,QAAQ,EAAE,CAAC;aACrE,CAAC;YAEF,6EAA6E;YAC7E,2DAA2D;YAC3D,iDAAiD;YACjD,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC;gBACjD,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC;gBAClC,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,MAAM,CAAC,eAAiC;QACnD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;QACtC,MAAM,cAAc,GAAG,IAAI,+BAAc,CAAC,SAAS,CAAC,CAAC;QACrD,MAAM,UAAU,GAAwB;YACtC,MAAM,EAAE,uBAAe,CAAC,SAAS;YACjC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,WAAW,EAAE,EAAE;SAChB,CAAC;QAEF,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,MAAM,cAAc,GAAG,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAiB,EAAE;YAC7E,IAAI;gBACF,IAAI,UAAU,CAAC,EAAE,EAAE;oBACjB,MAAM,YAAY,GAAG;wBACnB,MAAM,EAAE,UAAU,CAAC,MAAM;wBACzB,EAAE,EAAE,UAAU,CAAC,EAAE;qBAClB,CAAC;oBACF,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,wBAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC;oBAC1E,SAAS,GAAG,KAAK,CAAC;oBAClB,cAAc,GAAG,IAAI,CAAC;iBACvB;qBAAM;oBACL,MAAM,YAAY,GAAG;wBACnB,sBAAsB,EAAE,UAAU,CAAC,sBAAsB;wBACzD,OAAO,EAAE,UAAU,CAAC,OAAO;wBAC3B,MAAM,EAAE,UAAU,CAAC,MAAM;wBACzB,MAAM,EAAE,UAAU,CAAC,MAAM;qBAC1B,CAAC;oBACF,MAAM,IAAI,CAAC,aAAa,CAAC,wBAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,CAAC;oBAC9D,cAAc,GAAG,IAAI,CAAC;iBACvB;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,UAAU,GAAG,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,EAAG,CAAW,CAAC,OAAO,CAAC,CAAC;gBAC9F,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACzC;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAElC,IAAI,UAAU,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,UAAU,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,uBAAe,CAAC,OAAO,CAAC,CAAC,CAAC,uBAAe,CAAC,MAAM,CAAC;SACvF;aAAM,IAAI,SAAS,EAAE;YACpB,UAAU,CAAC,MAAM,GAAG,uBAAe,CAAC,OAAO,CAAC;SAC7C;aAAM;YACL,UAAU,CAAC,MAAM,GAAG,uBAAe,CAAC,OAAO,CAAC;SAC7C;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAEO,aAAa,CAAC,MAAc;QAClC,QAAQ,MAAM,EAAE;YACd,KAAK,IAAI;gBACP,OAAO,IAAI,CAAC;YACd,KAAK,KAAK;gBACR,OAAO,KAAK,CAAC;YACf,KAAK,KAAK;gBACR,OAAO,KAAK,CAAC;YACf;gBACE,OAAO,KAAK,CAAC;SAChB;IACH,CAAC;IAEO,cAAc,CAAC,UAAkB,EAAE,MAAc;QACvD,MAAM,QAAQ,GAAG,IAAA,gBAAQ,EAAC,UAAU,CAAC,CAAC;QACtC,QAAQ,MAAM,EAAE;YACd,KAAK,KAAK;gBACR,OAAO,aAAa,CAAC;YACvB,KAAK,KAAK;gBACR,OAAO,WAAW,CAAC;YACrB,KAAK,SAAS;gBACZ,OAAO,eAAe,CAAC;YACzB,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC;YACjB,KAAK,KAAK;gBACR,OAAO,OAAO,CAAC;YACjB,KAAK,QAAQ;gBACX,OAAO,QAAQ,CAAC;YAClB,KAAK,KAAK;gBACR,OAAO,KAAK,CAAC;YACf,KAAK,IAAI;gBACP,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE;oBACnC,OAAO,YAAY,CAAC;iBACrB;qBAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;oBACtC,OAAO,QAAQ,CAAC;iBACjB;qBAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;oBACxC,OAAO,UAAU,CAAC;iBACnB;gBACD,MAAM;YACR,KAAK,QAAQ;gBACX,OAAO,QAAQ,CAAC;YAClB,KAAK,MAAM;gBACT,OAAO,WAAW,CAAC;YACrB;gBACE,OAAO,EAAE,CAAC;SACb;IACH,CAAC;IAEO,KAAK,CAAC,mBAAmB;QAC/B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CACvD,8HAA8H,IAAI,CAAC,SAAS,CAAC,QAAQ,iDAAiD,IAAI,CAAC,SAAS,GAAG,CACxN,CAAC;QACF,OAAO,aAAa,CAAC,OAA2B,CAAC;IACnD,CAAC;;AAxKH,gCAyKC;AAxKyB,yBAAc,GAAG,CAAC,aAAa,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC"}

package/lib/src/client/deployStrategies/baseDeploy.d.ts

@@ -14,7 +14,7 @@ export declare abstract class BaseDeploy {
         apiVersion: string;
     };
     upsertBundle(Id?: string): Promise<ToolingCreateResult>;
-    protected toolingCreate(type: string, record: object): Promise<ToolingCreateResult>;
+    protected toolingCreate(type: string, record: Record<string, unknown>): Promise<ToolingCreateResult>;
     protected getFormattedPaths(filepath: string): string[];
     abstract deploy(component: SourceComponent, namespace: string): Promise<SourceDeployResult>;
 }

package/lib/src/client/deployStrategies/baseDeploy.js

@@ -1,19 +1,17 @@
 "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.BaseDeploy = void 0;
-const fs_1 = require("fs");
+/*
+ * 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
+ */
+/* eslint @typescript-eslint/no-unsafe-assignment:0, @typescript-eslint/no-unsafe-call:0, @typescript-eslint/no-unsafe-member-access:0  */
 const path_1 = require("path");
+const graceful_fs_1 = require("graceful-fs");
 const errors_1 = require("../../errors");
-// tslint:disable-next-line:no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 const DOMParser = require('xmldom-sfdx-encoding').DOMParser;
 class BaseDeploy {
     constructor(connection) {
@@ -28,8 +26,13 @@ class BaseDeploy {
             const packageNode = document.getElementsByTagName('packageVersions')[0];
             const descriptionNode = document.getElementsByTagName('description')[0];
             const labelNode = document.getElementsByTagName('label')[0];
-            const metadataField = Object.assign(Object.assign(Object.assign(Object.assign({ apiVersion }, (statusNode ? { status: statusNode.textContent } : {})), (packageNode ? { packageVersions: packageNode.textContent } : {})), (descriptionNode ? { description: descriptionNode.textContent } : {})), (labelNode ? { label: labelNode.textContent } : {}));
-            return metadataField;
+            return {
+                apiVersion,
+                ...(statusNode ? { status: statusNode.textContent } : {}),
+                ...(packageNode ? { packageVersions: packageNode.textContent } : {}),
+                ...(descriptionNode ? { description: descriptionNode.textContent } : {}),
+                ...(labelNode ? { label: labelNode.textContent } : {}),
+            };
         }
         catch (e) {
             throw new errors_1.DeployError('error_parsing_metadata_file');
@@ -37,32 +40,28 @@ class BaseDeploy {
     }
     // If bundle already exists then use Id and update existing
     // else, create a new bundle
-    upsertBundle(Id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const metadataContent = fs_1.readFileSync(this.component.xml, 'utf8');
-            const metadataField = this.buildMetadataField(metadataContent);
-            let bundleResult;
-            if (Id) {
-                const bundleObject = { Id, Metadata: metadataField };
-                bundleResult = (yield this.connection.tooling.update(this.component.type.name, bundleObject));
-            }
-            else {
-                const bundleObject = {
-                    FullName: this.component.fullName,
-                    Metadata: metadataField,
-                };
-                bundleResult = yield this.toolingCreate(this.component.type.name, bundleObject);
-            }
-            if (!bundleResult.success) {
-                throw new errors_1.DeployError('error_creating_metadata_type', this.component.type.name);
-            }
-            return bundleResult;
-        });
+    async upsertBundle(Id) {
+        const metadataContent = (0, graceful_fs_1.readFileSync)(this.component.xml, 'utf8');
+        const metadataField = this.buildMetadataField(metadataContent);
+        let bundleResult;
+        if (Id) {
+            const bundleObject = { Id, Metadata: metadataField };
+            bundleResult = (await this.connection.tooling.update(this.component.type.name, bundleObject));
+        }
+        else {
+            const bundleObject = {
+                FullName: this.component.fullName,
+                Metadata: metadataField,
+            };
+            bundleResult = await this.toolingCreate(this.component.type.name, bundleObject);
+        }
+        if (!bundleResult.success) {
+            throw new errors_1.DeployError('error_creating_metadata_type', this.component.type.name);
+        }
+        return bundleResult;
     }
-    toolingCreate(type, record) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return (yield this.connection.tooling.create(type, record));
-        });
+    async toolingCreate(type, record) {
+        return (await this.connection.tooling.create(type, record));
     }
     getFormattedPaths(filepath) {
         const pathParts = filepath.split(path_1.sep);

package/lib/src/client/deployStrategies/baseDeploy.js.map

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

package/lib/src/client/deployStrategies/containerDeploy.d.ts

@@ -1,6 +1,6 @@
-import { SourceDeployResult, ContainerAsyncRequest, RecordId, ToolingCreateResult } from '../types';
-import { BaseDeploy } from './baseDeploy';
+import { ContainerAsyncRequest, RecordId, SourceDeployResult, ToolingCreateResult } from '../types';
 import { SourceComponent } from '../../resolve';
+import { BaseDeploy } from './baseDeploy';
 export declare class ContainerDeploy extends BaseDeploy {
     private static readonly CONTAINER_ASYNC_REQUEST;
     private static readonly METADATA_CONTAINER;

package/lib/src/client/deployStrategies/containerDeploy.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.ContainerDeploy = void 0;
 /*
@@ -16,83 +7,77 @@ exports.ContainerDeploy = 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 fs_1 = require("fs");
+const graceful_fs_1 = require("graceful-fs");
 const toolingApi_1 = require("../toolingApi");
 const errors_1 = require("../../errors");
 const types_1 = require("../types");
 const path_1 = require("../../utils/path");
 const baseDeploy_1 = require("./baseDeploy");
 class ContainerDeploy extends baseDeploy_1.BaseDeploy {
-    deploy(component, namespace) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.component = component;
-            this.namespace = namespace;
-            const sourcePath = component.content;
-            const metadataPath = component.xml;
-            const container = yield this.createMetadataContainer();
-            yield this.createContainerMember([sourcePath, metadataPath], container);
-            const asyncRequest = yield this.createContainerAsyncRequest(container);
-            const containerRequestStatus = yield this.pollContainerStatus(asyncRequest.id);
-            return this.buildSourceDeployResult(containerRequestStatus);
-        });
+    async deploy(component, namespace) {
+        this.component = component;
+        this.namespace = namespace;
+        const sourcePath = component.content;
+        const metadataPath = component.xml;
+        const container = await this.createMetadataContainer();
+        await this.createContainerMember([sourcePath, metadataPath], container);
+        const asyncRequest = await this.createContainerAsyncRequest(container);
+        const containerRequestStatus = await this.pollContainerStatus(asyncRequest.id);
+        return this.buildSourceDeployResult(containerRequestStatus);
     }
-    createMetadataContainer() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const metadataContainer = yield this.toolingCreate(ContainerDeploy.METADATA_CONTAINER, {
-                Name: `Deploy_MDC_${Date.now()}`,
-            });
-            if (!metadataContainer.success) {
-                throw new errors_1.DeployError('beta_tapi_mdcontainer_error');
-            }
-            return metadataContainer;
+    async createMetadataContainer() {
+        const metadataContainer = await this.toolingCreate(ContainerDeploy.METADATA_CONTAINER, {
+            Name: `Deploy_MDC_${Date.now()}`,
         });
+        if (!metadataContainer.success) {
+            throw new errors_1.DeployError('beta_tapi_mdcontainer_error');
+        }
+        return metadataContainer;
     }
-    createContainerMember(outboundFiles, container) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const id = container.id;
-            const metadataContent = fs_1.readFileSync(outboundFiles[1], 'utf8');
-            const metadataField = this.buildMetadataField(metadataContent);
-            const body = fs_1.readFileSync(outboundFiles[0], 'utf8');
-            const fileName = path_1.baseName(outboundFiles[0]);
-            const entityId = yield this.getContentEntity(this.component.type.name, fileName, this.namespace);
-            const containerMemberObject = Object.assign({ MetadataContainerId: id, FullName: fileName, Body: body, Metadata: metadataField }, (entityId ? { contentEntityId: entityId } : {}));
-            const containerMember = yield this.toolingCreate(toolingApi_1.deployTypes.get(this.component.type.name), containerMemberObject);
-            if (!containerMember.success) {
-                throw new errors_1.DeployError('beta_tapi_membertype_error', this.component.type.name);
-            }
-            return containerMember;
-        });
+    async createContainerMember(outboundFiles, container) {
+        const id = container.id;
+        const metadataContent = (0, graceful_fs_1.readFileSync)(outboundFiles[1], 'utf8');
+        const metadataField = this.buildMetadataField(metadataContent);
+        const body = (0, graceful_fs_1.readFileSync)(outboundFiles[0], 'utf8');
+        const fileName = (0, path_1.baseName)(outboundFiles[0]);
+        const entityId = await this.getContentEntity(this.component.type.name, fileName, this.namespace);
+        const containerMemberObject = {
+            MetadataContainerId: id,
+            FullName: fileName,
+            Body: body,
+            Metadata: metadataField,
+            ...(entityId ? { contentEntityId: entityId } : {}),
+        };
+        const containerMember = await this.toolingCreate(toolingApi_1.deployTypes.get(this.component.type.name), containerMemberObject);
+        if (!containerMember.success) {
+            throw new errors_1.DeployError('beta_tapi_membertype_error', this.component.type.name);
+        }
+        return containerMember;
     }
-    getContentEntity(metadataType, fileName, namespace) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const queryResult = (yield this.connection.tooling.query(`Select Id from ${metadataType} where Name = '${fileName}' and NamespacePrefix = '${namespace}'`));
-            return queryResult && queryResult.records.length === 1 ? queryResult.records[0].Id : undefined;
-        });
+    async getContentEntity(metadataType, fileName, namespace) {
+        const queryResult = (await this.connection.tooling.query(`Select Id from ${metadataType} where Name = '${fileName}' and NamespacePrefix = '${namespace}'`));
+        return queryResult && queryResult.records.length === 1 ? queryResult.records[0].Id : undefined;
     }
-    createContainerAsyncRequest(container) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const contAsyncRequest = yield this.toolingCreate(ContainerDeploy.CONTAINER_ASYNC_REQUEST, {
-                MetadataContainerId: container.id,
-            });
-            if (!contAsyncRequest.success) {
-                throw new errors_1.DeployError('beta_tapi_car_error');
-            }
-            return contAsyncRequest;
+    async createContainerAsyncRequest(container) {
+        const contAsyncRequest = await this.toolingCreate(ContainerDeploy.CONTAINER_ASYNC_REQUEST, {
+            MetadataContainerId: container.id,
         });
+        if (!contAsyncRequest.success) {
+            throw new errors_1.DeployError('beta_tapi_car_error');
+        }
+        return contAsyncRequest;
     }
-    pollContainerStatus(containerId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let count = 0;
-            let containerStatus;
-            do {
-                if (count > 0) {
-                    yield this.sleep(100);
-                }
-                containerStatus = (yield this.connection.tooling.retrieve(ContainerDeploy.CONTAINER_ASYNC_REQUEST, containerId));
-                count++;
-            } while (containerStatus.State === "Queued" /* Queued */ && count <= 30);
-            return containerStatus;
-        });
+    async pollContainerStatus(containerId) {
+        let count = 0;
+        let containerStatus;
+        do {
+            if (count > 0) {
+                await this.sleep(100);
+            }
+            containerStatus = (await this.connection.tooling.retrieve(ContainerDeploy.CONTAINER_ASYNC_REQUEST, containerId));
+            count++;
+        } while (containerStatus.State === "Queued" /* Queued */ && count <= 30);
+        return containerStatus;
     }
     sleep(ms) {
         return new Promise((resolve) => setTimeout(resolve, ms));

package/lib/src/client/deployStrategies/containerDeploy.js.map

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