masterrecord 0.2.20 → 0.2.22

package/Migrations/cli.js

@@ -191,24 +191,40 @@ program.option('-V', 'output the version');
           return;
         }
 
+        // Resolve relative paths from the snapshot directory (portable snapshots)
+        const snapDir = path.dirname(file);
+        const contextAbs = path.resolve(snapDir, contextSnapshot.contextLocation || '');
+        const migBase = path.resolve(snapDir, contextSnapshot.migrationFolder || '.');
+
         let ContextCtor;
         try{
-          ContextCtor = require(contextSnapshot.contextLocation);
+          ContextCtor = require(contextAbs);
         }catch(_){
-          console.log(`Error - Cannot load Context file at '${contextSnapshot.contextLocation}'.`);
+          console.log(`Error - Cannot load Context file at '${contextAbs}'.`);
           return;
         }
         let contextInstance;
         try{
           contextInstance = new ContextCtor();
         }catch(_){
-          console.log(`Error - Failed to construct Context from '${contextSnapshot.contextLocation}'.`);
+          console.log(`Error - Failed to construct Context from '${contextAbs}'.`);
           return;
         }
         var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+
+        // Skip if no changes between snapshot schema and current entities
+        const has = migration.hasChanges(contextSnapshot.schema || [], cleanEntities || []);
+        if(!has){
+          console.log(`No changes detected for ${path.basename(contextAbs)}. Skipping.`);
+          return;
+        }
+
         var newEntity = migration.template(name, contextSnapshot.schema, cleanEntities);
+        if(!fs.existsSync(migBase)){
+          try{ fs.mkdirSync(migBase, { recursive: true }); }catch(_){ /* ignore */ }
+        }
         var migrationDate = Date.now();
-        var outputFile = `${contextSnapshot.migrationFolder}/${migrationDate}_${name}_migration.js`
+        var outputFile = `${migBase}/${migrationDate}_${name}_migration.js`
         fs.writeFile(outputFile, newEntity, 'utf8', function (err) {
           if (err) return console.log("--- Error running cammand, re-run command add-migration ---- ", err);
         });
@@ -595,6 +611,12 @@ program.option('-V', 'output the version');
           }
           var migration = new Migration();
           var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+          // If no changes, skip with message
+          const has = migration.hasChanges(cs.schema || [], cleanEntities || []);
+          if(!has){
+            console.log(`No changes detected for ${path.basename(contextAbs)}. Skipping.`);
+            continue;
+          }
           var newEntity = migration.template(name, cs.schema, cleanEntities);
           if(!fs.existsSync(migBase)){
             try{ fs.mkdirSync(migBase, { recursive: true }); }catch(_){ /* ignore */ }

package/Migrations/migrations.js

@@ -277,6 +277,22 @@ class Migrations{
         return tableObj;
     }
 
+    // Returns true if there are any changes between old and new schema
+    hasChanges(oldSchema, newSchema){
+        const tables = this.#buildMigrationObject(oldSchema, newSchema);
+        for(const t of tables){
+            if(!t) continue;
+            if((t.newTables && t.newTables.length) ||
+               (t.newColumns && t.newColumns.length) ||
+               (t.deletedColumns && t.deletedColumns.length) ||
+               (t.updatedColumns && t.updatedColumns.length) ||
+               (t.old === null) || (t.new === null)){
+                return true;
+            }
+        }
+        return false;
+    }
+
     template(name, oldSchema, newSchema){
         var MT = new MigrationTemplate(name);
         var tables = this.#buildMigrationObject(oldSchema, newSchema);

package/context.js

@@ -98,17 +98,19 @@ 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, "/");
             if(parent === currentRoot || parent === ""){
@@ -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");

package/package.json

@@ -9,7 +9,7 @@
     "app-root-path": "^3.1.0",
     "better-sqlite3": "^12.4.1"
   },
-  "version": "0.2.20",
+  "version": "0.2.22",
   "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": {