alexis-cli 1.0.2 → 1.0.4

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/commands/make-crud.js

@@ -1,6 +1,18 @@
 const fs = require('fs');
 const path = require('path');
 
+const projectRoot = process.cwd();
+const srcDir = path.join(projectRoot, 'src');
+
+const writeIfNotExists = (filePath, content) => {
+    if (fs.existsSync(filePath)) {
+        console.log(`↩️ Skipped ${path.basename(filePath)} (already exists)`);
+        return;
+    }
+    fs.writeFileSync(filePath, content + '\n');
+    console.log(`➕ Created ${path.basename(filePath)}`);
+};
+
 module.exports = (entityName) => {
     if (!entityName) {
         console.error('❌ Usage: alexis make crud <Entity>');
@@ -11,36 +23,35 @@ module.exports = (entityName) => {
     const EntityName =
         entityName.charAt(0).toUpperCase() + entityName.slice(1);
 
-    // 🔎 Vérifier l'Entity
-    const entityPath = path.join(
-        __dirname,
-        '../../src/entities',
-        `${EntityName}.entity.js`
-    );
+    /* ======================
+       ENTITY CHECK
+    ====================== */
+
+    const entityPath = path.join(srcDir, 'entities', `${EntityName}.entity.js`);
 
     if (!fs.existsSync(entityPath)) {
         console.error(`❌ Entity "${EntityName}" not found`);
         process.exit(1);
     }
 
-    // 📁 Module
-    const moduleDir = path.join(
-        __dirname,
-        '../../src/modules/v1',
-        moduleName
-    );
+    /* ======================
+       MODULE DIR
+    ====================== */
 
-    if (fs.existsSync(moduleDir)) {
-        console.error(`❌ Module "${moduleName}" already exists`);
-        process.exit(1);
-    }
+    const moduleDir = path.join(srcDir, 'modules/v1', moduleName);
 
-    fs.mkdirSync(moduleDir, { recursive: true });
+    if (!fs.existsSync(moduleDir)) {
+        fs.mkdirSync(moduleDir, { recursive: true });
+        console.log(`📁 Module "${moduleName}" created`);
+    } else {
+        console.log(`📁 Module "${moduleName}" already exists → completing`);
+    }
 
     /* ======================
        SERVICE
     ====================== */
-    fs.writeFileSync(
+
+    writeIfNotExists(
         path.join(moduleDir, `${moduleName}.service.js`),
         `
 const AppDataSource = require('../../../config/orm');
@@ -62,13 +73,14 @@ exports.update = async (id, data) => {
 
 exports.remove = (id) =>
   repo().delete(id);
-`.trim() + '\n'
+`.trim()
     );
 
     /* ======================
        CONTROLLER
     ====================== */
-    fs.writeFileSync(
+
+    writeIfNotExists(
         path.join(moduleDir, `${moduleName}.controller.js`),
         `
 const service = require('./${moduleName}.service');
@@ -113,13 +125,14 @@ exports.remove = async (req, res, next) => {
     next(e);
   }
 };
-`.trim() + '\n'
+`.trim()
     );
 
     /* ======================
        ROUTES + SWAGGER
     ====================== */
-    fs.writeFileSync(
+
+    writeIfNotExists(
         path.join(moduleDir, `${moduleName}.routes.js`),
         `
 /**
@@ -133,126 +146,31 @@ const express = require('express');
 const router = express.Router();
 const controller = require('./${moduleName}.controller');
 
-/**
- * @swagger
- * /${moduleName}:
- *   get:
- *     summary: Get all ${EntityName}
- *     tags: [${EntityName}]
- *     security:
- *       - bearerAuth: []
- *     responses:
- *       200:
- *         description: List of ${EntityName}
- */
 router.get('/', controller.findAll);
-
-/**
- * @swagger
- * /${moduleName}/{id}:
- *   get:
- *     summary: Get a ${EntityName} by id
- *     tags: [${EntityName}]
- *     security:
- *       - bearerAuth: []
- *     parameters:
- *       - in: path
- *         name: id
- *         required: true
- *         schema:
- *           type: integer
- *     responses:
- *       200:
- *         description: ${EntityName} found
- *       404:
- *         description: ${EntityName} not found
- */
 router.get('/:id', controller.findOne);
-
-/**
- * @swagger
- * /${moduleName}:
- *   post:
- *     summary: Create a ${EntityName}
- *     tags: [${EntityName}]
- *     security:
- *       - bearerAuth: []
- *     requestBody:
- *       required: true
- *       content:
- *         application/json:
- *           schema:
- *             type: object
- *     responses:
- *       201:
- *         description: ${EntityName} created
- */
 router.post('/', controller.create);
-
-/**
- * @swagger
- * /${moduleName}/{id}:
- *   put:
- *     summary: Update a ${EntityName}
- *     tags: [${EntityName}]
- *     security:
- *       - bearerAuth: []
- *     parameters:
- *       - in: path
- *         name: id
- *         required: true
- *         schema:
- *           type: integer
- *     requestBody:
- *       required: true
- *       content:
- *         application/json:
- *           schema:
- *             type: object
- *     responses:
- *       200:
- *         description: ${EntityName} updated
- */
 router.put('/:id', controller.update);
-
-/**
- * @swagger
- * /${moduleName}/{id}:
- *   delete:
- *     summary: Delete a ${EntityName}
- *     tags: [${EntityName}]
- *     security:
- *       - bearerAuth: []
- *     parameters:
- *       - in: path
- *         name: id
- *         required: true
- *         schema:
- *           type: integer
- *     responses:
- *       204:
- *         description: ${EntityName} deleted
- */
 router.delete('/:id', controller.remove);
 
 module.exports = router;
-`.trim() + '\n'
+`.trim()
     );
 
-    console.log(`✅ CRUD module "${moduleName}" created`);
-
     /* ======================
        AUTO-REGISTER ROUTE
     ====================== */
-    const routesIndexPath = path.join(
-        __dirname,
-        '../../src/routes/v1/index.js'
-    );
+
+    const routesIndexPath = path.join(srcDir, 'routes/v1/index.js');
+
+    if (!fs.existsSync(routesIndexPath)) {
+        console.warn('⚠️ routes/v1/index.js not found, skipping route registration');
+        return;
+    }
 
     let index = fs.readFileSync(routesIndexPath, 'utf8');
 
     const importLine =
-        `const ${moduleName}Routes = require('../../../src/modules/v1/${moduleName}/${moduleName}.routes');`;
+        `const ${moduleName}Routes = require('../../modules/v1/${moduleName}/${moduleName}.routes');`;
     const routeLine =
         `router.use('/${moduleName}', ${moduleName}Routes);`;
 
@@ -273,4 +191,5 @@ module.exports = router;
     fs.writeFileSync(routesIndexPath, index);
 
     console.log(`🔗 Route "/${moduleName}" registered`);
+    console.log(`✅ CRUD ready for "${EntityName}"`);
 };

package/commands/make-entity.js

@@ -2,6 +2,8 @@ const fs = require('fs');
 const path = require('path');
 const readline = require('readline');
 const entityTypes = require('../bin/cli/entity-types');
+const projectRoot = process.cwd();
+const srcDir = path.join(projectRoot, 'src');
 
 module.exports = async (name) => {
     if (!name) {
@@ -12,7 +14,7 @@ module.exports = async (name) => {
     const entityName = name.charAt(0).toUpperCase() + name.slice(1);
     const tableName = name.toLowerCase() + 's';
 
-    const entityDir = path.join(__dirname, '../../src/entities');
+    const entityDir = path.join(srcDir, 'entities');
     const entityPath = path.join(entityDir, `${entityName}.entity.js`);
 
     if (!fs.existsSync(entityDir)) {

package/commands/make-migration.js

@@ -6,8 +6,31 @@ module.exports = (name) => {
         process.exit(1);
     }
 
-    execSync(
-        `npx typeorm migration:generate src/migrations/${name} -d src/config/orm.js --outputJs`,
-        { stdio: 'inherit' }
-    );
+    console.log(`📦 Generating migration "${name}"...`);
+
+    try {
+        execSync(
+            `npx typeorm migration:generate src/migrations/${name} -d src/config/orm.js --outputJs`,
+            { stdio: 'inherit' }
+        );
+
+        console.log('✅ Migration generated from schema changes');
+    } catch (error) {
+        const message = error?.message || '';
+
+        if (message.includes('No changes in database schema were found')) {
+            console.warn('⚠️ No schema changes detected');
+            console.log('➡️ Creating empty migration instead');
+
+            execSync(
+                `npx typeorm migration:create src/migrations/${name}`,
+                { stdio: 'inherit' }
+            );
+
+            console.log('✅ Empty migration created');
+        } else {
+            console.error('❌ Migration generation failed');
+            process.exit(1);
+        }
+    }
 };

package/commands/make-module.js

@@ -1,5 +1,7 @@
 const fs = require('fs');
 const path = require('path');
+const projectRoot = process.cwd();
+const srcDir = path.join(projectRoot, 'src');
 
 module.exports = (moduleName) => {
     if (!moduleName) {
@@ -10,10 +12,10 @@ module.exports = (moduleName) => {
     const entityName =
         moduleName.charAt(0).toUpperCase() + moduleName.slice(1);
 
-    // 🔎 Vérifier que l'Entity existe
+    // Vérifier que l'Entity existe
     const entityPath = path.join(
-        __dirname,
-        '../../src/entities',
+        srcDir,
+        'entities',
         `${entityName}.entity.js`
     );
 
@@ -24,10 +26,10 @@ module.exports = (moduleName) => {
         process.exit(1);
     }
 
-    // 📁 Création du module
+    // Création du module
     const basePath = path.join(
-        __dirname,
-        '../../src/modules/v1',
+        srcDir,
+        'modules/v1',
         moduleName
     );
 
@@ -138,10 +140,10 @@ module.exports = router;
 
     console.log(`✅ Module v1 "${moduleName}" created and linked to entity "${entityName}"`);
 
-    // 🔗 Auto-register route
+    // Auto-register route
     const routesIndexPath = path.join(
-        __dirname,
-        '../../src/routes/v1/index.js'
+        srcDir,
+        'routes/v1/index.js'
     );
 
     if (!fs.existsSync(routesIndexPath)) {
@@ -151,7 +153,8 @@ module.exports = router;
 
     let indexContent = fs.readFileSync(routesIndexPath, 'utf8');
 
-    const importLine = `const ${moduleName}Routes = require('../../../src/modules/v1/${moduleName}/${moduleName}.routes');`;
+    const importLine =
+        `const ${moduleName}Routes = require('../../modules/v1/${moduleName}/${moduleName}.routes');`;
     const routeLine = `router.use('/${moduleName}', ${moduleName}Routes);`;
 
     if (!indexContent.includes(importLine)) {

package/commands/make-swagger.js

@@ -123,7 +123,7 @@ const buildExampleFromEntity = (entity) => {
 ====================================================== */
 
 module.exports = () => {
-    const projectRoot = path.join(__dirname, '../..');
+    const projectRoot = process.cwd();
     const srcDir = path.join(projectRoot, 'src');
     const swaggerDir = path.join(srcDir, 'swagger');
 
@@ -155,6 +155,17 @@ module.exports = () => {
     /* ========= ENTITIES → SCHEMAS ========= */
 
     const entitiesDir = path.join(srcDir, 'entities');
+    if (!fs.existsSync(entitiesDir)) {
+        console.warn('⚠️ No entities directory found, skipping Swagger generation');
+        return;
+    }
+
+    const modulesDir = path.join(srcDir, 'modules/v1');
+    if (!fs.existsSync(modulesDir)) {
+        console.warn('⚠️ No modules directory found, skipping Swagger generation');
+        return;
+    }
+
 
     fs.readdirSync(entitiesDir).forEach((file) => {
         if (!file.endsWith('.entity.js')) return;
@@ -245,44 +256,11 @@ module.exports = () => {
     };
     generateAuthSwagger(swagger);
 
-    const modulesDir = path.join(srcDir, 'modules/v1');
-
     fs.readdirSync(modulesDir).forEach((moduleName) => {
         if (moduleName === 'auth') return;
         const modulePath = path.join(modulesDir, moduleName);
         if (!fs.statSync(modulePath).isDirectory()) return;
 
-        /* ----- AUTH ----- */
-        if (moduleName === 'auth') {
-            swagger.paths['/auth/register'] = {
-                post: {
-                    tags: ['Auth'],
-                    summary: 'Register',
-                    description: 'Create a new user account',
-                    requestBody: {
-                        required: true,
-                        content: {
-                            'application/json': {
-                                schema: {
-                                    type: 'object',
-                                    properties: {
-                                        email: { type: 'string' },
-                                        password: { type: 'string' }
-                                    }
-                                },
-                                example: {
-                                    email: 'user@example.com',
-                                    password: 'password123'
-                                }
-                            }
-                        }
-                    },
-                    responses: { 201: { description: 'User created' } }
-                }
-            };
-            return;
-        }
-
         /* ----- CRUD ----- */
 
         const entityName =

package/commands/migrate.js

@@ -1,15 +1,33 @@
 const { execSync } = require('child_process');
 
 exports.run = () => {
-    execSync(
-        `npx typeorm migration:run -d src/config/orm.js`,
-        { stdio: 'inherit' }
-    );
+    console.log('🚀 Running database migrations...');
+
+    try {
+        execSync(
+            `npx typeorm migration:run -d src/config/orm.js`,
+            { stdio: 'inherit' }
+        );
+
+        console.log('✅ Migrations executed successfully');
+    } catch (error) {
+        console.error('❌ Migration failed');
+        process.exit(1);
+    }
 };
 
 exports.rollback = () => {
-    execSync(
-        `npx typeorm migration:revert -d src/config/orm.js`,
-        { stdio: 'inherit' }
-    );
+    console.log('⏪ Reverting last migration...');
+
+    try {
+        execSync(
+            `npx typeorm migration:revert -d src/config/orm.js`,
+            { stdio: 'inherit' }
+        );
+
+        console.log('✅ Migration reverted successfully');
+    } catch (error) {
+        console.error('❌ Rollback failed');
+        process.exit(1);
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alexis-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "main": "index.js",
   "bin": {
     "alexis": "bin/alexis.js"