directus-template-cli 0.7.0-beta.4 → 0.7.0-beta.6

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

@@ -1,33 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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);
-    const allOperations = (0, read_file_1.default)('operations', dir);
-    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${flows.length} flows`));
+import { createFlow, createOperations, readFlows, updateOperation } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+export default async function loadFlows(dir) {
+    const flows = readFile('flows', dir);
+    const allOperations = readFile('operations', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${flows.length} flows`));
     if (flows && flows.length > 0) {
         try {
             // Fetch existing flows
-            const existingFlows = await sdk_2.api.client.request((0, sdk_1.readFlows)({
+            const existingFlows = await api.client.request(readFlows({
                 limit: -1,
             }));
             const existingFlowIds = new Set(existingFlows.map(flow => flow.id));
             const newFlows = flows.filter(flow => !existingFlowIds.has(flow.id));
-            const results = await Promise.allSettled(newFlows.map(flow => sdk_2.api.client.request((0, sdk_1.createFlow)(flow))));
+            const results = await Promise.allSettled(newFlows.map(flow => api.client.request(createFlow(flow))));
             const createdFlowIds = new Set();
             for (const [index, result] of results.entries()) {
                 if (result.status === 'fulfilled') {
                     createdFlowIds.add(newFlows[index].id);
                 }
                 else {
-                    (0, catch_error_1.default)(result.reason);
+                    catchError(result.reason);
                 }
             }
             // Filter operations for newly created flows
@@ -35,36 +31,34 @@ async function loadFlows(dir) {
             await loadOperations(newOperations);
         }
         catch (error) {
-            (0, catch_error_1.default)(error);
+            catchError(error);
         }
         finally {
-            core_1.ux.action.stop();
+            ux.action.stop();
         }
     }
 }
-exports.default = loadFlows;
-async function loadOperations(operations) {
-    core_1.ux.action.status = `Loading ${operations.length} operations`;
+export async function loadOperations(operations) {
+    ux.action.status = `Loading ${operations.length} operations`;
     try {
         const opsIds = operations.map(operation => {
             const opCopy = { ...operation };
-            delete opCopy.reject;
-            delete opCopy.resolve;
+            opCopy.reject = undefined;
+            opCopy.resolve = undefined;
             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, {
+        await api.client.request(createOperations(opsIds));
+        const results = await Promise.allSettled(operations.map(operation => api.client.request(updateOperation(operation.id, {
             reject: operation.reject,
             resolve: operation.resolve,
         }))));
         for (const [index, result] of results.entries()) {
             if (result.status === 'rejected') {
-                (0, catch_error_1.default)(result.reason);
+                catchError(result.reason);
             }
         }
     }
     catch (error) {
-        (0, catch_error_1.default)(error);
+        catchError(error);
     }
 }
-exports.loadOperations = loadOperations;

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

@@ -1,19 +1,16 @@
-"use strict";
-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(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${folders.length} folders`));
+import { createFolders, readFolders, updateFolder } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+export default async function loadFolders(dir) {
+    const folders = readFile('folders', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${folders.length} folders`));
     if (folders && folders.length > 0) {
         try {
             // Fetch existing folders
-            const existingFolders = await sdk_2.api.client.request((0, sdk_1.readFolders)({
+            const existingFolders = await api.client.request(readFolders({
                 limit: -1,
             }));
             const existingFolderIds = new Set(existingFolders.map(folder => folder.id));
@@ -26,26 +23,25 @@ async function loadFolders(dir) {
             if (foldersToAdd.length > 0) {
                 const folderSkeleton = foldersToAdd.map(folder => ({ id: folder.id, name: folder.name }));
                 // Create the folders
-                await sdk_2.api.client.request((0, sdk_1.createFolders)(folderSkeleton));
+                await api.client.request(createFolders(folderSkeleton));
                 // Update the folders with relationships concurrently
                 await Promise.all(foldersToAdd.map(async (folder) => {
                     const { id, ...rest } = folder;
                     try {
-                        await sdk_2.api.client.request((0, sdk_1.updateFolder)(id, rest));
+                        await api.client.request(updateFolder(id, rest));
                     }
                     catch (error) {
-                        (0, catch_error_1.default)(error);
+                        catchError(error);
                     }
                 }));
             }
             else {
-                // ux.info('-- No new folders to create')
+                // ux.stdout('-- No new folders to create')
             }
         }
         catch (error) {
-            (0, catch_error_1.default)(error);
+            catchError(error);
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadFolders;

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

@@ -1,31 +1,27 @@
-"use strict";
-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(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${permissions.length} permissions`));
+import { createPermissions, readPermissions } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+export default async function loadPermissions(dir) {
+    const permissions = readFile('permissions', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${permissions.length} permissions`));
     if (permissions && permissions.length > 0) {
         try {
-            const existingPermissions = await sdk_2.api.client.request((0, sdk_1.readPermissions)({
+            const existingPermissions = await api.client.request(readPermissions({
                 limit: -1,
             }));
             const existingPermissionKeys = new Set(existingPermissions.map(p => `${p.collection}:${p.action}:${p.policy}`));
             // Filter out duplicates
             const newPermissions = permissions.filter(newPerm => !existingPermissionKeys.has(`${newPerm.collection}:${newPerm.action}:${newPerm.policy}`));
             if (newPermissions.length > 0) {
-                await sdk_2.api.client.request((0, sdk_1.createPermissions)(newPermissions));
+                await api.client.request(createPermissions(newPermissions));
             }
         }
         catch (error) {
-            (0, catch_error_1.default)(error);
+            catchError(error);
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadPermissions;

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

@@ -1,18 +1,15 @@
-"use strict";
-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(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${policies.length} policies`));
+import { createPolicy, readPolicies } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+export default async function loadPolicies(dir) {
+    const policies = readFile('policies', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${policies.length} policies`));
     if (policies && policies.length > 0) {
         // Fetch existing policies
-        const existingPolicies = await sdk_2.api.client.request((0, sdk_1.readPolicies)({
+        const existingPolicies = await api.client.request(readPolicies({
             limit: -1,
         }));
         const existingPolicyIds = new Set(existingPolicies.map(policy => policy.id));
@@ -21,19 +18,18 @@ async function loadPolicies(dir) {
         for await (const policy of policiesWithoutPublic) {
             try {
                 if (existingPolicyIds.has(policy.id)) {
-                    core_1.ux.action.status = `Skipping existing policy: ${policy.name}`;
+                    ux.action.status = `Skipping existing policy: ${policy.name}`;
                     continue;
                 }
                 // Create new policy
-                await sdk_2.api.client.request((0, sdk_1.createPolicy)(policy));
+                await api.client.request(createPolicy(policy));
                 // Add the new policy ID to our set of existing policies
                 existingPolicyIds.add(policy.id);
             }
             catch (error) {
-                (0, catch_error_1.default)(error);
+                catchError(error);
             }
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadPolicies;

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

@@ -1,18 +1,15 @@
-"use strict";
-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(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${presets.length} presets`));
+import { createPresets, readPresets } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+export default async function loadPresets(dir) {
+    const presets = readFile('presets', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${presets.length} presets`));
     if (presets && presets.length > 0) {
         // Fetch existing presets
-        const existingPresets = await sdk_2.api.client.request((0, sdk_1.readPresets)({
+        const existingPresets = await api.client.request(readPresets({
             limit: -1,
         }));
         const existingPresetIds = new Set(existingPresets.map(preset => preset.id));
@@ -28,16 +25,15 @@ async function loadPresets(dir) {
         });
         if (presetsToAdd.length > 0) {
             try {
-                await sdk_2.api.client.request((0, sdk_1.createPresets)(presetsToAdd));
+                await api.client.request(createPresets(presetsToAdd));
             }
             catch (error) {
-                (0, catch_error_1.default)(error);
+                catchError(error);
             }
         }
         else {
-            // ux.info('-- No new presets to create')
+            // ux.stdout('-- No new presets to create')
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadPresets;

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

@@ -1,4 +1,6 @@
 /**
  * Load relationships into the Directus instance
+ * @param dir - The directory to read the relations from
+ * @returns {Promise<void>} - Returns nothing
  */
 export default function loadRelations(dir: string): Promise<void>;

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

@@ -1,21 +1,20 @@
-"use strict";
-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"));
+import { createRelation, readRelations } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
 /**
  * Load relationships into the Directus instance
+ * @param dir - The directory to read the relations from
+ * @returns {Promise<void>} - Returns nothing
  */
-async function loadRelations(dir) {
-    const relations = (0, read_file_1.default)('relations', dir);
-    core_1.ux.action.start(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${relations.length} relations`));
+export default async function loadRelations(dir) {
+    const relations = readFile('relations', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${relations.length} relations`));
     if (relations && relations.length > 0) {
         // Fetch existing relations
-        const existingRelations = await sdk_2.api.client.request((0, sdk_1.readRelations)());
+        const existingRelations = await api.client.request(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}`;
@@ -25,21 +24,20 @@ async function loadRelations(dir) {
             return true;
         }).map(relation => {
             const cleanRelation = { ...relation };
-            delete cleanRelation.meta.id;
+            cleanRelation.meta.id = undefined;
             return cleanRelation;
         });
         await addRelations(relationsToAdd);
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadRelations;
 async function addRelations(relations) {
     for await (const relation of relations) {
         try {
-            await sdk_2.api.client.request((0, sdk_1.createRelation)(relation));
+            await api.client.request(createRelation(relation));
         }
         catch (error) {
-            (0, catch_error_1.default)(error);
+            catchError(error);
         }
     }
 }

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

@@ -1,20 +1,17 @@
-"use strict";
-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(core_1.ux.colorize(constants_1.DIRECTUS_PINK, `Loading ${roles.length} roles`));
+import { createRole, readRoles, updateRole } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import getRoleIds from '../utils/get-role-ids.js';
+import readFile from '../utils/read-file.js';
+export default async function loadRoles(dir) {
+    const roles = readFile('roles', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${roles.length} roles`));
     if (roles && roles.length > 0) {
-        const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
+        const { legacyAdminRoleId, newAdminRoleId } = await getRoleIds(dir);
         // Fetch existing roles
-        const existingRoles = await sdk_2.api.client.request((0, sdk_1.readRoles)({
+        const existingRoles = await api.client.request(readRoles({
             limit: -1,
         }));
         const existingRoleIds = new Set(existingRoles.map(role => role.id));
@@ -24,8 +21,8 @@ async function loadRoles(dir) {
             .filter(role => !existingRoleNames.has(role.name.toLowerCase())) // Filter out roles with existing names
             .map(role => {
             const r = { ...role };
-            delete r.users; // Alias field. User roles will be applied when the users are loaded.
-            delete r.parent; // We need to load all roles first
+            r.users = undefined; // Alias field. User roles will be applied when the users are loaded.
+            r.parent = undefined; // We need to load all roles first
             return r;
         });
         for await (const role of cleanedUpRoles) {
@@ -34,13 +31,13 @@ async function loadRoles(dir) {
                     continue;
                 }
                 // Create new role
-                await sdk_2.api.client.request((0, sdk_1.createRole)(role));
+                await api.client.request(createRole(role));
                 // Add the new role ID and name to our sets of existing roles
                 existingRoleIds.add(role.id);
                 existingRoleNames.add(role.name.toLowerCase());
             }
             catch (error) {
-                (0, catch_error_1.default)(error);
+                catchError(error);
             }
         }
         // Now add in any parent fields
@@ -52,13 +49,12 @@ async function loadRoles(dir) {
                     role.parent = newAdminRoleId;
                 }
                 const simplifiedRole = { parent: role.parent };
-                await sdk_2.api.client.request((0, sdk_1.updateRole)(role.id, simplifiedRole));
+                await api.client.request(updateRole(role.id, simplifiedRole));
             }
             catch (error) {
-                (0, catch_error_1.default)(error);
+                catchError(error);
             }
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadRoles;

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

@@ -1,21 +1,19 @@
-"use strict";
-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) => {
+import { readSettings, updateSettings } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { createDefu } from 'defu';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+// Cast ux to any to bypass type errors
+const customDefu = createDefu((obj, key, value) => {
     if (Array.isArray(obj[key]) && Array.isArray(value)) {
-        // @ts-expect-error
+        // @ts-ignore - ignore
         obj[key] = mergeArrays(key, obj[key], value);
         return true;
     }
     if (typeof obj[key] === 'string' && typeof value === 'string') {
-        // @ts-expect-error
+        // @ts-ignore - ignore
         obj[key] = mergeJsonStrings(obj[key], value);
         return true;
     }
@@ -42,17 +40,16 @@ function mergeJsonStrings(current, incoming) {
         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);
+export default async function loadSettings(dir) {
+    ux.action.start(ux.colorize(DIRECTUS_PINK, 'Loading settings'));
+    const settings = readFile('settings', dir);
     try {
-        const currentSettings = await sdk_2.api.client.request((0, sdk_1.readSettings)());
+        const currentSettings = await api.client.request(readSettings());
         const mergedSettings = customDefu(currentSettings, settings);
-        await sdk_2.api.client.request((0, sdk_1.updateSettings)(mergedSettings));
+        await api.client.request(updateSettings(mergedSettings));
     }
     catch (error) {
-        (0, catch_error_1.default)(error);
+        catchError(error);
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadSettings;

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

@@ -1,18 +1,15 @@
-"use strict";
-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) {
-    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`));
+import { createTranslations, readTranslations } from '@directus/sdk';
+import { ux } from '@oclif/core';
+import { DIRECTUS_PINK } from '../constants.js';
+import { api } from '../sdk.js';
+import catchError from '../utils/catch-error.js';
+import readFile from '../utils/read-file.js';
+export default async function loadTranslations(dir) {
+    const translations = readFile('translations', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${translations.length} translations`));
     if (translations && translations.length > 0) {
         // Fetch existing translations
-        const existingTranslations = await sdk_2.api.client.request((0, sdk_1.readTranslations)({
+        const existingTranslations = await api.client.request(readTranslations({
             limit: -1,
         }));
         const existingTranslationKeys = new Set(existingTranslations.map(t => `${t.language}_${t.key}`));
@@ -25,16 +22,15 @@ async function loadTranslations(dir) {
         });
         if (newTranslations.length > 0) {
             try {
-                await sdk_2.api.client.request((0, sdk_1.createTranslations)(newTranslations));
+                await api.client.request(createTranslations(newTranslations));
             }
             catch (error) {
-                (0, catch_error_1.default)(error);
+                catchError(error);
             }
         }
         else {
-            // ux.info('-- No new translations to create')
+            // ux.stdout('-- No new translations to create')
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadTranslations;