webspresso 0.0.14 → 0.0.16

package/README.md

@@ -1007,6 +1007,9 @@ webspresso db:make create_posts_table
 
 # Create migration from model (scaffolding)
 webspresso db:make create_users_table --model User
+
+# Admin Panel Setup
+webspresso admin:setup  # Create admin_users migration
 ```
 
 **Database Config File (`webspresso.db.js`):**

package/bin/commands/admin-setup.js

@@ -0,0 +1,72 @@
+/**
+ * Admin Setup Command
+ * Create admin_users table migration for admin panel
+ */
+
+const fs = require('fs');
+const path = require('path');
+const { loadDbConfig } = require('../utils/db');
+const { generateAdminUsersMigration } = require('../../plugins/admin-panel/migration-template');
+
+function registerCommand(program) {
+  program
+    .command('admin:setup')
+    .description('Create admin_users table migration for admin panel')
+    .option('-c, --config <path>', 'Path to database config file')
+    .action(async (options) => {
+      try {
+        const { config, path: configPath } = loadDbConfig(options.config);
+        console.log(`\n📦 Using config: ${configPath}\n`);
+        
+        const migrationDir = config.migrations?.directory || './migrations';
+        
+        // Ensure migrations directory exists
+        if (!fs.existsSync(migrationDir)) {
+          fs.mkdirSync(migrationDir, { recursive: true });
+          console.log(`Created directory: ${migrationDir}`);
+        }
+        
+        // Check if migration already exists
+        const existingMigrations = fs.readdirSync(migrationDir)
+          .filter(f => f.includes('admin_users') || f.includes('admin-users'));
+        
+        if (existingMigrations.length > 0) {
+          console.log(`⚠️  Admin users migration already exists:`);
+          existingMigrations.forEach(m => console.log(`   - ${m}`));
+          console.log(`\n   If you want to recreate it, delete the existing migration first.\n`);
+          return;
+        }
+        
+        // Generate filename with timestamp
+        const now = new Date();
+        const timestamp = [
+          now.getFullYear(),
+          String(now.getMonth() + 1).padStart(2, '0'),
+          String(now.getDate()).padStart(2, '0'),
+          '_',
+          String(now.getHours()).padStart(2, '0'),
+          String(now.getMinutes()).padStart(2, '0'),
+          String(now.getSeconds()).padStart(2, '0'),
+        ].join('');
+        
+        const filename = `${timestamp}_create_admin_users_table.js`;
+        const filepath = path.join(migrationDir, filename);
+        
+        // Generate migration content
+        const content = generateAdminUsersMigration();
+        
+        // Write migration file
+        fs.writeFileSync(filepath, content);
+        
+        console.log(`✅ Created admin users migration: ${filepath}\n`);
+        console.log(`📝 Next steps:`);
+        console.log(`   1. Run migration: webspresso db:migrate`);
+        console.log(`   2. Create first admin user via admin panel setup page\n`);
+      } catch (err) {
+        console.error('❌ Error:', err.message);
+        process.exit(1);
+      }
+    });
+}
+
+module.exports = { registerCommand };

package/bin/webspresso.js

@@ -24,6 +24,7 @@ const { registerCommand: registerDbRollback } = require('./commands/db-rollback'
 const { registerCommand: registerDbStatus } = require('./commands/db-status');
 const { registerCommand: registerDbMake } = require('./commands/db-make');
 const { registerCommand: registerSeed } = require('./commands/seed');
+const { registerCommand: registerAdminSetup } = require('./commands/admin-setup');
 
 registerNew(program);
 registerPage(program);
@@ -36,6 +37,7 @@ registerDbRollback(program);
 registerDbStatus(program);
 registerDbMake(program);
 registerSeed(program);
+registerAdminSetup(program);
 
 // Parse arguments
 program.parse();

package/core/orm/index.js

@@ -4,6 +4,7 @@
  * @module core/orm
  */
 
+const path = require('path');
 const { createSchemaHelpers, extractColumnsFromSchema, getColumnMeta } = require('./schema-helpers');
 const { defineModel, getModel, getAllModels, hasModel, clearRegistry } = require('./model');
 
@@ -40,8 +41,105 @@ function createDatabase(config) {
     throw new Error('Knex is required for ORM. Install it with: npm install knex');
   }
 
+  // Check if database driver is available in project's node_modules
+  const client = config.client;
+  if (client) {
+    const driverMap = {
+      'better-sqlite3': 'better-sqlite3',
+      'pg': 'pg',
+      'mysql2': 'mysql2',
+      'mysql': 'mysql2',
+    };
+    
+    const driverName = driverMap[client] || client;
+    
+    // Try to resolve and pre-load the driver from project's node_modules
+    // This ensures Knex can find it when it tries to load it
+    let driverPath = null;
+    const resolvePaths = [
+      path.join(process.cwd(), 'node_modules'),
+      process.cwd(),
+    ];
+    
+    for (const resolvePath of resolvePaths) {
+      try {
+        driverPath = require.resolve(driverName, { paths: [resolvePath] });
+        // Pre-load the driver so Knex can find it in Module._cache
+        require(driverPath);
+        break;
+      } catch (e) {
+        // Continue to next path
+      }
+    }
+    
+    // If still not found, provide helpful error
+    if (!driverPath) {
+      const installCmd = driverName === 'better-sqlite3' 
+        ? 'npm install better-sqlite3 --save'
+        : driverName === 'pg'
+        ? 'npm install pg --save'
+        : driverName === 'mysql2'
+        ? 'npm install mysql2 --save'
+        : `npm install ${driverName} --save`;
+      
+      throw new Error(
+        `Database driver "${driverName}" is not installed in your project. ` +
+        `Please install it with: ${installCmd}\n` +
+        `Note: Database drivers are peer dependencies and must be installed in your project's node_modules, not globally.\n` +
+        `Current working directory: ${process.cwd()}`
+      );
+    }
+  }
+
   // Create Knex instance
