masterrecord 0.2.16 → 0.2.17

package/Migrations/cli.js

@@ -569,21 +569,23 @@ program.option('-V', 'output the version');
     var executedLocation = process.cwd();
     try{
       // Find all context snapshots and run update per snapshot (avoids unrelated framework contexts)
-      var snapshotFiles = globSearch.sync(path.join(executedLocation, '**', '*_contextSnapShot.json'), executedLocation);
+      var snapshotFiles = globSearch.sync('**/*_contextSnapShot.json', executedLocation);
       if(!(snapshotFiles && snapshotFiles.length)){
         console.log('No context snapshots found. Run enable-migrations for each context first.');
         return;
       }
       // Group snapshots by context name (case-insensitive) and pick best per group
       var groups = {};
-      for(const snapFile of snapshotFiles){
+      for(const snapRel of snapshotFiles){
+        const snapFile = path.resolve(executedLocation, snapRel);
         let cs;
         try{ cs = require(snapFile); }catch(_){ continue; }
         const nameFromPath = path.basename(snapFile).replace(/_contextSnapShot\.json$/i, '').toLowerCase();
         const ctxName = (cs && cs.contextLocation)
           ? path.basename(cs.contextLocation).replace(/\.js$/i, '').toLowerCase()
           : nameFromPath;
-        const migs = globSearch.sync(path.join(cs.migrationFolder, '**', '*_migration.js'), cs.migrationFolder) || [];
+        const migRel = globSearch.sync('**/*_migration.js', cs.migrationFolder) || [];
+        const migs = migRel.map(f => path.resolve(cs.migrationFolder, f));
         if(!groups[ctxName]) groups[ctxName] = [];
         groups[ctxName].push({ snapFile, cs, ctxName, migs });
       }

package/Migrations/migrations.js

@@ -5,6 +5,7 @@ var fs = require('fs');
 var diff = require("deep-object-diff");
 var MigrationTemplate = require("./migrationTemplate");
 var globSearch = require("glob");
+var path = require('path');
 
 // https://blog.tekspace.io/code-first-multiple-db-context-migration/
 
@@ -203,28 +204,30 @@ class Migrations{
     }
 
     createSnapShot(snap){
-        
-        var dbFolder = `${snap.executedLocation}/db`;
+        // Place migrations alongside the Context file by default:
+        // <ContextDir>/db/migrations/<context>_contextSnapShot.json
+        const contextDir = path.dirname(snap.file);
+        const dbFolder = path.join(contextDir, 'db');
         if (!fs.existsSync(dbFolder)){
-            fs.mkdirSync(dbFolder);
+            fs.mkdirSync(dbFolder, { recursive: true });
         }
 
-        var migrationsDirectory = `${snap.executedLocation}/db/migrations`;
+        const migrationsDirectory = path.join(dbFolder, 'migrations');
         if (!fs.existsSync(migrationsDirectory)){
-            fs.mkdirSync(migrationsDirectory);
+            fs.mkdirSync(migrationsDirectory, { recursive: true });
         }
     
+        const snapshotPath = path.join(migrationsDirectory, `${snap.contextFileName}_contextSnapShot.json`);
         var content = {
             contextLocation: snap.file,
-            migrationFolder: `${snap.executedLocation}/db/migrations`,
-            snapShotLocation: `${snap.executedLocation}/db/migrations/${snap.contextFileName}_contextSnapShot.json`,
+            migrationFolder: migrationsDirectory,
+            snapShotLocation: snapshotPath,
             schema : snap.contextEntities
         };
     
         const jsonContent = JSON.stringify(content, null, 2);
         try{
-          // will replace the whole file if it exist
-            fs.writeFileSync(`${migrationsDirectory}/${snap.contextFileName}_contextSnapShot.json`, jsonContent);
+            fs.writeFileSync(snapshotPath, jsonContent);
         }catch (e){
             console.log("Cannot write file ", e);
         }

package/package.json

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