masterrecord 0.0.30 → 0.0.31

package/Masterrecord.js

@@ -2,254 +2,21 @@
 // https://github.com/kriasoft/node-sqlite
 // https://www.learnentityframeworkcore.com/dbset/deleting-data
 // version 1.0.19
+var context = require("./context");
+var schema = require("./Migrations/schema");
 
-var modelBuilder  = require('./Entity/EntityModelBuilder');
-var query = require('masterrecord/QueryLanguage/queryMethods');
-var tools =  require('./Tools');
-var SQLLiteEngine = require('masterrecord/SQLLiteEngine');
-var MYSQLEngine = require('masterrecord/MYSQLEngine');
-var insertManager = require('./InsertManager');
-var deleteManager = require('./DeleteManager');
-var globSearch = require("glob");
-
-
-class Context {
-    _isModelValid = {
-        isValid: true,
-        errors: []
-    };
-    __entities = [];
-    __builderEntities = [];
-    __trackedEntities = [];
-    __relationshipModels = [];
-    __enviornment = "";
-    __name = "";
-    isSQite = false;
-    isMySQL = false;
+class masterrecord{
 
     constructor(){
-        this. __enviornment = process.env.master;
-        this.__name = this.constructor.name;
-        this._SQLEngine = "";
-    }
-
-        /* 
-        SQLite expected model 
-        {
-            "type": "better-sqlite3",
-            "connection" : "/db/",
-            "password": "",
-            "username": ""
-        }
-    */
-    __SQLiteInit(env, sqlName){
-        try{
-            const sqlite3 = require(sqlName);
-            let DBAddress = env.completeConnection;
-            var db = new sqlite3(DBAddress, env);
-            db.__name = sqlName;
-            this._SQLEngine = new SQLLiteEngine();
-            return db;
-        }
-        catch (e) {
-            console.log("error SQL", e);
-        }
-    }
-
-    /*
-    mysql expected model
-         {
-             "type": "mysql",
-            host     : 'localhost',
-            user     : 'me',
-            password : 'secret',
-            database : 'my_db'
-          }
-          */
-    __mysqlInit(env, sqlName){
-        try{
-            const mysql = require(sqlName);
-            const connection = mysql.createConnection(env);
-            connection.connect();
-            db.__name = sqlName;
-            this._SQLEngine = new MYSQLEngine();
-            return connection;
-
-        }
-        catch (e) {
-            console.log("error SQL", e);
-        }
-    }
-
-
-
-    __clearErrorHandler(){
-        this._isModelValid = {
-            isValid: true,
-            errors: []
-        };
-    };
-
-    __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){
-            this.isSQite = true;
-            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;
-    }
-
-    validateSQLiteOptions(options){
-        if(options.hasOwnProperty('connect') === undefined){
-            console.log("connnect string settings is missing")
-            throw error("connection string settings is missing");
-        }
-
-    }
-    
-    useMySql(options, rootFolderLocation){
-        if(options !== undefined){
-            this.db = this.__mysqlInit(options, "mysql");
-            this._SQLEngine.setDB(this.db, "mysql");
-            return this;
-        }
-        else{
-            console.log("database options not defined - Master Record");
-        }
-    }
-
-
-    dbset(model, name){
-        var validModel = modelBuilder.create(model);
-        validModel.__name = name === undefined ? model.name : name;
-        this.__entities.push(validModel); // model object
-        var buildMod = tools.createNewInstance(validModel, query, this);
-        this.__builderEntities.push(buildMod); // query builder entites
-        this[validModel.__name] = buildMod;
-    }
-
-    modelState(){
-        return this._isModelValid;
-    }
-
-    saveChanges(){
-        try{
-            var tracked = this.__trackedEntities;
-            // start transaction
-            this._SQLEngine.startTransaction();
-            for (var model in tracked) {
-                var currentModel = tracked[model];
-                    switch(currentModel.__state) {
-                        case "insert": 
-                            var insert = new insertManager(this._SQLEngine, this._isModelValid, this.__entities);
-                            insert.init(currentModel);
-                            
-                        break;
-                        case "modified":
-                            if(currentModel.__dirtyFields.length > 0){
-                                var cleanCurrentModel = tools.removePrimarykeyandVirtual(currentModel, currentModel._entity);
-                                // build columns equal to value string 
-                                var argu = this._SQLEngine._buildSQLEqualTo(cleanCurrentModel);
-                                var primaryKey  = tools.getPrimaryKeyObject(cleanCurrentModel.__entity);
-                                var sqlUpdate = {tableName: cleanCurrentModel.__entity.__name, arg: argu, primaryKey : primaryKey, primaryKeyValue : cleanCurrentModel[primaryKey] };
-                                this._SQLEngine.update(sqlUpdate);
-                            }
-                            else{
-                                console.log("Tracked entity modified with no values being changed");
-                            }
-
-                          // code block
-                          break;
-                        case "delete":
-                            var deleteObject = new deleteManager(this._SQLEngine, this.__entities);
-                            deleteObject.init(currentModel);
-                            
-                          break;
-                    } 
-            }
-            this.__clearErrorHandler();
-            this._SQLEngine.endTransaction();
-        }
-        
-        catch(error){
-            this.__clearErrorHandler();
-            this._SQLEngine.errorTransaction();
-            console.log("error", error);
-            this.__clearTracked();
-            throw error;
-        }
-       
-        this.__clearTracked();
-        return true;
-    }
-
-    // TODO: WHY WE HAVE DOUBLE TRACKED OBJECTS - LOOP THROUGH ALL TRACKED OBJECTS
-    __track(model){
-        this.__trackedEntities.push(model);
-        return model;
+        this.context = context;
+        this.schema = schema;
     }
+}
 
