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

package/dist/commands/apply.js

@@ -7,6 +7,7 @@ const inquirer = tslib_1.__importStar(require("inquirer"));
 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 open_url_1 = tslib_1.__importDefault(require("../lib/utils/open-url"));
 const separator = '------------------';
@@ -25,7 +26,9 @@ class ApplyCommand extends core_1.Command {
             core_1.ux.log(`Logged in as ${response.first_name} ${response.last_name}`);
         }
         catch {
-            throw new Error('Invalid Directus token. Please check your credentials.');
+            (0, catch_error_1.default)('Invalid Directus token. Please check your credentials.', {
+                fatal: true,
+            });
         }
     }
     redirectToDirectusPlus() {
@@ -111,7 +114,9 @@ class ApplyCommand extends core_1.Command {
                 break;
             }
             default: {
-                throw new Error('Invalid template type');
+                (0, catch_error_1.default)('Invalid template type. Please check your template type.', {
+                    fatal: true,
+                });
             }
         }
         await this.initializeDirectusApi(validatedFlags);

package/dist/commands/extract.js

@@ -9,6 +9,7 @@ const slugify_1 = tslib_1.__importDefault(require("slugify"));
 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 {
@@ -48,7 +49,9 @@ class ExtractCommand extends core_1.Command {
             core_1.ux.log(`Logged in as ${response.first_name} ${response.last_name}`);
         }
         catch {
-            throw new Error('Invalid Directus token. Please check your credentials.');
+            (0, catch_error_1.default)('Invalid Directus token. Please check your credentials.', {
+                fatal: true,
+            });
         }
     }
     async runInteractive(flags) {

package/dist/lib/extract/extract-fields.js

@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
 const sdk_1 = require("@directus/sdk");
 const core_1 = require("@oclif/core");
 const sdk_2 = require("../sdk");
+const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
 const write_to_file_1 = tslib_1.__importDefault(require("../utils/write-to-file"));
 /**
  * Extract fields from the Directus instance
@@ -28,9 +29,7 @@ async function extractFields(dir) {
         core_1.ux.log('Extracted fields');
     }
     catch (error) {
-        core_1.ux.warn('Error extracting Fields:');
-        core_1.ux.warn(error.message);
-        console.error(error);
+        (0, catch_error_1.default)(error.message);
     }
 }
 exports.default = extractFields;

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

@@ -95,7 +95,7 @@ async function getCollectionPrimaryKeys(dir) {
 }
 function getPrimaryKey(collectionsMap, collection) {
     if (!collectionsMap[collection]) {
-        throw new Error(`Collection ${collection} not found in collections map`);
+        (0, catch_error_1.default)(`Collection ${collection} not found in collections map`);
     }
     return collectionsMap[collection];
 }

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

@@ -18,53 +18,54 @@ async function installExtension(extension) {
 }
 async function loadExtensions(dir) {
     const extensions = (0, read_file_1.default)('extensions', dir);
-    if (!extensions || extensions.length === 0) {
-        core_1.ux.log('No extensions found');
-        return;
-    }
-    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);
+    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.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.`);
+        core_1.ux.log('No extensions found or extensions file is empty. Skipping extension installation.');
     }
 }
 exports.default = loadExtensions;

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

@@ -32,7 +32,6 @@ async function loadFolders(dir) {
                 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);

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

@@ -3,10 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const catch_error_1 = tslib_1.__importDefault(require("./catch-error"));
 function readFile(file, dir) {
     const filePath = node_path_1.default.join(dir, `${file}.json`); // Use path.join for proper path resolution
     if (!node_fs_1.default.existsSync(filePath)) {
-        throw new Error(`File not found: ${filePath}`); // Improved error handling
+        (0, catch_error_1.default)(`File not found: ${filePath}`, {
+            context: {
+                dir,
+                file,
+                operation: 'readFile',
+            },
+        });
     }
     const fileContents = node_fs_1.default.readFileSync(filePath, 'utf8');
     const obj = JSON.parse(fileContents);

package/oclif.manifest.json

@@ -234,5 +234,5 @@
       ]
     }
   },
-  "version": "0.5.0-beta.2"
+  "version": "0.5.0-beta.4"
 }

package/package.json

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