webspresso 0.0.9 → 0.0.11

package/README.md

@@ -73,9 +73,70 @@ webspresso new my-app --no-tailwind
 - Asks if you want to install in the current directory
 - If current directory is not empty, shows a warning
 - Prompts for project name (defaults to current folder name)
+- Asks if you will use a database (SQLite, PostgreSQL, or MySQL)
+- If yes, adds the appropriate driver to `package.json` and creates `webspresso.db.js` config
+- After project creation, asks if you want to install dependencies
+- If yes, runs `npm install` and `npm run build:css`
+- Then asks if you want to start the development server
+- If yes, starts `npm run dev` automatically
+
+**Auto Installation:**
+```bash
+# With --install flag (semi-interactive)
+webspresso new my-app --install
+# → Automatically runs: npm install && npm run build:css
+# → Then prompts: "Start development server?" [Y/n]
+# → If yes: starts npm run dev (with watch:css if Tailwind enabled)
+
+# Without --install flag (fully interactive)
+webspresso new my-app
+# → Prompts: "Install dependencies and build CSS now?" [Y/n]
+# → If yes: runs npm install && npm run build:css
+# → Then: "Start development server?" [Y/n]
+# → If yes: starts npm run dev (with watch:css if Tailwind enabled)
+```
+
+**Note:** When dev server starts with Tailwind CSS, it automatically runs `watch:css` in the background to watch for CSS changes.
+
+**Database Selection:**
+During project creation, you'll be asked if you want to use a database:
+- **SQLite** (better-sqlite3) - Recommended for development and small projects
+- **PostgreSQL** (pg) - For production applications
+- **MySQL** (mysql2) - Alternative SQL database
+
+If you select a database:
+- The appropriate driver is added to `package.json` dependencies
+- `webspresso.db.js` config file is created with proper settings
+- `migrations/` directory is created
+- `models/` directory is created
+- `DATABASE_URL` is added to `.env.example` with a template
+
+**Seed Data Generation:**
+After selecting a database, you'll be asked if you want to generate seed data:
+- If yes, `@faker-js/faker` is added to dependencies
+- `seeds/` directory is created with `seeds/index.js`
+- `npm run seed` script is added to `package.json`
+- The seed script automatically detects models in `models/` directory and generates fake data based on their schemas
+
+To run seeds after creating models:
+```bash
+npm run seed
+```
+
+The seed script will:
+- Load all models from `models/` directory
+- Generate 10 fake records per model (by default)
+- Use smart field detection based on column names (email, name, title, etc.)
+
+You can always add database support later by:
+1. Installing the driver: `npm install better-sqlite3` (or `pg`, `mysql2`)
+2. Creating `webspresso.db.js` config file
+3. Adding `DATABASE_URL` to your `.env` file
+4. Creating `models/` directory and defining your models
+5. Optionally adding seed support: `npm install @faker-js/faker` and creating `seeds/index.js`
 
 Options:
-- `-i, --install` - Auto run `npm install` and `npm run build:css`
+- `-i, --install` - Auto run `npm install` and `npm run build:css` (non-interactive)
 - `--no-tailwind` - Skip Tailwind CSS setup
 
 The project includes:
@@ -1018,6 +1079,32 @@ npm install better-sqlite3
 
 ### Database Seeding
 
