masterrecord 0.2.21 → 0.2.23

package/context.js

@@ -98,19 +98,21 @@ class context {
         let currentRoot = root;
         const maxHops = 12;
         for(let i = 0; i < maxHops; i++){
-            const rootFolder = path.isAbsolute(rootFolderLocation) ? rootFolderLocation : `${currentRoot}/${rootFolderLocation}`;
+            const rootFolder = path.isAbsolute(rootFolderLocation) ? rootFolderLocation : path.join(currentRoot, rootFolderLocation);
             // Support both env.development.json and development.json naming
             const searchA = `${rootFolder}/**/*env.${envType}.json`;
             const searchB = `${rootFolder}/**/*${envType}.json`;
-            let files = globSearch.sync(searchA, currentRoot);
+            let files = globSearch.sync(searchA, { cwd: currentRoot, dot: true, nocase: true, windowsPathsNoEscape: true });
             if(!files || files.length === 0){
-                files = globSearch.sync(searchB, currentRoot);
+                files = globSearch.sync(searchB, { cwd: currentRoot, dot: true, nocase: true, windowsPathsNoEscape: true });
             }
-            const file = files && files[0];
-            if(file){
-                return { file: file, rootFolder: currentRoot };
+            const rel = files && files[0];
+            if(rel){
+                // Ensure absolute path for require()
+                const abs = path.isAbsolute(rel) ? rel : path.resolve(currentRoot, rel);
+                return { file: abs, rootFolder: currentRoot };
             }
-            const parent = tools.removeBackwardSlashSection(currentRoot, 1, "/");
+            const parent = path.dirname(currentRoot);
             if(parent === currentRoot || parent === ""){
                 break;
             }
@@ -151,7 +153,9 @@ class context {
                 throw new Error(`Environment config not found for '${envType}' under '${rootFolderLocation}'.`);
             }
 
-            const settings = require(file.file);
+            // Always require absolute file path to avoid module root ambiguity on global installs/Windows
+            const settingsPath = path.isAbsolute(file.file) ? file.file : path.resolve(file.rootFolder, file.file);
+            const settings = require(settingsPath);
             const options = settings[contextName];
             if(options === undefined){
                 console.log("settings missing context name settings");
@@ -162,11 +166,15 @@ class context {
 
             if(type === 'sqlite' || type === 'better-sqlite3'){
                 this.isSQLite = true; this.isMySQL = false;
-                // Back-compat: treat leading '/' as project-root relative, not filesystem root
+                // Treat leading project-style paths ('/components/...') as project-root relative across OSes
                 let dbPath = options.connection || '';
                 if(dbPath){
-                    if(dbPath.startsWith(path.sep) || !path.isAbsolute(dbPath)){
-                        dbPath = path.join(file.rootFolder, dbPath);
+                    const looksProjectRootRelative = dbPath.startsWith('/') || dbPath.startsWith('\\');
+                    const isAbsoluteFsPath = path.isAbsolute(dbPath);
+                    if(looksProjectRootRelative || !isAbsoluteFsPath){
+                        // Normalize leading separators to avoid duplicating separators on Windows
+                        const trimmed = dbPath.replace(/^[/\\]+/, '');
+                        dbPath = path.join(file.rootFolder, trimmed);
                     }
                 }
                 const dbDir = path.dirname(dbPath);
@@ -210,11 +218,21 @@ class context {
             }
 
             this.validateSQLiteOptions(options);
-            options.completeConnection = `${file.rootFolder}${options.connection}`;
-            var dbDirectory = options.completeConnection.substr(0, options.completeConnection.lastIndexOf("\/"));
+            // Build DB path similarly to env(): project-root relative on leading slash
+            let dbPath = options.connection || '';
+            if(dbPath){
+                const looksProjectRootRelative = dbPath.startsWith('/') || dbPath.startsWith('\\');
+                const isAbsoluteFsPath = path.isAbsolute(dbPath);
+                if(looksProjectRootRelative || !isAbsoluteFsPath){
+                    const trimmed = dbPath.replace(/^[/\\]+/, '');
+                    dbPath = path.join(file.rootFolder, trimmed);
+                }
+            }
+            options.completeConnection = dbPath;
+            var dbDirectory = path.dirname(options.completeConnection);
             
             if (!fs.existsSync(dbDirectory)){
-                fs.mkdirSync(dbDirectory);
+                fs.mkdirSync(dbDirectory, { recursive: true });
             }
 
             this.db = this.__SQLiteInit(options,  "better-sqlite3");

package/package.json

@@ -9,7 +9,7 @@
     "app-root-path": "^3.1.0",
     "better-sqlite3": "^12.4.1"
   },
-  "version": "0.2.21",
+  "version": "0.2.23",
   "description": "An Object-relational mapping for the Master framework. Master Record connects classes to relational database tables to establish a database with almost zero-configuration ",
   "homepage": "https://github.com/Tailor/MasterRecord#readme",
   "repository": {