auth0-deploy-cli 8.20.2 → 8.20.4-beta.0

package/lib/context/directory/handlers/attackProtection.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -68,34 +59,31 @@ function parse(context) {
         attackProtection,
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { attackProtection } = context.assets;
-        if (!attackProtection)
-            return;
-        const files = attackProtectionFiles(context.filePath);
-        fs_extra_1.default.ensureDirSync(files.directory);
-        const maskedAttackProtection = (0, defaults_1.attackProtectionDefaults)(attackProtection);
-        if (maskedAttackProtection.botDetection) {
-            (0, utils_1.dumpJSON)(files.botDetection, maskedAttackProtection.botDetection);
-        }
-        if (maskedAttackProtection.breachedPasswordDetection) {
-            (0, utils_1.dumpJSON)(files.breachedPasswordDetection, maskedAttackProtection.breachedPasswordDetection);
-        }
-        if (maskedAttackProtection.bruteForceProtection) {
-            (0, utils_1.dumpJSON)(files.bruteForceProtection, maskedAttackProtection.bruteForceProtection);
-        }
-        if (maskedAttackProtection.captcha) {
-            (0, utils_1.dumpJSON)(files.captcha, maskedAttackProtection.captcha);
-        }
-        if (maskedAttackProtection.suspiciousIpThrottling) {
-            (0, utils_1.dumpJSON)(files.suspiciousIpThrottling, maskedAttackProtection.suspiciousIpThrottling);
-        }
-    });
+async function dump(context) {
+    const { attackProtection } = context.assets;
+    if (!attackProtection)
+        return;
+    const files = attackProtectionFiles(context.filePath);
+    fs_extra_1.default.ensureDirSync(files.directory);
+    const maskedAttackProtection = (0, defaults_1.attackProtectionDefaults)(attackProtection);
+    if (maskedAttackProtection.botDetection) {
+        (0, utils_1.dumpJSON)(files.botDetection, maskedAttackProtection.botDetection);
+    }
+    if (maskedAttackProtection.breachedPasswordDetection) {
+        (0, utils_1.dumpJSON)(files.breachedPasswordDetection, maskedAttackProtection.breachedPasswordDetection);
+    }
+    if (maskedAttackProtection.bruteForceProtection) {
+        (0, utils_1.dumpJSON)(files.bruteForceProtection, maskedAttackProtection.bruteForceProtection);
+    }
+    if (maskedAttackProtection.captcha) {
+        (0, utils_1.dumpJSON)(files.captcha, maskedAttackProtection.captcha);
+    }
+    if (maskedAttackProtection.suspiciousIpThrottling) {
+        (0, utils_1.dumpJSON)(files.suspiciousIpThrottling, maskedAttackProtection.suspiciousIpThrottling);
+    }
 }
 const attackProtectionHandler = {
     parse,
     dump,
 };
 exports.default = attackProtectionHandler;
-//# sourceMappingURL=attackProtection.js.map

