webspresso 0.0.16 → 0.0.18

package/core/orm/index.js

@@ -7,24 +7,8 @@
 const path = require('path');
 const { createSchemaHelpers, extractColumnsFromSchema, getColumnMeta } = require('./schema-helpers');
 const { defineModel, getModel, getAllModels, hasModel, clearRegistry } = require('./model');
-
-// Create zdb instance with zod (zod is a dependency)
-let z;
-try {
-  z = require('zod');
-} catch {
-  // Zod not installed, zdb will be undefined
-  z = null;
-}
-
-// Export zdb instance directly
-const zdb = z ? createSchemaHelpers(z) : null;
 const { createRepository } = require('./repository');
-const { createQueryBuilder, QueryBuilder } = require('./query-builder');
-const { runTransaction, createTransactionContext } = require('./transaction');
 const { createMigrationManager } = require('./migrations');
-const { scaffoldMigration, scaffoldAlterMigration, scaffoldDropMigration } = require('./migrations/scaffold');
-const { createScopeContext } = require('./scopes');
 const { createSeeder } = require('./seeder');
 
 /**
@@ -52,28 +36,14 @@ function createDatabase(config) {
     };
     
     const driverName = driverMap[client] || client;
+    const projectNodeModules = path.join(process.cwd(), 'node_modules');
     
-    // 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) {
+    // Try to find and pre-load driver from project's node_modules
+    try {
+      const driverPath = require.resolve(driverName, { paths: [projectNodeModules] });
+      require(driverPath); // Pre-load into Module._cache
+    } catch (e) {
+      // Driver not found in project
       const installCmd = driverName === 'better-sqlite3' 
         ? 'npm install better-sqlite3 --save'
         : driverName === 'pg'
@@ -83,24 +53,21 @@ function createDatabase(config) {
         : `npm install ${driverName} --save`;
       
       throw new Error(
-        `Database driver "${driverName}" is not installed in your project. ` +
+        `Database driver "${driverName}" is not installed in your project.\n` +
         `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
-  // 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;
+    // Provide helpful error message
+    if (e.message && (e.message.includes('Cannot find module') || e.message.includes('npm install'))) {
+      const driverName = driverMap[config.client] || config.client;
       const installCmd = driverName === 'better-sqlite3' 
         ? 'npm install better-sqlite3 --save'
         : driverName === 'pg'
@@ -109,34 +76,10 @@ function createDatabase(config) {
         ? '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 new Error(
+        `Failed to initialize database: ${e.message}\n` +
+        `Make sure "${driverName}" is installed: ${installCmd}`
+      );
     }
     throw e;
   }
@@ -146,114 +89,113 @@ function createDatabase(config) {
   const migrate = createMigrationManager(knexInstance, migrationConfig);
 
   // Default scope context
-  let globalScopeContext = createScopeContext();
+  const defaultScopeContext = {
+    tenantId: null,
+    userId: null,
+  };
+
+  // Model registry
+  const models = new Map();
 
   /**
-   * Set global tenant ID
-   * @param {*} tenantId - Tenant ID
-   * @returns {DatabaseInstance}
+   * Get a model by name
+   * @param {string} name - Model name
+   * @returns {import('./types').ModelDefinition}
    */