+**CLI Command:**
+
+The easiest way to seed your database is using the CLI command:
+
+```bash
+# Run seeds (requires seeds/index.js)
+webspresso seed
+
+# Setup seed files if they don't exist
+webspresso seed --setup
+
+# Use custom database config
+webspresso seed --config ./custom-db-config.js
+
+# Use different environment
+webspresso seed --env production
+```
+
+The `webspresso seed` command:
+- Automatically loads all models from `models/` directory
+- Generates fake data based on model schemas
+- Creates 10 records per model by default
+- Uses smart field detection for appropriate fake data
+
+**Manual Setup:**
+
 Generate fake data for testing and development using `@faker-js/faker`:
 
 ```bash

package/bin/webspresso.js

@@ -121,6 +121,43 @@ program
     
     console.log(`\n🚀 Creating new Webspresso project: ${projectName}\n`);
     
+    // Ask about database
+    const { useDatabase, databaseType } = await inquirer.prompt([
+      {
+        type: 'confirm',
+        name: 'useDatabase',
+        message: 'Will you use a database?',
+        default: false
+      },
+      {
+        type: 'list',
+        name: 'databaseType',
+        message: 'Which database?',
+        choices: [
+          { name: 'SQLite (better-sqlite3)', value: 'better-sqlite3' },
+          { name: 'PostgreSQL (pg)', value: 'pg' },
+          { name: 'MySQL (mysql2)', value: 'mysql2' },
+          { name: 'None', value: null }
+        ],
+        default: 'better-sqlite3',
+        when: (answers) => answers.useDatabase
+      }
+    ]);
+    
+    // Ask about seed data if database is selected
+    let useSeed = false;
+    if (useDatabase && databaseType) {
+      const { generateSeed } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'generateSeed',
+          message: 'Generate seed data based on existing models?',
+          default: false
+        }
+      ]);
+      useSeed = generateSeed;
+    }
+    
     // Create directory structure (skip root if using current dir)
     if (!useCurrentDir) {
       fs.mkdirSync(projectPath, { recursive: true });
@@ -130,6 +167,11 @@ program
     fs.mkdirSync(path.join(projectPath, 'views'), { recursive: true });
     fs.mkdirSync(path.join(projectPath, 'public'), { recursive: true });
     
+    // Create models directory if database is selected
+    if (useDatabase && databaseType) {
+      fs.mkdirSync(path.join(projectPath, 'models'), { recursive: true });
+    }
+    
     // Create package.json
     const packageJson = {
       name: projectName,
@@ -146,6 +188,23 @@ program
       }
     };
     
+    // Add database driver if selected
+    if (useDatabase && databaseType) {
+      const dbDrivers = {
+        'better-sqlite3': '^9.0.0',
+        'pg': '^8.0.0',
+        'mysql2': '^3.0.0'
+      };
+      
+      packageJson.dependencies[databaseType] = dbDrivers[databaseType];
+    }
+    
+    // Add faker if seed is selected
+    if (useSeed) {
+      packageJson.dependencies['@faker-js/faker'] = '^8.0.0';
+      packageJson.scripts.seed = 'node seeds/index.js';
+    }
+    
     fs.writeFileSync(
       path.join(projectPath, 'package.json'),
       JSON.stringify(packageJson, null, 2) + '\n'
@@ -172,15 +231,186 @@ app.listen(PORT, () => {
     fs.writeFileSync(path.join(projectPath, 'server.js'), serverJs);
     
     // Create .env.example
-    const envExample = `PORT=3000
+    let envExample = `PORT=3000
 NODE_ENV=development
 DEFAULT_LOCALE=en
 SUPPORTED_LOCALES=en,tr
 BASE_URL=http://localhost:3000
 `;
     
+    if (useDatabase && databaseType) {
+      if (databaseType === 'better-sqlite3') {
+        envExample += `DATABASE_URL=sqlite:./database.sqlite
+`;
+      } else if (databaseType === 'pg') {
+        envExample += `DATABASE_URL=postgresql://user:password@localhost:5432/dbname
+`;
+      } else if (databaseType === 'mysql2') {
+        envExample += `DATABASE_URL=mysql://user:password@localhost:3306/dbname
+`;
+      }
+    }
+    
     fs.writeFileSync(path.join(projectPath, '.env.example'), envExample);
     