-  const knexInstance = knex(config);
+  // Knex will try to load the driver from its own node_modules
+  // We need to ensure the driver is available in the project's node_modules
+  let knexInstance;
+  try {
+    knexInstance = knex(config);
+  } catch (e) {
+    // If knex throws an error about missing driver, provide better message
+    if (e.message && (e.message.includes('Cannot find module') || e.message.includes('run') || e.message.includes('npm install'))) {
+      const driverName = config.client;
+      const installCmd = driverName === 'better-sqlite3' 
+        ? 'npm install better-sqlite3 --save'
+        : driverName === 'pg'
+        ? 'npm install pg --save'
+        : driverName === 'mysql2'
+        ? 'npm install mysql2 --save'
+        : `npm install ${driverName} --save`;
+      
+      // Check if driver exists in project's node_modules
+      let driverExists = false;
+      try {
+        require.resolve(driverName, { paths: [path.join(process.cwd(), 'node_modules')] });
+        driverExists = true;
+      } catch (resolveError) {
+        // Driver not found in project
+      }
+      
+      if (!driverExists) {
+        throw new Error(
+          `Database driver "${driverName}" is not installed in your project. ` +
+          `Please install it with: ${installCmd}\n` +
+          `Note: Database drivers are peer dependencies and must be installed in your project's node_modules, not globally.\n` +
+          `Current working directory: ${process.cwd()}\n` +
+          `Make sure you run "${installCmd}" in your project directory.`
+        );
+      } else {
+        // Driver exists but Knex can't find it - this is a module resolution issue
+        throw new Error(
+          `Database driver "${driverName}" is installed but Knex cannot find it. ` +
+          `This might be a module resolution issue. Try:\n` +
+          `1. Delete node_modules and package-lock.json\n` +
+          `2. Run "npm install" again\n` +
+          `3. Make sure "${driverName}" is in your package.json dependencies\n` +
+          `Original error: ${e.message}`
+        );
+      }
+    }
+    throw e;
+  }
 
   // Create migration manager
   const migrationConfig = config.migrations || {};

package/index.js

