masterrecord 0.3.19 → 0.3.21

package/Migrations/migrationTemplate.js

@@ -14,21 +14,21 @@ class MigrationTemplate {
     #down = ''
 
     get(){
-        return ` 
-         
+        return `
+
 var masterrecord = require('masterrecord');
 
-class ${this.name} extends masterrecord.schema { 
+class ${this.name} extends masterrecord.schema {
     constructor(context){
         super(context);
     }
 
-    up(table){
+    async up(table){
         this.init(table);
         ${this.#up}
     }
 
-    down(table){
+    async down(table){
         this.init(table);
         ${this.#down}
     }
@@ -47,10 +47,10 @@ module.exports = ${this.name};
     }
     createTable(type, name){
         if(type === "up"){
-            this.#up += os.EOL + `     this.createTable(table.${name});` 
+            this.#up += os.EOL + `     await this.createTable(table.${name});`
         }
         else{
-            this.#down += os.EOL + `     this.createTable(table.${name});` 
+            this.#down += os.EOL + `     await this.createTable(table.${name});`
         }
     }
 
@@ -66,10 +66,10 @@ module.exports = ${this.name};
    
     dropTable(type, name){
         if(type === "up"){
-            this.#down += os.EOL + `    this.droptable(table.${name});`
+            this.#down += os.EOL + `    this.dropTable(table.${name});`
         }
         else{
-            this.#down += os.EOL + `    this.droptable(table.${name});`
+            this.#down += os.EOL + `    this.dropTable(table.${name});`
         }
     }
 

package/context.js

@@ -452,7 +452,35 @@ class context {
                 const rel = files[0];
                 // Ensure absolute path for require()
                 const abs = path.isAbsolute(rel) ? rel : path.resolve(currentRoot, rel);
-                return { file: abs, rootFolder: currentRoot };
+
+                // Find actual project root by looking for package.json or .git
+                // This prevents duplicate paths like "app/models/components/workforce/db/"
+                let projectRoot = path.dirname(abs);
+                let searchDir = projectRoot;
+                let foundProjectRoot = false;
+
+                // Walk up the directory tree to find package.json or .git
+                for (let j = 0; j < MAX_CONFIG_SEARCH_HOPS; j++) {
+                    const hasPackageJson = fs.existsSync(path.join(searchDir, 'package.json'));
+                    const hasGit = fs.existsSync(path.join(searchDir, '.git'));
+
+                    if (hasPackageJson || hasGit) {
+                        projectRoot = searchDir;
+                        foundProjectRoot = true;
+                        break;
+                    }
+
+                    const parent = path.dirname(searchDir);
+                    if (parent === searchDir) break;  // Reached filesystem root
+                    searchDir = parent;
+                }
+
+                // Fallback to currentRoot if no project markers found
+                if (!foundProjectRoot) {
+                    projectRoot = currentRoot;
+                }
+
+                return { file: abs, rootFolder: projectRoot };
             }
 
             // Move to parent directory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "masterrecord",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "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 ",
   "main": "MasterRecord.js",
   "bin": {