directus-template-cli 0.5.0-beta.2 → 0.5.0-beta.20

package/dist/lib/load/load-flows.js

@@ -4,61 +4,67 @@ exports.loadOperations = void 0;
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 async function loadFlows(dir) {
     const flows = (0, read_file_1.default)('flows', dir);
-    core_1.ux.action.start(`Loading ${flows.length} flows`);
-    // Fetch existing flows
-    const existingFlows = await sdk_2.api.client.request((0, sdk_1.readFlows)({
-        limit: -1,
-    }));
-    const existingFlowIds = new Set(existingFlows.map(flow => flow.id));
-    const cleanedUpFlows = flows.map(flow => {
-        const cleanFlow = { ...flow };
-        delete cleanFlow.operations;
-        return cleanFlow;
-    });
-    for (const flow of cleanedUpFlows) {
+    const allOperations = (0, read_file_1.default)('operations', dir);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${flows.length} flows`));
+    if (flows && flows.length > 0) {
         try {
-            if (existingFlowIds.has(flow.id)) {
-                core_1.ux.log(`Skipping existing flow: ${flow.name}`);
-                continue;
+            // Fetch existing flows
+            const existingFlows = await sdk_2.api.client.request((0, sdk_1.readFlows)({
+                limit: -1,
+            }));
+            const existingFlowIds = new Set(existingFlows.map(flow => flow.id));
+            const newFlows = flows.filter(flow => !existingFlowIds.has(flow.id));
+            const results = await Promise.allSettled(newFlows.map(flow => sdk_2.api.client.request((0, sdk_1.createFlow)(flow))));
+            const createdFlowIds = new Set();
+            for (const [index, result] of results.entries()) {
+                if (result.status === 'fulfilled') {
+                    createdFlowIds.add(newFlows[index].id);
+                }
+                else {
+                    (0, catch_error_1.default)(result.reason);
+                }
             }
-            await sdk_2.api.client.request((0, sdk_1.createFlow)(flow));
-            existingFlowIds.add(flow.id);
+            // Filter operations for newly created flows
+            const newOperations = allOperations.filter(operation => createdFlowIds.has(operation.flow));
+            await loadOperations(newOperations);
         }
         catch (error) {
             (0, catch_error_1.default)(error);
         }
+        finally {
+            core_1.ux.action.stop();
+        }
     }
-    await loadOperations(dir);
-    core_1.ux.action.stop();
-    core_1.ux.log('Loaded Flows');
 }
 exports.default = loadFlows;
-async function loadOperations(dir) {
-    const operations = (0, read_file_1.default)('operations', dir);
-    core_1.ux.log(`Loading ${operations.length} operations`);
-    const opsIds = operations.map(i => {
-        const del = { ...i };
-        delete del.resolve;
-        delete del.reject;
-        return del;
-    });
-    await sdk_2.api.client.request((0, sdk_1.createOperations)(opsIds));
-    for (const operation of operations) {
-        const pl = {
+async function loadOperations(operations) {
+    core_1.ux.action.status = `Loading ${operations.length} operations`;
+    try {
+        const opsIds = operations.map(operation => {
+            const opCopy = { ...operation };
+            delete opCopy.reject;
+            delete opCopy.resolve;
+            return opCopy;
+        });
+        await sdk_2.api.client.request((0, sdk_1.createOperations)(opsIds));
+        const results = await Promise.allSettled(operations.map(operation => sdk_2.api.client.request((0, sdk_1.updateOperation)(operation.id, {
             reject: operation.reject,
             resolve: operation.resolve,
-        };
-        try {
-            await sdk_2.api.client.request((0, sdk_1.updateOperation)(operation.id, pl));
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
+        }))));
+        for (const [index, result] of results.entries()) {
+            if (result.status === 'rejected') {
+                (0, catch_error_1.default)(result.reason);
+            }
         }
     }
+    catch (error) {
+        (0, catch_error_1.default)(error);
+    }
 }
 exports.loadOperations = loadOperations;

package/dist/lib/load/load-folders.js

@@ -3,50 +3,49 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 async function loadFolders(dir) {
     const folders = (0, read_file_1.default)('folders', dir);
-    core_1.ux.action.start(`Loading ${folders.length} folders`);
-    try {
-        // Fetch existing folders
-        const existingFolders = await sdk_2.api.client.request((0, sdk_1.readFolders)({
-            limit: -1,
-        }));
-        const existingFolderIds = new Set(existingFolders.map(folder => folder.id));
-        const foldersToAdd = folders.filter(folder => {
-            if (existingFolderIds.has(folder.id)) {
-                core_1.ux.log(`Skipping existing folder: ${folder.name}`);
-                return false;
-            }
-            return true;
-        });
-        if (foldersToAdd.length > 0) {
-            const folderSkeleton = foldersToAdd.map(folder => ({ id: folder.id, name: folder.name }));
-            // Create the folders
-            await sdk_2.api.client.request((0, sdk_1.createFolders)(folderSkeleton));
-            core_1.ux.log(`Created ${foldersToAdd.length} new folders`);
-            // Update the folders with relationships concurrently
-            await Promise.all(foldersToAdd.map(async (folder) => {
-                const { id, ...rest } = folder;
-                try {
-                    await sdk_2.api.client.request((0, sdk_1.updateFolder)(id, rest));
-                    core_1.ux.log(`Updated relationships for folder: ${folder.name}`);
-                }
-                catch (error) {
-                    (0, catch_error_1.default)(error);
-                }
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${folders.length} folders`));
+    if (folders && folders.length > 0) {
+        try {
+            // Fetch existing folders
+            const existingFolders = await sdk_2.api.client.request((0, sdk_1.readFolders)({
+                limit: -1,
             }));
+            const existingFolderIds = new Set(existingFolders.map(folder => folder.id));
+            const foldersToAdd = folders.filter(folder => {
+                if (existingFolderIds.has(folder.id)) {
+                    return false;
+                }
+                return true;
+            });
+            if (foldersToAdd.length > 0) {
+                const folderSkeleton = foldersToAdd.map(folder => ({ id: folder.id, name: folder.name }));
+                // Create the folders
+                await sdk_2.api.client.request((0, sdk_1.createFolders)(folderSkeleton));
+                // Update the folders with relationships concurrently
+                await Promise.all(foldersToAdd.map(async (folder) => {
+                    const { id, ...rest } = folder;
+                    try {
+                        await sdk_2.api.client.request((0, sdk_1.updateFolder)(id, rest));
+                    }
+                    catch (error) {
+                        (0, catch_error_1.default)(error);
+                    }
+                }));
+            }
+            else {
+                // ux.info('-- No new folders to create')
+            }
         }
-        else {
-            core_1.ux.log('No new folders to create');
+        catch (error) {
+            (0, catch_error_1.default)(error);
         }
     }
-    catch (error) {
-        (0, catch_error_1.default)(error);
-    }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded folders');
 }
 exports.default = loadFolders;

