masterrecord 0.0.27 → 0.0.29

package/Masterrecord.js

@@ -1,7 +1,7 @@
 
 // https://github.com/kriasoft/node-sqlite
 // https://www.learnentityframeworkcore.com/dbset/deleting-data
-// version 1.0.14
+// version 1.0.19
 
 var modelBuilder  = require('./Entity/EntityModelBuilder');
 var query = require('masterrecord/QueryLanguage/queryMethods');
@@ -12,6 +12,7 @@ var insertManager = require('./InsertManager');
 var deleteManager = require('./DeleteManager');
 var globSearch = require("glob");
 
+
 class Context {
     _isModelValid = {
         isValid: true,
@@ -21,12 +22,13 @@ class Context {
     __builderEntities = [];
     __trackedEntities = [];
     __relationshipModels = [];
+    __enviornment = "";
+    __name = "";
 
     constructor(){
-        // TODO when we build the sql engine it depends on the which type.
-
-        this._SQLEngine = "";
+        this. __enviornment = process.env.master;
         this.__name = this.constructor.name;
+        this._SQLEngine = "";
     }
 
         /* 
@@ -40,8 +42,9 @@ class Context {
     */
     __SQLiteInit(env, sqlName){
         try{
+            console.log("===========+++++++++++++++")
             const sqlite3 = require(sqlName);
-            let DBAddress = env.connection;
+            let DBAddress = env.completeConnection;
             var db = new sqlite3(DBAddress, env);
             db.__name = sqlName;
             this._SQLEngine = new SQLLiteEngine();
@@ -86,28 +89,63 @@ class Context {
         };
     };
 
+    __findSettings(root, rootFolderLocation, envType){
+
+        var rootFolder = `${root}/${rootFolderLocation}`;
+        var search = `${rootFolder}/**/*env.${envType}.json`;
+        var files = globSearch.sync(search, rootFolder);
+        var file = files[0];
+        if(file === undefined){
+            root = tools.removeBackwardSlashSection(root, 1, "/");
+            rootFolder = `${root}/${rootFolderLocation}`;
+            var search = `${rootFolder}/**/*env.${envType}.json`;
+            var files = globSearch.sync(search,rootFolder);
+            file = files[0];
+            if(file === undefined){
+                root = tools.removeBackwardSlashSection(root, 1, "/");
+                rootFolder = `${root}/${rootFolderLocation}`;
+                var search = `${rootFolder}/**/*env.${envType}.json`;
+                var files = globSearch.sync(search,rootFolder);
+                file = files[0];
+                if(file === undefined){
+                    console.log(`could not find file - ${rootFolder}/env.${envType}.json`);
+                    throw error(`could not find file - ${rootFolder}/env.${envType}.json`);
+                }
+
+            }
+        
+        }
+        
+        return {
+            file: file,
+            rootFolder : root
+        };
+    }
+
     useSqlite(rootFolderLocation){
-            var contextName = this.constructor.name;
-            var envType = process.env.master;
-            var search = `${rootFolderLocation}/**/*env.${envType}.json`;
-            var files = globSearch.sync(search, rootFolderLocation);
-            var file = files[0];
-            var settings = require(file);
-            var options = settings[contextName][contextName];
+            var root =  process.cwd();
+            var envType = this.__enviornment;
+            var contextName = this.__name;
+            var file = this.__findSettings(root, rootFolderLocation, envType);
+            var settings = require(file.file);
+            var options = settings[contextName];
+            if(options === undefined){
+                console.log("settings missing context name settings");
+                throw error("settings missing context name settings");
+            }
+            this.validateSQLiteOptions(options);
+            options.completeConnection = `${file.rootFolder}${options.connection}`;
             this.db = this.__SQLiteInit(options,  "better-sqlite3");
             this._SQLEngine.setDB(this.db, "better-sqlite3");
             return this;
     }
 
-    useSqlite(options){
-        if(options !== undefined){
-            this.db = this.__SQLiteInit(options,  "better-sqlite3");
-            this._SQLEngine.setDB(this.db, "better-sqlite3");
-            return this;
-        }
-        else{
-            console.log("database options not defined - Master Record");
+    validateSQLiteOptions(options){
+        if(options.hasOwnProperty('connect') === undefined){
+            console.log("connnect string settings is missing")
+            throw error("connection string settings is missing");
         }
+
     }
     
     useMySql(options, rootFolderLocation){

package/Migrations/cli.js

@@ -21,20 +21,19 @@ program
   .alias('em')
   .description('Enables the migration in your project by creating a configuration class called ContextSnapShot.json')
   .action(function(contextFileName){
+
         var migration = new Migration();
         // location of folder where command is being executed..
         var executedLocation = process.cwd();
         // find context file from main folder location
-        var search = `${executedLocation}/**/*${contextFileName}.js`
-
-        var files = globSearch.sync(search, executedLocation);
-        var file = files[0];
-        var contextInstance = require(file);
+        var contextInstance = migration.getContext(executedLocation, contextFileName);
         
         var snap = {
-          file : files[0],
+          file : contextInstance.fileLocation,
           executedLocation : executedLocation,
-          context : new contextInstance(),
+          context : new contextInstance.context({
+            root: executedLocation
+          }),
           contextFileName: contextFileName.toLowerCase()
         }
 
@@ -50,15 +49,16 @@ program
   .action(function(name, contextFileName){
     var executedLocation = process.cwd();
     contextFileName = contextFileName.toLowerCase();
+    var migration = new Migration();
       try{
           // find context file from main folder location
           var search = `${executedLocation}/**/*${contextFileName}_contextSnapShot.json`;
 
          var files = globSearch.sync(search, executedLocation);
          var contextSnapshot = require(files[0]);
-         var migration = new Migration();
          var context = require(contextSnapshot.contextLocation);
-         var newEntity = migration.buildMigrationTemplate(name, contextSnapshot.schema, context.__entities);
+         var contextInstance = new context();
+         var newEntity = migration.buildMigrationTemplate(name, contextSnapshot.schema, contextInstance .__entities);
          var migrationDate = Date.now();
          var file = `${contextSnapshot.migrationFolder}/${migrationDate}_${name}_migration.js`
          fs.writeFile(file, newEntity, 'utf8', function (err) {
@@ -73,10 +73,11 @@ program
   });
 
  program
-  .command('update-database <contextFileName>')
+  .command('update-database <contextFileName> <environment>')
   .alias('ud')
   .description('Apply pending migrations to database')
-  .action(function(contextFileName){
+  .action(function(contextFileName, environment){
+    console.log("NODE_ENV", process.NODE_ENV)
     var executedLocation = process.cwd();
     contextFileName = contextFileName.toLowerCase();
 
@@ -86,16 +87,19 @@ program
          var files = globSearch.sync(search, executedLocation);
          var file = files[0];
          var contextSnapshot = require(file);
-         var searchMigration = `**/*_migration.js`
+
+         var searchMigration = `**/*_migration.js`;
          var migrationFiles = globSearch.sync(searchMigration, contextSnapshot.migrationFolder);
          if( migrationFiles){
+          // find newest migration file
             var mFiles = migrationFiles.sort(function(x, y){
               return new Date(x.timestamp) < new Date(y.timestamp) ? 1 : -1
             });
             mFiles = mFiles[0];
             var migration = require(mFiles);
-            var settings = Migration.getSettings(executedLocation);
-            var newMigrationInstance = new migration(settings);
+            var context = require(contextSnapshot.contextLocation);
+            var contextInstance = new context();
+            var newMigrationInstance = new migration(context);
             newMigrationInstance.up();
          }
         }catch (e){

package/Migrations/migrationTemplate.js

@@ -12,8 +12,8 @@ class MigrationTemplate {
     get(){
         return ` 
 class ${this.name} extends Schema { 
-    constructor(settings){
-        super(settings);
+    constructor(context){
+        super(context);
     }
 
     up(table){

package/Migrations/migrations.js

@@ -1,26 +1,25 @@
-// version 0.0.2
+// version 0.0.3
 // learn more about seeding info -  https://www.pauric.blog/Database-Updates-and-Migrations-with-Entity-Framework/
 
 var fs = require('fs');
 var diff = require("deep-object-diff");
 var MigrationTemplate = require("./migrationTemplate");
-
+var globSearch = require("glob");
 
 // https://blog.tekspace.io/code-first-multiple-db-context-migration/
 
 // node masterrecord add-migration josh C:\Users\rbatista\Downloads\kollege\freshmen\app\models\context
 class Migrations{
 
-    getSettings(rootLocation){
-        var envType = process.env.master;
-        var search = `${rootFolderLocation}/**/*env.${envType}.json`;
-        var files = globSearch.sync(search, rootFolderLocation);
+    getContext(executedLocation, contextFileName){
+        var search = `${executedLocation}/**/*${contextFileName}.js`
+        var files = globSearch.sync(search, executedLocation);
         var file = files[0];
-        var settings = require(file);
-        options = settings[contextName];
-        this.db = this.__SQLiteInit(options,  "better-sqlite3");
-        this._SQLEngine.setDB(this.db, "better-sqlite3");
-        return this;
+        var context = require(file);
+        return {
+            context : context,
+            fileLocation : file
+            }
     }
 
     createSnapShot(snap){
@@ -33,7 +32,6 @@ class Migrations{
             seed : function(seed){
                 this.seed(this);
             },
-            database: {},
             contextLocation: snap.file,
             migrationFolder: `${snap.executedLocation}/db/migrations`,
             snapShotLocation: `${snap.executedLocation}/db/migrations/${snap.contextFileName}_contextSnapShot.json`,
@@ -133,7 +131,7 @@ class Migrations{
 
       
     buildMigrationTemplate(name, oldSchema, newSchema){
-     
+
         var MT = new MigrationTemplate(name);
         var tables = this.organizeSchemaByTables(oldSchema, newSchema);
         tables = this.findNewColumnsInTables(tables);

package/Tools.js

@@ -4,6 +4,17 @@ class Tools{
         return entityList[name];
     }
 
+
+    // this will remove everthing from back slash amount
+    static removeBackwardSlashSection(string, amount, type){
+        type = type === undefined ? "\\" : type;
+        var stringArray =  string.split(type);
+        for(var i = 0; i < amount; i++){
+            stringArray.pop();
+        }
+        return stringArray.join(type);
+    }
+
     static removePrimarykeyandVirtual(currentModel, modelEntity){
         var newCurrentModel = Object.create(currentModel);
 

package/package.json

@@ -4,16 +4,16 @@
     "better-sqlite3": "^7.6.2",
     "commander": "^9.4.0",
     "glob" : "^8.0.3",
-    "deep-object-diff" : "1.1.7"
+    "deep-object-diff" : "^1.1.7"
   },
-  "version": "0.0.27",
+  "version": "0.0.29",
   "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": {
     "type": "git",
     "url": "git+https://github.com/Tailor/Masterrecord.git"
   },
-  "main": "./migrations/cli.js",
+  "main": "MasterRecord.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },