webspresso 0.0.16 → 0.0.17

package/core/orm/index.js

@@ -61,10 +61,21 @@ function createDatabase(config) {
       process.cwd(),
     ];
     
+    // Also try to resolve from parent directories (for nested projects)
+    let currentPath = process.cwd();
+    for (let i = 0; i < 5; i++) {
+      resolvePaths.push(path.join(currentPath, 'node_modules'));
+      const parent = path.dirname(currentPath);
+      if (parent === currentPath) break; // Reached root
+      currentPath = parent;
+    }
+    
     for (const resolvePath of resolvePaths) {
       try {
         driverPath = require.resolve(driverName, { paths: [resolvePath] });
         // Pre-load the driver so Knex can find it in Module._cache
+        // This is critical: Knex uses require() internally, so we need to
+        // load it into the cache first
         require(driverPath);
         break;
       } catch (e) {
@@ -72,22 +83,30 @@ function createDatabase(config) {
       }
     }
     
-    // If still not found, provide helpful error
+    // If still not found, try default resolution (might be in webspresso's node_modules)
     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()}`
-      );
+      try {
+        // Try to find it anywhere in the module resolution path
+        driverPath = require.resolve(driverName);
+        require(driverPath);
+      } catch (e) {
+        // Driver not found anywhere
+        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()}\n` +
+          `Make sure you run "${installCmd}" in your project directory.`
+        );
+      }
     }
   }
 
@@ -111,11 +130,29 @@ function createDatabase(config) {
       
       // 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
+      let foundDriverPath = null;
+      const checkPaths = [
+        path.join(process.cwd(), 'node_modules'),
+        process.cwd(),
+      ];
+      
+      // Also check parent directories
+      let currentPath = process.cwd();
+      for (let i = 0; i < 5; i++) {
+        checkPaths.push(path.join(currentPath, 'node_modules'));
+        const parent = path.dirname(currentPath);
+        if (parent === currentPath) break;
+        currentPath = parent;
+      }
+      
+      for (const checkPath of checkPaths) {
+        try {
+          foundDriverPath = require.resolve(driverName, { paths: [checkPath] });
+          driverExists = true;
+          break;
+        } catch (resolveError) {
+          // Continue checking
+        }
       }
       
       if (!driverExists) {
@@ -127,15 +164,24 @@ function createDatabase(config) {
           `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}`
-        );
+        // Driver exists but Knex can't find it - try to manually require it
+        try {
+          // Force load the driver into Module._cache
+          require(foundDriverPath);
+          // Retry Knex initialization
+          knexInstance = knex(config);
+        } catch (retryError) {
+          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` +
+            `4. Verify the driver is accessible: node -e "require('${driverName}')"\n` +
+            `Driver found at: ${foundDriverPath}\n` +
+            `Original error: ${e.message}`
+          );
+        }
       }
     }
     throw e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "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": {