package/lib/context/directory/handlers/branding.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -47,18 +38,19 @@ function parse(context) {
         return definition;
     }, {});
     return {
-        branding: Object.assign(Object.assign({}, brandingSettings), { templates }),
+        branding: {
+            ...brandingSettings,
+            templates,
+        },
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { branding } = context.assets;
-        if (!branding)
-            return;
-        dumpBranding(context);
-        if (!!branding.templates)
-            dumpBrandingTemplates(context);
-    });
+async function dump(context) {
+    const { branding } = context.assets;
+    if (!branding)
+        return;
+    dumpBranding(context);
+    if (!!branding.templates)
+        dumpBrandingTemplates(context);
 }
 const dumpBrandingTemplates = ({ filePath, assets }) => {
     if (!assets.branding || !assets.branding.templates)
@@ -84,7 +76,7 @@ const dumpBranding = ({ filePath, assets }) => {
         return;
     const { branding } = assets;
     const brandingWithoutTemplates = (() => {
-        const newBranding = Object.assign({}, branding);
+        const newBranding = { ...branding };
         delete newBranding.templates;
         return newBranding;
     })();
@@ -98,4 +90,3 @@ const brandingHandler = {
     dump,
 };
 exports.default = brandingHandler;
-//# sourceMappingURL=branding.js.map

package/lib/context/directory/handlers/clientGrants.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -33,58 +24,58 @@ function parse(context) {
         clientGrants,
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { clientGrants } = context.assets;
-        if (!clientGrants)
-            return; // Skip, nothing to dump
-        const grantsFolder = path_1.default.join(context.filePath, tools_1.constants.CLIENTS_GRANTS_DIRECTORY);
-        fs_extra_1.default.ensureDirSync(grantsFolder);
-        if (clientGrants.length === 0)
-            return;
-        const allResourceServers = yield (0, client_1.paginate)(context.mgmtClient.resourceServers.getAll, {
-            paginate: true,
-            include_totals: true,
-        });
-        const allClients = yield (0, client_1.paginate)(context.mgmtClient.clients.getAll, {
-            paginate: true,
-            include_totals: true,
-        });
-        // Convert client_id to the client name for readability
-        clientGrants.forEach((grant) => {
-            const dumpGrant = Object.assign({}, grant);
-            if (context.assets.clientsOrig) {
-                dumpGrant.client_id = (0, utils_1.convertClientIdToName)(dumpGrant.client_id, context.assets.clientsOrig);
-            }
-            const clientName = (() => {
-                const associatedClient = allClients.find((client) => client.client_id === grant.client_id);
-                if (associatedClient === undefined)
-                    return grant.client_id;
-                return associatedClient.name;
-            })();
-            // Convert audience to the API name for readability
-            const apiName = (grantAudience) => {
-                const associatedAPI = allResourceServers.find((resourceServer) => resourceServer.identifier === grantAudience);
-                if (associatedAPI === undefined)
-                    return grantAudience; // Use the audience if the API is not found
-                return associatedAPI.name; // Use the name of the API
-            };
-            // Replace keyword markers if necessary
-            const clientNameNonMarker = (0, keywordPreservation_1.doesHaveKeywordMarker)(clientName, context.mappings)
-                ? (0, tools_1.keywordReplace)(clientName, context.mappings)
-                : clientName;
-            const apiAudienceNonMarker = (0, keywordPreservation_1.doesHaveKeywordMarker)(grant.audience, context.mappings)
-                ? (0, tools_1.keywordReplace)(grant.audience, context.mappings)
-                : grant.audience;
-            // Construct the name using non-marker names
-            const name = (0, utils_1.sanitize)(`${clientNameNonMarker}-${apiName(apiAudienceNonMarker)}`);
-            // Ensure the name is not empty or invalid
-            if (!name || name.trim().length === 0) {
-                throw new Error(`Invalid name generated for client grant: ${JSON.stringify(grant)}`);
-            }
-            const grantFile = path_1.default.join(grantsFolder, `${name}.json`);
-            (0, utils_1.dumpJSON)(grantFile, dumpGrant);
-        });
+async function dump(context) {
+    const { clientGrants } = context.assets;
+    if (!clientGrants)
+        return; // Skip, nothing to dump
+    const grantsFolder = path_1.default.join(context.filePath, tools_1.constants.CLIENTS_GRANTS_DIRECTORY);
+    fs_extra_1.default.ensureDirSync(grantsFolder);
+    if (clientGrants.length === 0)
+        return;
+    const allResourceServers = await (0, client_1.paginate)(context.mgmtClient.resourceServers.list, {
+        paginate: true,
+        include_totals: true,
+    });
+    const allClients = await (0, client_1.paginate)(context.mgmtClient.clients.list, {
+        paginate: true,
+        include_totals: true,
+    });
+    // Convert client_id to the client name for readability
+    clientGrants.forEach((grant) => {
+        const dumpGrant = { ...grant };
+        if (context.assets.clientsOrig) {
+            dumpGrant.client_id = (0, utils_1.convertClientIdToName)(dumpGrant.client_id, context.assets.clientsOrig);
+        }
+        const clientName = (() => {
+            const associatedClient = allClients.find((client) => client.client_id === grant.client_id);
+            if (associatedClient === undefined)
+                return grant.client_id;
+            return associatedClient.name;
+        })();
+        // Convert audience to the API name for readability
+        const apiName = (grantAudience) => {
+            if (!grantAudience)
+                return grantAudience;
+            const associatedAPI = allResourceServers.find((resourceServer) => resourceServer.identifier === grantAudience);
+            if (associatedAPI === undefined)
+                return grantAudience; // Use the audience if the API is not found
+            return associatedAPI.name; // Use the name of the API
+        };
+        // Replace keyword markers if necessary
+        const clientNameNonMarker = (0, keywordPreservation_1.doesHaveKeywordMarker)(clientName, context.mappings)
+            ? (0, tools_1.keywordReplace)(clientName, context.mappings)
+            : clientName;
+        const apiAudienceNonMarker = (0, keywordPreservation_1.doesHaveKeywordMarker)(grant.audience, context.mappings)
+            ? (0, tools_1.keywordReplace)(grant.audience, context.mappings)
+            : grant.audience;
+        // Construct the name using non-marker names
+        const name = (0, utils_1.sanitize)(`${clientNameNonMarker}-${apiName(apiAudienceNonMarker)}`);
+        // Ensure the name is not empty or invalid
+        if (!name || name.trim().length === 0) {
+            throw new Error(`Invalid name generated for client grant: ${JSON.stringify(grant)}`);
+        }
+        const grantFile = path_1.default.join(grantsFolder, `${name}.json`);
+        (0, utils_1.dumpJSON)(grantFile, dumpGrant);
     });
 }
 const clientGrantsHandler = {
@@ -92,4 +83,3 @@ const clientGrantsHandler = {
     dump,
 };
 exports.default = clientGrantsHandler;
-//# sourceMappingURL=clientGrants.js.map

package/lib/context/directory/handlers/clients.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -44,25 +35,23 @@ function parse(context) {
         clients,
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { clients } = context.assets;
-        if (!clients)
-            return; // Skip, nothing to dump
-        const clientsFolder = path_1.default.join(context.filePath, tools_1.constants.CLIENTS_DIRECTORY);
-        fs_extra_1.default.ensureDirSync(clientsFolder);
-        clients.forEach((client) => {
-            const clientName = (0, utils_1.sanitize)(client.name);
-            const clientFile = path_1.default.join(clientsFolder, `${clientName}.json`);
-            if (client.custom_login_page) {
-                const html = client.custom_login_page;
-                const customLoginHtml = path_1.default.join(clientsFolder, `${clientName}_custom_login_page.html`);
-                logger_1.default.info(`Writing ${customLoginHtml}`);
-                fs_extra_1.default.writeFileSync(customLoginHtml, html);
-                client.custom_login_page = `./${clientName}_custom_login_page.html`;
-            }
-            (0, utils_1.dumpJSON)(clientFile, (0, utils_1.clearClientArrays)(client));
-        });
+async function dump(context) {
+    const { clients } = context.assets;
+    if (!clients)
+        return; // Skip, nothing to dump
+    const clientsFolder = path_1.default.join(context.filePath, tools_1.constants.CLIENTS_DIRECTORY);
+    fs_extra_1.default.ensureDirSync(clientsFolder);
+    clients.forEach((client) => {
+        const clientName = (0, utils_1.sanitize)(client.name);
+        const clientFile = path_1.default.join(clientsFolder, `${clientName}.json`);
+        if (client.custom_login_page) {
+            const html = client.custom_login_page;
+            const customLoginHtml = path_1.default.join(clientsFolder, `${clientName}_custom_login_page.html`);
+            logger_1.default.info(`Writing ${customLoginHtml}`);
+            fs_extra_1.default.writeFileSync(customLoginHtml, html);
+            client.custom_login_page = `./${clientName}_custom_login_page.html`;
+        }
+        (0, utils_1.dumpJSON)(clientFile, (0, utils_1.clearClientArrays)(client));
     });
 }
 const clientsHandler = {
@@ -70,4 +59,3 @@ const clientsHandler = {
     dump,
 };
 exports.default = clientsHandler;
-//# sourceMappingURL=clients.js.map

package/lib/context/directory/handlers/connections.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -48,40 +39,41 @@ function parse(context) {
         connections,
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { connections, clientsOrig } = context.assets;
-        if (!connections)
-            return; // Skip, nothing to dump
-        const connectionsFolder = path_1.default.join(context.filePath, tools_1.constants.CONNECTIONS_DIRECTORY);
-        fs_extra_1.default.ensureDirSync(connectionsFolder);
-        // Convert enabled_clients from id to name
-        connections.forEach((connection) => {
-            let dumpedConnection = Object.assign(Object.assign({}, connection), (connection.enabled_clients && {
+async function dump(context) {
+    const { connections, clientsOrig } = context.assets;
+    if (!connections)
+        return; // Skip, nothing to dump
+    const connectionsFolder = path_1.default.join(context.filePath, tools_1.constants.CONNECTIONS_DIRECTORY);
+    fs_extra_1.default.ensureDirSync(connectionsFolder);
+    // Convert enabled_clients from id to name
+    connections.forEach((connection) => {
+        let dumpedConnection = {
+            ...connection,
+            ...(connection.enabled_clients && {
                 enabled_clients: (0, utils_1.mapClientID2NameSorted)(connection.enabled_clients, clientsOrig || []),
-            }));
-            const connectionName = (0, utils_1.sanitize)(dumpedConnection.name);
-            // Mask secrets
-            dumpedConnection = (0, defaults_1.connectionDefaults)(dumpedConnection);
-            if (dumpedConnection.strategy === 'email') {
-                (0, utils_1.ensureProp)(dumpedConnection, 'options.email.body');
-                const html = dumpedConnection.options.email.body;
-                const emailConnectionHtml = path_1.default.join(connectionsFolder, `${connectionName}.html`);
-                logger_1.default.info(`Writing ${emailConnectionHtml}`);
-                fs_extra_1.default.writeFileSync(emailConnectionHtml, html);
-                dumpedConnection.options.email.body = `./${connectionName}.html`;
+            }),
+        };
+        const connectionName = (0, utils_1.sanitize)(dumpedConnection.name);
+        // Mask secrets
+        dumpedConnection = (0, defaults_1.connectionDefaults)(dumpedConnection);
+        if (dumpedConnection.strategy === 'email') {
+            (0, utils_1.ensureProp)(dumpedConnection, 'options.email.body');
+            const html = dumpedConnection.options.email.body;
+            const emailConnectionHtml = path_1.default.join(connectionsFolder, `${connectionName}.html`);
+            logger_1.default.info(`Writing ${emailConnectionHtml}`);
+            fs_extra_1.default.writeFileSync(emailConnectionHtml, html);
+            dumpedConnection.options.email.body = `./${connectionName}.html`;
+        }
+        if (dumpedConnection.strategy === 'samlp' && dumpedConnection.options) {
+            if ('cert' in dumpedConnection.options) {
+                dumpedConnection.options.cert = (0, utils_1.encodeCertStringToBase64)(dumpedConnection.options.cert);
             }
-            if (dumpedConnection.strategy === 'samlp' && dumpedConnection.options) {
-                if ('cert' in dumpedConnection.options) {
-                    dumpedConnection.options.cert = (0, utils_1.encodeCertStringToBase64)(dumpedConnection.options.cert);
-                }
-                if ('signingCert' in dumpedConnection.options) {
-                    dumpedConnection.options.signingCert = (0, utils_1.encodeCertStringToBase64)(dumpedConnection.options.signingCert);
-                }
+            if ('signingCert' in dumpedConnection.options) {
+                dumpedConnection.options.signingCert = (0, utils_1.encodeCertStringToBase64)(dumpedConnection.options.signingCert);
             }
-            const connectionFile = path_1.default.join(connectionsFolder, `${connectionName}.json`);
-            (0, utils_1.dumpJSON)(connectionFile, dumpedConnection);
-        });
+        }
+        const connectionFile = path_1.default.join(connectionsFolder, `${connectionName}.json`);
+        (0, utils_1.dumpJSON)(connectionFile, dumpedConnection);
     });
 }
 const connectionsHandler = {
@@ -89,4 +81,3 @@ const connectionsHandler = {
     dump,
 };
 exports.default = connectionsHandler;
-//# sourceMappingURL=connections.js.map

package/lib/context/directory/handlers/customDomains.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,21 +21,18 @@ function parse(context) {
         }),
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { customDomains } = context.assets;
-        if (!customDomains)
-            return; // Skip, nothing to dump
-        // Create Rules folder
-        const customDomainsDirectory = getCustomDomainsDirectory(context.filePath);
-        fs_extra_1.default.ensureDirSync(customDomainsDirectory);
-        const customDomainsFile = getCustomDomainsFile(context.filePath);
-        (0, utils_1.dumpJSON)(customDomainsFile, customDomains);
-    });
+async function dump(context) {
+    const { customDomains } = context.assets;
+    if (!customDomains)
+        return; // Skip, nothing to dump
+    // Create Rules folder
+    const customDomainsDirectory = getCustomDomainsDirectory(context.filePath);
+    fs_extra_1.default.ensureDirSync(customDomainsDirectory);
+    const customDomainsFile = getCustomDomainsFile(context.filePath);
+    (0, utils_1.dumpJSON)(customDomainsFile, customDomains);
 }
 const customDomainsHandler = {
     parse,
     dump,
 };
 exports.default = customDomainsHandler;
-//# sourceMappingURL=customDomains.js.map

package/lib/context/directory/handlers/databases.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());
-    });
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -18,7 +9,6 @@ const tools_1 = require("../../../tools");
 const logger_1 = __importDefault(require("../../../logger"));
 const utils_1 = require("../../../utils");
 function getDatabase(folder, mappingOpts) {
-    var _a;
     const metaFile = path_1.default.join(folder, 'database.json');
     const metaData = (() => {
         try {
@@ -33,9 +23,17 @@ function getDatabase(folder, mappingOpts) {
         logger_1.default.warn(`Skipping database folder ${folder} as ${metaFile} is empty`);
         return {};
     }
-    const database = Object.assign(Object.assign({}, metaData), { options: Object.assign(Object.assign({}, (metaData.options || {})), ((metaData === null || metaData === void 0 ? void 0 : metaData.customScripts) && { customScripts: metaData === null || metaData === void 0 ? void 0 : metaData.customScripts })) });
+    const database = {
+        ...metaData,
+        options: {
+            // @ts-ignore because this code exists currently, but still needs to be understood if it is correct or not
+            ...(metaData.options || {}),
+            // @ts-ignore because this code exists currently, but still needs to be understood if it is correct or not
+            ...(metaData?.customScripts && { customScripts: metaData?.customScripts }),
+        },
+    };
     // If any customScripts configured then load content of files
-    if ((_a = database.options) === null || _a === void 0 ? void 0 : _a.customScripts) {
+    if (database.options?.customScripts) {
         Object.entries(database.options.customScripts).forEach(([name, script]) => {
             if (!tools_1.constants.DATABASE_SCRIPTS.includes(name)) {
                 // skip invalid keys in customScripts object
@@ -66,25 +64,29 @@ function parse(context) {
         databases,
     };
 }
-function dump(context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const { databases } = context.assets;
-        if (!databases)
-            return; // Skip, nothing to dump
-        const databasesFolder = path_1.default.join(context.filePath, tools_1.constants.DATABASE_CONNECTIONS_DIRECTORY);
-        fs_extra_1.default.ensureDirSync(databasesFolder);
-        databases.forEach((database) => {
-            var _a;
-            const dbFolder = path_1.default.join(databasesFolder, (0, utils_1.sanitize)(database.name));
-            fs_extra_1.default.ensureDirSync(dbFolder);
-            const sortCustomScripts = (name1, name2) => {
-                if (name1 === name2)
-                    return 0;
-                return name1 > name2 ? 1 : -1;
-            };
-            const formatted = Object.assign(Object.assign(Object.assign({}, database), (database.enabled_clients && {
+async function dump(context) {
+    const { databases } = context.assets;
+    if (!databases)
+        return; // Skip, nothing to dump
+    const databasesFolder = path_1.default.join(context.filePath, tools_1.constants.DATABASE_CONNECTIONS_DIRECTORY);
+    fs_extra_1.default.ensureDirSync(databasesFolder);
+    databases.forEach((database) => {
+        const dbFolder = path_1.default.join(databasesFolder, (0, utils_1.sanitize)(database.name));
+        fs_extra_1.default.ensureDirSync(dbFolder);
+        const sortCustomScripts = (name1, name2) => {
+            if (name1 === name2)
+                return 0;
+            return name1 > name2 ? 1 : -1;
+        };
+        const formatted = {
+            ...database,
+            ...(database.enabled_clients && {
                 enabled_clients: (0, utils_1.mapClientID2NameSorted)(database.enabled_clients, context.assets.clientsOrig || []),
-            })), { options: Object.assign(Object.assign({}, (database.options || {})), (((_a = database.options) === null || _a === void 0 ? void 0 : _a.customScripts) && {
+            }),
+            options: {
+                ...(database.options || {}),
+                // customScripts option only written if there are scripts
+                ...(database.options?.customScripts && {
                     customScripts: Object.entries(database.options.customScripts)
                         // @ts-ignore because we'll fix this in subsequent PR
                         .sort(sortCustomScripts)
@@ -98,10 +100,11 @@ function dump(context) {
                         scripts[name] = `./${scriptName}`;
                         return scripts;
                     }, {}),
-                })) });
-            const databaseFile = path_1.default.join(dbFolder, 'database.json');
-            (0, utils_1.dumpJSON)(databaseFile, formatted);
-        });
+                }),
+            },
+        };
+        const databaseFile = path_1.default.join(dbFolder, 'database.json');
+        (0, utils_1.dumpJSON)(databaseFile, formatted);
     });
 }
 const databasesHandler = {
@@ -109,4 +112,3 @@ const databasesHandler = {
     dump,
 };
 exports.default = databasesHandler;
-//# sourceMappingURL=databases.js.map