@@ -63,6 +63,9 @@ module.exports = {
   // ORM
   ...orm,
   
+  // Direct zdb export (for convenience)
+  zdb: orm.zdb,
+
   // Plugins
   schemaExplorerPlugin,
   adminPanelPlugin,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "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": {
@@ -37,9 +37,11 @@
     "plugins/"
   ],
   "dependencies": {
+    "bcrypt": "^5.1.1",
     "commander": "^11.1.0",
     "dayjs": "^1.11.19",
     "express": "^4.18.2",
+    "express-session": "^1.18.0",
     "helmet": "^7.2.0",
     "inquirer": "^8.2.6",
     "knex": "^3.1.0",

package/plugins/admin-panel/admin-user-model.js

@@ -4,8 +4,8 @@
  * @module plugins/admin-panel/admin-user-model
  */
 
-const { defineModel } = require('../../../core/orm/model');
-const { zdb } = require('../../../core/orm');
+const { defineModel } = require('../../core/orm/model');
+const { zdb } = require('../../core/orm');
 
 /**
  * AdminUser model schema
@@ -23,7 +23,7 @@ const AdminUserSchema = zdb.schema({
 
 /**
  * Create and register AdminUser model
- * @returns {import('../../../core/orm/types').ModelDefinition}
+ * @returns {import('../../core/orm/types').ModelDefinition}
  */
 function createAdminUserModel() {
   return defineModel({

package/plugins/admin-panel/api.js

@@ -4,7 +4,7 @@
  * @module plugins/admin-panel/api
  */
 
-const { getAllModels, getModel } = require('../../../core/orm/model');
+const { getAllModels, getModel } = require('../../core/orm/model');
 const { checkAdminExists, setupAdmin, login, logout, requireAuth } = require('./auth');
 
 /**

package/plugins/admin-panel/index.js

@@ -31,25 +31,9 @@ function adminPanelPlugin(options = {}) {
     throw new Error('Admin panel plugin requires a database instance. Pass `db` in options.');
   }
 
-  // Check for peer dependencies
-  let session = null;
-  let bcrypt = null;
-
-  try {
-    session = require('express-session');
-  } catch (e) {
-    throw new Error(
-      'Admin panel plugin requires express-session. Install it with: npm install express-session'
-    );
-  }
-
-  try {
-    bcrypt = require('bcrypt');
-  } catch (e) {
-    throw new Error(
-      'Admin panel plugin requires bcrypt. Install it with: npm install bcrypt'
-    );
-  }
+  // Dependencies are now in main package
+  const session = require('express-session');
+  const bcrypt = require('bcrypt');
 
   return {
     name: 'admin-panel',
@@ -61,8 +45,13 @@ function adminPanelPlugin(options = {}) {
      * Register hook - called when plugin is registered
      */
     async register(ctx) {
-      // Create and register AdminUser model
-      const AdminUser = createAdminUserModel();
+      // Create and register AdminUser model (only if not already registered)
+      const { getModel } = require('../../core/orm/model');
+      let AdminUser = getModel('AdminUser');
+      
+      if (!AdminUser) {
+        AdminUser = createAdminUserModel();
+      }
 
       // Store in plugin context for later use
       this._adminUser = AdminUser;
@@ -86,19 +75,24 @@ function adminPanelPlugin(options = {}) {
       const bcrypt = this._bcrypt;
       const session = this._session;
 
-      // Setup session middleware
-      const sessionSecret = options.sessionSecret || process.env.SESSION_SECRET || 'webspresso-admin-secret-change-in-production';
-      
-      app.use(session({
-        secret: sessionSecret,
-        resave: false,
-        saveUninitialized: false,
-        cookie: {
-          secure: process.env.NODE_ENV === 'production',
-          httpOnly: true,
-          maxAge: 24 * 60 * 60 * 1000, // 24 hours
-        },
-      }));
+      // Setup session middleware (only once, even if multiple plugins)
+      // Check if session middleware is already registered
+      if (!app._webspressoSessionInitialized) {
+        const sessionSecret = options.sessionSecret || process.env.SESSION_SECRET || 'webspresso-admin-secret-change-in-production';
+        
+        app.use(session({
+          secret: sessionSecret,
+          resave: false,
+          saveUninitialized: false,
+          cookie: {
+            secure: process.env.NODE_ENV === 'production',
+            httpOnly: true,
+            maxAge: 24 * 60 * 60 * 1000, // 24 hours
+          },
+        }));
+        
+        app._webspressoSessionInitialized = true;
+      }
 
       // Create API handlers
       const apiHandlers = createApiHandlers({