+    // Create database config if database is selected
+    if (useDatabase && databaseType) {
+      let dbConfig = '';
+      
+      if (databaseType === 'better-sqlite3') {
+        dbConfig = `module.exports = {
+  client: 'better-sqlite3',
+  connection: {
+    filename: process.env.DATABASE_URL?.replace('sqlite:', '') || './database.sqlite'
+  },
+  migrations: {
+    directory: './migrations',
+    tableName: 'knex_migrations',
+  },
+  useNullAsDefault: true
+};
+`;
+      } else if (databaseType === 'pg') {
+        dbConfig = `module.exports = {
+  client: 'pg',
+  connection: process.env.DATABASE_URL,
+  migrations: {
+    directory: './migrations',
+    tableName: 'knex_migrations',
+  },
+  pool: {
+    min: 2,
+    max: 10
+  }
+};
+`;
+      } else if (databaseType === 'mysql2') {
+        dbConfig = `module.exports = {
+  client: 'mysql2',
+  connection: process.env.DATABASE_URL,
+  migrations: {
+    directory: './migrations',
+    tableName: 'knex_migrations',
+  },
+  pool: {
+    min: 2,
+    max: 10
+  }
+};
+`;
+      }
+      
+      fs.writeFileSync(path.join(projectPath, 'webspresso.db.js'), dbConfig);
+      
+      // Create migrations directory
+      fs.mkdirSync(path.join(projectPath, 'migrations'), { recursive: true });
+    }
+    
+    // Create seed files if seed is selected
+    if (useSeed) {
+      fs.mkdirSync(path.join(projectPath, 'seeds'), { recursive: true });
+      
+      const seedIndex = `require('dotenv').config();
+const { faker } = require('@faker-js/faker');
+const path = require('path');
+const fs = require('fs');
+const { createDatabase, getAllModels } = require('webspresso/orm');
+const dbConfig = require('./webspresso.db.js');
+
+const db = createDatabase(dbConfig);
+const seeder = db.seeder(faker);
+
+/**
+ * Load all models from models/ directory
+ */
+function loadModels() {
+  const modelsDir = path.join(__dirname, 'models');
+  
+  if (!fs.existsSync(modelsDir)) {
+    return [];
+  }
+  
+  const modelFiles = fs.readdirSync(modelsDir)
+    .filter(file => file.endsWith('.js') && !file.startsWith('_'));
+  
+  const loadedModels = [];
+  for (const file of modelFiles) {
+    try {
+      require(path.join(modelsDir, file));
+      loadedModels.push(file);
+    } catch (error) {
+      console.warn(\`⚠️  Failed to load model from \${file}:\`, error.message);
+    }
+  }
+  
+  return loadedModels;
+}
+
+/**
+ * Seed database with fake data
+ * This script automatically detects models in the models/ directory
+ * and generates seed data based on their schemas.
+ */
+async function runSeeds() {
+  try {
+    console.log('🌱 Starting seed process...');
+    
+    // Load all models
+    const loadedFiles = loadModels();
+    
+    if (loadedFiles.length === 0) {
+      console.log('⚠️  No model files found in models/ directory.');
+      console.log('   Create models first, then run: npm run seed');
+      await db.knex.destroy();
+      return;
+    }
+    
+    // Get all registered models
+    const models = getAllModels();
+    
+    if (models.size === 0) {
+      console.log('⚠️  No models registered. Make sure your model files export models using defineModel().');
+      await db.knex.destroy();
+      return;
+    }
+    
+    console.log(\`📦 Found \${models.size} model(s):\`);
+    for (const [name] of models) {
+      console.log(\`   - \${name}\`);
+    }
+    
+    // Seed each model
+    const results = {};
+    for (const [modelName, model] of models) {
+      console.log(\`\\n🌱 Seeding \${modelName}...\`);
+      
+      // Default count: 10 records per model
+      const count = 10;
+      const records = await seeder.seed(modelName, count);
+      results[modelName] = records.length;
+      
+      console.log(\`✅ Created \${records.length} \${modelName} record(s)\`);
+    }
+    
+    console.log(\`\\n✨ Seed completed! Created:\`);
+    for (const [modelName, count] of Object.entries(results)) {
+      console.log(\`   - \${count} \${modelName} record(s)\`);
+    }
+    
+    await db.knex.destroy();
+  } catch (error) {
+    console.error('❌ Seed failed:', error);
+    await db.knex.destroy().catch(() => {});
+    process.exit(1);
+  }
+}
+
+runSeeds();
+`;
+      
+      fs.writeFileSync(path.join(projectPath, 'seeds', 'index.js'), seedIndex);
+    }
+    
     // Create .gitignore
     const gitignore = `node_modules/
 .env
@@ -429,8 +659,8 @@ module.exports = {
       console.log('✅ Tailwind CSS setup complete!');
     }
     
-    // Auto install if requested
-    if (autoInstall) {
+    // Helper function to run installation
+    async function runInstallation(projectPath, useTailwind) {
       console.log('\n📦 Installing dependencies...\n');
       const { execSync } = require('child_process');
       try {
@@ -447,27 +677,137 @@ module.exports = {
           });
         }
         
-        console.log('\n✅ Project ready!\n');
+        console.log('\n✅ Installation complete!\n');
+      } catch (err) {
+        console.error('❌ Installation failed:', err.message);
+        process.exit(1);
+      }
+    }
+    
+    // Helper function to start dev server
+    function startDevServer(projectPath, useTailwind) {
+      console.log('\n🚀 Starting development server...\n');
+      console.log('Press Ctrl+C to stop\n');
+      
+      const { spawn } = require('child_process');
+      
+      if (useTailwind) {
+        // Start CSS watch and server together
+        const cssWatch = spawn('npm', ['run', 'watch:css'], {
+          stdio: 'inherit',
+          shell: true,
+          cwd: projectPath
+        });
+        
+        const server = spawn('node', ['--watch', 'server.js'], {
+          stdio: 'inherit',
+          shell: true,
+          cwd: projectPath,
+          env: { ...process.env, PORT: process.env.PORT || '3000', NODE_ENV: 'development' }
+        });
+        
+        // Handle exit
+        const cleanup = () => {
+          cssWatch.kill();
+          server.kill();
+          process.exit(0);
+        };
+        
+        process.on('SIGINT', cleanup);
+        process.on('SIGTERM', cleanup);
+        
+        cssWatch.on('exit', cleanup);
+        server.on('exit', cleanup);
+      } else {
+        // Just start server
+        const server = spawn('node', ['--watch', 'server.js'], {
+          stdio: 'inherit',
+          shell: true,
+          cwd: projectPath,
+          env: { ...process.env, PORT: process.env.PORT || '3000', NODE_ENV: 'development' }
+        });
+        
+        server.on('exit', (code) => {
+          process.exit(code || 0);
+        });
+        
+        process.on('SIGINT', () => {
+          server.kill();
+          process.exit(0);
+        });
+      }
+    }
+    
+    // Auto install if requested or ask interactively
+    if (autoInstall) {
+      await runInstallation(projectPath, useTailwind);
+      
+      // Ask if user wants to start dev server
+      const { shouldStartDev } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'shouldStartDev',
+          message: 'Start development server?',
+          default: true
+        }
+      ]);
+      
+      if (shouldStartDev) {
+        startDevServer(projectPath, useTailwind);
+      } else {
+        console.log('✅ Project ready!\n');
         console.log('Start developing:');
         if (!useCurrentDir) {
           console.log(`  cd ${projectName}`);
         }
         console.log('  npm run dev\n');
-      } catch (err) {
-        console.error('❌ Installation failed:', err.message);
-        process.exit(1);
       }
     } else {
-      console.log('\n✅ Project created successfully!\n');
-      console.log('Next steps:');
-      if (!useCurrentDir) {
-        console.log(`  cd ${projectName}`);
-      }
-      console.log('  npm install');
-      if (useTailwind) {
-        console.log('  npm run build:css');
+      // Ask if user wants to install dependencies
+      const { shouldInstall } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'shouldInstall',
+          message: 'Install dependencies and build CSS now?',
+          default: true
+        }
+      ]);
+      
+      if (shouldInstall) {
+        await runInstallation(projectPath, useTailwind);
+        
+        // Ask if user wants to start dev server
+        const { shouldStartDev } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'shouldStartDev',
+            message: 'Start development server?',
+            default: true
+          }
+        ]);
+        
+        if (shouldStartDev) {
+          startDevServer(projectPath, useTailwind);
+        } else {
+          console.log('\n✅ Project ready!\n');
+          console.log('Start developing:');
+          if (!useCurrentDir) {
+            console.log(`  cd ${projectName}`);
+          }
+          console.log('  npm run dev\n');
+        }
+      } else {
+        console.log('\n✅ Project created successfully!\n');
+        console.log('Next steps:');
+        if (!useCurrentDir) {
+          console.log(`  cd ${projectName}`);
+        }
+        console.log('  npm install');
+        if (useTailwind) {
+          console.log('  npm run build:css');
+        }
+        console.log('  npm run dev\n');
       }
-      console.log('  npm run dev\n');
     }
   });
 
@@ -1132,6 +1472,174 @@ exports.down = function(knex) {
 `;
 }
 
