directus-template-cli 0.5.0-beta.7 → 0.5.0-beta.8

package/dist/commands/apply.d.ts

@@ -3,26 +3,27 @@ export default class ApplyCommand extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        content: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        dashboards: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        directusToken: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        directusUrl: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        extensions: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        files: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        flows: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        partial: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        permissions: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        programmatic: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        schema: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        settings: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
-        templateLocation: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        templateType: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        users: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
+        content: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        dashboards: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        directusToken: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        directusUrl: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        extensions: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        files: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        flows: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        partial: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        permissions: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        programmatic: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        schema: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        settings: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        templateLocation: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        templateType: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        users: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
     private initializeDirectusApi;
     private redirectToDirectusPlus;
     private runInteractive;
     private runProgrammatic;
+    private selectLocalTemplate;
     private validateFlags;
 }

package/dist/commands/apply.js

@@ -4,13 +4,14 @@ const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
 const inquirer = tslib_1.__importStar(require("inquirer"));
+const constants_1 = require("../lib/constants");
 const index_js_1 = tslib_1.__importDefault(require("../lib/load/index.js"));
 const sdk_2 = require("../lib/sdk");
 const auth_1 = require("../lib/utils/auth");
 const catch_error_1 = tslib_1.__importDefault(require("../lib/utils/catch-error"));
 const get_template_1 = require("../lib/utils/get-template");
+const logger_1 = require("../lib/utils/logger");
 const open_url_1 = tslib_1.__importDefault(require("../lib/utils/open-url"));
