vasuzex 2.0.13 → 2.0.15

package/database/models/User.js

@@ -10,6 +10,7 @@ export class User extends Model {
   static fillable = [
     'name',
     'email',
+    'password',
     'phone',
     'avatar',
     'role'
@@ -63,6 +64,20 @@ export class User extends Model {
   async verifyPassword(password) {
     return await Hash.check(password, this.attributes.password);
   }
+
+  /**
+   * Find user by email (static method for AuthService)
+   */
+  static async findByEmail(email) {
+    return await this.where('email', email).first();
+  }
+
+  /**
+   * Find user by ID (static method)
+   */
+  static async findById(id) {
+    return await this.where('id', id).first();
+  }
 }
 
 export default User;

package/database/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "@vasuzex/database",
+  "version": "1.0.0",
+  "type": "module",
+  "main": "./index.js",
+  "exports": {
+    ".": "./index.js",
+    "./models/*": "./models/*.js"
+  }
+}

package/framework/Console/Commands/generate-app.js

@@ -10,22 +10,18 @@ import {
   getAppPath,
   pathExists,
   writeFileContent,
+  readProjectName,
   
   // Package Manager
   createAppPackageJson,
   addRootScripts,
   
-  // Template Generator
-  generateAppTemplate,
-  generateServerTemplate,
+  // Template Generator (for common files only)
   generateEnvTemplate,
   generateGitignoreTemplate,
   generateReadmeTemplate,
   
-  // API Structure
-  generateCompleteAPIStructure,
-  
-  // Web Structure
+  // Web Structure (will be migrated to Plop later)
   generateCompleteWebStructure,
   
   // Validation
@@ -140,20 +136,22 @@ async function generateSingleApp(name, type, framework) {
  * Generate API application
  */
 async function generateAPIApp(name, targetDir) {
-  // Create complete API structure (controllers, models, services, etc.)
-  await generateCompleteAPIStructure(targetDir);
+  // Use app name for @{appName}/database imports (not root project name)
+  const { generateAPIApp: plopGenerateAPI } = await import('./utils/plopGenerator.js');
   
-  // Generate app.js (BaseApp inheritance)
-  await writeFileContent(
-    join(targetDir, 'src/app.js'),
-    generateAppTemplate(name)
-  );
+  console.log('📝 Generating API files from templates...');
   
-  // Generate index.js (BaseServer inheritance)
-  await writeFileContent(
-    join(targetDir, 'src/index.js'),
-    generateServerTemplate(name)
-  );
+  // Get actual project name from root package.json
+  const projectName = await readProjectName();
+  
+  // Pass project name and app name separately for template interpolation
+  const result = await plopGenerateAPI(targetDir, projectName, name);
+  
+  if (!result.success) {
+    throw new Error(`Template generation failed: ${result.error}`);
+  }
+  
+  console.log(`✓ Generated ${result.filesCreated.length} files`);
 }
 
 /**

package/framework/Console/Commands/utils/databasePackageTemplate.js

@@ -0,0 +1,20 @@
+/**
+ * Database Package Template
+ * Creates a workspace package for centralized database models
+ */
+
+/**
+ * Generate database/package.json
+ */
+export function generateDatabasePackageJson(projectName) {
+  return {
+    name: `@${projectName}/database`,
+    version: '1.0.0',
+    type: 'module',
+    main: './index.js',
+    exports: {
+      '.': './index.js',
+      './models/*': './models/*.js'
+    }
+  };
+}

package/framework/Console/Commands/utils/fileOperations.js

@@ -45,6 +45,20 @@ export async function writeJsonFile(filePath, data) {
   await writeFile(filePath, JSON.stringify(data, null, 2) + '\n');
 }
 
+/**
+ * Read project name from root package.json
+ */
+export async function readProjectName() {
+  try {
+    const rootPackageJson = join(process.cwd(), 'package.json');
+    const pkg = await readJsonFile(rootPackageJson);
+    return pkg.name || 'my-app';
+  } catch (error) {
+    console.warn('⚠️  Could not read project name from package.json, using default');
+    return 'my-app';
+  }
+}
+
 /**
  * Check if path exists
  */

package/framework/Console/Commands/utils/index.js

@@ -9,15 +9,9 @@ export * from './fileOperations.js';
 // Package Manager
 export * from './packageManager.js';
 
-// Template Generator
+// Template Generator (for common files and Web templates)
 export * from './templateGenerator.js';
 
-// API Templates
-export * from './apiTemplates.js';
-
-// API Structure
-export * from './apiStructure.js';
-
 // Web Structure
 export * from './webStructure.js';
 
@@ -35,3 +29,6 @@ export * from './installer.js';
 
 // Console Display
 export * from './consoleDisplay.js';
+
+// Plop Generator (for API templates)
+export * from './plopGenerator.js';

package/framework/Console/Commands/utils/packageManager.js

@@ -4,7 +4,7 @@
  */
 
 import { join } from 'path';
-import { pathExists, readJsonFile, writeJsonFile, getProjectRoot } from './fileOperations.js';
+import { pathExists, readJsonFile, writeJsonFile, getProjectRoot, readProjectName } from './fileOperations.js';
 
 /**
  * Detect vasuzex dependency version
@@ -48,8 +48,14 @@ export async function detectVasuzexDependency(appDir = null) {
  * Create package.json for app (V2 - Minimal, uses hoisted dependencies)
  */
 export async function createAppPackageJson(appName, appType, targetDir, framework = null) {
+  // Remove -api or -web suffix if already present to avoid duplication
+  const cleanAppName = appName.replace(/-?(api|web)$/, '');
+  
+  // Get project name for database package reference
+  const projectName = await readProjectName();
+  
   const packageJson = {
-    name: `${appName}-${appType}`,
+    name: `${cleanAppName}-${appType}`,
     version: '1.0.0',
     description: `${appName} ${appType} application`,
     type: 'module',
@@ -66,13 +72,15 @@ export async function createAppPackageJson(appName, appType, targetDir, framewor
       'db:migrate': 'node -e "console.log(\'Run migrations from project root: pnpm db:migrate\')"',
     };
     
-    // API dependencies - vasuzex is hoisted from root, no need to declare
+    // API dependencies (vasuzex is hoisted from root, not needed here)
     packageJson.dependencies = {
+      [`@${projectName}/database`]: 'workspace:*',
       'express': '^5.2.1',
       'bcryptjs': '^2.4.3',
       'jsonwebtoken': '^9.0.3',
       'joi': '^17.13.3',
       'cors': '^2.8.5',
+      'helmet': '^8.1.0',
       'dotenv': '^16.6.1',
       'pg': '^8.16.3',
       'guruorm': '^2.0.0'
@@ -98,7 +106,9 @@ export async function createAppPackageJson(appName, appType, targetDir, framewor
         'react-dom': '^18.2.0',
         'react-router-dom': '^6.28.0',
         '@reduxjs/toolkit': '^2.5.0',
-        'redux-persist': '^6.0.0'
+        'redux-persist': '^6.0.0',
+        'yup': '^1.0.0', // Required for validation (login/registration)
+        'sweetalert2': '^11.0.0', // Required for alerts/notifications
       };
       
       packageJson.devDependencies = {
@@ -107,7 +117,9 @@ export async function createAppPackageJson(appName, appType, targetDir, framewor
       };
     } else if (framework === 'vue') {
       packageJson.dependencies = {
-        'vue': '^3.4.0'
+        'vue': '^3.4.0',
+        'yup': '^1.0.0', // Required for validation
+        'sweetalert2': '^11.0.0', // Required for alerts/notifications
       };
       
       packageJson.devDependencies = {
@@ -116,7 +128,9 @@ export async function createAppPackageJson(appName, appType, targetDir, framewor
       };
     } else if (framework === 'svelte') {
       packageJson.dependencies = {
-        'svelte': '^4.2.0'
+        'svelte': '^4.2.0',
+        'yup': '^1.0.0', // Required for validation
+        'sweetalert2': '^11.0.0', // Required for alerts/notifications
       };
       
       packageJson.devDependencies = {

package/framework/Console/Commands/utils/plopGenerator.js

@@ -0,0 +1,113 @@
+/**
+ * Plop Generator Utility
+ * Programmatically invoke Plop for template generation
+ */
+
+import nodePlop from 'node-plop';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+/**
+ * Generate API service files using Plop
+ * 
+ * @param {string} destPath - Destination path for generated files
+ * @param {string} projectName - Project name for @projectName/database imports
+ * @param {string} appName - App name (e.g., 'blog', 'shop')
+ * @returns {Promise<Object>} Generation results
+ */
+export async function generateAPIApp(destPath, projectName, appName) {
+  try {
+    // Load plopfile - it's in Console/, not Console/Commands/
+    const plopfilePath = path.join(__dirname, '../../plopfile.js');
+    
+    // Load plop with plopfile
+    const plop = await nodePlop(plopfilePath);
+    
+    // Get the generator
+    const generator = plop.getGenerator('api-app');
+    
+    // Run the generator with data
+    const results = await generator.runActions({
+      destPath,
+      projectName,
+      appName
+    });
+    
+    return {
+      success: true,
+      results,
+      filesCreated: results.changes.map(c => c.path)
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error.message,
+      stack: error.stack
+    };
+  }
+}
+
+// Keep old name for backward compatibility
+export const generateAPIService = generateAPIApp;
+
+/**
+ * Generate all API files
+ * Wrapper function that generates complete API structure
+ * 
+ * @param {string} destPath - Destination path
+ * @param {string} projectName - Project name
+ * @param {string} appName - App name
+ * @returns {Promise<Object>} Generation results
+ */
+export async function generateCompleteAPI(destPath, projectName, appName) {
+  const results = {
+    services: null,
+    controllers: null,
+    middleware: null,
+    routes: null,
+    success: true,
+    errors: []
+  };
+  
+  try {
+    // Generate API service files
+    const serviceResult = await generateAPIService(destPath, projectName, appName);
+    results.services = serviceResult;
+    
+    if (!serviceResult.success) {
+      results.success = false;
+      results.errors.push(serviceResult.error);
+    }
+    
+    return results;
+  } catch (error) {
+    results.success = false;
+    results.errors.push(error.message);
+    return results;
+  }
+}
+
+/**
+ * Test Plop setup
+ * Verify that Plop is correctly configured
+ */
+export async function testPlopSetup() {
+  try {
+    const plopfilePath = path.join(__dirname, '../plopfile.js');
+    const plop = await nodePlop(plopfilePath);
+    const generators = plop.getGeneratorList();
+    
+    return {
+      success: true,
+      generators: generators.map(g => g.name)
+    };
+  } catch (error) {
+    return {
+      success: false,
+      error: error.message
+    };
+  }
+}

package/framework/Console/Commands/utils/templateGenerator.js

@@ -48,14 +48,6 @@ class ${className} extends BaseApp {
     });
   }
 
-  /**
-   * Override security middleware setup to bypass config service
-   */
-  setupSecurityMiddleware() {
-    // Skip security middleware for pilot test
-    // In production, load actual security config
-  }
-
   /**
    * Setup custom middleware (after body parsers, before routes)
    */

package/framework/Console/config/generator.config.js

@@ -0,0 +1,142 @@
+/**
+ * Generator Configuration
+ * Centralized configuration for all generators and CLI tools
+ * NO HARDCODING - all configurable values in one place
+ */
+
+export const GENERATOR_CONFIG = {
+  // Package Information
+  package: {
+    name: 'vasuzex',
+    displayName: 'Vasuzex',
+    author: 'Vasuzex Team',
+    repository: 'rishicool/vasuzex',
+    repositoryUrl: 'https://github.com/rishicool/vasuzex',
+    documentationUrl: 'https://github.com/rishicool/vasuzex/tree/main/docs',
+    issuesUrl: 'https://github.com/rishicool/vasuzex/issues',
+    license: 'MIT',
+  },
+
+  // Default Ports
+  ports: {
+    api: 3000,
+    web: 3001,
+    mediaServer: 4003,
+  },
+
+  // Database Defaults
+  database: {
+    postgresql: {
+      host: 'localhost',
+      port: 5432,
+      user: 'postgres',
+    },
+    mysql: {
+      host: 'localhost',
+      port: 3306,
+      user: 'root',
+    },
+    sqlite: {
+      defaultPath: './database',
+    },
+  },
+
+  // Framework Defaults
+  defaults: {
+    appName: 'blog',
+    template: 'fullstack',
+    webFramework: 'react',
+    database: 'PostgreSQL',
+    sessionCookie: 'vasuzex_session',
+  },
+
+  // Dependencies
+  dependencies: {
+    // Core dependencies always installed
+    core: [
+      'axios',
+      'bcrypt',
+      'bcryptjs',
+      'chalk',
+      'commander',
+      'cors',
+      'dotenv',
+      'express',
+      'fs-extra',
+      'guruorm',
+      'helmet',
+      'inquirer',
+      'joi',
+      'jsonwebtoken',
+      'maxmind',
+      'multer',
+      'ora',
+      'pg',
+      'sharp',
+    ],
+
+    // Web framework specific
+    web: {
+      react: ['react', 'react-dom', 'react-redux', '@reduxjs/toolkit'],
+      vue: ['vue'],
+      svelte: ['svelte'],
+    },
+
+    // Web app always includes
+    webCommon: [
+      'yup', // Required for validation (login/registration)
+    ],
+
+    // Optional dependencies
+    optional: {
+      sweetalert2: '^11.0.0', // Conditional usage
+    },
+
+    // Dev dependencies
+    dev: [
+      '@jest/globals',
+      '@vitejs/plugin-react',
+      '@vitejs/plugin-vue',
+      '@sveltejs/vite-plugin-svelte',
+      'dotenv-cli',
+      'eslint',
+      'eslint-config-prettier',
+      'jest',
+      'nodemon',
+      'prettier',
+      'turbo',
+      'vite',
+    ],
+  },
+
+  // Template Messages
+  messages: {
+    creating: '🚀 Creating Vasuzex project...',
+    success: '✅ Vasuzex V2 Project created successfully!',
+    hybrid: '🎉 Using hybrid dependency management - all deps in root node_modules',
+    happyCoding: 'Happy coding! 🎉',
+  },
+
+  // File Patterns
+  files: {
+    ignore: [
+      'node_modules/',
+      '.env',
+      '.DS_Store',
+      '*.log',
+      'coverage/',
+      'dist/',
+      'build/',
+      '.vscode/',
+      '.idea/',
+      '*.sqlite',
+      'storage/logs/*',
+      '!storage/logs/.gitkeep',
+      'pnpm-lock.yaml',
+      'package-lock.yaml',
+      'yarn.lock',
+    ],
+  },
+};
+
+export default GENERATOR_CONFIG;

package/framework/Console/plopfile.js

@@ -0,0 +1,142 @@
+/**
+ * Plop.js Configuration for Vasuzex Template Generation
+ * 
+ * This file defines generators for creating API, Web, and Media Server apps
+ * Used internally by vasuzex generate:app command
+ */
+
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+export default function (plop) {
+  // Helpers for template transformations
+  plop.setHelper('capitalize', (text) => {
+    return text.charAt(0).toUpperCase() + text.slice(1);
+  });
+  
+  plop.setHelper('pascalCase', (text) => {
+    return text
+      .split(/[-_]/)
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join('');
+  });
+  
+  plop.setHelper('camelCase', (text) => {
+    const pascal = text
+      .split(/[-_]/)
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
+      .join('');
+    return pascal.charAt(0).toLowerCase() + pascal.slice(1);
+  });
+  
+  plop.setHelper('kebabCase', (text) => {
+    return text.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+  });
+
+  // Set base path for templates
+  plop.setGenerator('api-app', {
+    description: 'Generate complete API application',
+    prompts: [],
+    actions: function(data) {
+      const actions = [];
+      const basePath = data.destPath || '.';
+      
+      // Controllers
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/controllers/BaseController.js`,
+        templateFile: 'templates/api/controllers/BaseController.js.hbs',
+        skipIfExists: true
+      });
+      
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/controllers/AuthController.js`,
+        templateFile: 'templates/api/controllers/AuthController.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Services
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/services/AuthService.js`,
+        templateFile: 'templates/api/services/AuthService.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Middleware
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/middleware/authMiddleware.js`,
+        templateFile: 'templates/api/middleware/authMiddleware.js.hbs',
+        skipIfExists: true
+      });
+      
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/middleware/errorHandler.js`,
+        templateFile: 'templates/api/middleware/errorHandler.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Routes
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/routes/auth.js`,
+        templateFile: 'templates/api/routes/auth.js.hbs',
+        skipIfExists: true
+      });
+      
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/routes/index.js`,
+        templateFile: 'templates/api/routes/index.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Requests
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/requests/AuthRequests.js`,
+        templateFile: 'templates/api/requests/AuthRequests.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Helpers
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/helpers/env.js`,
+        templateFile: 'templates/api/helpers/env.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Config
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/config/database.js`,
+        templateFile: 'templates/api/config/database.js.hbs',
+        skipIfExists: true
+      });
+      
+      // Main app files
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/app.js`,
+        templateFile: 'templates/api/app.js.hbs',
+        skipIfExists: true
+      });
+      
+      actions.push({
+        type: 'add',
+        path: `${basePath}/src/index.js`,
+        templateFile: 'templates/api/server.js.hbs',
+        skipIfExists: true
+      });
+      
+      return actions;
+    }
+  });
+}