alexis-cli 1.0.4 → 1.0.5

package/commands/make-swagger.js

@@ -96,7 +96,7 @@ const buildSchemaFromEntity = (entity) => {
     return {
         type: 'object',
         properties,
-        required: required.length ? required : undefined
+        ...(required.length ? { required } : {})
     };
 };
 
@@ -126,6 +126,13 @@ module.exports = () => {
     const projectRoot = process.cwd();
     const srcDir = path.join(projectRoot, 'src');
     const swaggerDir = path.join(srcDir, 'swagger');
+    const entitiesDir = path.join(srcDir, 'entities');
+    const modulesDir = path.join(srcDir, 'modules/v1');
+
+    if (!fs.existsSync(entitiesDir) || !fs.existsSync(modulesDir)) {
+        console.warn('⚠️ Missing entities or modules directory → Swagger skipped');
+        return;
+    }
 
     if (!fs.existsSync(swaggerDir)) {
         fs.mkdirSync(swaggerDir, { recursive: true });
@@ -136,7 +143,7 @@ module.exports = () => {
         info: {
             title: 'Express API',
             version: '1.0.0',
-            description: 'API générée automatiquement'
+            description: 'Swagger généré automatiquement'
         },
         servers: [{ url: 'http://localhost:3000/api/v1' }],
         paths: {},
@@ -152,46 +159,35 @@ 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;
-    }
-
+    /* ======================================================
+       ENTITIES → SCHEMAS
+    ====================================================== */
 
     fs.readdirSync(entitiesDir).forEach((file) => {
         if (!file.endsWith('.entity.js')) return;
 
-        let entity;
         try {
-            entity = require(path.join(entitiesDir, file));
+            const entity = require(path.join(entitiesDir, file));
+            if (entity.options?.swagger === false) return;
+
+            const name = entity.options.name;
+            swagger.components.schemas[name] = buildSchemaFromEntity(entity);
         } catch {
             console.warn(`⚠️ Cannot load entity ${file}`);
-            return;
         }
-
-        if (entity.options?.swagger === false) return;
-
-        const entityName = entity.options.name;
-        swagger.components.schemas[entityName] = buildSchemaFromEntity(entity);
     });
 
-    /* ========= MODULES / ROUTES ========= */
+    /* ======================================================
+       AUTH (only if module exists)
+    ====================================================== */
+
+    const authDir = path.join(modulesDir, 'auth');
 
-    const generateAuthSwagger = (swagger) => {
+    if (fs.existsSync(authDir) && fs.existsSync(path.join(authDir, 'auth.routes.js'))) {
         swagger.paths['/auth/register'] = {
             post: {
                 tags: ['Auth'],
                 summary: 'Register',
-                description: 'Create a new user account',
                 requestBody: {
                     required: true,
                     content: {
@@ -207,10 +203,7 @@ module.exports = () => {
                         }
                     }
                 },
-                responses: {
-                    201: { description: 'User created' },
-                    400: { description: 'User already exists' }
-                }
+                responses: { 201: { description: 'User created' } }
             }
         };
 
@@ -218,7 +211,6 @@ module.exports = () => {
             post: {
                 tags: ['Auth'],
                 summary: 'Login',
-                description: 'Authenticate user and return JWT token',
                 requestBody: {
                     required: true,
                     content: {
@@ -227,17 +219,14 @@ module.exports = () => {
                                 type: 'object',
                                 required: ['email', 'password'],
                                 properties: {
-                                    email: { type: 'string', example: 'user@example.com' },
-                                    password: { type: 'string', example: 'password123' }
+                                    email: { type: 'string' },
+                                    password: { type: 'string' }
                                 }
                             }
                         }
                     }
                 },
-                responses: {
-                    200: { description: 'JWT token returned' },
-                    401: { description: 'Invalid credentials' }
-                }
+                responses: { 200: { description: 'JWT token' } }
             }
         };
 
@@ -245,166 +234,109 @@ module.exports = () => {
             get: {
                 tags: ['Auth'],
                 summary: 'Profile',
-                description: 'Get current authenticated user',
                 security: [{ bearerAuth: [] }],
-                responses: {
-                    200: { description: 'User profile' },
-                    401: { description: 'Unauthorized' }
-                }
+                responses: { 200: { description: 'User profile' } }
             }
         };
-    };
-    generateAuthSwagger(swagger);
+
+        console.log('🔐 Auth Swagger added');
+    } else {
+        console.log('ℹ️ Auth module not found → skipping Auth Swagger');
+    }
+
+    /* ======================================================
+       CRUD MODULES
+    ====================================================== */
 
     fs.readdirSync(modulesDir).forEach((moduleName) => {
         if (moduleName === 'auth') return;
+
         const modulePath = path.join(modulesDir, moduleName);
         if (!fs.statSync(modulePath).isDirectory()) return;
 
-        /* ----- CRUD ----- */
-
         const entityName =
             moduleName.charAt(0).toUpperCase() + moduleName.slice(1);
 
-        const schemaRef = {
-            $ref: `#/components/schemas/${entityName}`
-        };
-
-        const entityPath = path.join(srcDir, 'entities', `${entityName}.entity.js`);
-        const entity = fs.existsSync(entityPath)
-            ? require(entityPath)
-            : null;
+        if (!swagger.components.schemas[entityName]) {
+            console.warn(`⚠️ No schema for ${entityName} → skipping`);
+            return;
+        }
 
-        const exampleBody = entity ? buildExampleFromEntity(entity) : {};
+        const entityPath = path.join(entitiesDir, `${entityName}.entity.js`);
+        const entity = fs.existsSync(entityPath) ? require(entityPath) : null;
 
+        const example = entity ? buildExampleFromEntity(entity) : {};
+        const schemaRef = { $ref: `#/components/schemas/${entityName}` };
 
         const basePath = `/${moduleName}`;
-
-        swagger.paths[basePath] = {
-            get: {
-                tags: [entityName],
-                summary: `List ${entityName}`,
-                description: `Retrieve all ${entityName}`,
-                security: [{ bearerAuth: [] }],
-                responses: {
-                    200: {
-                        description: 'List retrieved',
-                        content: {
-                            'application/json': {
-                                schema: {
-                                    type: 'array',
-                                    items: schemaRef
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-
-            post: {
-                tags: [entityName],
-                summary: `Create ${entityName}`,
-                description: `Create a new ${entityName}`,
-                security: [{ bearerAuth: [] }],
-                requestBody: {
-                    required: true,
+        const idPath = `${basePath}/{id}`;
+
+        swagger.paths[basePath] ??= {};
+        swagger.paths[idPath] ??= {};
+
+        swagger.paths[basePath].get = {
+            tags: [entityName],
+            summary: `List ${entityName}`,
+            security: [{ bearerAuth: [] }],
+            responses: {
+                200: {
+                    description: 'Success',
                     content: {
                         'application/json': {
-                            schema: schemaRef,
-                            example: exampleBody
-                        }
-                    }
-                },
-                responses: {
-                    201: {
-                        description: `${entityName} created`,
-                        content: {
-                            'application/json': {
-                                schema: schemaRef
-                            }
+                            schema: { type: 'array', items: schemaRef }
                         }
                     }
                 }
             }
         };
-        swagger.paths[`${basePath}/{id}`] = {
-            get: {
-                tags: [entityName],
-                summary: `Get ${entityName}`,
-                description: `Retrieve a ${entityName} by ID`,
-                security: [{ bearerAuth: [] }],
-                parameters: [
-                    {
-                        name: 'id',
-                        in: 'path',
-                        required: true,
-                        schema: { type: 'number' }
+
+        swagger.paths[basePath].post = {
+            tags: [entityName],
+            summary: `Create ${entityName}`,
+            security: [{ bearerAuth: [] }],
+            requestBody: {
+                required: true,
+                content: {
+                    'application/json': {
+                        schema: schemaRef,
+                        example
                     }
-                ],
-                responses: {
-                    200: {
-                        description: 'Entity found',
-                        content: {
-                            'application/json': {
-                                schema: schemaRef
-                            }
-                        }
-                    },
-                    404: { description: 'Not found' }
                 }
             },
+            responses: { 201: { description: 'Created' } }
+        };
 
-            put: {
-                tags: [entityName],
-                summary: `Update ${entityName}`,
-                description: `Update an existing ${entityName}`,
-                security: [{ bearerAuth: [] }],
-                parameters: [
-                    {
-                        name: 'id',
-                        in: 'path',
-                        required: true,
-                        schema: { type: 'number' }
-                    }
-                ],
-                requestBody: {
-                    required: true,
-                    content: {
-                        'application/json': {
-                            schema: schemaRef,
-                            example: exampleBody
-                        }
-                    }
-                },
-                responses: {
-                    200: {
-                        description: `${entityName} updated`,
-                        content: {
-                            'application/json': {
-                                schema: schemaRef
-                            }
-                        }
+        swagger.paths[idPath].get = {
+            tags: [entityName],
+            summary: `Get ${entityName}`,
+            security: [{ bearerAuth: [] }],
+            parameters: [{ name: 'id', in: 'path', required: true, schema: { type: 'number' } }],
+            responses: { 200: { description: 'Found' } }
+        };
+
+        swagger.paths[idPath].put = {
+            tags: [entityName],
+            summary: `Update ${entityName}`,
+            security: [{ bearerAuth: [] }],
+            parameters: [{ name: 'id', in: 'path', required: true, schema: { type: 'number' } }],
+            requestBody: {
+                required: true,
+                content: {
+                    'application/json': {
+                        schema: schemaRef,
+                        example
                     }
                 }
             },
+            responses: { 200: { description: 'Updated' } }
+        };
 
-            delete: {
-                tags: [entityName],
-                summary: `Delete ${entityName}`,
-                description: `Delete a ${entityName}`,
-                security: [{ bearerAuth: [] }],
-                parameters: [
-                    {
-                        name: 'id',
-                        in: 'path',
-                        required: true,
-                        schema: { type: 'number' }
-                    }
-                ],
-                responses: {
-                    204: { description: `${entityName} deleted` }
-                }
-            }
+        swagger.paths[idPath].delete = {
+            tags: [entityName],
+            summary: `Delete ${entityName}`,
+            security: [{ bearerAuth: [] }],
+            parameters: [{ name: 'id', in: 'path', required: true, schema: { type: 'number' } }],
+            responses: { 204: { description: 'Deleted' } }
         };
     });
 

package/package.json

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