+// seed command
+program
+  .command('seed')
+  .description('Run database seeders to populate database with fake data')
+  .option('-c, --config <path>', 'Path to database config file')
+  .option('-e, --env <environment>', 'Environment (development, production)', 'development')
+  .option('--setup', 'Setup seed files if they don\'t exist')
+  .action(async (options) => {
+    // Check if it's a Webspresso project
+    if (!fs.existsSync(path.join(process.cwd(), 'server.js')) && 
+        !fs.existsSync(path.join(process.cwd(), 'pages'))) {
+      console.error('❌ Not a Webspresso project! Run this command in your project directory.');
+      process.exit(1);
+    }
+
+    // Check for faker
+    let faker;
+    try {
+      faker = require('@faker-js/faker');
+    } catch {
+      console.error('❌ @faker-js/faker not installed.');
+      console.log('   Install it with: npm install @faker-js/faker');
+      process.exit(1);
+    }
+
+    // Load database config
+    const { config, path: configPath } = loadDbConfig(options.config);
+    console.log(`\n📦 Using config: ${configPath}`);
+    console.log(`   Environment: ${options.env}\n`);
+
+    // Check if models directory exists
+    const modelsDir = path.join(process.cwd(), 'models');
+    if (!fs.existsSync(modelsDir)) {
+      console.error('❌ models/ directory not found.');
+      console.log('   Create models first, then run: webspresso seed');
+      process.exit(1);
+    }
+
+    // Check if seeds directory exists
+    const seedsDir = path.join(process.cwd(), 'seeds');
+    const seedIndexPath = path.join(seedsDir, 'index.js');
+    
+    if (!fs.existsSync(seedsDir) || !fs.existsSync(seedIndexPath)) {
+      if (options.setup) {
+        console.log('📝 Setting up seed files...\n');
+        
+        // Create seeds directory
+        if (!fs.existsSync(seedsDir)) {
+          fs.mkdirSync(seedsDir, { recursive: true });
+        }
+        
+        // Create seed index file
+        const seedIndex = `require('dotenv').config();
+const { faker } = require('@faker-js/faker');
+const path = require('path');
+const fs = require('fs');
+const { createDatabase, getAllModels } = require('webspresso/orm');
+const dbConfig = require('../webspresso.db.js');
+
+const db = createDatabase(dbConfig);
+const seeder = db.seeder(faker);
+
+/**
+ * Load all models from models/ directory
+ */
+function loadModels() {
+  const modelsDir = path.join(__dirname, '..', 'models');
+  
+  if (!fs.existsSync(modelsDir)) {
+    return [];
+  }
+  
+  const modelFiles = fs.readdirSync(modelsDir)
+    .filter(file => file.endsWith('.js') && !file.startsWith('_'));
+  
+  const loadedModels = [];
+  for (const file of modelFiles) {
+    try {
+      require(path.join(modelsDir, file));
+      loadedModels.push(file);
+    } catch (error) {
+      console.warn(\`⚠️  Failed to load model from \${file}:\`, error.message);
+    }
+  }
+  
+  return loadedModels;
+}
+
+/**
+ * Seed database with fake data
+ * This script automatically detects models in the models/ directory
+ * and generates seed data based on their schemas.
+ */
+async function runSeeds() {
+  try {
+    console.log('🌱 Starting seed process...');
+    
+    // Load all models
+    const loadedFiles = loadModels();
+    
+    if (loadedFiles.length === 0) {
+      console.log('⚠️  No model files found in models/ directory.');
+      console.log('   Create models first, then run: webspresso seed');
+      await db.knex.destroy();
+      return;
+    }
+    
+    // Get all registered models
+    const models = getAllModels();
+    
+    if (models.size === 0) {
+      console.log('⚠️  No models registered. Make sure your model files export models using defineModel().');
+      await db.knex.destroy();
+      return;
+    }
+    
+    console.log(\`📦 Found \${models.size} model(s):\`);
+    for (const [name] of models) {
+      console.log(\`   - \${name}\`);
+    }
+    
+    // Seed each model
+    const results = {};
+    for (const [modelName, model] of models) {
+      console.log(\`\\n🌱 Seeding \${modelName}...\`);
+      
+      // Default count: 10 records per model
+      const count = 10;
+      const records = await seeder.seed(modelName, count);
+      results[modelName] = records.length;
+      
+      console.log(\`✅ Created \${records.length} \${modelName} record(s)\`);
+    }
+    
+    console.log(\`\\n✨ Seed completed! Created:\`);
+    for (const [modelName, count] of Object.entries(results)) {
+      console.log(\`   - \${count} \${modelName} record(s)\`);
+    }
+    
+    await db.knex.destroy();
+  } catch (error) {
+    console.error('❌ Seed failed:', error);
+    await db.knex.destroy().catch(() => {});
+    process.exit(1);
+  }
+}
+
+runSeeds();
+`;
+        
+        fs.writeFileSync(seedIndexPath, seedIndex);
+        console.log('✅ Seed files created!\n');
+      } else {
+        console.error('❌ seeds/index.js not found.');
+        console.log('   Run with --setup flag to create seed files: webspresso seed --setup');
+        process.exit(1);
+      }
+    }
+
+    // Run the seed script
+    try {
+      require(seedIndexPath);
+    } catch (error) {
+      console.error('❌ Failed to run seed:', error.message);
+      process.exit(1);
+    }
+  });
+
 // Parse arguments
 program.parse();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "description": "Minimal, production-ready SSR framework for Node.js with file-based routing, Nunjucks templating, built-in i18n, and CLI tooling",
   "main": "index.js",
   "bin": {