-    __findTracked(id){
-        if(id){
-            for (var model in this.__trackedEntities) {
-                if(this.__trackedEntities[model].__ID === id){
-                    return this.__trackedEntities[model];
-                }
-            }
-        }
-        return null;
-    }
 
-    __clearTracked(){
-        this.__trackedEntities = [];
-    }
-}
+module.exports = masterrecord;
 
 
-module.exports = Context;
 
 /*
 

package/Migrations/cli.js

@@ -16,7 +16,7 @@ const [,, ...args] = process.argv
 
 program
   .version('0.0.2')
-  .option('-v, --version', '0.0.30') 
+  .option('-v, --version', '0.0.31') 
   .description('A ORM framework that facilitates the creation and use of business objects whose data requires persistent storage to a database');
 
   // Instructions : to run command you must go to main project folder is located and run the command using the  context file name.

package/Migrations/schema.js

@@ -87,4 +87,4 @@ class schema{
 
 */
 
-module.exports = Schema;
+module.exports = schema;

package/QueryLanguage/queryMethods.js

@@ -1,7 +1,7 @@
 // ALL THIS SHOULD DO IS BUILD A SQL QUERY
 // version 1.0.222
 // TODO: change name of queryManager to select manager;
-var entityTrackerModel = require('masterrecord/Entity/EntityTrackerModel');
+var entityTrackerModel = require('masterrecord/Entity/entityTrackerModel');
 var tools = require('masterrecord/Tools');
 var queryScript = require('masterrecord/QueryLanguage/queryScript');
 

package/context.js