package/dist/lib/load/load-permissions.js

@@ -3,31 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 async function loadPermissions(dir) {
     const permissions = (0, read_file_1.default)('permissions', dir);
-    core_1.ux.action.start(`Loading ${permissions.length} permissions`);
-    try {
-        const existingPermissions = await sdk_2.api.client.request((0, sdk_1.readPermissions)({
-            limit: -1,
-        }));
-        const existingPermissionKeys = new Set(existingPermissions.map(p => `${p.collection}:${p.action}:${p.policy}`));
-        // Filter out duplicates
-        const newPermissions = permissions.filter(newPerm => !existingPermissionKeys.has(`${newPerm.collection}:${newPerm.action}:${newPerm.policy}`));
-        if (newPermissions.length > 0) {
-            await sdk_2.api.client.request((0, sdk_1.createPermissions)(newPermissions));
-            core_1.ux.log(`Created ${newPermissions.length} new permissions`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${permissions.length} permissions`));
+    if (permissions && permissions.length > 0) {
+        try {
+            const existingPermissions = await sdk_2.api.client.request((0, sdk_1.readPermissions)({
+                limit: -1,
+            }));
+            const existingPermissionKeys = new Set(existingPermissions.map(p => `${p.collection}:${p.action}:${p.policy}`));
+            // Filter out duplicates
+            const newPermissions = permissions.filter(newPerm => !existingPermissionKeys.has(`${newPerm.collection}:${newPerm.action}:${newPerm.policy}`));
+            if (newPermissions.length > 0) {
+                await sdk_2.api.client.request((0, sdk_1.createPermissions)(newPermissions));
+            }
         }
-        else {
-            core_1.ux.log('No new permissions to create');
+        catch (error) {
+            (0, catch_error_1.default)(error);
         }
     }
-    catch (error) {
-        (0, catch_error_1.default)(error);
-    }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded permissions');
 }
 exports.default = loadPermissions;

package/dist/lib/load/load-policies.js

@@ -3,35 +3,37 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 async function loadPolicies(dir) {
     const policies = (0, read_file_1.default)('policies', dir);
-    core_1.ux.action.start(`Loading ${policies.length} policies`);
-    // Fetch existing policies
-    const existingPolicies = await sdk_2.api.client.request((0, sdk_1.readPolicies)({
-        limit: -1,
-    }));
-    const existingPolicyIds = new Set(existingPolicies.map(policy => policy.id));
-    const PUBLIC_POLICY_ID = 'abf8a154-5b1c-4a46-ac9c-7300570f4f17';
-    const policiesWithoutPublic = policies.filter(policy => policy.id !== PUBLIC_POLICY_ID);
-    for await (const policy of policiesWithoutPublic) {
-        try {
-            if (existingPolicyIds.has(policy.id)) {
-                core_1.ux.log(`Skipping existing policy: ${policy.name}`);
-                continue;
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${policies.length} policies`));
+    if (policies && policies.length > 0) {
+        // Fetch existing policies
+        const existingPolicies = await sdk_2.api.client.request((0, sdk_1.readPolicies)({
+            limit: -1,
+        }));
+        const existingPolicyIds = new Set(existingPolicies.map(policy => policy.id));
+        const PUBLIC_POLICY_ID = 'abf8a154-5b1c-4a46-ac9c-7300570f4f17';
+        const policiesWithoutPublic = policies.filter(policy => policy.id !== PUBLIC_POLICY_ID);
+        for await (const policy of policiesWithoutPublic) {
+            try {
+                if (existingPolicyIds.has(policy.id)) {
+                    core_1.ux.action.status = `Skipping existing policy: ${policy.name}`;
+                    continue;
+                }
+                // Create new policy
+                await sdk_2.api.client.request((0, sdk_1.createPolicy)(policy));
+                // Add the new policy ID to our set of existing policies
+                existingPolicyIds.add(policy.id);
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
             }
-            // Create new policy
-            await sdk_2.api.client.request((0, sdk_1.createPolicy)(policy));
-            // Add the new policy ID to our set of existing policies
-            existingPolicyIds.add(policy.id);
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
         }
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded policies');
 }
 exports.default = loadPolicies;

package/dist/lib/load/load-presets.js

@@ -3,40 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 async function loadPresets(dir) {
     const presets = (0, read_file_1.default)('presets', dir);
-    core_1.ux.action.start(`Loading ${presets.length} presets`);
-    // Fetch existing presets
-    const existingPresets = await sdk_2.api.client.request((0, sdk_1.readPresets)({
-        limit: -1,
-    }));
-    const existingPresetIds = new Set(existingPresets.map(preset => preset.id));
-    const presetsToAdd = presets.filter(preset => {
-        if (existingPresetIds.has(preset.id)) {
-            return false;
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${presets.length} presets`));
+    if (presets && presets.length > 0) {
+        // Fetch existing presets
+        const existingPresets = await sdk_2.api.client.request((0, sdk_1.readPresets)({
+            limit: -1,
+        }));
+        const existingPresetIds = new Set(existingPresets.map(preset => preset.id));
+        const presetsToAdd = presets.filter(preset => {
+            if (existingPresetIds.has(preset.id)) {
+                return false;
+            }
+            return true;
+        }).map(preset => {
+            const cleanPreset = { ...preset };
+            cleanPreset.user = null;
+            return cleanPreset;
+        });
+        if (presetsToAdd.length > 0) {
+            try {
+                await sdk_2.api.client.request((0, sdk_1.createPresets)(presetsToAdd));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
         }
-        return true;
-    }).map(preset => {
-        const cleanPreset = { ...preset };
-        cleanPreset.user = null;
-        return cleanPreset;
-    });
-    if (presetsToAdd.length > 0) {
-        try {
-            await sdk_2.api.client.request((0, sdk_1.createPresets)(presetsToAdd));
-            core_1.ux.log(`Created ${presetsToAdd.length} new presets`);
+        else {
+            // ux.info('-- No new presets to create')
         }
-        catch (error) {
-            (0, catch_error_1.default)(error);
-        }
-    }
-    else {
-        core_1.ux.log('No new presets to create');
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded presets');
 }
 exports.default = loadPresets;

package/dist/lib/load/load-relations.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
@@ -11,25 +12,25 @@ const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
  */
 async function loadRelations(dir) {
     const relations = (0, read_file_1.default)('relations', dir);
-    core_1.ux.action.start(`Loading ${relations.length} relations`);
-    // Fetch existing relations
-    const existingRelations = await sdk_2.api.client.request((0, sdk_1.readRelations)());
-    const existingRelationKeys = new Set(existingRelations.map(relation => `${relation.collection}:${relation.field}:${relation.related_collection}`));
-    const relationsToAdd = relations.filter(relation => {
-        const key = `${relation.collection}:${relation.field}:${relation.related_collection}`;
-        if (existingRelationKeys.has(key)) {
-            core_1.ux.log(`Skipping existing relation: ${key}`);
-            return false;
-        }
-        return true;
-    }).map(relation => {
-        const cleanRelation = { ...relation };
-        delete cleanRelation.meta.id;
-        return cleanRelation;
-    });
-    await addRelations(relationsToAdd);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${relations.length} relations`));
+    if (relations && relations.length > 0) {
+        // Fetch existing relations
+        const existingRelations = await sdk_2.api.client.request((0, sdk_1.readRelations)());
+        const existingRelationKeys = new Set(existingRelations.map(relation => `${relation.collection}:${relation.field}:${relation.related_collection}`));
+        const relationsToAdd = relations.filter(relation => {
+            const key = `${relation.collection}:${relation.field}:${relation.related_collection}`;
+            if (existingRelationKeys.has(key)) {
+                return false;
+            }
+            return true;
+        }).map(relation => {
+            const cleanRelation = { ...relation };
+            delete cleanRelation.meta.id;
+            return cleanRelation;
+        });
+        await addRelations(relationsToAdd);
+    }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded relations');
 }
 exports.default = loadRelations;
 async function addRelations(relations) {

package/dist/lib/load/load-roles.js

@@ -3,62 +3,62 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const get_role_ids_1 = tslib_1.__importDefault(require("../utils/get-role-ids"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 async function loadRoles(dir) {
     const roles = (0, read_file_1.default)('roles', dir);
-    core_1.ux.action.start(`Loading ${roles.length} roles`);
-    const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
-    // Fetch existing roles
-    const existingRoles = await sdk_2.api.client.request((0, sdk_1.readRoles)({
-        limit: -1,
-    }));
-    const existingRoleIds = new Set(existingRoles.map(role => role.id));
-    const existingRoleNames = new Set(existingRoles.map(role => role.name.toLowerCase()));
-    const cleanedUpRoles = roles
-        .filter(role => role.name !== 'Administrator') // Don't load legacy admin role
-        .filter(role => !existingRoleNames.has(role.name.toLowerCase())) // Filter out roles with existing names
-        .map(role => {
-        const r = { ...role };
-        delete r.users; // Alias field. User roles will be applied when the users are loaded.
-        delete r.parent; // We need to load all roles first
-        return r;
-    });
-    for await (const role of cleanedUpRoles) {
-        try {
-            if (existingRoleIds.has(role.id)) {
-                core_1.ux.log(`Skipping existing role: ${role.name}`);
-                continue;
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${roles.length} roles`));
+    if (roles && roles.length > 0) {
+        const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
+        // Fetch existing roles
+        const existingRoles = await sdk_2.api.client.request((0, sdk_1.readRoles)({
+            limit: -1,
+        }));
+        const existingRoleIds = new Set(existingRoles.map(role => role.id));
+        const existingRoleNames = new Set(existingRoles.map(role => role.name.toLowerCase()));
+        const cleanedUpRoles = roles
+            .filter(role => role.name !== 'Administrator') // Don't load legacy admin role
+            .filter(role => !existingRoleNames.has(role.name.toLowerCase())) // Filter out roles with existing names
+            .map(role => {
+            const r = { ...role };
+            delete r.users; // Alias field. User roles will be applied when the users are loaded.
+            delete r.parent; // We need to load all roles first
+            return r;
+        });
+        for await (const role of cleanedUpRoles) {
+            try {
+                if (existingRoleIds.has(role.id)) {
+                    continue;
+                }
+                // Create new role
+                await sdk_2.api.client.request((0, sdk_1.createRole)(role));
+                // Add the new role ID and name to our sets of existing roles
+                existingRoleIds.add(role.id);
+                existingRoleNames.add(role.name.toLowerCase());
             }
-            // Create new role
-            await sdk_2.api.client.request((0, sdk_1.createRole)(role));
-            // Add the new role ID and name to our sets of existing roles
-            existingRoleIds.add(role.id);
-            existingRoleNames.add(role.name.toLowerCase());
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
-        }
-    }
-    // Now add in any parent fields
-    const rolesWithParents = roles.filter(role => role.parent !== null);
-    for await (const role of rolesWithParents) {
-        try {
-            // Remap any roles where the parent ID is the default admin role
-            if (role.parent === legacyAdminRoleId) {
-                role.parent = newAdminRoleId;
+            catch (error) {
+                (0, catch_error_1.default)(error);
             }
-            const simplifiedRole = { parent: role.parent };
-            await sdk_2.api.client.request((0, sdk_1.updateRole)(role.id, simplifiedRole));
-            core_1.ux.log(`Updated parent for role: ${role.name}`);
         }
-        catch (error) {
-            (0, catch_error_1.default)(error);
+        // Now add in any parent fields
+        const rolesWithParents = roles.filter(role => role.parent !== null);
+        for await (const role of rolesWithParents) {
+            try {
+                // Remap any roles where the parent ID is the default admin role
+                if (role.parent === legacyAdminRoleId) {
+                    role.parent = newAdminRoleId;
+                }
+                const simplifiedRole = { parent: role.parent };
+                await sdk_2.api.client.request((0, sdk_1.updateRole)(role.id, simplifiedRole));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
         }
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded roles');
 }
 exports.default = loadRoles;

package/dist/lib/load/load-settings.js

@@ -2,20 +2,57 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
+const core_1 = require("@oclif/core");
 const defu_1 = require("defu");
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
+const customDefu = (0, defu_1.createDefu)((obj, key, value) => {
+    if (Array.isArray(obj[key]) && Array.isArray(value)) {
+        // @ts-expect-error
+        obj[key] = mergeArrays(key, obj[key], value);
+        return true;
+    }
+    if (typeof obj[key] === 'string' && typeof value === 'string') {
+        // @ts-expect-error
+        obj[key] = mergeJsonStrings(obj[key], value);
+        return true;
+    }
+});
+function mergeArrays(key, current, incoming) {
+    const mergeKeys = {
+        /* eslint-disable camelcase */
+        basemaps: ['key'],
+        custom_aspect_ratios: ['key'],
+        module_bar: ['id', 'type'],
+        storage_asset_presets: ['key'],
+        /* eslint-enable camelcase */
+    };
+    const keys = mergeKeys[key];
+    if (!keys)
+        return [...new Set([...current, ...incoming])];
+    return current.concat(incoming.filter(item => !current.some(currentItem => keys.every(k => currentItem[k] === item[k]))));
+}
+function mergeJsonStrings(current, incoming) {
+    try {
+        return JSON.stringify(customDefu(JSON.parse(current), JSON.parse(incoming)));
+    }
+    catch {
+        return incoming; // If not valid JSON, return the incoming value
+    }
+}
 async function loadSettings(dir) {
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, 'Loading settings'));
     const settings = (0, read_file_1.default)('settings', dir);
     try {
-        // Get the current settings and merge them with current settings as defaults. To prevent overriding any logos, themes, etc.
         const currentSettings = await sdk_2.api.client.request((0, sdk_1.readSettings)());
-        const mergedSettings = (0, defu_1.defu)(currentSettings, settings);
+        const mergedSettings = customDefu(currentSettings, settings);
         await sdk_2.api.client.request((0, sdk_1.updateSettings)(mergedSettings));
     }
     catch (error) {
         (0, catch_error_1.default)(error);
     }
+    core_1.ux.action.stop();
 }
 exports.default = loadSettings;