directus-template-cli 0.5.0-beta.10 → 0.5.0-beta.11

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

@@ -9,45 +9,47 @@ 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(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',
-        params: {
-            limit: -1,
-        },
-        path: '/access',
-    }));
-    const existingAccessById = new Map(existingAccesses.map(acc => [acc.id, acc]));
-    const existingAccessByCompositeKey = new Map(existingAccesses.map(acc => [getCompositeKey(acc), acc]));
-    for await (const acc of access) {
-        try {
-            if (existingAccessById.has(acc.id)) {
-                continue;
+    if (access && access.length > 0) {
+        // Fetch existing accesses
+        const existingAccesses = await sdk_1.api.client.request(() => ({
+            method: 'GET',
+            params: {
+                limit: -1,
+            },
+            path: '/access',
+        }));
+        const existingAccessById = new Map(existingAccesses.map(acc => [acc.id, acc]));
+        const existingAccessByCompositeKey = new Map(existingAccesses.map(acc => [getCompositeKey(acc), acc]));
+        for await (const acc of access) {
+            try {
+                if (existingAccessById.has(acc.id)) {
+                    continue;
+                }
+                const compositeKey = getCompositeKey(acc);
+                if (existingAccessByCompositeKey.has(compositeKey)) {
+                    continue;
+                }
+                // If the role is null, delete the role key to avoid errors
+                if (acc.role === null) {
+                    delete acc.role;
+                }
+                await sdk_1.api.client.request(() => ({
+                    body: JSON.stringify(acc),
+                    method: 'POST',
+                    path: '/access',
+                }));
+                // Add the new access to our maps
+                existingAccessById.set(acc.id, acc);
+                existingAccessByCompositeKey.set(compositeKey, acc);
             }
-            const compositeKey = getCompositeKey(acc);
-            if (existingAccessByCompositeKey.has(compositeKey)) {
-                continue;
+            catch (error) {
+                (0, catch_error_1.default)(error, {
+                    context: {
+                        access: acc,
+                        operation: 'createAccess',
+                    },
+                });
             }
-            // If the role is null, delete the role key to avoid errors
-            if (acc.role === null) {
-                delete acc.role;
-            }
-            await sdk_1.api.client.request(() => ({
-                body: JSON.stringify(acc),
-                method: 'POST',
-                path: '/access',
-            }));
-            // Add the new access to our maps
-            existingAccessById.set(acc.id, acc);
-            existingAccessByCompositeKey.set(compositeKey, acc);
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error, {
-                context: {
-                    access: acc,
-                    operation: 'createAccess',
-                },
-            });
         }
     }
     core_1.ux.action.stop();

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

@@ -11,31 +11,33 @@ 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(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,
-    }));
-    const existingDashboardIds = new Set(existingDashboards.map(dashboard => dashboard.id));
-    const filteredDashboards = dashboards.filter(dashboard => {
-        if (existingDashboardIds.has(dashboard.id)) {
-            return false;
-        }
-        return true;
-    }).map(dash => {
-        const newDash = { ...dash };
-        delete newDash.panels;
-        return newDash;
-    });
-    await Promise.all(filteredDashboards.map(async (dashboard) => {
-        try {
-            await sdk_2.api.client.request((0, sdk_1.createDashboard)(dashboard));
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
-        }
-    }));
-    await loadPanels(dir);
-    core_1.ux.action.stop();
+    if (dashboards && dashboards.length > 0) {
+        // Fetch existing dashboards
+        const existingDashboards = await sdk_2.api.client.request((0, sdk_1.readDashboards)({
+            limit: -1,
+        }));
+        const existingDashboardIds = new Set(existingDashboards.map(dashboard => dashboard.id));
+        const filteredDashboards = dashboards.filter(dashboard => {
+            if (existingDashboardIds.has(dashboard.id)) {
+                return false;
+            }
+            return true;
+        }).map(dash => {
+            const newDash = { ...dash };
+            delete newDash.panels;
+            return newDash;
+        });
+        await Promise.all(filteredDashboards.map(async (dashboard) => {
+            try {
+                await sdk_2.api.client.request((0, sdk_1.createDashboard)(dashboard));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
+        }));
+        await loadPanels(dir);
+        core_1.ux.action.stop();
+    }
 }
 exports.default = loadDashboards;
 async function loadPanels(dir) {

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

@@ -13,52 +13,54 @@ 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(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
-        const existingFiles = await sdk_2.api.client.request((0, sdk_1.readFiles)({
-            fields: ['id', 'filename_disk'],
-            filter: {
-                id: {
-                    _in: fileIds,
+    if (files && files.length > 0) {
+        try {
+            const fileIds = files.map(file => file.id);
+            // Fetch only the files we're interested in
+            const existingFiles = await sdk_2.api.client.request((0, sdk_1.readFiles)({
+                fields: ['id', 'filename_disk'],
+                filter: {
+                    id: {
+                        _in: fileIds,
+                    },
                 },
-            },
-            limit: -1,
-        }));
-        const existingFileIds = new Set(existingFiles.map(file => file.id));
-        const existingFileNames = new Set(existingFiles.map(file => file.filename_disk));
-        const filesToUpload = files.filter(file => {
-            if (existingFileIds.has(file.id)) {
-                return false;
-            }
-            if (existingFileNames.has(file.filename_disk)) {
-                return false;
-            }
-            return true;
-        });
-        await Promise.all(filesToUpload.map(async (asset) => {
-            const fileName = asset.filename_disk;
-            const assetPath = node_path_1.default.resolve(dir, 'assets', fileName);
-            const fileStream = new Blob([(0, node_fs_1.readFileSync)(assetPath)], { type: asset.type });
-            const form = new formdata_node_1.FormData();
-            form.append('id', asset.id);
-            if (asset.title)
-                form.append('title', asset.title);
-            if (asset.description)
-                form.append('description', asset.description);
-            if (asset.folder)
-                form.append('folder', asset.folder);
-            form.append('file', fileStream, fileName);
-            try {
-                await sdk_2.api.client.request((0, sdk_1.uploadFiles)(form));
-            }
-            catch (error) {
-                (0, catch_error_1.default)(error);
-            }
-        }));
-    }
-    catch (error) {
-        (0, catch_error_1.default)(error);
+                limit: -1,
+            }));
+            const existingFileIds = new Set(existingFiles.map(file => file.id));
+            const existingFileNames = new Set(existingFiles.map(file => file.filename_disk));
+            const filesToUpload = files.filter(file => {
+                if (existingFileIds.has(file.id)) {
+                    return false;
+                }
+                if (existingFileNames.has(file.filename_disk)) {
+                    return false;
+                }
+                return true;
+            });
+            await Promise.all(filesToUpload.map(async (asset) => {
+                const fileName = asset.filename_disk;
+                const assetPath = node_path_1.default.resolve(dir, 'assets', fileName);
+                const fileStream = new Blob([(0, node_fs_1.readFileSync)(assetPath)], { type: asset.type });
+                const form = new formdata_node_1.FormData();
+                form.append('id', asset.id);
+                if (asset.title)
+                    form.append('title', asset.title);
+                if (asset.description)
+                    form.append('description', asset.description);
+                if (asset.folder)
+                    form.append('folder', asset.folder);
+                form.append('file', fileStream, fileName);
+                try {
+                    await sdk_2.api.client.request((0, sdk_1.uploadFiles)(form));
+                }
+                catch (error) {
+                    (0, catch_error_1.default)(error);
+                }
+            }));
+        }
+        catch (error) {
+            (0, catch_error_1.default)(error);
+        }
     }
     core_1.ux.action.stop();
 }

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

@@ -12,32 +12,34 @@ 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`));
-    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 newFlows = flows.filter(flow => !existingFlowIds.has(flow.id));
-        const results = await Promise.allSettled(newFlows.map(flow => sdk_2.api.client.request((0, sdk_1.createFlow)(flow))));
-        const createdFlowIds = new Set();
-        for (const [index, result] of results.entries()) {
-            if (result.status === 'fulfilled') {
-                createdFlowIds.add(newFlows[index].id);
-            }
-            else {
-                (0, catch_error_1.default)(result.reason);
+    if (flows && flows.length > 0) {
+        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 newFlows = flows.filter(flow => !existingFlowIds.has(flow.id));
+            const results = await Promise.allSettled(newFlows.map(flow => sdk_2.api.client.request((0, sdk_1.createFlow)(flow))));
+            const createdFlowIds = new Set();
+            for (const [index, result] of results.entries()) {
+                if (result.status === 'fulfilled') {
+                    createdFlowIds.add(newFlows[index].id);
+                }
+                else {
+                    (0, catch_error_1.default)(result.reason);
+                }
             }
+            // Filter operations for newly created flows
+            const newOperations = allOperations.filter(operation => createdFlowIds.has(operation.flow));
+            await loadOperations(newOperations);
+        }
+        catch (error) {
+            (0, catch_error_1.default)(error);
+        }
+        finally {
+            core_1.ux.action.stop();
         }
-        // Filter operations for newly created flows
-        const newOperations = allOperations.filter(operation => createdFlowIds.has(operation.flow));
-        await loadOperations(newOperations);
-    }
-    catch (error) {
-        (0, catch_error_1.default)(error);
-    }
-    finally {
-        core_1.ux.action.stop();
     }
 }
 exports.default = loadFlows;

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

@@ -10,40 +10,42 @@ 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`));
-    try {
-        // Fetch existing folders
-        const existingFolders = await sdk_2.api.client.request((0, sdk_1.readFolders)({
-            limit: -1,
-        }));
-        const existingFolderIds = new Set(existingFolders.map(folder => folder.id));
-        const foldersToAdd = folders.filter(folder => {
-            if (existingFolderIds.has(folder.id)) {
-                return false;
-            }
-            return true;
-        });
-        if (foldersToAdd.length > 0) {
-            const folderSkeleton = foldersToAdd.map(folder => ({ id: folder.id, name: folder.name }));
-            // Create the folders
-            await sdk_2.api.client.request((0, sdk_1.createFolders)(folderSkeleton));
-            // Update the folders with relationships concurrently
-            await Promise.all(foldersToAdd.map(async (folder) => {
-                const { id, ...rest } = folder;
-                try {
-                    await sdk_2.api.client.request((0, sdk_1.updateFolder)(id, rest));
-                }
-                catch (error) {
-                    (0, catch_error_1.default)(error);
-                }
+    if (folders && folders.length > 0) {
+        try {
+            // Fetch existing folders
+            const existingFolders = await sdk_2.api.client.request((0, sdk_1.readFolders)({
+                limit: -1,
             }));
+            const existingFolderIds = new Set(existingFolders.map(folder => folder.id));
+            const foldersToAdd = folders.filter(folder => {
+                if (existingFolderIds.has(folder.id)) {
+                    return false;
+                }
+                return true;
+            });
+            if (foldersToAdd.length > 0) {
+                const folderSkeleton = foldersToAdd.map(folder => ({ id: folder.id, name: folder.name }));
+                // Create the folders
+                await sdk_2.api.client.request((0, sdk_1.createFolders)(folderSkeleton));
+                // Update the folders with relationships concurrently
+                await Promise.all(foldersToAdd.map(async (folder) => {
+                    const { id, ...rest } = folder;
+                    try {
+                        await sdk_2.api.client.request((0, sdk_1.updateFolder)(id, rest));
+                    }
+                    catch (error) {
+                        (0, catch_error_1.default)(error);
+                    }
+                }));
+            }
+            else {
+                // ux.info('-- No new folders to create')
+            }
         }
-        else {
-            // ux.info('-- No new folders to create')
+        catch (error) {
+            (0, catch_error_1.default)(error);
         }
     }
-    catch (error) {
-        (0, catch_error_1.default)(error);
-    }
     core_1.ux.action.stop();
 }
 exports.default = loadFolders;

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

@@ -10,19 +10,21 @@ 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`));
-    try {
-        const existingPermissions = await sdk_2.api.client.request((0, sdk_1.readPermissions)({
-            limit: -1,
-        }));
-        const existingPermissionKeys = new Set(existingPermissions.map(p => `${p.collection}:${p.action}:${p.policy}`));
-        // Filter out duplicates
-        const newPermissions = permissions.filter(newPerm => !existingPermissionKeys.has(`${newPerm.collection}:${newPerm.action}:${newPerm.policy}`));
-        if (newPermissions.length > 0) {
-            await sdk_2.api.client.request((0, sdk_1.createPermissions)(newPermissions));
+    if (permissions && permissions.length > 0) {
+        try {
+            const existingPermissions = await sdk_2.api.client.request((0, sdk_1.readPermissions)({
+                limit: -1,
+            }));
+            const existingPermissionKeys = new Set(existingPermissions.map(p => `${p.collection}:${p.action}:${p.policy}`));
+            // Filter out duplicates
+            const newPermissions = permissions.filter(newPerm => !existingPermissionKeys.has(`${newPerm.collection}:${newPerm.action}:${newPerm.policy}`));
+            if (newPermissions.length > 0) {
+                await sdk_2.api.client.request((0, sdk_1.createPermissions)(newPermissions));
+            }
+        }
+        catch (error) {
+            (0, catch_error_1.default)(error);
         }
-    }
-    catch (error) {
-        (0, catch_error_1.default)(error);
     }
     core_1.ux.action.stop();
 }

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

@@ -10,26 +10,28 @@ 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`));
-    // Fetch existing policies
-    const existingPolicies = await sdk_2.api.client.request((0, sdk_1.readPolicies)({
-        limit: -1,
-    }));
-    const existingPolicyIds = new Set(existingPolicies.map(policy => policy.id));
-    const PUBLIC_POLICY_ID = 'abf8a154-5b1c-4a46-ac9c-7300570f4f17';
-    const policiesWithoutPublic = policies.filter(policy => policy.id !== PUBLIC_POLICY_ID);
-    for await (const policy of policiesWithoutPublic) {
-        try {
-            if (existingPolicyIds.has(policy.id)) {
-                core_1.ux.action.status = `Skipping existing policy: ${policy.name}`;
-                continue;
+    if (policies && policies.length > 0) {
+        // Fetch existing policies
+        const existingPolicies = await sdk_2.api.client.request((0, sdk_1.readPolicies)({
+            limit: -1,
+        }));
+        const existingPolicyIds = new Set(existingPolicies.map(policy => policy.id));
+        const PUBLIC_POLICY_ID = 'abf8a154-5b1c-4a46-ac9c-7300570f4f17';
+        const policiesWithoutPublic = policies.filter(policy => policy.id !== PUBLIC_POLICY_ID);
+        for await (const policy of policiesWithoutPublic) {
+            try {
+                if (existingPolicyIds.has(policy.id)) {
+                    core_1.ux.action.status = `Skipping existing policy: ${policy.name}`;
+                    continue;
+                }
+                // Create new policy
+                await sdk_2.api.client.request((0, sdk_1.createPolicy)(policy));
+                // Add the new policy ID to our set of existing policies
+                existingPolicyIds.add(policy.id);
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
             }
-            // Create new policy
-            await sdk_2.api.client.request((0, sdk_1.createPolicy)(policy));
-            // Add the new policy ID to our set of existing policies
-            existingPolicyIds.add(policy.id);
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
         }
     }
     core_1.ux.action.stop();

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

@@ -10,31 +10,33 @@ 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`));
-    // Fetch existing presets
-    const existingPresets = await sdk_2.api.client.request((0, sdk_1.readPresets)({
-        limit: -1,
-    }));
-    const existingPresetIds = new Set(existingPresets.map(preset => preset.id));
-    const presetsToAdd = presets.filter(preset => {
-        if (existingPresetIds.has(preset.id)) {
-            return false;
+    if (presets && presets.length > 0) {
+        // Fetch existing presets
+        const existingPresets = await sdk_2.api.client.request((0, sdk_1.readPresets)({
+            limit: -1,
+        }));
+        const existingPresetIds = new Set(existingPresets.map(preset => preset.id));
+        const presetsToAdd = presets.filter(preset => {
+            if (existingPresetIds.has(preset.id)) {
+                return false;
+            }
+            return true;
+        }).map(preset => {
+            const cleanPreset = { ...preset };
+            cleanPreset.user = null;
+            return cleanPreset;
+        });
+        if (presetsToAdd.length > 0) {
+            try {
+                await sdk_2.api.client.request((0, sdk_1.createPresets)(presetsToAdd));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
         }
-        return true;
-    }).map(preset => {
-        const cleanPreset = { ...preset };
-        cleanPreset.user = null;
-        return cleanPreset;
-    });
-    if (presetsToAdd.length > 0) {
-        try {
-            await sdk_2.api.client.request((0, sdk_1.createPresets)(presetsToAdd));
+        else {
+            // ux.info('-- No new presets to create')
         }
-        catch (error) {
-            (0, catch_error_1.default)(error);
-        }
-    }
-    else {
-        // ux.info('-- No new presets to create')
     }
     core_1.ux.action.stop();
 }

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

@@ -13,21 +13,23 @@ 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(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)) {
-            return false;
-        }
-        return true;
-    }).map(relation => {
-        const cleanRelation = { ...relation };
-        delete cleanRelation.meta.id;
-        return cleanRelation;
-    });
-    await addRelations(relationsToAdd);
+    if (relations && relations.length > 0) {
+        // Fetch existing relations
+        const existingRelations = await sdk_2.api.client.request((0, sdk_1.readRelations)());
+        const existingRelationKeys = new Set(existingRelations.map(relation => `${relation.collection}:${relation.field}:${relation.related_collection}`));
+        const relationsToAdd = relations.filter(relation => {
+            const key = `${relation.collection}:${relation.field}:${relation.related_collection}`;
+            if (existingRelationKeys.has(key)) {
+                return false;
+            }
+            return true;
+        }).map(relation => {
+            const cleanRelation = { ...relation };
+            delete cleanRelation.meta.id;
+            return cleanRelation;
+        });
+        await addRelations(relationsToAdd);
+    }
     core_1.ux.action.stop();
 }
 exports.default = loadRelations;

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

@@ -11,50 +11,52 @@ 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`));
-    const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
-    // Fetch existing roles
-    const existingRoles = await sdk_2.api.client.request((0, sdk_1.readRoles)({
-        limit: -1,
-    }));
-    const existingRoleIds = new Set(existingRoles.map(role => role.id));
-    const existingRoleNames = new Set(existingRoles.map(role => role.name.toLowerCase()));
-    const cleanedUpRoles = roles
-        .filter(role => role.name !== 'Administrator') // Don't load legacy admin role
-        .filter(role => !existingRoleNames.has(role.name.toLowerCase())) // Filter out roles with existing names
-        .map(role => {
-        const r = { ...role };
-        delete r.users; // Alias field. User roles will be applied when the users are loaded.
-        delete r.parent; // We need to load all roles first
-        return r;
-    });
-    for await (const role of cleanedUpRoles) {
-        try {
-            if (existingRoleIds.has(role.id)) {
-                continue;
+    if (roles && roles.length > 0) {
+        const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
+        // Fetch existing roles
+        const existingRoles = await sdk_2.api.client.request((0, sdk_1.readRoles)({
+            limit: -1,
+        }));
+        const existingRoleIds = new Set(existingRoles.map(role => role.id));
+        const existingRoleNames = new Set(existingRoles.map(role => role.name.toLowerCase()));
+        const cleanedUpRoles = roles
+            .filter(role => role.name !== 'Administrator') // Don't load legacy admin role
+            .filter(role => !existingRoleNames.has(role.name.toLowerCase())) // Filter out roles with existing names
+            .map(role => {
+            const r = { ...role };
+            delete r.users; // Alias field. User roles will be applied when the users are loaded.
+            delete r.parent; // We need to load all roles first
+            return r;
+        });
+        for await (const role of cleanedUpRoles) {
+            try {
+                if (existingRoleIds.has(role.id)) {
+                    continue;
+                }
+                // Create new role
+                await sdk_2.api.client.request((0, sdk_1.createRole)(role));
+                // Add the new role ID and name to our sets of existing roles
+                existingRoleIds.add(role.id);
+                existingRoleNames.add(role.name.toLowerCase());
             }
-            // Create new role
-            await sdk_2.api.client.request((0, sdk_1.createRole)(role));
-            // Add the new role ID and name to our sets of existing roles
-            existingRoleIds.add(role.id);
-            existingRoleNames.add(role.name.toLowerCase());
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
-        }
-    }
-    // Now add in any parent fields
-    const rolesWithParents = roles.filter(role => role.parent !== null);
-    for await (const role of rolesWithParents) {
-        try {
-            // Remap any roles where the parent ID is the default admin role
-            if (role.parent === legacyAdminRoleId) {
-                role.parent = newAdminRoleId;
+            catch (error) {
+                (0, catch_error_1.default)(error);
             }
-            const simplifiedRole = { parent: role.parent };
-            await sdk_2.api.client.request((0, sdk_1.updateRole)(role.id, simplifiedRole));
         }
-        catch (error) {
-            (0, catch_error_1.default)(error);
+        // Now add in any parent fields
+        const rolesWithParents = roles.filter(role => role.parent !== null);
+        for await (const role of rolesWithParents) {
+            try {
+                // Remap any roles where the parent ID is the default admin role
+                if (role.parent === legacyAdminRoleId) {
+                    role.parent = newAdminRoleId;
+                }
+                const simplifiedRole = { parent: role.parent };
+                await sdk_2.api.client.request((0, sdk_1.updateRole)(role.id, simplifiedRole));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
         }
     }
     core_1.ux.action.stop();

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

@@ -10,28 +10,30 @@ 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`));
-    // Fetch existing translations
-    const existingTranslations = await sdk_2.api.client.request((0, sdk_1.readTranslations)({
-        limit: -1,
-    }));
-    const existingTranslationKeys = new Set(existingTranslations.map(t => `${t.language}_${t.key}`));
-    const newTranslations = translations.filter(t => {
-        const key = `${t.language}_${t.key}`;
-        if (existingTranslationKeys.has(key)) {
-            return false;
+    if (translations && translations.length > 0) {
+        // Fetch existing translations
+        const existingTranslations = await sdk_2.api.client.request((0, sdk_1.readTranslations)({
+            limit: -1,
+        }));
+        const existingTranslationKeys = new Set(existingTranslations.map(t => `${t.language}_${t.key}`));
+        const newTranslations = translations.filter(t => {
+            const key = `${t.language}_${t.key}`;
+            if (existingTranslationKeys.has(key)) {
+                return false;
+            }
+            return true;
+        });
+        if (newTranslations.length > 0) {
+            try {
+                await sdk_2.api.client.request((0, sdk_1.createTranslations)(newTranslations));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
         }
-        return true;
-    });
-    if (newTranslations.length > 0) {
-        try {
-            await sdk_2.api.client.request((0, sdk_1.createTranslations)(newTranslations));
+        else {
+            // ux.info('-- No new translations to create')
         }
-        catch (error) {
-            (0, catch_error_1.default)(error);
-        }
-    }
-    else {
-        // ux.info('-- No new translations to create')
     }
     core_1.ux.action.stop();
 }

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

@@ -11,45 +11,56 @@ 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(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: {
-            _or: [
-                { email: { _in: incomingUserEmails } },
-                { id: { _in: incomingUserIds } },
-            ],
-        },
-        limit: -1,
-    }));
-    const filteredUsers = users.map(user => {
-        // If the user is an admin, we need to change their role to the new admin role
-        const isAdmin = user.role === legacyAdminRoleId;
-        user.role = isAdmin ? newAdminRoleId : user.role;
-        // Delete the unneeded fields
-        delete user.last_page;
-        delete user.token;
-        delete user.policies;
-        // Delete passwords to prevent setting to *******
-        delete user.password;
-        return user;
-    });
-    for await (const user of filteredUsers) {
-        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));
-        }
-        catch (error) {
-            (0, catch_error_1.default)(error);
+    if (users && users.length > 0) {
+        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: {
+                _or: [
+                    { email: { _in: incomingUserEmails } },
+                    { id: { _in: incomingUserIds } },
+                ],
+            },
+            limit: -1,
+        }));
+        const filteredUsers = users.map(user => {
+            // If the user is an admin, we need to change their role to the new admin role
+            const isAdmin = user.role === legacyAdminRoleId;
+            user.role = isAdmin ? newAdminRoleId : user.role;
+            // Delete the unneeded fields
+            delete user.last_page;
+            delete user.token;
+            delete user.policies;
+            // Delete passwords to prevent setting to *******
+            delete user.password;
+            return user;
+        });
+        for await (const user of filteredUsers) {
+            const existingUserWithSameId = existingUsers && Array.isArray(existingUsers)
+                ? existingUsers.find(existing => existing.id === user.id)
+                : undefined;
+            const existingUserWithSameEmail = existingUsers && Array.isArray(existingUsers)
+                ? existingUsers.find(existing => existing.email === user.email)
+                : undefined;
+            if (existingUserWithSameId) {
+                // Skip if there's an existing user with the same id
+                continue;
+            }
+            if (existingUserWithSameEmail) {
+                // Delete email if there's an existing user with the same email but different id
+                delete user.email;
+            }
+            if (user.email === null) {
+                // Delete email if it's null
+                delete user.email;
+            }
+            try {
+                await sdk_2.api.client.request((0, sdk_1.createUser)(user));
+            }
+            catch (error) {
+                (0, catch_error_1.default)(error);
+            }
         }
     }
     core_1.ux.action.stop();

package/oclif.manifest.json

@@ -234,5 +234,5 @@
       ]
     }
   },
-  "version": "0.5.0-beta.10"
+  "version": "0.5.0-beta.11"
 }

package/package.json

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