masterrecord 0.2.5 → 0.2.7

package/Migrations/cli.js

@@ -21,6 +21,19 @@ var Migration = require('./migrations');
 var globSearch = require("glob");
 const pkg = require(path.join(__dirname, '..', 'package.json'));
 
+// Extract numeric timestamp from migration filename (e.g., 1737999999999_name_migration.js)
+function __getMigrationTimestamp(file){
+  try{
+    const base = path.basename(file);
+    const match = /^([0-9]{10,})_/i.exec(base);
+    if(match){ return Number(match[1]); }
+    const stat = fs.statSync(file);
+    return stat.mtimeMs || 0;
+  }catch(_){
+    return 0;
+  }
+}
+
 
 const [,, ...args] = process.argv
 
@@ -45,6 +58,10 @@ program.option('-V', 'output the version');
         var executedLocation = process.cwd();
         // find context file from main folder location
         var contextInstance = migration.findContext(executedLocation, contextFileName);
+        if(!contextInstance){
+          console.log(`Error - Cannot read or find Context file '${contextFileName}.js' in '${executedLocation}'.`);
+          return;
+        }
         var snap = {
           file : contextInstance.fileLocation,
           executedLocation : executedLocation,
@@ -103,23 +120,41 @@ program.option('-V', 'output the version');
           // find context file from main folder location
         var search = `${executedLocation}/**/*${contextFileName}_contextSnapShot.json`;
         var files = globSearch.sync(search, executedLocation);
-        var file = files[0];
-        if(file){
-          var contextSnapshot = require(files[0]);
-          var context = require(contextSnapshot.contextLocation);
-          var contextInstance = new context();
-          var cleanEntities = migration.cleanEntities(contextInstance.__entities);
-          var newEntity = migration.template(name, contextSnapshot.schema, cleanEntities);
-          var migrationDate = Date.now();
-          var file = `${contextSnapshot.migrationFolder}/${migrationDate}_${name}_migration.js`
-          fs.writeFile(file, newEntity, 'utf8', function (err) {
-            if (err) return console.log("--- Error running cammand, re-run command add-migration ---- ", err);
-          });
-          console.log(`${name} migration file created`);
+        var file = files && files[0];
+        if(!file){
+          console.log(`Error - Cannot read or find Context snapshot '${contextFileName}_contextSnapShot.json' in '${executedLocation}'. Run 'masterrecord enable-migrations ${contextFileName}'.`);
+          return;
+        }
+        var contextSnapshot = null;
+        try{
+          contextSnapshot = require(file);
+        }catch(_){
+          console.log(`Error - Cannot read context snapshot at '${file}'.`);
+          return;
+        }
+
+        let ContextCtor;
+        try{
+          ContextCtor = require(contextSnapshot.contextLocation);
+        }catch(_){
+          console.log(`Error - Cannot load Context file at '${contextSnapshot.contextLocation}'.`);
+          return;
         }
-        else{
-          console.log("Error - Cannot read or find Context file");
+        let contextInstance;
+        try{
+          contextInstance = new ContextCtor();
+        }catch(_){
+          console.log(`Error - Failed to construct Context from '${contextSnapshot.contextLocation}'.`);
+          return;
         }
+        var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+        var newEntity = migration.template(name, contextSnapshot.schema, cleanEntities);
+        var migrationDate = Date.now();
+        var outputFile = `${contextSnapshot.migrationFolder}/${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);
+        });
+        console.log(`${name} migration file created`);
        }catch (e){
          console.log("Error - Cannot read or find file ", e);
       }
@@ -142,25 +177,20 @@ program.option('-V', 'output the version');
           var contextSnapshot = require(file);
           var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
           var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
-          if( migrationFiles){
-            
-           // find newest migration file
-           // THIS DOESNT WORK BUG - hack to fix this I just take the last file which I am asuming is the newest one
-             var mFiles = migrationFiles.sort(function(x, y){
-               return new Date(x.timestamp) < new Date(y.timestamp) ? 1 : -1
-             });
-          /** ENd of BUG */
-          
-             var mFile = mFiles[mFiles.length -1];
+          if( migrationFiles && migrationFiles.length){
+            // sort by timestamp prefix or file mtime as fallback
+            var mFiles = migrationFiles.slice().sort(function(a, b){
+              return __getMigrationTimestamp(a) - __getMigrationTimestamp(b);
+            });
+            var mFile = mFiles[mFiles.length -1];
 
              var migrationProjectFile = require(mFile);
              var context = require(contextSnapshot.contextLocation);
              var contextInstance = new context();
              var newMigrationProjectInstance = new migrationProjectFile(context);
 
-             var tableObj = migration.buildUpObject(contextSnapshot.schema, contextInstance.__entities);
-             
-             var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+            var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+            var tableObj = migration.buildUpObject(contextSnapshot.schema, cleanEntities);
              newMigrationProjectInstance.up(tableObj);
             
              var snap = {
@@ -201,51 +231,62 @@ program.option('-V', 'output the version');
          var search = `${executedLocation}/**/*${contextFileName}_contextSnapShot.json`;
          var files = globSearch.sync(search, executedLocation);
          var file = files[0];
-         if(file){
-          var contextSnapshot = require(file);
-          var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
-          var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
-          if( migrationFiles){
-            
-          
-            // organize by time
-            var mFiles = migrationFiles.sort(function(x, y){
-              return new Date(x.timestamp) < new Date(y.timestamp) ? 1 : -1;
-            });
-             var context = require(contextSnapshot.contextLocation);
-             
-             for (let i = 0; i < mFiles.length; i++) {
-                var file = mFiles[i];
-                var migrationProjectFile = require(file);
-
-                var contextInstance = new context();
-                var newMigrationProjectInstance = new migrationProjectFile(context);
-                var tableObj = migration.buildUpObject(contextSnapshot.schema, contextInstance.__entities);
-                var cleanEntities = migration.cleanEntities(contextInstance.__entities);
-                newMigrationProjectInstance.up(tableObj);
-            }
-        
-            
-            var snap = {
-                  file : contextSnapshot.contextLocation,
-                  executedLocation : executedLocation,
-                  context : contextInstance,
-                  contextEntities : cleanEntities,
-                  contextFileName: contextFileName
-                }
- 
-             migration.createSnapShot(snap);
-             console.log("database updated");
-          }
-          else{
+         if(!file){
+           console.log(`Error - Cannot read or find Context snapshot '${contextFileName}_contextSnapShot.json' in '${executedLocation}'.`);
+           return;
+         }
+         var contextSnapshot;
+         try{
+           contextSnapshot = require(file);
+         }catch(_){
+           console.log(`Error - Cannot read context snapshot at '${file}'.`);
+           return;
+         }
+         var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
+         var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
+         if(!(migrationFiles && migrationFiles.length)){
            console.log("Error - Cannot read or find migration file");
-          }
-
+           return;
          }
-         else{
-           console.log("Error - Cannot read or find Context file");
-          }
-        }catch (e){
+         // organize by time using filename timestamp or file mtime
+         var mFiles = migrationFiles.slice().sort(function(a, b){
+           return __getMigrationTimestamp(a) - __getMigrationTimestamp(b);
+         });
+         let ContextCtor;
+         try{
+           ContextCtor = require(contextSnapshot.contextLocation);
+         }catch(_){
+           console.log(`Error - Cannot load Context file at '${contextSnapshot.contextLocation}'.`);
+           return;
+         }
+         var contextInstance;
+         try{
+           contextInstance = new ContextCtor();
+         }catch(_){
+           console.log(`Error - Failed to construct Context from '${contextSnapshot.contextLocation}'.`);
+           return;
+         }
+         var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+         for (let i = 0; i < mFiles.length; i++) {
+            var migFile = mFiles[i];
+            var migrationProjectFile = require(migFile);
+            var newMigrationProjectInstance = new migrationProjectFile(ContextCtor);
+            var tableObj = migration.buildUpObject(contextSnapshot.schema, cleanEntities);
+            newMigrationProjectInstance.up(tableObj);
+         }
+         var snap = {
+               file : contextSnapshot.contextLocation,
+               executedLocation : executedLocation,
+               context : contextInstance,
+               contextEntities : cleanEntities,
+               contextFileName: contextFileName
+             }
+ 
+         migration.createSnapShot(snap);
+         console.log("database updated");
+ 
+        }
+        catch (e){
           console.log("Error - Cannot read or find file ", e);
         }
   });
@@ -261,16 +302,27 @@ program.option('-V', 'output the version');
       var search = `${executedLocation}/**/*${contextFileName}_contextSnapShot.json`;
       var files = globSearch.sync(search, executedLocation);
       var file = files[0];
-      if(file){
-          var contextSnapshot = require(file);
-          var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
-          var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
-          if( migrationFiles){
-            return migrationFiles;
-          }
+      if(!file){
+        console.log(`Error - Cannot read or find Context snapshot '${contextFileName}_contextSnapShot.json' in '${executedLocation}'.`);
+        return;
+      }
+      var contextSnapshot;
+      try{
+        contextSnapshot = require(file);
+      }catch(_){
+        console.log(`Error - Cannot read context snapshot at '${file}'.`);
+        return;
       }
-      else{
-        console.log("Error - Cannot read or find Context file");
+      var searchMigration = `${contextSnapshot.migrationFolder}/**/*_migration.js`;
+      var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
+      if(!(migrationFiles && migrationFiles.length)){
+        console.log("No migration files found.");
+        return;
+      }
+      var sorted = migrationFiles.slice().sort((a,b) => __getMigrationTimestamp(a) - __getMigrationTimestamp(b));
+      // Print relative names for readability
+      for(const f of sorted){
+        console.log(path.basename(f));
       }
  });
 
@@ -281,10 +333,102 @@ program.option('-V', 'output the version');
   .description('Apply pending migrations to database - down method call')
   .action(function(migrationFileName){
   // this will call all the down methods until it gets to the one your looking for. First it needs to validate that there is such a file.
-  // TODO:
-  
-  });
+    var executedLocation = process.cwd();
+    var migration = new Migration();
+    try{
+      // Accept either a bare filename or a path; normalize to basename
+      var targetName = path.basename(migrationFileName);
+
+      // Locate the target migration file anywhere under the current folder
+      var searchTarget = `${executedLocation}/**/${targetName}`;
+      var targetMatches = globSearch.sync(searchTarget, executedLocation);
+      if(!(targetMatches && targetMatches.length)){
+        console.log(`Error - Cannot read or find migration file '${targetName}' in '${executedLocation}'.`);
+        return;
+      }
+      var targetFilePath = targetMatches[0];
+      var migrationFolder = path.dirname(targetFilePath);
+
+      // Find the context snapshot within the same migrations folder
+      var snapshotMatches = globSearch.sync(`${migrationFolder}/**/*_contextSnapShot.json`, migrationFolder);
+      var snapshotFile = snapshotMatches && snapshotMatches[0];
+      if(!snapshotFile){
+        console.log("Error - Cannot read or find Context snapshot in migration folder.");
+        return;
+      }
 
+      var contextSnapshot;
+      try{
+        contextSnapshot = require(snapshotFile);
+      }catch(_){
+        console.log(`Error - Cannot read context snapshot at '${snapshotFile}'.`);
+        return;
+      }
+
+      // Get all migration files in this folder
+      var allMigrationFiles = globSearch.sync(`${migrationFolder}/**/*_migration.js`, migrationFolder);
+      if(!(allMigrationFiles && allMigrationFiles.length)){
+        console.log("Error - Cannot read or find migration file");
+        return;
+      }
+
+      // Sort chronologically
+      var sorted = allMigrationFiles.slice().sort(function(a, b){
+        return __getMigrationTimestamp(a) - __getMigrationTimestamp(b);
+      });
+
+      // Find target index by basename match
+      var targetIndex = sorted.findIndex(function(f){ return path.basename(f) === targetName; });
+      if(targetIndex === -1){
+        console.log(`Error - Target migration '${targetName}' not found.`);
+        return;
+      }
+
+      // Prepare context and table object
+      let ContextCtor;
+      try{
+        ContextCtor = require(contextSnapshot.contextLocation);
+      }catch(_){
+        console.log(`Error - Cannot load Context file at '${contextSnapshot.contextLocation}'.`);
+        return;
+      }
+      var contextInstance;
+      try{
+        contextInstance = new ContextCtor();
+      }catch(_){
+        console.log(`Error - Failed to construct Context from '${contextSnapshot.contextLocation}'.`);
+        return;
+      }
+      var cleanEntities = migration.cleanEntities(contextInstance.__entities);
+      var tableObj = migration.buildUpObject(contextSnapshot.schema, cleanEntities);
+
+      // Roll back (down) all migrations newer than the target (i.e., strictly after targetIndex)
+      for (var i = sorted.length - 1; i > targetIndex; i--) {
+        var migFile = sorted[i];
+        var MigCtor = require(migFile);
+        var migInstance = new MigCtor(ContextCtor);
+        if(typeof migInstance.down === 'function'){
+          migInstance.down(tableObj);
+        } else {
+          console.log(`Warning - Migration '${path.basename(migFile)}' has no down method; skipping.`);
+        }
+      }
+
+      // Update snapshot
+      var snap = {
+        file : contextSnapshot.contextLocation,
+        executedLocation : executedLocation,
+        context : contextInstance,
+        contextEntities : cleanEntities,
+        contextFileName: path.basename(snapshotFile).replace('_contextSnapShot.json','')
+      }
+      migration.createSnapShot(snap);
+      console.log("database updated");
+
+    }catch (e){
+      console.log("Error - Cannot read or find file ", e);
+    }
+  });
 
 
 program.parse(process.argv);

package/Migrations/migrationMySQLQuery.js

@@ -8,10 +8,17 @@ class migrationMySQLQuery {
         var columnList = [];
         for (var key in table) {
             if(typeof table[key] === "object"){
-                columnList.push(table[key].name);
+                var col = table[key];
+                // Skip relationship-only fields
+                if(col.type === 'hasOne' || col.type === 'hasMany' || col.type === 'hasManyThrough'){
+                    continue;
+                }
+                // Map belongsTo to its foreignKey name
+                var name = (col.relationshipType === 'belongsTo' && col.foreignKey) ? col.foreignKey : col.name;
+                columnList.push(name);
             }
         }
-        return columnList.join(',');;
+        return columnList.join(',');
     }
 
     #columnMapping(table){

package/Migrations/migrationSQLiteQuery.js

@@ -8,10 +8,17 @@ class migrationSQLiteQuery {
         var columnList = [];
         for (var key in table) {
             if(typeof table[key] === "object"){
-                columnList.push(table[key].name);
+                var col = table[key];
+                // Skip relationship-only fields
+                if(col.type === 'hasOne' || col.type === 'hasMany' || col.type === 'hasManyThrough'){
+                    continue;
+                }
+                // Map belongsTo to its foreignKey name
+                var name = (col.relationshipType === 'belongsTo' && col.foreignKey) ? col.foreignKey : col.name;
+                columnList.push(name);
             }
         }
-        return columnList.join(',');;
+        return columnList.join(',');
     }
 
     #columnMapping(table){
@@ -134,7 +141,12 @@ class migrationSQLiteQuery {
         var queryVar = "";
         for (var key in table) {
             if(typeof table[key] === "object"){
-                queryVar += `${this.#columnMapping(table[key])}, `;
+                var col = table[key];
+                // Skip relationship-only fields
+                if(col.type === 'hasOne' || col.type === 'hasMany' || col.type === 'hasManyThrough'){
+                    continue;
+                }
+                queryVar += `${this.#columnMapping(col)}, `;
             }
         }
     

package/Migrations/migrations.js

@@ -167,7 +167,10 @@ class Migrations{
     findContext(executedLocation, contextFileName){
         var search = `${executedLocation}/**/*${contextFileName}.js`
         var files = globSearch.sync(search, executedLocation);
-        var file = files[0];
+        var file = files && files[0];
+        if(!file){
+            return null;
+        }
         var context = require(file);
         return {
             context : context,

package/package.json

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