@salesforce/source-deploy-retrieve 5.0.1 → 5.0.2

package/lib/src/convert/metadataConverter.js

@@ -1,148 +1,143 @@
 "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.MetadataConverter = void 0;
-const graceful_fs_1 = require("graceful-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
+ */
 const path_1 = require("path");
+const graceful_fs_1 = require("graceful-fs");
 const fileSystemHandler_1 = require("../utils/fileSystemHandler");
-const streams_1 = require("./streams");
 const errors_1 = require("../errors");
 const collections_1 = require("../collections");
 const registry_1 = require("../registry");
+const streams_1 = require("./streams");
 class MetadataConverter {
     constructor(registry = new registry_1.RegistryAccess()) {
         this.registry = registry;
     }
-    convert(comps, targetFormat, output) {
+    async convert(comps, targetFormat, output) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                let cs;
-                let components;
-                if (comps instanceof collections_1.ComponentSet) {
-                    cs = comps;
-                    components = Array.from(comps.getSourceComponents());
-                }
-                else {
-                    cs = new collections_1.ComponentSet(comps, this.registry);
-                    components = comps;
-                }
-                let manifestContents;
-                const isSource = targetFormat === 'source';
-                const tasks = [];
-                let writer;
-                let mergeSet;
-                let packagePath;
-                let defaultDirectory;
-                switch (output.type) {
-                    case 'directory':
-                        if (output.packageName) {
-                            cs.fullName = output.packageName;
-                        }
-                        manifestContents = cs.getPackageXml();
-                        packagePath = this.getPackagePath(output);
-                        defaultDirectory = packagePath;
-                        writer = new streams_1.StandardWriter(packagePath);
-                        if (!isSource) {
-                            const manifestPath = path_1.join(packagePath, MetadataConverter.PACKAGE_XML_FILE);
-                            tasks.push(graceful_fs_1.promises.writeFile(manifestPath, manifestContents));
-                            // For deploying destructive changes
-                            const destructiveChangesTypes = cs.getTypesOfDestructiveChanges();
-                            if (destructiveChangesTypes.length) {
-                                // for each of the destructive changes in the component set, convert and write the correct metadata
-                                // to each manifest
-                                destructiveChangesTypes.map((destructiveChangesType) => {
-                                    const file = this.getDestructiveManifest(destructiveChangesType);
-                                    const destructiveManifestContents = cs.getPackageXml(4, destructiveChangesType);
-                                    const destructiveManifestPath = path_1.join(packagePath, file);
-                                    tasks.push(graceful_fs_1.promises.writeFile(destructiveManifestPath, destructiveManifestContents));
-                                });
-                            }
-                        }
-                        break;
-                    case 'zip':
-                        if (output.packageName) {
-                            cs.fullName = output.packageName;
-                        }
-                        manifestContents = cs.getPackageXml();
-                        packagePath = this.getPackagePath(output);
-                        defaultDirectory = packagePath;
-                        writer = new streams_1.ZipWriter(packagePath);
-                        if (!isSource) {
-                            writer.addToZip(manifestContents, MetadataConverter.PACKAGE_XML_FILE);
-                            // For deploying destructive changes
-                            const destructiveChangesTypes = cs.getTypesOfDestructiveChanges();
-                            if (destructiveChangesTypes.length) {
-                                // for each of the destructive changes in the component set, convert and write the correct metadata
-                                // to each manifest
-                                destructiveChangesTypes.map((destructiveChangeType) => {
-                                    const file = this.getDestructiveManifest(destructiveChangeType);
-                                    const destructiveManifestContents = cs.getPackageXml(4, destructiveChangeType);
-                                    writer.addToZip(destructiveManifestContents, file);
-                                });
-                            }
-                        }
-                        break;
-                    case 'merge':
-                        if (!isSource) {
-                            throw new errors_1.LibraryError('error_merge_metadata_target_unsupported');
+        try {
+            let cs;
+            let components;
+            if (comps instanceof collections_1.ComponentSet) {
+                cs = comps;
+                components = Array.from(comps.getSourceComponents());
+            }
+            else {
+                cs = new collections_1.ComponentSet(comps, this.registry);
+                components = comps;
+            }
+            let manifestContents;
+            const isSource = targetFormat === 'source';
+            const tasks = [];
+            let writer;
+            let mergeSet;
+            let packagePath;
+            let defaultDirectory;
+            switch (output.type) {
+                case 'directory':
+                    if (output.packageName) {
+                        cs.fullName = output.packageName;
+                    }
+                    manifestContents = cs.getPackageXml();
+                    packagePath = this.getPackagePath(output);
+                    defaultDirectory = packagePath;
+                    writer = new streams_1.StandardWriter(packagePath);
+                    if (!isSource) {
+                        const manifestPath = (0, path_1.join)(packagePath, MetadataConverter.PACKAGE_XML_FILE);
+                        tasks.push(graceful_fs_1.promises.writeFile(manifestPath, manifestContents));
+                        // For deploying destructive changes
+                        const destructiveChangesTypes = cs.getTypesOfDestructiveChanges();
+                        if (destructiveChangesTypes.length) {
+                            // for each of the destructive changes in the component set, convert and write the correct metadata
+                            // to each manifest
+                            destructiveChangesTypes.map((destructiveChangesType) => {
+                                const file = this.getDestructiveManifest(destructiveChangesType);
+                                const destructiveManifestContents = cs.getPackageXml(4, destructiveChangesType);
+                                const destructiveManifestPath = (0, path_1.join)(packagePath, file);
+                                tasks.push(graceful_fs_1.promises.writeFile(destructiveManifestPath, destructiveManifestContents));
+                            });
                         }
-                        defaultDirectory = output.defaultDirectory;
-                        mergeSet = new collections_1.ComponentSet();
-                        // since child components are composed in metadata format, we need to merge using the parent
-                        for (const component of output.mergeWith) {
-                            mergeSet.add((_a = component.parent) !== null && _a !== void 0 ? _a : component);
+                    }
+                    break;
+                case 'zip':
+                    if (output.packageName) {
+                        cs.fullName = output.packageName;
+                    }
+                    manifestContents = cs.getPackageXml();
+                    packagePath = this.getPackagePath(output);
+                    defaultDirectory = packagePath;
+                    writer = new streams_1.ZipWriter(packagePath);
+                    if (!isSource) {
+                        writer.addToZip(manifestContents, MetadataConverter.PACKAGE_XML_FILE);
+                        // For deploying destructive changes
+                        const destructiveChangesTypes = cs.getTypesOfDestructiveChanges();
+                        if (destructiveChangesTypes.length) {
+                            // for each of the destructive changes in the component set, convert and write the correct metadata
+                            // to each manifest
+                            destructiveChangesTypes.map((destructiveChangeType) => {
+                                const file = this.getDestructiveManifest(destructiveChangeType);
+                                const destructiveManifestContents = cs.getPackageXml(4, destructiveChangeType);
+                                writer.addToZip(destructiveManifestContents, file);
+                            });
                         }
-                        writer = new streams_1.StandardWriter(output.defaultDirectory);
-                        writer.forceIgnoredPaths = output.forceIgnoredPaths;
-                        break;
-                }
-                const conversionPipeline = streams_1.pipeline(new streams_1.ComponentReader(components), new streams_1.ComponentConverter(targetFormat, this.registry, mergeSet, defaultDirectory), writer);
-                tasks.push(conversionPipeline);
-                yield Promise.all(tasks);
-                const result = { packagePath };
-                if (output.type === 'zip' && !packagePath) {
-                    result.zipBuffer = writer.buffer;
-                }
-                else if (output.type !== 'zip') {
-                    result.converted = writer.converted;
-                }
-                return result;
+                    }
+                    break;
+                case 'merge':
+                    if (!isSource) {
+                        throw new errors_1.LibraryError('error_merge_metadata_target_unsupported');
+                    }
+                    defaultDirectory = output.defaultDirectory;
+                    mergeSet = new collections_1.ComponentSet();
+                    // since child components are composed in metadata format, we need to merge using the parent
+                    for (const component of output.mergeWith) {
+                        mergeSet.add((_a = component.parent) !== null && _a !== void 0 ? _a : component);
+                    }
+                    writer = new streams_1.StandardWriter(output.defaultDirectory);
+                    writer.forceIgnoredPaths = output.forceIgnoredPaths;
+                    break;
+            }
+            const conversionPipeline = (0, streams_1.pipeline)(new streams_1.ComponentReader(components), new streams_1.ComponentConverter(targetFormat, this.registry, mergeSet, defaultDirectory), writer);
+            tasks.push(conversionPipeline);
+            await Promise.all(tasks);
+            const result = { packagePath };
+            if (output.type === 'zip' && !packagePath) {
+                result.zipBuffer = writer.buffer;
             }
-            catch (e) {
-                throw new errors_1.ConversionError(e);
+            else if (output.type !== 'zip') {
+                result.converted = writer.converted;
             }
-        });
+            return result;
+        }
+        catch (e) {
+            throw new errors_1.ConversionError(e);
+        }
     }
     getPackagePath(outputConfig) {
         let packagePath;
         const { genUniqueDir = true, outputDirectory, packageName, type } = outputConfig;
         if (outputDirectory) {
             if (packageName) {
-                packagePath = path_1.join(outputDirectory, packageName);
+                packagePath = (0, path_1.join)(outputDirectory, packageName);
             }
             else {
                 if (genUniqueDir) {
-                    packagePath = path_1.join(outputDirectory, `${MetadataConverter.DEFAULT_PACKAGE_PREFIX}_${Date.now()}`);
+                    packagePath = (0, path_1.join)(outputDirectory, `${MetadataConverter.DEFAULT_PACKAGE_PREFIX}_${Date.now()}`);
                 }
                 else {
-                    packagePath = path_1.normalize(outputDirectory);
+                    packagePath = (0, path_1.normalize)(outputDirectory);
                 }
             }
             if (type === 'zip') {
                 packagePath += '.zip';
-                fileSystemHandler_1.ensureDirectoryExists(path_1.dirname(packagePath));
+                (0, fileSystemHandler_1.ensureDirectoryExists)((0, path_1.dirname)(packagePath));
             }
             else {
-                fileSystemHandler_1.ensureDirectoryExists(packagePath);
+                (0, fileSystemHandler_1.ensureDirectoryExists)(packagePath);
             }
         }
         return packagePath;

package/lib/src/convert/metadataConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metadataConverter.js","sourceRoot":"","sources":["../../../src/convert/metadataConverter.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,+BAAgD;AAChD,6CAAuC;AAEvC,kEAAmE;AACnE,sCAA0D;AAE1D,gDAAsE;AACtE,0CAA6C;AAC7C,uCAAsH;AAGtH,MAAa,iBAAiB;IAQ5B,YAAmB,QAAQ,GAAG,IAAI,yBAAc,EAAE;QAChD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IACM,KAAK,CAAC,OAAO,CAClB,KAA+C,EAC/C,YAA4B,EAC5B,MAA2B;;QAE3B,IAAI;YACF,IAAI,EAAgB,CAAC;YACrB,IAAI,UAAqC,CAAC;YAC1C,IAAI,KAAK,YAAY,0BAAY,EAAE;gBACjC,EAAE,GAAG,KAAK,CAAC;gBACX,UAAU,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC;aACtD;iBAAM;gBACL,EAAE,GAAG,IAAI,0BAAY,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC5C,UAAU,GAAG,KAAK,CAAC;aACpB;YACD,IAAI,gBAAgB,CAAC;YACrB,MAAM,QAAQ,GAAG,YAAY,KAAK,QAAQ,CAAC;YAC3C,MAAM,KAAK,GAAG,EAAE,CAAC;YAEjB,IAAI,MAAuB,CAAC;YAC5B,IAAI,QAAsB,CAAC;YAC3B,IAAI,WAAuB,CAAC;YAC5B,IAAI,gBAA4B,CAAC;YAEjC,QAAQ,MAAM,CAAC,IAAI,EAAE;gBACnB,KAAK,WAAW;oBACd,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtB,EAAE,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC;qBAClC;oBACD,gBAAgB,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;oBACtC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC1C,gBAAgB,GAAG,WAAW,CAAC;oBAC/B,MAAM,GAAG,IAAI,wBAAc,CAAC,WAAW,CAAC,CAAC;oBACzC,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;wBAC3E,KAAK,CAAC,IAAI,CAAC,sBAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC;wBAC/D,oCAAoC;wBACpC,MAAM,uBAAuB,GAAG,EAAE,CAAC,4BAA4B,EAAE,CAAC;wBAClE,IAAI,uBAAuB,CAAC,MAAM,EAAE;4BAClC,mGAAmG;4BACnG,mBAAmB;4BACnB,uBAAuB,CAAC,GAAG,CAAC,CAAC,sBAAsB,EAAE,EAAE;gCACrD,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,CAAC;gCACjE,MAAM,2BAA2B,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;gCAChF,MAAM,uBAAuB,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;gCACxD,KAAK,CAAC,IAAI,CAAC,sBAAQ,CAAC,SAAS,CAAC,uBAAuB,EAAE,2BAA2B,CAAC,CAAC,CAAC;4BACvF,CAAC,CAAC,CAAC;yBACJ;qBACF;oBACD,MAAM;gBACR,KAAK,KAAK;oBACR,IAAI,MAAM,CAAC,WAAW,EAAE;wBACtB,EAAE,CAAC,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC;qBAClC;oBACD,gBAAgB,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC;oBACtC,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAC1C,gBAAgB,GAAG,WAAW,CAAC;oBAC/B,MAAM,GAAG,IAAI,mBAAS,CAAC,WAAW,CAAC,CAAC;oBACpC,IAAI,CAAC,QAAQ,EAAE;wBACZ,MAAoB,CAAC,QAAQ,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;wBACrF,oCAAoC;wBACpC,MAAM,uBAAuB,GAAG,EAAE,CAAC,4BAA4B,EAAE,CAAC;wBAClE,IAAI,uBAAuB,CAAC,MAAM,EAAE;4BAClC,mGAAmG;4BACnG,mBAAmB;4BACnB,uBAAuB,CAAC,GAAG,CAAC,CAAC,qBAAqB,EAAE,EAAE;gCACpD,MAAM,IAAI,GAAG,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,CAAC;gCAChE,MAAM,2BAA2B,GAAG,EAAE,CAAC,aAAa,CAAC,CAAC,EAAE,qBAAqB,CAAC,CAAC;gCAC9E,MAAoB,CAAC,QAAQ,CAAC,2BAA2B,EAAE,IAAI,CAAC,CAAC;4BACpE,CAAC,CAAC,CAAC;yBACJ;qBACF;oBACD,MAAM;gBACR,KAAK,OAAO;oBACV,IAAI,CAAC,QAAQ,EAAE;wBACb,MAAM,IAAI,qBAAY,CAAC,yCAAyC,CAAC,CAAC;qBACnE;oBACD,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC;oBAC3C,QAAQ,GAAG,IAAI,0BAAY,EAAE,CAAC;oBAC9B,4FAA4F;oBAC5F,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,SAAS,EAAE;wBACxC,QAAQ,CAAC,GAAG,CAAC,MAAA,SAAS,CAAC,MAAM,mCAAI,SAAS,CAAC,CAAC;qBAC7C;oBACD,MAAM,GAAG,IAAI,wBAAc,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;oBACrD,MAAM,CAAC,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAC;oBACpD,MAAM;aACT;YAED,MAAM,kBAAkB,GAAG,IAAA,kBAAQ,EACjC,IAAI,yBAAe,CAAC,UAAU,CAAC,EAC/B,IAAI,4BAAkB,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,EAAE,QAAQ,EAAE,gBAAgB,CAAC,EAC/E,MAAM,CACP,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAC/B,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAEzB,MAAM,MAAM,GAAkB,EAAE,WAAW,EAAE,CAAC;YAC9C,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,IAAI,CAAC,WAAW,EAAE;gBACzC,MAAM,CAAC,SAAS,GAAI,MAAoB,CAAC,MAAM,CAAC;aACjD;iBAAM,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;gBAChC,MAAM,CAAC,SAAS,GAAI,MAAyB,CAAC,SAAS,CAAC;aACzD;YACD,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,IAAI,wBAAe,CAAC,CAAC,CAAC,CAAC;SAC9B;IACH,CAAC;IAEO,cAAc,CAAC,YAAyC;QAC9D,IAAI,WAAuB,CAAC;QAC5B,MAAM,EAAE,YAAY,GAAG,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,YAAY,CAAC;QACjF,IAAI,eAAe,EAAE;YACnB,IAAI,WAAW,EAAE;gBACf,WAAW,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,WAAW,CAAC,CAAC;aAClD;iBAAM;gBACL,IAAI,YAAY,EAAE;oBAChB,WAAW,GAAG,IAAA,WAAI,EAAC,eAAe,EAAE,GAAG,iBAAiB,CAAC,sBAAsB,IAAI,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;iBAClG;qBAAM;oBACL,WAAW,GAAG,IAAA,gBAAS,EAAC,eAAe,CAAC,CAAC;iBAC1C;aACF;YAED,IAAI,IAAI,KAAK,KAAK,EAAE;gBAClB,WAAW,IAAI,MAAM,CAAC;gBACtB,IAAA,yCAAqB,EAAC,IAAA,cAAO,EAAC,WAAW,CAAC,CAAC,CAAC;aAC7C;iBAAM;gBACL,IAAA,yCAAqB,EAAC,WAAW,CAAC,CAAC;aACpC;SACF;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;IAEO,sBAAsB,CAAC,sBAA8C;QAC3E,IAAI,sBAAsB,KAAK,oCAAsB,CAAC,IAAI,EAAE;YAC1D,OAAO,iBAAiB,CAAC,iCAAiC,CAAC;SAC5D;aAAM,IAAI,sBAAsB,KAAK,oCAAsB,CAAC,GAAG,EAAE;YAChE,OAAO,iBAAiB,CAAC,gCAAgC,CAAC;SAC3D;IACH,CAAC;;AArJH,8CAsJC;AArJwB,kCAAgB,GAAG,aAAa,CAAC;AACjC,mDAAiC,GAAG,4BAA4B,CAAC;AACjE,kDAAgC,GAAG,2BAA2B,CAAC;AAC/D,wCAAsB,GAAG,iBAAiB,CAAC"}

package/lib/src/convert/streams.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
 import { pipeline as cbPipeline, Readable, Transform, Writable } from 'stream';
-import { SourceComponent, MetadataResolver } from '../resolve';
-import { SfdxFileFormat, WriterFormat } from './types';
-import { SourcePath } from '../common';
-import { ConvertContext } from './convertContext';
 import { JsonMap } from '@salesforce/ts-types';
+import { MetadataResolver, SourceComponent } from '../resolve';
+import { SourcePath } from '../common';
 import { ComponentSet } from '../collections';
 import { RegistryAccess } from '../registry';
+import { ConvertContext } from './convertContext';
+import { SfdxFileFormat, WriterFormat } from './types';
 export declare const pipeline: typeof cbPipeline.__promisify__;
 export declare class ComponentReader extends Readable {
     private iter;

package/lib/src/convert/streams.js

@@ -1,20 +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());
-    });
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsToXml = exports.ZipWriter = exports.StandardWriter = exports.ComponentWriter = exports.ComponentConverter = exports.ComponentReader = exports.pipeline = void 0;
 /*
@@ -23,20 +7,20 @@ exports.JsToXml = exports.ZipWriter = exports.StandardWriter = exports.Component
  * 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 archiver_1 = require("archiver");
-const graceful_fs_1 = require("graceful-fs");
 const path_1 = require("path");
 const stream_1 = require("stream");
 const util_1 = require("util");
+const archiver_1 = require("archiver");
+const graceful_fs_1 = require("graceful-fs");
+const fast_xml_parser_1 = require("fast-xml-parser");
+const core_1 = require("@salesforce/core");
 const resolve_1 = require("../resolve");
 const fileSystemHandler_1 = require("../utils/fileSystemHandler");
 const common_1 = require("../common");
-const convertContext_1 = require("./convertContext");
-const transformers_1 = require("./transformers");
-const fast_xml_parser_1 = require("fast-xml-parser");
 const errors_1 = require("../errors");
-const core_1 = require("@salesforce/core");
-exports.pipeline = util_1.promisify(stream_1.pipeline);
+const transformers_1 = require("./transformers");
+const convertContext_1 = require("./convertContext");
+exports.pipeline = (0, util_1.promisify)(stream_1.pipeline);
 class ComponentReader extends stream_1.Readable {
     constructor(components) {
         super({ objectMode: true });
@@ -66,72 +50,57 @@ class ComponentConverter extends stream_1.Transform {
         this.transformerFactory = new transformers_1.MetadataTransformerFactory(registry, this.context);
         this.defaultDirectory = defaultDirectory;
     }
-    _transform(chunk, encoding, callback) {
+    async _transform(chunk, encoding, callback) {
         var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let err;
-            const writeInfos = [];
-            // Only transform components not marked for delete.
-            if (!chunk.isMarkedForDelete()) {
-                try {
-                    const converts = [];
-                    const transformer = this.transformerFactory.getTransformer(chunk);
-                    const mergeWith = (_a = this.mergeSet) === null || _a === void 0 ? void 0 : _a.getSourceComponents(chunk);
-                    switch (this.targetFormat) {
-                        case 'source':
-                            if (mergeWith) {
-                                for (const mergeComponent of mergeWith) {
-                                    converts.push(transformer.toSourceFormat(chunk, mergeComponent));
-                                }
-                            }
-                            if (converts.length === 0) {
-                                converts.push(transformer.toSourceFormat(chunk));
+        let err;
+        const writeInfos = [];
+        // Only transform components not marked for delete.
+        if (!chunk.isMarkedForDelete()) {
+            try {
+                const converts = [];
+                const transformer = this.transformerFactory.getTransformer(chunk);
+                const mergeWith = (_a = this.mergeSet) === null || _a === void 0 ? void 0 : _a.getSourceComponents(chunk);
+                switch (this.targetFormat) {
+                    case 'source':
+                        if (mergeWith) {
+                            for (const mergeComponent of mergeWith) {
+                                converts.push(transformer.toSourceFormat(chunk, mergeComponent));
                             }
-                            break;
-                        case 'metadata':
-                            converts.push(transformer.toMetadataFormat(chunk));
-                            break;
-                        default:
-                            throw new errors_1.LibraryError('error_convert_invalid_format', this.targetFormat);
-                    }
-                    // could maybe improve all this with lazy async collections...
-                    (yield Promise.all(converts)).forEach((infos) => writeInfos.push(...infos));
-                }
-                catch (e) {
-                    err = e;
+                        }
+                        if (converts.length === 0) {
+                            converts.push(transformer.toSourceFormat(chunk));
+                        }
+                        break;
+                    case 'metadata':
+                        converts.push(transformer.toMetadataFormat(chunk));
+                        break;
+                    default:
+                        throw new errors_1.LibraryError('error_convert_invalid_format', this.targetFormat);
                 }
+                // could maybe improve all this with lazy async collections...
+                (await Promise.all(converts)).forEach((infos) => writeInfos.push(...infos));
+            }
+            catch (e) {
+                err = e;
             }
-            callback(err, { component: chunk, writeInfos });
-        });
+        }
+        callback(err, { component: chunk, writeInfos });
     }
     /**
      * Called at the end when all components have passed through the pipeline. Finalizers
      * take care of any additional work to be done at this stage e.g. recomposing child components.
      */
-    _flush(callback) {
-        var e_1, _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            let err;
-            try {
-                try {
-                    for (var _b = __asyncValues(this.context.executeFinalizers(this.defaultDirectory)), _c; _c = yield _b.next(), !_c.done;) {
-                        const finalizerResult = _c.value;
-                        finalizerResult.forEach((result) => this.push(result));
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-            }
-            catch (e) {
-                err = e;
+    async _flush(callback) {
+        let err;
+        try {
+            for await (const finalizerResult of this.context.executeFinalizers(this.defaultDirectory)) {
+                finalizerResult.forEach((result) => this.push(result));
             }
-            callback(err);
-        });
+        }
+        catch (e) {
+            err = e;
+        }
+        callback(err);
     }
 }
 exports.ComponentConverter = ComponentConverter;
@@ -150,54 +119,50 @@ class StandardWriter extends ComponentWriter {
         this.resolver = resolver;
         this.logger = core_1.Logger.childFromRoot(this.constructor.name);
     }
-    _write(chunk, encoding, callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let err;
-            if (chunk.writeInfos.length !== 0) {
-                try {
-                    const toResolve = [];
-                    const writeTasks = chunk.writeInfos.map((info) => {
-                        const fullDest = path_1.isAbsolute(info.output)
-                            ? info.output
-                            : path_1.join(this.rootDestination, info.output);
-                        if (!graceful_fs_1.existsSync(fullDest)) {
-                            for (const ignoredPath of this.forceIgnoredPaths) {
-                                if (path_1.dirname(ignoredPath).includes(path_1.dirname(fullDest)) &&
-                                    path_1.basename(ignoredPath).includes(path_1.basename(fullDest))) {
-                                    return;
-                                }
+    async _write(chunk, encoding, callback) {
+        let err;
+        if (chunk.writeInfos.length !== 0) {
+            try {
+                const toResolve = [];
+                const writeTasks = chunk.writeInfos.map((info) => {
+                    const fullDest = (0, path_1.isAbsolute)(info.output) ? info.output : (0, path_1.join)(this.rootDestination, info.output);
+                    if (!(0, graceful_fs_1.existsSync)(fullDest)) {
+                        for (const ignoredPath of this.forceIgnoredPaths) {
+                            if ((0, path_1.dirname)(ignoredPath).includes((0, path_1.dirname)(fullDest)) &&
+                                (0, path_1.basename)(ignoredPath).includes((0, path_1.basename)(fullDest))) {
+                                return;
                             }
                         }
-                        if (this.forceIgnoredPaths.has(fullDest)) {
+                    }
+                    if (this.forceIgnoredPaths.has(fullDest)) {
+                        return;
+                    }
+                    // if there are children, resolve each file. o/w just pick one of the files to resolve
+                    if (toResolve.length === 0 || chunk.component.type.children) {
+                        // This is a workaround for a server side ListViews bug where
+                        // duplicate components are sent. W-9614275
+                        if (toResolve.includes(fullDest)) {
+                            this.logger.debug(`Ignoring duplicate metadata for: ${fullDest}`);
                             return;
                         }
-                        // if there are children, resolve each file. o/w just pick one of the files to resolve
-                        if (toResolve.length === 0 || chunk.component.type.children) {
-                            // This is a workaround for a server side ListViews bug where
-                            // duplicate components are sent. W-9614275
-                            if (toResolve.includes(fullDest)) {
-                                this.logger.debug(`Ignoring duplicate metadata for: ${fullDest}`);
-                                return;
-                            }
-                            toResolve.push(fullDest);
-                        }
-                        fileSystemHandler_1.ensureFileExists(fullDest);
-                        return exports.pipeline(info.source, graceful_fs_1.createWriteStream(fullDest));
-                    });
-                    // it is a reasonable expectation that when a conversion call exits, the files of
-                    // every component has been written to the destination. This await ensures the microtask
-                    // queue is empty when that call exits and overall less memory is consumed.
-                    yield Promise.all(writeTasks);
-                    for (const fsPath of toResolve) {
-                        this.converted.push(...this.resolver.getComponentsFromPath(fsPath));
+                        toResolve.push(fullDest);
                     }
-                }
-                catch (e) {
-                    err = e;
+                    (0, fileSystemHandler_1.ensureFileExists)(fullDest);
+                    return (0, exports.pipeline)(info.source, (0, graceful_fs_1.createWriteStream)(fullDest));
+                });
+                // it is a reasonable expectation that when a conversion call exits, the files of
+                // every component has been written to the destination. This await ensures the microtask
+                // queue is empty when that call exits and overall less memory is consumed.
+                await Promise.all(writeTasks);
+                for (const fsPath of toResolve) {
+                    this.converted.push(...this.resolver.getComponentsFromPath(fsPath));
                 }
             }
-            callback(err);
-        });
+            catch (e) {
+                err = e;
+            }
+        }
+        callback(err);
     }
 }
 exports.StandardWriter = StandardWriter;
@@ -207,45 +172,44 @@ class ZipWriter extends ComponentWriter {
         // compression-/speed+ (0)<---(3)---------->(9) compression+/speed-
         // 3 appears to be a decent balance of compression and speed. It felt like
         // higher values = diminishing returns on compression and made conversion slower
-        this.zip = archiver_1.create('zip', { zlib: { level: 3 } });
+        this.zip = (0, archiver_1.create)('zip', { zlib: { level: 3 } });
         this.buffers = [];
-        exports.pipeline(this.zip, this.getOutputStream());
-    }
-    _write(chunk, encoding, callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let err;
-            try {
-                for (const info of chunk.writeInfos) {
-                    this.addToZip(info.source, info.output);
-                }
+        void (0, exports.pipeline)(this.zip, this.getOutputStream());
+    }
+    // required to be async to override Node's Writable class
+    // eslint-disable-next-line @typescript-eslint/require-await
+    async _write(chunk, encoding, callback) {
+        let err;
+        try {
+            for (const info of chunk.writeInfos) {
+                this.addToZip(info.source, info.output);
             }
-            catch (e) {
-                err = e;
-            }
-            callback(err);
-        });
+        }
+        catch (e) {
+            err = e;
+        }
+        callback(err);
     }
-    _final(callback) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let err;
-            try {
-                yield this.zip.finalize();
-            }
-            catch (e) {
-                err = e;
-            }
-            callback(err);
-        });
+    async _final(callback) {
+        let err;
+        try {
+            await this.zip.finalize();
+        }
+        catch (e) {
+            err = e;
+        }
+        callback(err);
     }
     addToZip(contents, path) {
         this.zip.append(contents, { name: path });
     }
     getOutputStream() {
         if (this.rootDestination) {
-            return graceful_fs_1.createWriteStream(this.rootDestination);
+            return (0, graceful_fs_1.createWriteStream)(this.rootDestination);
         }
         else {
             const bufferWritable = new stream_1.Writable();
+            // eslint-disable-next-line no-underscore-dangle
             bufferWritable._write = (chunk, encoding, cb) => {
                 this.buffers.push(chunk);
                 cb();