@@ -0,0 +1,248 @@
+
+var modelBuilder  = require('./Entity/EntityModelBuilder');
+var query = require('masterrecord/QueryLanguage/queryMethods');
+var tools =  require('./Tools');
+var SQLLiteEngine = require('masterrecord/SQLLiteEngine');
+var MYSQLEngine = require('masterrecord/MYSQLEngine');
+var insertManager = require('./InsertManager');
+var deleteManager = require('./DeleteManager');
+var globSearch = require("glob");
+
+
+class Context {
+    _isModelValid = {
+        isValid: true,
+        errors: []
+    };
+    __entities = [];
+    __builderEntities = [];
+    __trackedEntities = [];
+    __relationshipModels = [];
+    __enviornment = "";
+    __name = "";
+    isSQite = false;
+    isMySQL = false;
+
+    constructor(){
+        this. __enviornment = process.env.master;
+        this.__name = this.constructor.name;
+        this._SQLEngine = "";
+    }
+
+        /* 
+        SQLite expected model 
+        {
+            "type": "better-sqlite3",
+            "connection" : "/db/",
+            "password": "",
+            "username": ""
+        }
+    */
+    __SQLiteInit(env, sqlName){
+        try{
+            const sqlite3 = require(sqlName);
+            let DBAddress = env.completeConnection;
+            var db = new sqlite3(DBAddress, env);
+            db.__name = sqlName;
+            this._SQLEngine = new SQLLiteEngine();
+            return db;
+        }
+        catch (e) {
+            console.log("error SQL", e);
+        }
+    }
+
+    /*
+    mysql expected model
+         {
+             "type": "mysql",
+            host     : 'localhost',
+            user     : 'me',
+            password : 'secret',
+            database : 'my_db'
+          }
+          */
+    __mysqlInit(env, sqlName){
+        try{
+            const mysql = require(sqlName);
+            const connection = mysql.createConnection(env);
+            connection.connect();
+            db.__name = sqlName;
+            this._SQLEngine = new MYSQLEngine();
+            return connection;
+
+        }
+        catch (e) {
+            console.log("error SQL", e);
+        }
+    }
+
+
+
+    __clearErrorHandler(){
+        this._isModelValid = {
+            isValid: true,
+            errors: []
+        };
+    };
+
+    __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){
+            this.isSQite = true;
+            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;
+    }
+
+    validateSQLiteOptions(options){
+        if(options.hasOwnProperty('connect') === undefined){
+            console.log("connnect string settings is missing")
+            throw error("connection string settings is missing");
+        }
+
+    }
+    
+    useMySql(options, rootFolderLocation){
+        if(options !== undefined){
+            this.db = this.__mysqlInit(options, "mysql");
+            this._SQLEngine.setDB(this.db, "mysql");
+            return this;
+        }
+        else{
+            console.log("database options not defined - Master Record");
+        }
+    }
+
+
+    dbset(model, name){
+        var validModel = modelBuilder.create(model);
+        validModel.__name = name === undefined ? model.name : name;
+        this.__entities.push(validModel); // model object
+        var buildMod = tools.createNewInstance(validModel, query, this);
+        this.__builderEntities.push(buildMod); // query builder entites
+        this[validModel.__name] = buildMod;
+    }
+
+    modelState(){
+        return this._isModelValid;
+    }
+
+    saveChanges(){
+        try{
+            var tracked = this.__trackedEntities;
+            // start transaction
+            this._SQLEngine.startTransaction();
+            for (var model in tracked) {
+                var currentModel = tracked[model];
+                    switch(currentModel.__state) {
+                        case "insert": 
+                            var insert = new insertManager(this._SQLEngine, this._isModelValid, this.__entities);
+                            insert.init(currentModel);
+                            
+                        break;
+                        case "modified":
+                            if(currentModel.__dirtyFields.length > 0){
+                                var cleanCurrentModel = tools.removePrimarykeyandVirtual(currentModel, currentModel._entity);
+                                // build columns equal to value string 
+                                var argu = this._SQLEngine._buildSQLEqualTo(cleanCurrentModel);
+                                var primaryKey  = tools.getPrimaryKeyObject(cleanCurrentModel.__entity);
+                                var sqlUpdate = {tableName: cleanCurrentModel.__entity.__name, arg: argu, primaryKey : primaryKey, primaryKeyValue : cleanCurrentModel[primaryKey] };
+                                this._SQLEngine.update(sqlUpdate);
+                            }
+                            else{
+                                console.log("Tracked entity modified with no values being changed");
+                            }
+
+                          // code block
+                          break;
+                        case "delete":
+                            var deleteObject = new deleteManager(this._SQLEngine, this.__entities);
+                            deleteObject.init(currentModel);
+                            
+                          break;
+                    } 
+            }
+            this.__clearErrorHandler();
+            this._SQLEngine.endTransaction();
+        }
+        
+        catch(error){
+            this.__clearErrorHandler();
+            this._SQLEngine.errorTransaction();
+            console.log("error", error);
+            this.__clearTracked();
+            throw error;
+        }
+       
+        this.__clearTracked();
+        return true;
+    }
+
+    // TODO: WHY WE HAVE DOUBLE TRACKED OBJECTS - LOOP THROUGH ALL TRACKED OBJECTS
+    __track(model){
+        this.__trackedEntities.push(model);
+        return model;
+    }
+
+    __findTracked(id){
+        if(id){
+            for (var model in this.__trackedEntities) {
+                if(this.__trackedEntities[model].__ID === id){
+                    return this.__trackedEntities[model];
+                }
+            }
+        }
+        return null;
+    }
+
+    __clearTracked(){
+        this.__trackedEntities = [];
+    }
+}
+
+
+module.exports = Context;

package/package.json

@@ -6,7 +6,7 @@
     "glob" : "^8.0.3",
     "deep-object-diff" : "^1.1.7"
   },
-  "version": "0.0.30",
+  "version": "0.0.31",
   "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": {