-  function forTenant(tenantId) {
-    globalScopeContext.tenantId = tenantId;
-    return db;
+  function getModelInstance(name) {
+    const model = models.get(name);
+    if (!model) {
+      throw new Error(`Model "${name}" is not defined. Make sure you've called defineModel() first.`);
+    }
+    return model;
   }
 
   /**
-   * Create a repository for a model
-   * @param {import('./types').ModelDefinition} model - Model definition
-   * @returns {import('./types').Repository}
+   * Check if a model exists
+   * @param {string} name - Model name
+   * @returns {boolean}
    */
-  function createRepo(model) {
-    return createRepository(model, knexInstance, { ...globalScopeContext });
+  function hasModelInstance(name) {
+    return models.has(name);
   }
 
   /**
-   * Run a callback within a transaction
-   * @param {function(import('./types').TransactionContext): Promise<*>} callback
-   * @returns {Promise<*>}
+   * Get all registered models
+   * @returns {Array<import('./types').ModelDefinition>}
    */
-  function transaction(callback) {
-    return runTransaction(knexInstance, callback, { ...globalScopeContext });
+  function getAllModelInstances() {
+    return Array.from(models.values());
   }
 
   /**
-   * Get raw Knex instance for advanced queries
-   * @returns {import('knex').Knex}
+   * Register a model
+   * @param {import('./types').ModelDefinition} model - Model definition
    */
-  function raw() {
-    return knexInstance;
+  function registerModel(model) {
+    models.set(model.name, model);
   }
 
   /**
-   * Close all database connections
-   * @returns {Promise<void>}
+   * Get repository for a model
+   * @param {string} modelName - Model name
+   * @param {import('./types').ScopeContext} [scopeContext] - Scope context
+   * @returns {import('./types').Repository}
    */
-  async function destroy() {
-    await knexInstance.destroy();
+  function getRepository(modelName, scopeContext = defaultScopeContext) {
+    const model = getModelInstance(modelName);
+    return createRepository(model, knexInstance, scopeContext);
   }
 
   /**
-   * Create a seeder instance
-   * @param {Object} faker - Faker instance (@faker-js/faker)
-   * @returns {Object} Seeder API
+   * Get query builder for a model
+   * @param {string} modelName - Model name
+   * @param {import('./types').ScopeContext} [scopeContext] - Scope context
+   * @returns {import('knex').Knex.QueryBuilder}
    */
-  function seeder(faker) {
-    return createSeeder(faker, knexInstance);
+  function query(modelName, scopeContext = defaultScopeContext) {
+    const model = getModelInstance(modelName);
+    const repo = createRepository(model, knexInstance, scopeContext);
+    return repo.query();
   }
 
-  const db = {
+  /**
+   * Create seeder instance
+   * @returns {import('./types').Seeder}
+   */
+  function createSeederInstance() {
+    return createSeeder(knexInstance, models);
+  }
+
+  return {
     knex: knexInstance,
-    createRepository: createRepo,
-    transaction,
     migrate,
-    seeder,
-    forTenant,
-    raw,
-    destroy,
+    getModel: getModelInstance,
+    hasModel: hasModelInstance,
+    getAllModels: getAllModelInstances,
+    registerModel,
+    getRepository,
+    query,
+    createSeeder: createSeederInstance,
+    destroy: () => knexInstance.destroy(),
   };
-
-  return db;
 }
 
-// Export everything
+// Export zdb instance directly
+const z = require('zod');
+const zdb = z ? createSchemaHelpers(z) : null;
+
 module.exports = {
   // Main factory
   createDatabase,
-
-  // Schema helpers - zdb instance (direct export)
+  // Schema helpers
   zdb,
-  createSchemaHelpers,
-  extractColumnsFromSchema,
-  getColumnMeta,
-
-  // Model
+  // Model utilities
   defineModel,
   getModel,
   getAllModels,
   hasModel,
   clearRegistry,
-
-  // Repository (for direct use if needed)
-  createRepository,
-
-  // Query builder
-  createQueryBuilder,
-  QueryBuilder,
-
-  // Transaction
-  runTransaction,
-  createTransactionContext,
-
-  // Migrations
-  createMigrationManager,
-  scaffoldMigration,
-  scaffoldAlterMigration,
-  scaffoldDropMigration,
-
-  // Scopes
-  createScopeContext,
-
-  // Seeder
-  createSeeder,
+  // Column utilities
+  extractColumnsFromSchema,
+  getColumnMeta,
 };
-

package/core/orm/model.js

@@ -80,7 +80,7 @@ function defineModel(options) {
     },
     columns,
     admin: {
-      enabled: admin.enabled || false,
+      enabled: admin.enabled === true, // Explicit boolean check
       label: admin.label || name,
       icon: admin.icon || null,
       customFields: admin.customFields || {},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "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": {
@@ -50,7 +50,7 @@
   },
   "peerDependencies": {
     "@faker-js/faker": "^9.0.0",
-    "better-sqlite3": "^9.0.0",
+    "better-sqlite3": "^11.10.0",
     "dotenv": "^16.0.0",
     "mysql2": "^3.0.0",
     "pg": "^8.0.0"
@@ -75,7 +75,7 @@
   "devDependencies": {
     "@faker-js/faker": "^9.3.0",
     "@vitest/coverage-v8": "^1.2.0",
-    "better-sqlite3": "^11.0.0",
+    "better-sqlite3": "^11.10.0",
     "chokidar": "^3.5.3",
     "dotenv": "^16.3.1",
     "release-it": "^17.11.0",

package/plugins/admin-panel/api.js

@@ -131,7 +131,7 @@ function createApiHandlers(options) {
       const adminModels = [];
 
       for (const [name, model] of allModels) {
-        if (model.admin && model.admin.enabled) {
+        if (model.admin && model.admin.enabled === true) {
           adminModels.push({
             name: model.name,
             table: model.table,
@@ -162,7 +162,7 @@ function createApiHandlers(options) {
         return res.status(404).json({ error: 'Model not found' });
       }
 
-      if (!model.admin || !model.admin.enabled) {
+      if (!model.admin || model.admin.enabled !== true) {
         return res.status(403).json({ error: 'Model not enabled in admin panel' });
       }
 
@@ -204,7 +204,7 @@ function createApiHandlers(options) {
       const { model: modelName } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }
 
@@ -270,7 +270,7 @@ function createApiHandlers(options) {
       const { model: modelName, id } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }
 
@@ -295,7 +295,7 @@ function createApiHandlers(options) {
       const { model: modelName } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }
 
@@ -316,7 +316,7 @@ function createApiHandlers(options) {
       const { model: modelName, id } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }
 
@@ -341,7 +341,7 @@ function createApiHandlers(options) {
       const { model: modelName, id } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }
 
@@ -366,7 +366,7 @@ function createApiHandlers(options) {
       const { model: modelName, relation: relationName } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }
 
@@ -395,7 +395,7 @@ function createApiHandlers(options) {
       const { model: modelName, query: queryName } = req.params;
       const model = getModel(modelName);
 
-      if (!model || !model.admin || !model.admin.enabled) {
+      if (!model || !model.admin || model.admin.enabled !== true) {
         return res.status(404).json({ error: 'Model not found or not enabled' });
       }