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

package/dist/lib/init/index.js

@@ -1,71 +1,99 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
-const tslib_1 = require("tslib");
-const prompts_1 = require("@clack/prompts");
-const core_1 = require("@oclif/core");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const giget_1 = require("giget");
-const glob_1 = require("glob");
-const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const nypm_1 = require("nypm");
-const apply_1 = tslib_1.__importDefault(require("../../commands/apply"));
-const docker_1 = require("../../services/docker");
-const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
-const parse_github_url_1 = require("../utils/parse-github-url");
-const config_1 = require("./config");
-async function init(dir, flags) {
+import { note, outro, spinner } from '@clack/prompts';
+import { ux } from '@oclif/core';
+import chalk from 'chalk';
+import { execa } from 'execa';
+import { downloadTemplate } from 'giget';
+import { glob } from 'glob';
+import fs from 'node:fs';
+import { detectPackageManager, installDependencies } from 'nypm';
+import path from 'pathe';
+import dotenv from 'dotenv';
+import ApplyCommand from '../../commands/apply.js';
+import { createDocker } from '../../services/docker.js';
+import catchError from '../utils/catch-error.js';
+import { createGigetString, parseGitHubUrl } from '../utils/parse-github-url.js';
+import { readTemplateConfig } from '../utils/template-config.js';
+import { DOCKER_CONFIG } from './config.js';
+export async function init({ dir, flags }) {
     // Check target directory
     const shouldForce = flags.overrideDir;
-    if (node_fs_1.default.existsSync(dir) && !shouldForce) {
+    if (fs.existsSync(dir) && !shouldForce) {
         throw new Error('Directory already exists. Use --override-dir to override.');
     }
-    const frontendDir = node_path_1.default.join(dir, flags.frontend);
-    const directusDir = node_path_1.default.join(dir, 'directus');
+    // If template is a URL, we need to handle it differently
+    const isDirectUrl = flags.template?.startsWith('http');
+    const directusDir = path.join(dir, 'directus');
     let template;
+    let packageManager = null;
     try {
         // Download the template from GitHub
-        const parsedUrl = (0, parse_github_url_1.parseGitHubUrl)(flags.template);
-        template = await (0, giget_1.downloadTemplate)((0, parse_github_url_1.createGigetString)(parsedUrl), {
+        const parsedUrl = parseGitHubUrl(flags.template);
+        // If it's a direct URL, we download the entire repository
+        // Otherwise, we use the template from the starters repo
+        template = await downloadTemplate(createGigetString(parsedUrl), {
             dir,
             force: shouldForce,
         });
-        // Cleanup the template
-        if (flags.frontend) {
-            // Ensure directus directory exists before cleaning up
-            if (!node_fs_1.default.existsSync(directusDir)) {
-                node_fs_1.default.mkdirSync(directusDir, { recursive: true });
+        // For direct URLs, we need to check if there's a directus directory
+        // If not, assume the entire repo is a directus template
+        if (isDirectUrl) {
+            if (!fs.existsSync(directusDir)) {
+                // Move all files to directus directory
+                fs.mkdirSync(directusDir, { recursive: true });
+                const files = fs.readdirSync(dir);
+                for (const file of files) {
+                    if (file !== 'directus') {
+                        fs.renameSync(path.join(dir, file), path.join(directusDir, file));
+                    }
+                }
             }
-            // Read and parse package.json
-            const packageJsonPath = node_path_1.default.join(dir, 'package.json');
-            if (!node_fs_1.default.existsSync(packageJsonPath)) {
-                throw new Error('package.json not found in template');
+        }
+        // Read template configuration
+        const templateInfo = readTemplateConfig(dir);
+        let frontendDir;
+        // Handle frontends based on template configuration
+        if (flags.frontend && templateInfo) {
+            // Find the selected frontend in the configuration
+            const selectedFrontend = templateInfo.frontendOptions.find(f => f.id === flags.frontend);
+            if (!selectedFrontend) {
+                throw new Error(`Frontend "${flags.frontend}" not found in template configuration`);
             }
-            const packageJson = JSON.parse(node_fs_1.default.readFileSync(packageJsonPath, 'utf8'));
-            const templateConfig = packageJson['directus:template'];
-            // Get all frontend paths from the configuration
-            const frontendPaths = Object.values((templateConfig === null || templateConfig === void 0 ? void 0 : templateConfig.frontends) || {})
-                .map(frontend => frontend.path.replace(/^\.\//, ''))
-                .filter(path => path !== flags.frontend); // Exclude the selected frontend
-            // Remove unused frontend directories
-            for (const frontendPath of frontendPaths) {
-                const pathToRemove = node_path_1.default.join(dir, frontendPath);
-                if (node_fs_1.default.existsSync(pathToRemove)) {
-                    node_fs_1.default.rmSync(pathToRemove, { recursive: true });
+            // Remove all frontend directories except the selected one
+            for (const frontend of templateInfo.frontendOptions) {
+                if (frontend.id !== flags.frontend) {
+                    const pathToRemove = path.join(dir, frontend.path);
+                    if (fs.existsSync(pathToRemove)) {
+                        fs.rmSync(pathToRemove, { recursive: true });
+                    }
                 }
             }
+            // Move the selected frontend to the correct location if needed
+            frontendDir = path.join(dir, selectedFrontend.path);
+            if (frontendDir !== path.join(dir, flags.frontend)) {
+                fs.renameSync(frontendDir, path.join(dir, flags.frontend));
+                frontendDir = path.join(dir, flags.frontend);
+            }
         }
+        const directusInfo = {
+            email: '',
+            password: '',
+            url: '',
+        };
         // Find and copy all .env.example files
-        const envFiles = glob_1.glob.sync(node_path_1.default.join(dir, '**', '.env.example'));
+        const envFiles = glob.sync(path.join(dir, '**', '.env.example'));
         for (const file of envFiles) {
             const envFile = file.replace('.env.example', '.env');
-            node_fs_1.default.copyFileSync(file, envFile);
+            fs.copyFileSync(file, envFile);
+            // Read default Directus login info from .env
+            const parsedEnv = dotenv.parse(fs.readFileSync(file, 'utf8'));
+            directusInfo.email = parsedEnv.ADMIN_EMAIL;
+            directusInfo.password = parsedEnv.ADMIN_PASSWORD;
+            directusInfo.url = parsedEnv.PUBLIC_URL;
         }
         // Start Directus and apply template only if directus directory exists
-        if (node_fs_1.default.existsSync(directusDir)) {
+        if (fs.existsSync(directusDir)) {
             // Initialize Docker service
-            const dockerService = (0, docker_1.createDocker)(config_1.DOCKER_CONFIG);
+            const dockerService = createDocker(DOCKER_CONFIG);
             // Check if Docker is installed
             const dockerStatus = await dockerService.checkDocker();
             if (!dockerStatus.installed || !dockerStatus.running) {
@@ -73,66 +101,62 @@ async function init(dir, flags) {
             }
             try {
                 await dockerService.startContainers(directusDir);
-                const healthCheckUrl = `${config_1.DIRECTUS_CONFIG.url}:${config_1.DIRECTUS_CONFIG.port}${config_1.DOCKER_CONFIG.healthCheckEndpoint}`;
+                const healthCheckUrl = `${directusInfo.url}${DOCKER_CONFIG.healthCheckEndpoint}`;
                 await dockerService.waitForHealthy(healthCheckUrl);
-                const templatePath = node_path_1.default.join(directusDir, 'template');
-                // const s = spinner()
-                // s.start(`Attempting to apply template from: ${templatePath}`)
-                // ux.log(`Attempting to apply template from: ${templatePath}`)
-                await apply_1.default.run([
+                const templatePath = path.join(directusDir, 'template');
+                ux.stdout(`Attempting to apply template from: ${templatePath}`);
+                await ApplyCommand.run([
                     '--directusUrl=http://localhost:8055',
                     '-p',
                     '--userEmail=admin@example.com',
                     '--userPassword=d1r3ctu5',
-                    '--templateLocation=' + templatePath,
+                    `--templateLocation=${templatePath}`,
                 ]);
-                // s.stop('Template applied!')
             }
             catch (error) {
-                core_1.ux.error('Failed to start Directus containers or apply template');
+                ux.error('Failed to start Directus containers or apply template');
                 throw error;
             }
         }
-        // Install dependencies for frontend if it exists
-        if (flags.installDeps && node_fs_1.default.existsSync(frontendDir)) {
-            const s = (0, prompts_1.spinner)();
+        // Install dependencies if requested
+        if (flags.installDeps) {
+            const s = spinner();
             s.start('Installing dependencies');
-            // ux.action.start('Installing dependencies')
             try {
-                const packageManager = await (0, nypm_1.detectPackageManager)(frontendDir);
-                await (0, nypm_1.installDependencies)({
-                    cwd: frontendDir,
-                    packageManager,
-                    silent: true,
-                });
+                if (fs.existsSync(frontendDir)) {
+                    packageManager = await detectPackageManager(frontendDir);
+                    await installDependencies({
+                        cwd: frontendDir,
+                        packageManager,
+                        silent: true,
+                    });
+                }
             }
             catch (error) {
-                core_1.ux.warn('Failed to install dependencies');
+                ux.warn('Failed to install dependencies');
                 throw error;
             }
-            // ux.action.stop()
             s.stop('Dependencies installed!');
         }
         // Initialize Git repo
         if (flags.gitInit) {
-            const s = (0, prompts_1.spinner)();
+            const s = spinner();
             s.start('Initializing git repository');
-            // ux.action.start('Initializing git repository')
             await initGit(dir);
-            // ux.action.stop()
             s.stop('Git repository initialized!');
         }
         // Finishing up
-        const relativeDir = node_path_1.default.relative(process.cwd(), dir);
-        const nextSteps = `- Directus is running on http://localhost:8055 \n- Navigate to your project directory using ${chalk_1.default.cyan(`cd ${relativeDir}`)} and start developing! \n- Review the \`./README.md\` file for next steps.`;
-        (0, prompts_1.note)(nextSteps, 'Next Steps');
-        // ux.log('You\'ll find the following directories in your project:')
-        // ux.log('• directus')
-        // ux.log(`• ${flags.frontend}`)
-        (0, prompts_1.outro)(`Problems? Join the community on Discord at ${chalk_1.default.underline(chalk_1.default.cyan('https://directus.chat'))}`);
+        const relativeDir = path.relative(process.cwd(), dir);
+        const directusText = `- Directus is running on ${directusInfo.url ?? 'http://localhost:8055'}. You can login with the email: ${chalk.cyan(directusInfo.email)} and password: ${chalk.cyan(directusInfo.password)}. \n`;
+        const frontendText = flags.frontend ? `- To start the frontend, run ${chalk.cyan(`cd ${flags.frontend}`)} and then ${chalk.cyan(`${packageManager?.name} run dev`)}. \n` : '';
+        const projectText = `- Navigate to your project directory using ${chalk.cyan(`cd ${relativeDir}`)}. \n`;
+        const readmeText = '- Review the \`./README.md\` file for more information and next steps.';
+        const nextSteps = chalk.white(`${directusText}${projectText}${frontendText}${readmeText}`);
+        note(nextSteps, 'Next Steps');
+        outro(`Problems or questions? Hop into the community on Discord at ${chalk.underline(chalk.cyan('https://directus.chat'))}`);
     }
     catch (error) {
-        (0, catch_error_1.default)(error, {
+        catchError(error, {
             context: { dir, flags, function: 'init' },
             fatal: true,
             logToFile: true,
@@ -140,11 +164,10 @@ async function init(dir, flags) {
     }
     return {
         directusDir,
-        frontendDir,
+        frontendDir: flags.frontend ? path.join(dir, flags.frontend) : undefined,
         template,
     };
 }
-exports.init = init;
 /**
  * Initialize a git repository
  * @param targetDir - The directory to initialize the git repository in
@@ -152,13 +175,10 @@ exports.init = init;
  */
 async function initGit(targetDir) {
     try {
-        // ux.action.start('Initializing git repository')
-        const { execa } = await Promise.resolve().then(() => tslib_1.__importStar(require('execa')));
         await execa('git', ['init'], { cwd: targetDir });
-        // ux.action.stop()
     }
     catch (error) {
-        (0, catch_error_1.default)(error, {
+        catchError(error, {
             context: { function: 'initGit', targetDir },
             fatal: false,
             logToFile: true,

package/dist/lib/init/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/lib/load/apply-flags.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateInteractiveFlags = exports.validateProgrammaticFlags = exports.loadFlags = void 0;
-const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
-exports.loadFlags = [
+import { ux } from '@oclif/core';
+import catchError from '../utils/catch-error.js';
+export const loadFlags = [
     'content',
     'dashboards',
     'extensions',
@@ -15,53 +11,51 @@ exports.loadFlags = [
     'settings',
     'users',
 ];
-function validateProgrammaticFlags(flags) {
+export function validateProgrammaticFlags(flags) {
     const { directusToken, directusUrl, templateLocation, userEmail, userPassword } = flags;
     if (!directusUrl)
-        core_1.ux.error('Directus URL is required for programmatic mode.');
+        ux.error('Directus URL is required for programmatic mode.');
     if (!directusToken && (!userEmail || !userPassword))
-        core_1.ux.error('Either Directus token or email and password are required for programmatic mode.');
+        ux.error('Either Directus token or email and password are required for programmatic mode.');
     if (!templateLocation)
-        core_1.ux.error('Template location is required for programmatic mode.');
+        ux.error('Template location is required for programmatic mode.');
     return flags.partial ? handlePartialFlags(flags) : setAllFlagsTrue(flags);
 }
-exports.validateProgrammaticFlags = validateProgrammaticFlags;
-function validateInteractiveFlags(flags) {
+export function validateInteractiveFlags(flags) {
     return flags.partial ? handlePartialFlags(flags) : setAllFlagsTrue(flags);
 }
-exports.validateInteractiveFlags = validateInteractiveFlags;
 function handlePartialFlags(flags) {
-    const enabledFlags = exports.loadFlags.filter(flag => flags[flag] === true);
-    const disabledFlags = exports.loadFlags.filter(flag => flags[flag] === false);
+    const enabledFlags = loadFlags.filter(flag => flags[flag] === true);
+    const disabledFlags = loadFlags.filter(flag => flags[flag] === false);
     if (enabledFlags.length > 0) {
-        for (const flag of exports.loadFlags)
+        for (const flag of loadFlags)
             flags[flag] = enabledFlags.includes(flag);
     }
     else if (disabledFlags.length > 0) {
-        for (const flag of exports.loadFlags)
+        for (const flag of loadFlags)
             flags[flag] = !disabledFlags.includes(flag);
     }
     else {
         setAllFlagsTrue(flags);
     }
     handleDependencies(flags);
-    if (!exports.loadFlags.some(flag => flags[flag])) {
-        (0, catch_error_1.default)(new Error('When using --partial, at least one component must be loaded.'), { fatal: true });
+    if (!loadFlags.some(flag => flags[flag])) {
+        catchError(new Error('When using --partial, at least one component must be loaded.'), { fatal: true });
     }
     return flags;
 }
 function handleDependencies(flags) {
     if (flags.content && (!flags.schema || !flags.files)) {
         flags.schema = flags.files = true;
-        core_1.ux.warn('Content loading requires schema and files. Enabling schema and files flags.');
+        ux.warn('Content loading requires schema and files. Enabling schema and files flags.');
     }
     if (flags.users && !flags.permissions) {
         flags.permissions = true;
-        core_1.ux.warn('User loading requires permissions. Enabling permissions flag.');
+        ux.warn('User loading requires permissions. Enabling permissions flag.');
     }
 }
 function setAllFlagsTrue(flags) {
-    for (const flag of exports.loadFlags)
+    for (const flag of loadFlags)
         flags[flag] = true;
     return flags;
 }

package/dist/lib/load/index.d.ts

@@ -1,13 +1,2 @@
-interface ApplyFlags {
-    content: boolean;
-    dashboards: boolean;
-    extensions: boolean;
-    files: boolean;
-    flows: boolean;
-    permissions: boolean;
-    schema: boolean;
-    settings: boolean;
-    users: boolean;
-}
+import type { ApplyFlags } from './apply-flags.js';
 export default function apply(dir: string, flags: ApplyFlags): Promise<{}>;
-export {};

package/dist/lib/load/index.js

@@ -1,68 +1,64 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const check_template_1 = tslib_1.__importDefault(require("../utils/check-template"));
-const load_access_1 = tslib_1.__importDefault(require("./load-access"));
-const load_collections_1 = tslib_1.__importDefault(require("./load-collections"));
-const load_dashboards_1 = tslib_1.__importDefault(require("./load-dashboards"));
-const load_data_1 = tslib_1.__importDefault(require("./load-data"));
-const load_extensions_1 = tslib_1.__importDefault(require("./load-extensions"));
-const load_files_1 = tslib_1.__importDefault(require("./load-files"));
-const load_flows_1 = tslib_1.__importDefault(require("./load-flows"));
-const load_folders_1 = tslib_1.__importDefault(require("./load-folders"));
-const load_permissions_1 = tslib_1.__importDefault(require("./load-permissions"));
-const load_policies_1 = tslib_1.__importDefault(require("./load-policies"));
-const load_presets_1 = tslib_1.__importDefault(require("./load-presets"));
-const load_relations_1 = tslib_1.__importDefault(require("./load-relations"));
-const load_roles_1 = tslib_1.__importDefault(require("./load-roles"));
-const load_settings_1 = tslib_1.__importDefault(require("./load-settings"));
-const load_translations_1 = tslib_1.__importDefault(require("./load-translations"));
-const load_users_1 = tslib_1.__importDefault(require("./load-users"));
-const update_required_fields_1 = tslib_1.__importDefault(require("./update-required-fields"));
-async function apply(dir, flags) {
-    const source = dir + '/src';
-    const isTemplateOk = await (0, check_template_1.default)(source);
+import { ux } from '@oclif/core';
+import checkTemplate from '../utils/check-template.js';
+import loadAccess from './load-access.js';
+import loadCollections from './load-collections.js';
+import loadDashboards from './load-dashboards.js';
+import loadData from './load-data.js';
+import loadExtensions from './load-extensions.js';
+import loadFiles from './load-files.js';
+import loadFlows from './load-flows.js';
+import loadFolders from './load-folders.js';
+import loadPermissions from './load-permissions.js';
+import loadPolicies from './load-policies.js';
+import loadPresets from './load-presets.js';
+import loadRelations from './load-relations.js';
+import loadRoles from './load-roles.js';
+import loadSettings from './load-settings.js';
+import loadTranslations from './load-translations.js';
+import loadUsers from './load-users.js';
+import updateRequiredFields from './update-required-fields.js';
+export default async function apply(dir, flags) {
+    const source = `${dir}/src`;
+    const isTemplateOk = await checkTemplate(source);
     if (!isTemplateOk) {
-        core_1.ux.error('The template is missing the collections, fields, or relations files. Older templates are not supported in v0.4 of directus-template-cli. Try using v0.3 to load older templates npx directus-template-cli@0.3 apply or extract the template using latest version before applying. Exiting...');
+        ux.error('The template is missing the collections, fields, or relations files. Older templates are not supported in v0.4 of directus-template-cli. Try using v0.3 to load older templates npx directus-template-cli@0.3 apply or extract the template using latest version before applying. Exiting...');
     }
     if (flags.schema) {
-        await (0, load_collections_1.default)(source);
-        await (0, load_relations_1.default)(source);
+        await loadCollections(source);
+        await loadRelations(source);
     }
     if (flags.permissions || flags.users) {
-        await (0, load_roles_1.default)(source);
-        await (0, load_policies_1.default)(source);
-        await (0, load_permissions_1.default)(source);
+        await loadRoles(source);
+        await loadPolicies(source);
+        await loadPermissions(source);
         if (flags.users) {
-            await (0, load_users_1.default)(source);
+            await loadUsers(source);
         }
-        await (0, load_access_1.default)(source);
+        await loadAccess(source);
     }
     if (flags.files) {
-        await (0, load_folders_1.default)(source);
-        await (0, load_files_1.default)(source);
+        await loadFolders(source);
+        await loadFiles(source);
     }
     if (flags.content) {
-        await (0, load_data_1.default)(source);
+        await loadData(source);
     }
     if (flags.schema) {
-        await (0, update_required_fields_1.default)(source);
+        await updateRequiredFields(source);
     }
     if (flags.dashboards) {
-        await (0, load_dashboards_1.default)(source);
+        await loadDashboards(source);
     }
     if (flags.flows) {
-        await (0, load_flows_1.default)(source);
+        await loadFlows(source);
     }
     if (flags.settings) {
-        await (0, load_settings_1.default)(source);
-        await (0, load_translations_1.default)(source);
-        await (0, load_presets_1.default)(source);
+        await loadSettings(source);
+        await loadTranslations(source);
+        await loadPresets(source);
     }
     if (flags.extensions) {
-        await (0, load_extensions_1.default)(source);
+        await loadExtensions(source);
     }
     return {};
 }
-exports.default = apply;

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

@@ -1,25 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const constants_1 = require("../constants");
-const sdk_1 = require("../sdk");
-const catch_error_1 = tslib_1.__importDefault(require("../utils/catch-error"));
-const 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 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`));
+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 loadAccess(dir) {
+    const access = readFile('access', dir);
+    ux.action.start(ux.colorize(DIRECTUS_PINK, `Loading ${access.length} accesses`));
     if (access && access.length > 0) {
         // Fetch existing accesses
-        const existingAccesses = await sdk_1.api.client.request(() => ({
+        const existingAccesses = await api.client.request(() => ({
             method: 'GET',
             params: {
                 limit: -1,
             },
             path: '/access',
         }));
-        const { legacyAdminRoleId, newAdminRoleId } = await (0, get_role_ids_1.default)(dir);
+        const { legacyAdminRoleId, newAdminRoleId } = await getRoleIds(dir);
         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) {
@@ -39,7 +36,7 @@ async function loadAccess(dir) {
                 if (acc.role === legacyAdminRoleId) {
                     acc.role = newAdminRoleId;
                 }
-                await sdk_1.api.client.request(() => ({
+                await api.client.request(() => ({
                     body: JSON.stringify(acc),
                     method: 'POST',
                     path: '/access',
@@ -49,7 +46,7 @@ async function loadAccess(dir) {
                 existingAccessByCompositeKey.set(compositeKey, acc);
             }
             catch (error) {
-                (0, catch_error_1.default)(error, {
+                catchError(error, {
                     context: {
                         access: acc,
                         operation: 'createAccess',
@@ -58,11 +55,9 @@ async function loadAccess(dir) {
             }
         }
     }
-    core_1.ux.action.stop();
+    ux.action.stop();
 }
-exports.default = loadAccess;
 // Helper function to generate a composite key for each access
 function getCompositeKey(acc) {
-    var _a, _b;
-    return `${(_a = acc.role) !== null && _a !== void 0 ? _a : 'null'}-${(_b = acc.user) !== null && _b !== void 0 ? _b : 'null'}-${acc.policy}`;
+    return `${acc.role ?? 'null'}-${acc.user ?? 'null'}-${acc.policy}`;
 }