@diagramers/cli 1.0.57 → 1.0.61

package/dist/services/table-generator.js

@@ -36,63 +36,92 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTable = generateTable;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-async function generateTable(tableName) {
+// Function to convert plural table names to singular for file names
+function pluralToSingular(word) {
+    if (word.endsWith('ies')) {
+        return word.slice(0, -3) + 'y'; // categories -> category
+    }
+    else if (word.endsWith('es')) {
+        return word.slice(0, -2); // boxes -> box
+    }
+    else if (word.endsWith('s')) {
+        return word.slice(0, -1); // users -> user, products -> product
+    }
+    return word; // already singular
+}
+async function generateTable(tableName, options = {}) {
     // Validate table name
     if (!tableName || !/^[a-zA-Z][a-zA-Z0-9_-]*$/.test(tableName)) {
         throw new Error('Invalid table name. Use only letters, numbers, hyphens, and underscores. Must start with a letter.');
     }
-    const tableNameCapitalized = tableName.charAt(0).toUpperCase() + tableName.slice(1);
+    const singularName = pluralToSingular(tableName);
+    const tableNameCapitalized = singularName.charAt(0).toUpperCase() + singularName.slice(1);
     const currentDir = process.cwd();
     // Check for required API project structure
-    const requiredDirs = [
-        'src/entities',
-        'src/schemas'
-    ];
+    const requiredDirs = ['src/modules'];
     const missingDirs = requiredDirs.filter(dir => !fs.existsSync(path.join(currentDir, dir)));
     if (missingDirs.length > 0) {
         throw new Error(`This command should be run from a diagramers API project. Missing directories: ${missingDirs.join(', ')}`);
     }
-    console.log('📝 Creating entity...');
-    const entityContent = generateEntityContent(tableName, tableNameCapitalized);
-    fs.writeFileSync(path.join(currentDir, 'src/entities', `${tableName}.ts`), entityContent);
-    console.log('📋 Creating schema...');
-    const schemaContent = generateSchemaContent(tableName, tableNameCapitalized);
-    fs.writeFileSync(path.join(currentDir, 'src/schemas', `${tableName}.ts`), schemaContent);
-    // Update dbcontext to include the new entity
-    updateDbContext(currentDir, tableName, tableNameCapitalized);
+    // Create module directory structure
+    const modulePath = path.join(currentDir, 'src/modules', tableName);
+    if (!fs.existsSync(modulePath)) {
+        fs.mkdirSync(modulePath, { recursive: true });
+        fs.mkdirSync(path.join(modulePath, 'entities'), { recursive: true });
+        fs.mkdirSync(path.join(modulePath, 'schemas'), { recursive: true });
+    }
+    console.log(`📝 Creating entity for table '${tableName}'...`);
+    const entityContent = generateEntityContent(singularName, tableNameCapitalized, options);
+    fs.writeFileSync(path.join(modulePath, 'entities', `${singularName}.entity.ts`), entityContent);
+    console.log(`📋 Creating schema for table '${tableName}'...`);
+    const schemaContent = generateSchemaContent(singularName, tableNameCapitalized, tableName, options);
+    fs.writeFileSync(path.join(modulePath, 'schemas', `${singularName}.schema.ts`), schemaContent);
+    // Add to seeder
+    console.log(`🌱 Adding '${tableName}' to database seeder...`);
+    await addToSeeder(currentDir, tableName, singularName, tableNameCapitalized, options);
     console.log('✅ Table generation completed!');
-    console.log(`📊 Entity: src/entities/${tableName}.ts`);
-    console.log(`📋 Schema: src/schemas/${tableName}.ts`);
-    console.log('🔄 dbcontext.ts updated');
+    console.log(`📊 Entity: src/modules/${tableName}/entities/${singularName}.entity.ts`);
+    console.log(`📋 Schema: src/modules/${tableName}/schemas/${singularName}.schema.ts`);
+    console.log('🌱 Added to database seeder');
 }
-function generateEntityContent(tableName, tableNameCapitalized) {
+function generateEntityContent(singularName, tableNameCapitalized, options) {
+    const fields = options.fields || ['name', 'description'];
+    let fieldDefinitions = '';
+    fields.forEach((field) => {
+        const fieldType = getFieldType(field);
+        const isOptional = field === 'description' || field.includes('?');
+        const cleanField = field.replace('?', '');
+        fieldDefinitions += `    ${cleanField}${isOptional ? '?' : ''}: ${fieldType};\n`;
+    });
     return `import * as mongoose from 'mongoose';
 import { ObjectId } from "bson";
 
 export interface I${tableNameCapitalized} extends mongoose.Document {
-    _id: ObjectId,
-    name: string,
-    description?: string,
-    status: number,
-    createdAt: Date,
-    updatedAt: Date
+    _id: ObjectId;
+${fieldDefinitions}    status: number;
+    createdAt: Date;
+    updatedAt: Date;
 }`;
 }
-function generateSchemaContent(tableName, tableNameCapitalized) {
+function generateSchemaContent(singularName, tableNameCapitalized, tableName, options) {
+    const fields = options.fields || ['name', 'description'];
+    let schemaFields = '';
+    fields.forEach((field) => {
+        const isOptional = field === 'description' || field.includes('?');
+        const cleanField = field.replace('?', '');
+        const mongooseType = getMongooseType(cleanField);
+        const required = !isOptional;
+        schemaFields += `        ${cleanField}: {
+            type: ${mongooseType},
+            required: ${required},
+        },\n`;
+    });
     return `import * as mongoose from 'mongoose';
-import { I${tableNameCapitalized} } from '../entities/${tableName}';
+import { I${tableNameCapitalized} } from '../entities/${singularName}.entity';
 
-export const ${tableName}Schema = new mongoose.Schema(
+export const ${singularName}Schema = new mongoose.Schema(
     {
-        name: {
-            type: mongoose.SchemaTypes.String,
-            required: true,
-        },
-        description: {
-            type: mongoose.SchemaTypes.String,
-            required: false,
-        },
-        status: {
+${schemaFields}        status: {
             type: mongoose.SchemaTypes.Number,
             default: 1,
         }
@@ -100,38 +129,160 @@ export const ${tableName}Schema = new mongoose.Schema(
     { timestamps: true, suppressReservedKeysWarning: true },
 );
 
-export const ${tableNameCapitalized}Entity = mongoose.model<I${tableNameCapitalized}>('${tableName}', ${tableName}Schema);`;
+export const ${tableNameCapitalized}Model = mongoose.model<I${tableNameCapitalized}>('${tableName}', ${singularName}Schema);`;
+}
+function getFieldType(field) {
+    const cleanField = field.replace('?', '').toLowerCase();
+    if (cleanField.includes('id') || cleanField === '_id')
+        return 'ObjectId';
+    if (cleanField.includes('email'))
+        return 'string';
+    if (cleanField.includes('password'))
+        return 'string';
+    if (cleanField.includes('phone'))
+        return 'string';
+    if (cleanField.includes('url'))
+        return 'string';
+    if (cleanField.includes('date') || cleanField.includes('time'))
+        return 'Date';
+    if (cleanField.includes('count') || cleanField.includes('number') || cleanField.includes('age'))
+        return 'number';
+    if (cleanField.includes('is') || cleanField.includes('has') || cleanField.includes('verified'))
+        return 'boolean';
+    if (cleanField.includes('status'))
+        return 'number';
+    return 'string'; // default
 }
-function updateDbContext(currentDir, tableName, tableNameCapitalized) {
-    const dbcontextPath = path.join(currentDir, 'src/helpers/dbcontext.ts');
-    if (!fs.existsSync(dbcontextPath)) {
-        console.log('⚠️ dbcontext.ts not found, skipping dbcontext update');
+function getMongooseType(field) {
+    const cleanField = field.toLowerCase();
+    if (cleanField.includes('id') || cleanField === '_id')
+        return 'mongoose.SchemaTypes.ObjectId';
+    if (cleanField.includes('date') || cleanField.includes('time'))
+        return 'mongoose.SchemaTypes.Date';
+    if (cleanField.includes('count') || cleanField.includes('number') || cleanField.includes('age'))
+        return 'mongoose.SchemaTypes.Number';
+    if (cleanField.includes('is') || cleanField.includes('has') || cleanField.includes('verified'))
+        return 'mongoose.SchemaTypes.Boolean';
+    if (cleanField.includes('status'))
+        return 'mongoose.SchemaTypes.Number';
+    return 'mongoose.SchemaTypes.String'; // default
+}
+async function addToSeeder(currentDir, tableName, singularName, tableNameCapitalized, options) {
+    const seederPath = path.join(currentDir, 'src/core/database/seeder.ts');
+    if (!fs.existsSync(seederPath)) {
+        console.log('⚠️ Seeder file not found, skipping seeder update');
         return;
     }
-    let dbcontextContent = fs.readFileSync(dbcontextPath, 'utf8');
+    let seederContent = fs.readFileSync(seederPath, 'utf8');
     // Add import
-    const importStatement = `import { ${tableNameCapitalized}Entity } from '../schemas/${tableName}';`;
-    if (!dbcontextContent.includes(importStatement)) {
-        // Find the last import statement and add after it
-        const importRegex = /import.*from.*['"];?\s*$/gm;
-        const matches = [...dbcontextContent.matchAll(importRegex)];
-        if (matches.length > 0) {
-            const lastImport = matches[matches.length - 1];
-            const insertIndex = lastImport.index + lastImport[0].length;
-            dbcontextContent = dbcontextContent.slice(0, insertIndex) + '\n' + importStatement + dbcontextContent.slice(insertIndex);
+    const importStatement = `import { ${tableNameCapitalized}Model } from '../../modules/${tableName}/schemas/${singularName}.schema';`;
+    if (!seederContent.includes(importStatement)) {
+        // Find the last import and add after it
+        const lastImportIndex = seederContent.lastIndexOf('import');
+        const nextLineIndex = seederContent.indexOf('\n', lastImportIndex);
+        seederContent = seederContent.slice(0, nextLineIndex) + '\n' + importStatement + seederContent.slice(nextLineIndex);
+    }
+    // Add to SeedData interface
+    const seedDataInterface = `  ${tableName}?: any[];`;
+    if (!seederContent.includes(seedDataInterface)) {
+        const interfaceMatch = seederContent.match(/export interface SeedData \{([^}]*)\}/s);
+        if (interfaceMatch) {
+            const beforeClosing = interfaceMatch[0].lastIndexOf('}');
+            const beforeText = interfaceMatch[0].slice(0, beforeClosing);
+            const afterText = interfaceMatch[0].slice(beforeClosing);
+            const newInterface = beforeText + seedDataInterface + '\n' + afterText;
+            seederContent = seederContent.replace(interfaceMatch[0], newInterface);
         }
     }
-    // Add to dbcontext object
-    const dbcontextObjectRegex = /export\s+default\s*\{([^}]*)\}/s;
-    const match = dbcontextContent.match(dbcontextObjectRegex);
-    if (match) {
-        const objectContent = match[1];
-        if (!objectContent.includes(`${tableNameCapitalized}Entity`)) {
-            const newObjectContent = objectContent.trim() + `,\n    ${tableNameCapitalized}Entity`;
-            dbcontextContent = dbcontextContent.replace(dbcontextObjectRegex, `export default {$1${newObjectContent}\n}`);
+    // Add seeder method
+    const seederMethod = `  private async seed${tableNameCapitalized}s(data: any[]): Promise<void> {
+    if (data.length === 0) return;
+    
+    logger.info(\`[DatabaseSeeder] Seeding \${data.length} ${tableName}...\`);
+    
+    for (const ${singularName}Data of data) {
+      try {
+        const existing = await ${tableNameCapitalized}Model.findOne({ name: ${singularName}Data.name });
+        if (!existing) {
+          const ${singularName} = new ${tableNameCapitalized}Model({
+            ...${singularName}Data,
+            status: 1
+          });
+          await ${singularName}.save();
+          logger.info(\`[DatabaseSeeder] Created ${singularName}: \${${singularName}Data.name}\`);
+        } else {
+          logger.info(\`[DatabaseSeeder] ${tableNameCapitalized} \${${singularName}Data.name} already exists, skipping\`);
         }
+      } catch (error) {
+        logger.error(\`[DatabaseSeeder] Failed to create ${singularName} \${${singularName}Data.name}:\`, error);
+      }
+    }
+  }`;
+    // Add method before closing class brace
+    const classEndIndex = seederContent.lastIndexOf('}');
+    seederContent = seederContent.slice(0, classEndIndex) + seederMethod + '\n\n' + seederContent.slice(classEndIndex);
+    // Add seeder call in seed method
+    const seederCall = `    if (data.${tableName}) {
+      await this.seed${tableNameCapitalized}s(data.${tableName});
+    }`;
+    // Find the seed method and add the call
+    const seedMethodMatch = seederContent.match(/async seed\([^{]*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/s);
+    if (seedMethodMatch) {
+        const beforeClosing = seedMethodMatch[0].lastIndexOf('}');
+        const beforeText = seedMethodMatch[0].slice(0, beforeClosing);
+        const afterText = seedMethodMatch[0].slice(beforeClosing);
+        const newSeedMethod = beforeText + '\n' + seederCall + '\n  ' + afterText;
+        seederContent = seederContent.replace(seedMethodMatch[0], newSeedMethod);
+    }
+    // Add default seed data
+    const defaultData = generateDefaultSeedData(tableName, options);
+    const defaultDataLine = `    ${tableName}: ${JSON.stringify(defaultData, null, 6)},`;
+    // Find defaultData object and add the line
+    const defaultDataMatch = seederContent.match(/const defaultData: SeedData = \{([^}]*(?:\{[^}]*\}[^}]*)*)\}/s);
+    if (defaultDataMatch) {
+        const beforeClosing = defaultDataMatch[0].lastIndexOf('}');
+        const beforeText = defaultDataMatch[0].slice(0, beforeClosing);
+        const afterText = defaultDataMatch[0].slice(beforeClosing);
+        const newDefaultData = beforeText + '\n' + defaultDataLine + '\n  ' + afterText;
+        seederContent = seederContent.replace(defaultDataMatch[0], newDefaultData);
+    }
+    fs.writeFileSync(seederPath, seederContent);
+}
+function generateDefaultSeedData(tableName, options) {
+    const fields = options.fields || ['name', 'description'];
+    const sampleData = [];
+    // Generate 3 sample records
+    for (let i = 1; i <= 3; i++) {
+        const record = {};
+        fields.forEach((field) => {
+            const cleanField = field.replace('?', '');
+            if (cleanField === 'name') {
+                record[cleanField] = `Sample ${tableName.charAt(0).toUpperCase() + tableName.slice(1, -1)} ${i}`;
+            }
+            else if (cleanField === 'description') {
+                record[cleanField] = `Description for sample ${tableName.slice(0, -1)} ${i}`;
+            }
+            else if (cleanField.includes('email')) {
+                record[cleanField] = `sample${i}@example.com`;
+            }
+            else if (cleanField.includes('phone')) {
+                record[cleanField] = `+1234567890${i}`;
+            }
+            else if (cleanField.includes('url')) {
+                record[cleanField] = `https://example.com/${cleanField}${i}`;
+            }
+            else if (cleanField.includes('count') || cleanField.includes('number') || cleanField.includes('age')) {
+                record[cleanField] = i * 10;
+            }
+            else if (cleanField.includes('is') || cleanField.includes('has') || cleanField.includes('verified')) {
+                record[cleanField] = i % 2 === 1;
+            }
+            else {
+                record[cleanField] = `Sample ${cleanField} ${i}`;
+            }
+        });
+        sampleData.push(record);
     }
-    fs.writeFileSync(dbcontextPath, dbcontextContent);
-    console.log('📊 Updated dbcontext.ts');
+    return sampleData;
 }
 //# sourceMappingURL=table-generator.js.map

package/dist/services/table-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-generator.js","sourceRoot":"","sources":["../../src/services/table-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table-generator.js","sourceRoot":"","sources":["../../src/services/table-generator.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diagramers/cli",
-  "version": "1.0.57",
+  "version": "1.0.61",
   "description": "Diagramers CLI - Command-line tools for managing Diagramers projects",
   "main": "dist/index.js",
   "bin": {