directus-template-cli 0.7.0-beta.1 → 0.7.0-beta.2

package/dist/commands/init.d.ts

@@ -24,6 +24,7 @@ export default class InitCommand extends Command {
     /**
      * Interactive mode: prompts the user for each piece of info, with added template checks.
      * @param flags - The flags passed to the command.
+     * @param args - The arguments passed to the command.
      * @returns void
      */
     private runInteractive;

package/dist/commands/init.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const prompts_1 = require("@clack/prompts");
 const core_1 = require("@oclif/core");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const constants_1 = require("../lib/constants");
 const init_1 = require("../lib/init");
+const animated_bunny_1 = require("../lib/utils/animated-bunny");
 const github_1 = require("../services/github");
 class InitCommand extends core_1.Command {
     constructor() {
@@ -18,37 +21,44 @@ class InitCommand extends core_1.Command {
     async run() {
         const { args, flags } = await this.parse(InitCommand);
         const typedFlags = flags;
+        const typedArgs = args;
         // Set the target directory and create it if it doesn't exist
         this.targetDir = node_path_1.default.resolve(args.directory);
         // if (!fs.existsSync(this.targetDir)) {
         //   fs.mkdirSync(this.targetDir, {recursive: true})
         // }
-        await (typedFlags.programmatic ? this.runProgrammatic(typedFlags) : this.runInteractive(typedFlags));
+        await (typedFlags.programmatic ? this.runProgrammatic(typedFlags) : this.runInteractive(typedFlags, typedArgs));
     }
     /**
      * Interactive mode: prompts the user for each piece of info, with added template checks.
      * @param flags - The flags passed to the command.
+     * @param args - The arguments passed to the command.
      * @returns void
      */
-    async runInteractive(flags) {
-        core_1.ux.styledHeader('Directus Template CLI - Init');
+    async runInteractive(flags, args) {
+        await (0, animated_bunny_1.animatedBunny)('Let\'s create a new Directus project!');
+        (0, prompts_1.intro)(`${chalk_1.default.bgHex(constants_1.DIRECTUS_PURPLE).white.bold('Directus Template CLI 🐰')} - Create Project`);
         // Create GitHub service
         const github = (0, github_1.createGitHub)();
+        // If no dir is provided, ask for it
+        if (!args.directory || args.directory === '.') {
+            this.targetDir = await (0, prompts_1.text)({
+                message: 'Enter the directory to create the project in:',
+                placeholder: './my-directus-project',
+            }).then(ans => ans);
+        }
         // 1. Fetch available templates
         const availableTemplates = await github.getTemplates();
         // 2. Prompt for template if not provided
         let { template } = flags;
         if (!template) {
-            template = await inquirer_1.default
-                .prompt([
-                {
-                    choices: availableTemplates,
-                    message: 'Which Directus starters template would you like to use?',
-                    name: 'template',
-                    type: 'list',
-                },
-            ])
-                .then(ans => ans.template);
+            template = await (0, prompts_1.select)({
+                message: 'Which Directus backend template would you like to use?',
+                options: availableTemplates.map(template => ({
+                    label: template,
+                    value: template,
+                })),
+            }).then(ans => ans);
         }
         // 3. Validate that the template exists, fetch subdirectories
         let directories = await github.getTemplateDirectories(template);
@@ -66,55 +76,30 @@ class InitCommand extends core_1.Command {
         // 4. If user hasn't specified a valid flags.frontend, ask from the list
         let chosenFrontend = flags.frontend;
         if (!chosenFrontend || !potentialFrontends.includes(chosenFrontend)) {
-            chosenFrontend = await inquirer_1.default
-                .prompt([
-                {
-                    choices: potentialFrontends,
-                    message: 'Which frontend framework do you want to use?',
-                    name: 'chosenFrontend',
-                    type: 'list',
-                },
-            ])
-                .then(ans => ans.chosenFrontend);
+            chosenFrontend = await (0, prompts_1.select)({
+                message: 'Which frontend framework do you want to use?',
+                options: potentialFrontends.map(frontend => ({
+                    label: frontend,
+                    value: frontend,
+                })),
+            }).then(ans => ans);
         }
         flags.frontend = chosenFrontend;
-        // 5. Continue with the rest of the interactive flow:
-        // if (!this.checkDockerInstalled()) {
-        //   const {installDocker} = await inquirer.prompt<{ installDocker: boolean }>([
-        //     {
-        //       default: false,
-        //       message: 'Docker is not installed. Do you want to install Docker?',
-        //       name: 'installDocker',
-        //       type: 'confirm',
-        //     },
-        //   ])
-        //   if (installDocker) {
-        //     ux.log('Please follow Docker\'s official instructions to install Docker, then re-run the init command.')
-        //     this.exit(0)
-        //   }
-        // }
-        const { installDeps } = await inquirer_1.default.prompt([
-            {
-                default: true,
-                message: 'Would you like to install project dependencies automatically?',
-                name: 'installDeps',
-                type: 'confirm',
-            },
-        ]);
-        const { initGit } = await inquirer_1.default.prompt([
-            {
-                default: true,
-                message: 'Initialize a new Git repository?',
-                name: 'initGit',
-                type: 'confirm',
-            },
-        ]);
+        const installDeps = await (0, prompts_1.confirm)({
+            initialValue: true,
+            message: 'Would you like to install project dependencies automatically?',
+        }).then(ans => ans);
+        const initGit = await (0, prompts_1.confirm)({
+            initialValue: true,
+            message: 'Initialize a new Git repository?',
+        }).then(ans => ans);
         await (0, init_1.init)(this.targetDir, {
             frontend: chosenFrontend,
             gitInit: initGit,
             installDeps,
             template,
         });
+        core_1.ux.exit(0);
     }
     /**
      * Programmatic mode: relies on flags only, with checks for template existence and valid frontend.
@@ -144,6 +129,7 @@ class InitCommand extends core_1.Command {
             installDeps: true,
             template,
         });
+        core_1.ux.exit(0);
     }
 }
 InitCommand.args = {

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

@@ -1,3 +1,4 @@
+import { type DownloadTemplateResult } from 'giget';
 interface InitFlags {
     frontend?: string;
     gitInit?: boolean;
@@ -5,5 +6,9 @@ interface InitFlags {
     overrideDir?: boolean;
     template?: string;
 }
-export declare function init(dir: string, flags: InitFlags): Promise<void>;
+export declare function init(dir: string, flags: InitFlags): Promise<{
+    directusDir: string;
+    frontendDir: string;
+    template: DownloadTemplateResult;
+}>;
 export {};

package/dist/lib/init/index.js

@@ -2,7 +2,9 @@
 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"));
@@ -74,7 +76,9 @@ async function init(dir, flags) {
                 const healthCheckUrl = `${config_1.DIRECTUS_CONFIG.url}:${config_1.DIRECTUS_CONFIG.port}${config_1.DOCKER_CONFIG.healthCheckEndpoint}`;
                 await dockerService.waitForHealthy(healthCheckUrl);
                 const templatePath = node_path_1.default.join(directusDir, 'template');
-                core_1.ux.log(`Attempting to apply template from: ${templatePath}`);
+                // const s = spinner()
+                // s.start(`Attempting to apply template from: ${templatePath}`)
+                // ux.log(`Attempting to apply template from: ${templatePath}`)
                 await apply_1.default.run([
                     '--directusUrl=http://localhost:8055',
                     '-p',
@@ -82,6 +86,7 @@ async function init(dir, flags) {
                     '--userPassword=d1r3ctu5',
                     '--templateLocation=' + templatePath,
                 ]);
+                // s.stop('Template applied!')
             }
             catch (error) {
                 core_1.ux.error('Failed to start Directus containers or apply template');
@@ -90,32 +95,41 @@ async function init(dir, flags) {
         }
         // Install dependencies for frontend if it exists
         if (flags.installDeps && node_fs_1.default.existsSync(frontendDir)) {
-            core_1.ux.action.start('Installing dependencies');
+            const s = (0, prompts_1.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,
                 });
             }
             catch (error) {
                 core_1.ux.warn('Failed to install dependencies');
                 throw error;
             }
-            core_1.ux.action.stop();
+            // ux.action.stop()
+            s.stop('Dependencies installed!');
         }
         // Initialize Git repo
         if (flags.gitInit) {
-            core_1.ux.action.start('Initializing git repository');
+            const s = (0, prompts_1.spinner)();
+            s.start('Initializing git repository');
+            // ux.action.start('Initializing git repository')
             await initGit(dir);
-            core_1.ux.action.stop();
+            // ux.action.stop()
+            s.stop('Git repository initialized!');
         }
         // Finishing up
-        core_1.ux.log(`🚀 Directus initialized with template – ${flags.template}`);
-        core_1.ux.log('You\'ll find the following directories in your project:');
-        core_1.ux.log('• directus');
-        core_1.ux.log(`• ${flags.frontend}`);
-        core_1.ux.exit(0);
+        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'))}`);
     }
     catch (error) {
         (0, catch_error_1.default)(error, {
@@ -124,6 +138,11 @@ async function init(dir, flags) {
             logToFile: true,
         });
     }
+    return {
+        directusDir,
+        frontendDir,
+        template,
+    };
 }
 exports.init = init;
 /**
@@ -133,10 +152,10 @@ exports.init = init;
  */
 async function initGit(targetDir) {
     try {
-        core_1.ux.action.start('Initializing git repository');
+        // ux.action.start('Initializing git repository')
         const { execa } = await Promise.resolve().then(() => tslib_1.__importStar(require('execa')));
         await execa('git', ['init'], { cwd: targetDir });
-        core_1.ux.action.stop();
+        // ux.action.stop()
     }
     catch (error) {
         (0, catch_error_1.default)(error, {

package/dist/lib/utils/animated-bunny.d.ts

@@ -0,0 +1,2 @@
+export declare const RANDOM_SAYINGS: string[];
+export declare function animatedBunny(customMessage?: string): Promise<void>;

package/dist/lib/utils/animated-bunny.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.animatedBunny = exports.RANDOM_SAYINGS = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const log_update_1 = tslib_1.__importDefault(require("log-update"));
+const constants_1 = require("../constants");
+exports.RANDOM_SAYINGS = [
+    'One does not simply write backends...',
+    'I don\'t always test my code, but when I do, I use production.',
+    'A wild Directus appears!',
+    'Error 418: I\'m a teapot. Just kidding, I\'m Directus and I\'ve got your backend covered.',
+    'I\'ll fix it later. Narrator: They didn\'t fix it later.',
+];
+async function animatedBunny(customMessage) {
+    const saying = customMessage || exports.RANDOM_SAYINGS[Math.floor(Math.random() * exports.RANDOM_SAYINGS.length)];
+    let typedSaying = '';
+    let blinkState = true;
+    let charIndex = 0;
+    let isCleanedUp = false;
+    const cleanup = () => {
+        if (isCleanedUp)
+            return;
+        isCleanedUp = true;
+        clearInterval(animation);
+        clearInterval(typing);
+        log_update_1.default.done();
+    };
+    // Ensure cleanup on process exit
+    process.on('exit', cleanup);
+    process.on('SIGINT', () => {
+        cleanup();
+        process.exit(0);
+    });
+    const updateFrame = () => {
+        if (isCleanedUp)
+            return;
+        const eyes = blinkState ? '• •' : '- -';
+        const frame = `
+(\\(\\
+( ${eyes}) ${chalk_1.default.dim('.')}${chalk_1.default.hex(constants_1.DIRECTUS_PINK).visible(`"${typedSaying}"`)}
+o_(")(")
+`;
+        (0, log_update_1.default)(frame);
+    };
+    const animation = setInterval(() => {
+        blinkState = !blinkState;
+        updateFrame();
+    }, 500);
+    const typing = setInterval(() => {
+        if (charIndex < saying.length) {
+            typedSaying += saying[charIndex];
+            charIndex++;
+            updateFrame();
+        }
+        else {
+            clearInterval(typing);
+        }
+    }, 10);
+    try {
+        // Run the animation for the duration of typing plus 1 second
+        await new Promise(resolve => setTimeout(resolve, saying.length * 10 + 1000));
+    }
+    finally {
+        cleanup();
+        // Remove the event listeners
+        process.removeListener('exit', cleanup);
+        process.removeListener('SIGINT', cleanup);
+    }
+}
+exports.animatedBunny = animatedBunny;

package/dist/services/docker.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createDocker = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
+const prompts_1 = require("@clack/prompts");
 const execa_1 = require("execa");
 const catch_error_1 = tslib_1.__importDefault(require("../lib/utils/catch-error"));
 const wait_1 = require("../lib/utils/wait");
@@ -43,12 +43,14 @@ async function checkDocker() {
  */
 function startContainers(cwd) {
     try {
-        core_1.ux.action.start('Starting Docker containers');
+        // ux.action.start('Starting Docker containers')
+        const s = (0, prompts_1.spinner)();
+        s.start('Starting Docker containers');
         return (0, execa_1.execa)('docker-compose', ['up', '-d'], {
             cwd,
             // stdio: 'inherit',
         }).then(() => {
-            core_1.ux.action.stop();
+            s.stop('Docker containers running!');
         });
     }
     catch (error) {
@@ -88,7 +90,8 @@ function stopContainers(cwd) {
  */
 function createWaitForHealthy(config) {
     async function waitForHealthy(healthCheckUrl) {
-        core_1.ux.action.start('Waiting for service to be healthy');
+        const s = (0, prompts_1.spinner)();
+        s.start('Waiting for Directus to be ready.');
         try {
             await (0, wait_1.waitFor)(async () => {
                 try {
@@ -103,11 +106,11 @@ function createWaitForHealthy(config) {
                 interval: config.interval,
                 maxAttempts: config.maxAttempts,
             });
-            core_1.ux.action.stop();
+            s.stop('Directus is ready!');
             return true;
         }
         catch (error) {
-            core_1.ux.action.stop('failed');
+            s.stop('');
             (0, catch_error_1.default)(error, {
                 context: { function: 'waitForHealthy', url: healthCheckUrl },
                 fatal: true,

package/oclif.manifest.json

@@ -359,5 +359,5 @@
       ]
     }
   },
-  "version": "0.7.0-beta.1"
+  "version": "0.7.0-beta.2"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "directus-template-cli",
-  "version": "0.7.0-beta.1",
+  "version": "0.7.0-beta.2",
   "description": "CLI Utility for applying templates to a Directus instance.",
   "author": "bryantgillespie @bryantgillespie",
   "bin": {
@@ -17,12 +17,14 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
+    "@clack/prompts": "^0.10.0",
     "@directus/sdk": "^17.0.1",
     "@oclif/core": "^3.18.1",
     "@oclif/plugin-help": "^6.0.12",
     "@oclif/plugin-plugins": "^4.1.22",
     "@octokit/rest": "^21.1.1",
     "bottleneck": "^2.19.5",
+    "chalk": "^5.4.1",
     "defu": "^6.1.4",
     "dotenv": "^16.4.1",
     "execa": "^9.5.2",
@@ -30,7 +32,9 @@
     "giget": "^1.2.1",
     "glob": "^11.0.1",
     "inquirer": "^8.2.5",
+    "log-update": "^6.1.0",
     "nypm": "^0.5.2",
+    "picocolors": "^1.1.1",
     "pkg-types": "^1.3.1",
     "slugify": "^1.6.6"
   },