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

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,70 @@ 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 {
+        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,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.9"
 }

package/package.json

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