Merge pull request #194 from devforth/create-cli

Create cli

Author: ivictbor

adminforth/commands/createApp/utils.js

@@ -96,29 +96,33 @@ function generateDbUrlForPrisma(connectionString) {
   return connectionString.toString();
 }
 
-function initialChecks() {
+function initialChecks(options) {
   return [
     {
       title: '👀 Checking Node.js version...',
       task: () => checkNodeVersion(20)
     },
     {
       title: '👀 Validating current working directory...',
-      task: () => checkForExistingPackageJson()
+      task: () => checkForExistingPackageJson(options)
     }
   ]
 }
 
-function checkForExistingPackageJson() {
-  if (fs.existsSync(path.join(process.cwd(), 'package.json'))) {
+function checkForExistingPackageJson(options) {
+  const projectDir = path.join(process.cwd(), options.appName);
+  if (fs.existsSync(projectDir)) {
     throw new Error(
-      `A package.json already exists in this directory.\n` +
-      `Please remove it or use an empty directory.`
+      `Directory "${options.appName}" already exists.\n` +
+      `Please remove it or use a different name.`
     );
   }
 }
 
 async function scaffoldProject(ctx, options, cwd) {
+  const projectDir = path.join(cwd, options.appName);
+  await fse.ensureDir(projectDir);
+
   const connectionString = parseConnectionString(options.db);
   const provider = detectDbProvider(connectionString.protocol);
   const prismaDbUrl = generateDbUrlForPrisma(connectionString);
@@ -130,9 +134,9 @@ async function scaffoldProject(ctx, options, cwd) {
   const dirname = path.dirname(filename);
 
   // Prepare directories
-  ctx.customDir = path.join(cwd, 'custom');
+  ctx.customDir = path.join(projectDir, 'custom');
   await fse.ensureDir(ctx.customDir);
-  await fse.ensureDir(path.join(cwd, 'resources'));
+  await fse.ensureDir(path.join(projectDir, 'resources'));
 
   // Copy static assets to `custom/assets`
   const sourceAssetsDir = path.join(dirname, 'assets');
@@ -141,13 +145,14 @@ async function scaffoldProject(ctx, options, cwd) {
   await fse.copy(sourceAssetsDir, targetAssetsDir);
 
   // Write templated files
-  writeTemplateFiles(dirname, cwd, {
+  writeTemplateFiles(dirname, projectDir, {
     dbUrl: connectionString.toString(),
     prismaDbUrl,
     appName,
     provider,
   });
 
+  return projectDir;  // Return the new directory path
 }
 
 async function writeTemplateFiles(dirname, cwd, options) {
@@ -241,9 +246,13 @@ async function installDependencies(ctx, cwd) {
   ]);
 }
 
-function generateFinalInstructions(skipPrismaSetup) {
+function generateFinalInstructions(skipPrismaSetup, options) {
   let instruction = '⏭️  Run the following commands to get started:\n';
   if (!skipPrismaSetup)
+    instruction += `
+  ${chalk.dim('// Go to the project directory')}
+  ${chalk.cyan(`$ cd ${options.appName}`)}\n`;
+
     instruction += `
   ${chalk.dim('// Generate and apply initial migration')}
   ${chalk.cyan('$ npm run makemigration -- --name init')}\n`;
@@ -272,33 +281,35 @@ export function prepareWorkflow(options) {
       title: '🔍 Initial checks...',
       task: (_, task) =>
         task.newListr(
-          initialChecks(),
+          initialChecks(options),
           { concurrent: true },
         )
     },
     {
       title: '🚀 Scaffolding your project...',
-      task: async (ctx) => scaffoldProject(ctx, options, cwd)
+      task: async (ctx) => {
+        ctx.projectDir = await scaffoldProject(ctx, options, cwd);
+      }
     },
     {
       title: '📦 Installing dependencies...',
-      task: async (ctx) => installDependencies(ctx, cwd)
+      task: async (ctx) => installDependencies(ctx, ctx.projectDir)
     },
     {
       title: '📝 Preparing final instructions...',
       task: (ctx) => {
-        console.log(chalk.green(`✅ Successfully created your new Adminforth project!\n`));
-        console.log(generateFinalInstructions(ctx.skipPrismaSetup));
+        console.log(chalk.green(`✅ Successfully created your new Adminforth project in ${ctx.projectDir}!\n`));
+        console.log(generateFinalInstructions(ctx.skipPrismaSetup, options));
         console.log('\n\n');
+      }
     }
-  }],
+  ],
   {
     rendererOptions: {collapseSubtasks: false},
     concurrent: false,
     exitOnError: true,
     collectErrors: true,
-  }
-);
+  });
 
   return tasks;
 }

adminforth/commands/createPlugin/templates/index.ts.hbs

@@ -3,7 +3,7 @@ import type { IAdminForth, IHttpServer, AdminForthResourcePages, AdminForthResou
 import type { PluginOptions } from './types.js';
 
 
-export default class ChatGptPlugin extends AdminForthPlugin {
+export default class {{pluginName}} extends AdminForthPlugin {
   options: PluginOptions;
 
   constructor(options: PluginOptions) {