-const separator = '------------------';
 class ApplyCommand extends core_1.Command {
     // MAIN FUNCTION
     async run() {
@@ -23,10 +24,10 @@ class ApplyCommand extends core_1.Command {
         try {
             sdk_2.api.setAuthToken(flags.directusToken);
             const response = await sdk_2.api.client.request((0, sdk_1.readMe)());
-            core_1.ux.log(`Logged in as ${response.first_name} ${response.last_name}`);
+            core_1.ux.log(`-- Logged in as ${response.first_name} ${response.last_name}`);
         }
         catch {
-            (0, catch_error_1.default)('Invalid Directus token. Please check your credentials.', {
+            (0, catch_error_1.default)('-- Invalid Directus token. Please check your credentials.', {
                 fatal: true,
             });
         }
@@ -38,6 +39,7 @@ class ApplyCommand extends core_1.Command {
     }
     async runInteractive(flags) {
         const validatedFlags = this.validateFlags(flags);
+        core_1.ux.styledHeader(core_1.ux.colorize(constants_1.DIRECTUS_PURPLE, 'Welcome to the Directus Template CLI'));
         const templateType = await inquirer.prompt([
             {
                 choices: [
@@ -68,7 +70,7 @@ class ApplyCommand extends core_1.Command {
             }
             case 'local': {
                 const localTemplateDir = await core_1.ux.prompt('What is the local template directory?');
-                template = await (0, get_template_1.getLocalTemplate)(localTemplateDir);
+                template = await this.selectLocalTemplate(localTemplateDir);
                 break;
             }
             case 'github': {
@@ -80,19 +82,19 @@ class ApplyCommand extends core_1.Command {
                 this.redirectToDirectusPlus();
             }
         }
-        core_1.ux.log(`You selected ${template.templateName}`);
-        core_1.ux.log(separator);
+        core_1.ux.log(`You selected ${core_1.ux.colorize(constants_1.DIRECTUS_PINK, template.templateName)}`);
+        core_1.ux.log(constants_1.SEPARATOR);
         // Get Directus URL and token
         const directusUrl = await (0, auth_1.getDirectusUrl)();
         const directusToken = await (0, auth_1.getDirectusToken)(directusUrl);
         flags.directusUrl = directusUrl;
         flags.directusToken = directusToken;
         if (template) {
-            core_1.ux.log(`Applying template - ${template.templateName} to ${directusUrl}`);
+            core_1.ux.styledHeader(core_1.ux.colorize(constants_1.DIRECTUS_PURPLE, `Applying template - ${template.templateName} to ${directusUrl}`));
             await (0, index_js_1.default)(template.directoryPath, validatedFlags);
             core_1.ux.action.stop();
-            core_1.ux.log(separator);
-            core_1.ux.log('Template applied successfully.');
+            core_1.ux.log(constants_1.SEPARATOR);
+            core_1.ux.info('Template applied successfully.');
             core_1.ux.exit(0);
         }
     }
@@ -120,13 +122,40 @@ class ApplyCommand extends core_1.Command {
             }
         }
         await this.initializeDirectusApi(validatedFlags);
-        core_1.ux.log(`Applying template - ${template.templateName} to ${validatedFlags.directusUrl}`);
+        const logMessage = `Applying template - ${template.templateName} to ${validatedFlags.directusUrl}`;
+        core_1.ux.styledHeader(logMessage);
+        logger_1.logger.log('info', logMessage);
         await (0, index_js_1.default)(template.directoryPath, validatedFlags);
         core_1.ux.action.stop();
-        core_1.ux.log(separator);
-        core_1.ux.log('Template applied successfully.');
+        core_1.ux.log(constants_1.SEPARATOR);
+        core_1.ux.info('Template applied successfully.');
         core_1.ux.exit(0);
     }
+    async selectLocalTemplate(localTemplateDir) {
+        try {
+            const templates = await (0, get_template_1.getInteractiveLocalTemplate)(localTemplateDir);
+            if (templates.length === 1) {
+                return templates[0];
+            }
+            const { selectedTemplate } = await inquirer.prompt([
+                {
+                    choices: templates.map(t => ({ name: `${t.templateName} (${core_1.ux.colorize('dim', t.directoryPath)})`, value: t })),
+                    message: 'Multiple templates found. Please select one:',
+                    name: 'selectedTemplate',
+                    type: 'list',
+                },
+            ]);
+            return selectedTemplate;
+        }
+        catch (error) {
+            if (error instanceof Error) {
+                core_1.ux.error(error.message);
+            }
+            else {
+                core_1.ux.error('An unknown error occurred while getting the local template.');
+            }
+        }
+    }
     validateFlags(flags) {
         if (flags.programmatic) {
             if (!flags.directusUrl || !flags.directusToken) {

package/dist/commands/extract.js

@@ -6,12 +6,12 @@ const core_1 = require("@oclif/core");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const slugify_1 = tslib_1.__importDefault(require("slugify"));
+const constants_1 = require("../lib/constants");
 const extract_1 = tslib_1.__importDefault(require("../lib/extract/"));
 const sdk_2 = require("../lib/sdk");
 const auth_1 = require("../lib/utils/auth");
 const catch_error_1 = tslib_1.__importDefault(require("../lib/utils/catch-error"));
 const template_defaults_1 = require("../lib/utils/template-defaults");
-const separator = '------------------';
 class ExtractCommand extends core_1.Command {
     async run() {
         const { flags } = await this.parse(ExtractCommand);
@@ -33,11 +33,11 @@ class ExtractCommand extends core_1.Command {
         catch (error) {
             core_1.ux.error(`Failed to create directory or write files: ${error.message}`);
         }
-        core_1.ux.log(separator);
+        core_1.ux.log(constants_1.SEPARATOR);
         core_1.ux.action.start(`Extracting template - from ${flags.directusUrl} to ${directory}`);
         await (0, extract_1.default)(directory);
         core_1.ux.action.stop();
-        core_1.ux.log(separator);
+        core_1.ux.log(constants_1.SEPARATOR);
         core_1.ux.log('Template extracted successfully.');
         this.exit(0);
     }
@@ -46,7 +46,7 @@ class ExtractCommand extends core_1.Command {
         try {
             sdk_2.api.setAuthToken(flags.directusToken);
             const response = await sdk_2.api.client.request((0, sdk_1.readMe)());
-            core_1.ux.log(`Logged in as ${response.first_name} ${response.last_name}`);
+            core_1.ux.log(`-- Logged in as ${response.first_name} ${response.last_name}`);
         }
         catch {
             (0, catch_error_1.default)('Invalid Directus token. Please check your credentials.', {

package/dist/lib/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const DIRECTUS_PURPLE = "#6644ff";
+export declare const DIRECTUS_PINK = "#FF99DD";
+export declare const SEPARATOR = "------------------";

package/dist/lib/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SEPARATOR = exports.DIRECTUS_PINK = exports.DIRECTUS_PURPLE = void 0;
+exports.DIRECTUS_PURPLE = '#6644ff';
+exports.DIRECTUS_PINK = '#FF99DD';
+exports.SEPARATOR = '------------------';

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

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
+const constants_1 = require("../constants");
 const sdk_1 = 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 loadAccess(dir) {
     const access = (0, read_file_1.default)('access', dir);
-    core_1.ux.action.start(`Loading ${access.length} accesses`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${access.length} accesses`));
     // Fetch existing accesses
     const existingAccesses = await sdk_1.api.client.request(() => ({
         method: 'GET',
@@ -21,12 +22,10 @@ async function loadAccess(dir) {
     for await (const acc of access) {
         try {
             if (existingAccessById.has(acc.id)) {
-                core_1.ux.log(`Skipping existing access with ID: ${acc.id}`);
                 continue;
             }
             const compositeKey = getCompositeKey(acc);
             if (existingAccessByCompositeKey.has(compositeKey)) {
-                core_1.ux.log(`Skipping existing access with composite key: ${compositeKey}`);
                 continue;
             }
             // If the role is null, delete the role key to avoid errors
@@ -52,7 +51,6 @@ async function loadAccess(dir) {
         }
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded Accesses');
 }
 exports.default = loadAccess;
 // Helper function to generate a composite key for each access

package/dist/lib/load/load-collections.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"));
@@ -10,32 +11,53 @@ const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
  * Load collections into the Directus instance
  */
 async function loadCollections(dir) {
-    const collections = (0, read_file_1.default)('collections', dir);
-    const fields = (0, read_file_1.default)('fields', dir);
-    core_1.ux.action.start(`Loading ${collections.length} collections and ${fields.length} fields.`);
-    // Remove the group so that we can create the collections
-    const removedGroupKey = structuredClone(collections).map(col => {
-        delete col.meta.group;
-        return col;
-    });
-    await addCollections(removedGroupKey, fields);
-    await updateCollections(collections);
-    await addCustomFieldsOnSystemCollections(fields);
+    const collectionsToAdd = (0, read_file_1.default)('collections', dir);
+    const fieldsToAdd = (0, read_file_1.default)('fields', dir);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${collectionsToAdd.length} collections and ${fieldsToAdd.length} fields`));
+    await processCollections(collectionsToAdd, fieldsToAdd);
+    await updateCollections(collectionsToAdd);
+    await addCustomFieldsOnSystemCollections(fieldsToAdd);
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded collections and fields.');
 }
 exports.default = loadCollections;
-async function addCollections(collections, fields) {
-    for await (const collection of collections) {
+async function processCollections(collectionsToAdd, fieldsToAdd) {
+    const existingCollections = await sdk_2.api.client.request((0, sdk_1.readCollections)());
+    const existingFields = await sdk_2.api.client.request((0, sdk_1.readFields)());
+    for await (const collection of collectionsToAdd) {
         try {
-            collection.fields = fields.filter((field) => field.collection === collection.collection);
-            await sdk_2.api.client.request((0, sdk_1.createCollection)(collection));
+            const existingCollection = existingCollections.find((c) => c.collection === collection.collection);
+            await (existingCollection ? addNewFieldsToExistingCollection(collection.collection, fieldsToAdd, existingFields) : addNewCollectionWithFields(collection, fieldsToAdd));
         }
         catch (error) {
             (0, catch_error_1.default)(error);
         }
     }
 }
+async function addNewCollectionWithFields(collection, allFields) {
+    const collectionFields = allFields.filter(field => field.collection === collection.collection);
+    const collectionWithoutGroup = {
+        ...collection,
+        fields: collectionFields,
+        meta: { ...collection.meta },
+    };
+    delete collectionWithoutGroup.meta.group;
+    await sdk_2.api.client.request((0, sdk_1.createCollection)(collectionWithoutGroup));
+}
+async function addNewFieldsToExistingCollection(collectionName, fieldsToAdd, existingFields) {
+    const collectionFieldsToAdd = fieldsToAdd.filter(field => field.collection === collectionName);
+    const existingCollectionFields = existingFields.filter((field) => field.collection === collectionName);
+    for await (const field of collectionFieldsToAdd) {
+        if (!existingCollectionFields.some((existingField) => existingField.field === field.field)) {
+            try {
+                // @ts-ignore
+                await sdk_2.api.client.request((0, sdk_1.createField)(collectionName, field));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
+        }
+    }
+}
 async function updateCollections(collections) {
     for await (const collection of collections) {
         try {
@@ -55,9 +77,13 @@ async function updateCollections(collections) {
 }
 async function addCustomFieldsOnSystemCollections(fields) {
     const customFields = fields.filter((field) => field.collection.startsWith('directus_'));
+    const existingFields = await sdk_2.api.client.request((0, sdk_1.readFields)());
     for await (const field of customFields) {
         try {
-            await sdk_2.api.client.request((0, sdk_1.createField)(field.collection, field));
+            const fieldExists = existingFields.some((existingField) => existingField.collection === field.collection && existingField.field === field.field);
+            if (!fieldExists) {
+                await sdk_2.api.client.request((0, sdk_1.createField)(field.collection, field));
+            }
         }
         catch (error) {
             (0, catch_error_1.default)(error);

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

@@ -4,12 +4,13 @@ exports.loadPanels = 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 loadDashboards(dir) {
     const dashboards = (0, read_file_1.default)('dashboards', dir);
-    core_1.ux.action.start(`Loading ${dashboards.length} dashboards`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${dashboards.length} dashboards`));
     // Fetch existing dashboards
     const existingDashboards = await sdk_2.api.client.request((0, sdk_1.readDashboards)({
         limit: -1,
@@ -17,7 +18,6 @@ async function loadDashboards(dir) {
     const existingDashboardIds = new Set(existingDashboards.map(dashboard => dashboard.id));
     const filteredDashboards = dashboards.filter(dashboard => {
         if (existingDashboardIds.has(dashboard.id)) {
-            core_1.ux.log(`Skipping existing dashboard: ${dashboard.name}`);
             return false;
         }
         return true;
@@ -36,12 +36,11 @@ async function loadDashboards(dir) {
     }));
     await loadPanels(dir);
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded dashboards');
 }
 exports.default = loadDashboards;
 async function loadPanels(dir) {
     const panels = (0, read_file_1.default)('panels', dir);
-    core_1.ux.log(`Loading ${panels.length} panels`);
+    core_1.ux.action.status = `Loading ${panels.length} panels`;
     // Fetch existing panels
     const existingPanels = await sdk_2.api.client.request((0, sdk_1.readPanels)({
         limit: -1,
@@ -49,7 +48,6 @@ async function loadPanels(dir) {
     const existingPanelIds = new Set(existingPanels.map(panel => panel.id));
     const filteredPanels = panels.filter(panel => {
         if (existingPanelIds.has(panel.id)) {
-            core_1.ux.log(`Skipping existing panel: ${panel.id}`);
             return false;
         }
         return true;

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

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const constants_1 = require("../constants");
 const sdk_2 = require("../sdk");
 const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const chunk_array_1 = require("../utils/chunk-array");
@@ -11,16 +12,15 @@ const read_file_1 = tslib_1.__importDefault(require("../utils/read-file"));
 const BATCH_SIZE = 50;
 async function loadData(dir) {
     const collections = (0, read_file_1.default)('collections', dir);
-    core_1.ux.action.start(`Loading data for ${collections.length} collections`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading data for ${collections.length} collections`));
     await loadSkeletonRecords(dir);
     await loadFullData(dir);
     await loadSingletons(dir);
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded data.');
 }
 exports.default = loadData;
 async function loadSkeletonRecords(dir) {
-    core_1.ux.log('Loading skeleton records');
+    core_1.ux.action.status = 'Loading skeleton records';
     const collections = (0, read_file_1.default)('collections', dir);
     const primaryKeyMap = await getCollectionPrimaryKeys(dir);
     const userCollections = collections
@@ -32,10 +32,46 @@ async function loadSkeletonRecords(dir) {
         const primaryKeyField = getPrimaryKey(primaryKeyMap, name);
         const sourceDir = node_path_1.default.resolve(dir, 'content');
         const data = (0, read_file_1.default)(name, sourceDir);
-        const batches = (0, chunk_array_1.chunkArray)(data, BATCH_SIZE).map(batch => batch.map(entry => ({ [primaryKeyField]: entry[primaryKeyField] })));
+        // Fetch existing primary keys
+        const existingPrimaryKeys = await getExistingPrimaryKeys(name, primaryKeyField);
+        // Filter out existing records
+        const newData = data.filter(entry => !existingPrimaryKeys.has(entry[primaryKeyField]));
+        if (newData.length === 0) {
+            core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Skipping ${name}: No new records to add`);
+            return;
+        }
+        const batches = (0, chunk_array_1.chunkArray)(newData, BATCH_SIZE).map(batch => batch.map(entry => ({ [primaryKeyField]: entry[primaryKeyField] })));
         await Promise.all(batches.map(batch => uploadBatch(name, batch, sdk_1.createItems)));
+        core_1.ux.log(`${core_1.ux.colorize('dim', '--')} Added ${newData.length} new skeleton records to ${name}`);
     }));
-    core_1.ux.log('Loaded skeleton records');
+    core_1.ux.action.status = 'Loaded skeleton records';
+}
+async function getExistingPrimaryKeys(collection, primaryKeyField) {
+    const existingKeys = new Set();
+    let page = 1;
+    const limit = 1000; // Adjust based on your needs and API limits
+    while (true) {
+        try {
+            // @ts-expect-error string
+            const response = await sdk_2.api.client.request((0, sdk_1.readItems)(collection, {
+                fields: [primaryKeyField],
+                limit,
+                page,
+            }));
+            if (response.length === 0)
+                break;
+            for (const item of response)
+                existingKeys.add(item[primaryKeyField]);
+            if (response.length < limit)
+                break;
+            page++;
+        }
+        catch (error) {
+            (0, catch_error_1.default)(error);
+            break;
+        }
+    }
+    return existingKeys;
 }
 async function uploadBatch(collection, batch, method) {
     try {
@@ -46,7 +82,7 @@ async function uploadBatch(collection, batch, method) {
     }
 }
 async function loadFullData(dir) {
-    core_1.ux.log('Updating records with full data');
+    core_1.ux.action.status = 'Updating records with full data';
     const collections = (0, read_file_1.default)('collections', dir);
     const userCollections = collections
         .filter(item => !item.collection.startsWith('directus_', 0))
@@ -59,10 +95,10 @@ async function loadFullData(dir) {
         const batches = (0, chunk_array_1.chunkArray)(data, BATCH_SIZE).map(batch => batch.map(({ user_created, user_updated, ...cleanedRow }) => cleanedRow));
         await Promise.all(batches.map(batch => uploadBatch(name, batch, sdk_1.updateItemsBatch)));
     }));
-    core_1.ux.log('Updated records with full data');
+    core_1.ux.action.status = 'Updated records with full data';
 }
 async function loadSingletons(dir) {
-    core_1.ux.log('Loading data for singleton collections');
+    core_1.ux.action.status = 'Loading data for singleton collections';
     const collections = (0, read_file_1.default)('collections', dir);
     const singletonCollections = collections
         .filter(item => !item.collection.startsWith('directus_', 0))
@@ -80,7 +116,7 @@ async function loadSingletons(dir) {
             (0, catch_error_1.default)(error);
         }
     }));
-    core_1.ux.log('Loaded data for singleton collections');
+    core_1.ux.action.status = 'Loaded data for singleton collections';
 }
 async function getCollectionPrimaryKeys(dir) {
     var _a;

package/dist/lib/load/load-extensions.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"));
@@ -17,56 +18,58 @@ async function installExtension(extension) {
     }));
 }
 async function loadExtensions(dir) {
-    core_1.ux.action.start('Loading extensions');
-    const extensions = (0, read_file_1.default)('extensions', dir);
-    if (extensions && extensions.length > 0) {
-        const installedExtensions = await sdk_2.api.client.request((0, sdk_1.readExtensions)());
-        const registryExtensions = extensions.filter(ext => { var _a; return ((_a = ext.meta) === null || _a === void 0 ? void 0 : _a.source) === 'registry' && !ext.bundle; });
-        const bundles = [...new Set(extensions.filter(ext => ext.bundle).map(ext => ext.bundle))];
-        const localExtensions = extensions.filter(ext => { var _a; return ((_a = ext.meta) === null || _a === void 0 ? void 0 : _a.source) === 'local'; });
-        const extensionsToInstall = extensions.filter(ext => {
-            var _a;
-            return ((_a = ext.meta) === null || _a === void 0 ? void 0 : _a.source) === 'registry'
-                && !ext.bundle
-                // @ts-expect-error
-                && !installedExtensions.some(installed => installed.id === ext.id);
-        });
-        core_1.ux.log(`Found ${extensions.length} extensions total: ${registryExtensions.length} registry extensions (including ${bundles.length} bundles), and ${localExtensions.length} local extensions`);
-        if (extensionsToInstall.length > 0) {
-            core_1.ux.action.start(`Installing ${extensionsToInstall.length} extensions`);
-            const results = await Promise.allSettled(extensionsToInstall.map(async (ext) => {
-                var _a, _b, _c;
-                try {
-                    await installExtension({
-                        id: ext.id,
-                        // The extension version UUID is the folder name
-                        version: (_a = ext.meta) === null || _a === void 0 ? void 0 : _a.folder,
-                    });
-                    return `Installed ${(_b = ext.schema) === null || _b === void 0 ? void 0 : _b.name}`;
-                }
-                catch (error) {
-                    (0, catch_error_1.default)(error);
-                    return `Failed to install ${(_c = ext.schema) === null || _c === void 0 ? void 0 : _c.name}`;
-                }
-            }));
-            for (const result of results) {
-                if (result.status === 'fulfilled') {
-                    core_1.ux.log(result.value);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, 'Loading extensions'));
+    try {
+        const extensions = (0, read_file_1.default)('extensions', dir);
+        if (extensions && extensions.length > 0) {
+            const installedExtensions = await sdk_2.api.client.request((0, sdk_1.readExtensions)());
+            const registryExtensions = extensions.filter(ext => { var _a; return ((_a = ext.meta) === null || _a === void 0 ? void 0 : _a.source) === 'registry' && !ext.bundle; });
+            const bundles = [...new Set(extensions.filter(ext => ext.bundle).map(ext => ext.bundle))];
+            const localExtensions = extensions.filter(ext => { var _a; return ((_a = ext.meta) === null || _a === void 0 ? void 0 : _a.source) === 'local'; });
+            const extensionsToInstall = extensions.filter(ext => {
+                var _a;
+                return ((_a = ext.meta) === null || _a === void 0 ? void 0 : _a.source) === 'registry'
+                    && !ext.bundle
+                    // @ts-expect-error
+                    && !installedExtensions.some(installed => installed.id === ext.id);
+            });
+            core_1.ux.log(`Found ${extensions.length} extensions total: ${registryExtensions.length} registry extensions (including ${bundles.length} bundles), and ${localExtensions.length} local extensions`);
+            if (extensionsToInstall.length > 0) {
+                core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Installing ${extensionsToInstall.length} extensions`));
+                const results = await Promise.allSettled(extensionsToInstall.map(async (ext) => {
+                    var _a, _b, _c;
+                    try {
+                        await installExtension({
+                            id: ext.id,
+                            // The extension version UUID is the folder name
+                            version: (_a = ext.meta) === null || _a === void 0 ? void 0 : _a.folder,
+                        });
+                        return `-- Installed ${(_b = ext.schema) === null || _b === void 0 ? void 0 : _b.name}`;
+                    }
+                    catch (error) {
+                        (0, catch_error_1.default)(error);
+                        return `-- Failed to install ${(_c = ext.schema) === null || _c === void 0 ? void 0 : _c.name}`;
+                    }
+                }));
+                for (const result of results) {
+                    if (result.status === 'fulfilled') {
+                        core_1.ux.log(result.value);
+                    }
                 }
+                core_1.ux.action.stop();
+                core_1.ux.log('Finished installing extensions');
+            }
+            else {
+                // All extensions are already installed
+                core_1.ux.log('All extensions are already installed');
+            }
+            if (localExtensions.length > 0) {
+                core_1.ux.log(`Note: ${localExtensions.length} local extensions need to be installed manually.`);
             }
-            core_1.ux.action.stop();
-            core_1.ux.log('Finished installing extensions');
-        }
-        else {
-            // All extensions are already installed
-            core_1.ux.log('All extensions are already installed');
-        }
-        if (localExtensions.length > 0) {
-            core_1.ux.log(`Note: ${localExtensions.length} local extensions need to be installed manually.`);
         }
     }
-    else {
-        core_1.ux.log('No extensions found or extensions file is empty. Skipping extension installation.');
+    catch {
+        core_1.ux.log(`${core_1.ux.colorize('dim', '--')} No extensions found or extensions file is empty. Skipping extension installation.`);
     }
     core_1.ux.action.stop();
 }

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

@@ -6,12 +6,13 @@ const core_1 = require("@oclif/core");
 const formdata_node_1 = require("formdata-node");
 const node_fs_1 = require("node:fs");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
+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 loadFiles(dir) {
     const files = (0, read_file_1.default)('files', dir);
-    core_1.ux.action.start(`Loading ${files.length} files`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${files.length} files`));
     try {
         const fileIds = files.map(file => file.id);
         // Fetch only the files we're interested in
@@ -28,11 +29,9 @@ async function loadFiles(dir) {
         const existingFileNames = new Set(existingFiles.map(file => file.filename_disk));
         const filesToUpload = files.filter(file => {
             if (existingFileIds.has(file.id)) {
-                core_1.ux.log(`Skipping existing file with ID: ${file.id}`);
                 return false;
             }
             if (existingFileNames.has(file.filename_disk)) {
-                core_1.ux.log(`Skipping existing file with name: ${file.filename_disk}`);
                 return false;
             }
             return true;
@@ -57,12 +56,10 @@ async function loadFiles(dir) {
                 (0, catch_error_1.default)(error);
             }
         }));
-        core_1.ux.log(`Uploaded ${filesToUpload.length} new files`);
     }
     catch (error) {
         (0, catch_error_1.default)(error);
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Finished loading files');
 }
 exports.default = loadFiles;

package/dist/lib/load/load-flows.d.ts

@@ -1,2 +1,2 @@
 export default function loadFlows(dir: string): Promise<void>;
-export declare function loadOperations(dir: string): Promise<void>;
+export declare function loadOperations(operations: any[]): Promise<void>;

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

@@ -4,61 +4,66 @@ 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) {
-        try {
-            if (existingFlowIds.has(flow.id)) {
-                core_1.ux.log(`Skipping existing flow: ${flow.name}`);
-                continue;
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${flows.length} flows`));
+    try {
+        // 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 { operations, ...cleanFlow } = flow;
+            return { cleanFlow, operations };
+        });
+        const newFlows = cleanedUpFlows.filter(({ cleanFlow }) => !existingFlowIds.has(cleanFlow.id));
+        const results = await Promise.allSettled(newFlows.map(({ cleanFlow }) => sdk_2.api.client.request((0, sdk_1.createFlow)(cleanFlow))));
+        const createdFlowIds = new Set();
+        for (const [index, result] of results.entries()) {
+            if (result.status === 'fulfilled') {
+                createdFlowIds.add(newFlows[index].cleanFlow.id);
+            }
+            else {
+                (0, catch_error_1.default)(result.reason);
             }
-            await sdk_2.api.client.request((0, sdk_1.createFlow)(flow));
-            existingFlowIds.add(flow.id);
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
         }
+        // Only load operations for newly created flows
+        const newOperations = newFlows
+            .filter(({ cleanFlow }) => createdFlowIds.has(cleanFlow.id))
+            .flatMap(({ operations }) => operations);
+        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 {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const opsIds = operations.map(({ reject, resolve, ...rest }) => rest);
+        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,12 +3,13 @@ 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`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${folders.length} folders`));
     try {
         // Fetch existing folders
         const existingFolders = await sdk_2.api.client.request((0, sdk_1.readFolders)({
@@ -17,7 +18,6 @@ async function loadFolders(dir) {
         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;
@@ -26,7 +26,6 @@ async function loadFolders(dir) {
             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;
@@ -39,13 +38,12 @@ async function loadFolders(dir) {
             }));
         }
         else {
-            core_1.ux.log('No new folders to create');
+            // ux.info('-- No new folders to create')
         }
     }
     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,12 +3,13 @@ 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`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${permissions.length} permissions`));
     try {
         const existingPermissions = await sdk_2.api.client.request((0, sdk_1.readPermissions)({
             limit: -1,
@@ -18,16 +19,11 @@ async function loadPermissions(dir) {
         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`);
-        }
-        else {
-            core_1.ux.log('No new permissions to create');
         }
     }
     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,12 +3,13 @@ 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`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${policies.length} policies`));
     // Fetch existing policies
     const existingPolicies = await sdk_2.api.client.request((0, sdk_1.readPolicies)({
         limit: -1,
@@ -19,7 +20,7 @@ async function loadPolicies(dir) {
     for await (const policy of policiesWithoutPublic) {
         try {
             if (existingPolicyIds.has(policy.id)) {
-                core_1.ux.log(`Skipping existing policy: ${policy.name}`);
+                core_1.ux.action.status = `Skipping existing policy: ${policy.name}`;
                 continue;
             }
             // Create new policy
@@ -32,6 +33,5 @@ async function loadPolicies(dir) {
         }
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded policies');
 }
 exports.default = loadPolicies;

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

@@ -3,12 +3,13 @@ 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`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${presets.length} presets`));
     // Fetch existing presets
     const existingPresets = await sdk_2.api.client.request((0, sdk_1.readPresets)({
         limit: -1,
@@ -27,16 +28,14 @@ async function loadPresets(dir) {
     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`);
         }
         catch (error) {
             (0, catch_error_1.default)(error);
         }
     }
     else {
-        core_1.ux.log('No new presets to create');
+        // ux.info('-- 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,14 +12,13 @@ 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`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `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;
@@ -29,7 +29,6 @@ async function loadRelations(dir) {
     });
     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,13 +3,14 @@ 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`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `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)({
@@ -29,7 +30,6 @@ async function loadRoles(dir) {
     for await (const role of cleanedUpRoles) {
         try {
             if (existingRoleIds.has(role.id)) {
-                core_1.ux.log(`Skipping existing role: ${role.name}`);
                 continue;
             }
             // Create new role
@@ -52,13 +52,11 @@ async function loadRoles(dir) {
             }
             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);
         }
     }
     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;

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

@@ -3,12 +3,13 @@ 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 loadTranslations(dir) {
-    core_1.ux.action.start('Loading translations');
     const translations = (0, read_file_1.default)('translations', dir);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${translations.length} translations`));
     // Fetch existing translations
     const existingTranslations = await sdk_2.api.client.request((0, sdk_1.readTranslations)({
         limit: -1,
@@ -17,7 +18,6 @@ async function loadTranslations(dir) {
     const newTranslations = translations.filter(t => {
         const key = `${t.language}_${t.key}`;
         if (existingTranslationKeys.has(key)) {
-            core_1.ux.log(`Skipping existing translation: ${key}`);
             return false;
         }
         return true;
@@ -25,16 +25,14 @@ async function loadTranslations(dir) {
     if (newTranslations.length > 0) {
         try {
             await sdk_2.api.client.request((0, sdk_1.createTranslations)(newTranslations));
-            core_1.ux.log(`Created ${newTranslations.length} new translations`);
         }
         catch (error) {
             (0, catch_error_1.default)(error);
         }
     }
     else {
-        core_1.ux.log('No new translations to create');
+        // ux.info('-- No new translations to create')
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded translations');
 }
 exports.default = loadTranslations;

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

@@ -3,20 +3,23 @@ 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 loadUsers(dir) {
     const users = (0, read_file_1.default)('users', dir);
-    core_1.ux.action.start(`Loading ${users.length} users`);
+    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${users.length} users`));
     const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
     const incomingUserEmails = users.map(user => user.email);
+    const incomingUserIds = users.map(user => user.id).filter(Boolean);
     const existingUsers = await sdk_2.api.client.request((0, sdk_1.readUsers)({
         filter: {
-            email: {
-                _in: incomingUserEmails,
-            },
+            _or: [
+                { email: { _in: incomingUserEmails } },
+                { id: { _in: incomingUserIds } },
+            ],
         },
         limit: -1,
     }));
@@ -33,9 +36,14 @@ async function loadUsers(dir) {
         return user;
     });
     for await (const user of filteredUsers) {
-        // If user email is null or already in use, we just delete the email key to pass validation and retain the user and any realationship data
-        if (user.email === null || existingUsers.some(existingUser => existingUser.email === user.email)) {
+        const existingUser = existingUsers.find(existing => existing.email === user.email || existing.id === user.id);
+        if (existingUser) {
+            // If user already exists, we'll skip creating a new one
             delete user.email;
+            delete user.id;
+            // You might want to update the existing user here instead
+            // await api.client.request(updateUser(existingUser.id, user))
+            continue;
         }
         try {
             await sdk_2.api.client.request((0, sdk_1.createUser)(user));
@@ -45,6 +53,5 @@ async function loadUsers(dir) {
         }
     }
     core_1.ux.action.stop();
-    core_1.ux.log('Loaded users');
 }
 exports.default = loadUsers;

package/dist/lib/utils/auth.js

@@ -24,7 +24,7 @@ async function getDirectusToken(directusUrl) {
     try {
         sdk_2.api.setAuthToken(directusToken);
         const response = await sdk_2.api.client.request((0, sdk_1.readMe)());
-        core_1.ux.log(`Logged in as ${response.first_name} ${response.last_name}`);
+        core_1.ux.log(`-- Logged in as ${response.first_name} ${response.last_name}`);
         return directusToken;
     }
     catch (error) {

package/dist/lib/utils/catch-error.js

@@ -5,14 +5,14 @@ const logger_1 = require("./logger");
 function catchError(error, options = {}, logToFile = true) {
     const errorMessage = isDirectusError(error) ? formatDirectusError(error)
         : (error instanceof Error ? formatGenericError(error)
-            : `Unknown error: ${JSON.stringify(error)}`);
+            : `${JSON.stringify(error)}`);
     const contextString = options.context
         ? Object.entries(options.context)
             .map(([key, value]) => `${key}: ${JSON.stringify(value)}`)
             .join(', ') : '';
     const formattedMessage = [
-        contextString && `Context: ${contextString}`,
         errorMessage,
+        contextString && `Context: ${contextString}`,
     ].filter(Boolean).join('\n');
     options.fatal ? core_1.ux.error(formattedMessage) : core_1.ux.warn(formattedMessage);
     if (logToFile) {

package/dist/lib/utils/get-template.d.ts

@@ -4,5 +4,6 @@ interface Template {
 }
 export declare function getCommunityTemplates(): Promise<Template[]>;
 export declare function getLocalTemplate(localTemplateDir: string): Promise<Template>;
+export declare function getInteractiveLocalTemplate(localTemplateDir: string): Promise<Template[]>;
 export declare function getGithubTemplate(ghTemplateUrl: string): Promise<Template>;
 export {};

package/dist/lib/utils/get-template.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGithubTemplate = exports.getLocalTemplate = exports.getCommunityTemplates = void 0;
+exports.getGithubTemplate = exports.getInteractiveLocalTemplate = exports.getLocalTemplate = exports.getCommunityTemplates = void 0;
 const tslib_1 = require("tslib");
 const giget_1 = require("giget");
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const path_1 = tslib_1.__importDefault(require("./path"));
 const read_templates_1 = require("./read-templates");
@@ -33,6 +34,46 @@ async function getLocalTemplate(localTemplateDir) {
     return (0, read_templates_1.readTemplate)(resolvedDir);
 }
 exports.getLocalTemplate = getLocalTemplate;
+async function getInteractiveLocalTemplate(localTemplateDir) {
+    const resolvedDir = (0, path_1.default)(localTemplateDir);
+    if (!resolvedDir) {
+        throw new Error('Directory does not exist.');
+    }
+    const directTemplate = await (0, read_templates_1.readTemplate)(resolvedDir);
+    if (directTemplate) {
+        return [directTemplate];
+    }
+    const templates = await (0, read_templates_1.readAllTemplates)(resolvedDir);
+    if (templates.length === 0) {
+        // If no templates found, search nested directories
+        const nestedTemplates = await findNestedTemplates(resolvedDir, 2);
+        if (nestedTemplates.length === 0) {
+            throw new Error('No valid templates found in the specified directory or its subdirectories.');
+        }
+        return nestedTemplates;
+    }
+    return templates;
+}
+exports.getInteractiveLocalTemplate = getInteractiveLocalTemplate;
+async function findNestedTemplates(dir, depth) {
+    if (depth === 0)
+        return [];
+    const templates = [];
+    const entries = await node_fs_1.default.promises.readdir(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        if (entry.isDirectory()) {
+            const fullPath = node_path_1.default.join(dir, entry.name);
+            const dirTemplates = await (0, read_templates_1.readAllTemplates)(fullPath);
+            templates.push(...dirTemplates);
+            if (dirTemplates.length === 0 && depth > 1) {
+                // If no templates found and we can go deeper, search subdirectories
+                const nestedTemplates = await findNestedTemplates(fullPath, depth - 1);
+                templates.push(...nestedTemplates);
+            }
+        }
+    }
+    return templates;
+}
 async function getGithubTemplate(ghTemplateUrl) {
     try {
         const ghString = await (0, transform_github_url_1.transformGitHubUrl)(ghTemplateUrl);

package/dist/lib/utils/read-templates.js

@@ -17,8 +17,10 @@ async function readTemplate(directoryPath) {
         }
         return null;
     }
-    catch (error) {
-        console.error(`Failed to read package.json file in directory ${directoryPath}: ${error}`);
+    catch {
+        // console.error(
+        //   `Failed to read package.json file in directory ${directoryPath}: ${error}`,
+        // )
         return null;
     }
 }

package/oclif.manifest.json

@@ -234,5 +234,5 @@
       ]
     }
   },
-  "version": "0.5.0-beta.7"
+  "version": "0.5.0-beta.8"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.5.0-beta.7",
+  "version": "0.5.0-beta.8",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "bin": {