gina 0.0.9-p91b → 0.1.1-alpha.2

package/{core/utils → framework/v0.1.1-alpha.2}/lib/model.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2016 Rhinostone <gina@rhinostone.com>
+ * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,12 +16,12 @@ var math        = require('./math');
  * Model uitl
  *
  * @package     Gina.Utils
- * @author      Rhinostone <gina@rhinostone.com>
+ * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
 function ModelUtil() {
     var self        = this;
-    var cacheless   = (process.env.IS_CACHELESS == 'false') ? false : true;
+    var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
 
     /**
      * Init
@@ -101,7 +101,7 @@ function ModelUtil() {
     *
     * */
     this.setModelEntity = function(bundle, model, name, module) {
-        var cacheless   = (process.env.IS_CACHELESS == 'false') ? false : true;
+        var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
         
         if (arguments.length > 1) {
             if (!self.entities) {
@@ -209,6 +209,7 @@ function ModelUtil() {
     this.loadAllModels = function(bundles, configuration, env, cb) {
 
         var loadModel = function(b, bundles, configuration, env, cb) {
+            
             var modelObject     = getContext('modelUtil').entities[bundles[b]] // to check if already laoded
                 , bundle        = bundles[b]
                 , len           = bundles.length
@@ -222,6 +223,10 @@ function ModelUtil() {
                 var mObj = {};
 
                 var models = connectors;
+                
+                if ( !models || typeof(models) == 'undefined' ) {
+                    console.warn('no models attached to connector '+ connector);
+                }
 
                 var t = 0;
 
@@ -236,6 +241,7 @@ function ModelUtil() {
                         setContext('modelConnectors', modelConnectors);
 
                         var conn                = null
+                            , connectorPath     = null
                             , entitiesManager   = null
                             , modelPath         = null
                             , entitiesPath      = null
@@ -247,16 +253,19 @@ function ModelUtil() {
 
                             for (var name in self.models[bundle]) {//name as connector name
                                 conn            = self.models[bundle][name]['_connection'];
+                                connectorPath   = _(conf.connectorsPath +'/'+ conf.content['connectors'][name].connector);
                                 modelPath       = _(conf.modelsPath + '/' + name);
                                 entitiesPath    = _(modelPath + '/entities');
                                 //Getting Entities Manager thru connector.
-                                entitiesManager = new require( _(conf.modelsPath + '/index.js', true) )(conn)[name](conn, { model: name, bundle: bundle, database: conf.content['connectors'][name].database });
+                                //entitiesManager = new require( _(modelPath + '/index.js', true) )(conn)[name](conn, { model: name, bundle: bundle, database: conf.content['connectors'][name].database });
+                                entitiesManager = new require( _(connectorPath + '/index.js', true) )(conn, { model: name, bundle: bundle, database: conf.content['connectors'][name].database });
 
                                 self.setConnection(bundle, name, conn);
 
                                 // step 1: creating entities classes in the context
                                 // must be done only when all models conn are alive because of `cross models/database use cases`
                                 for (var nttClass in entitiesManager) {
+                                    //console.debug('Trying to create NTT: ', nttClass);
                                     if ( !/^[A-Z]/.test( nttClass ) ) {
                                         throw new Error('Entity Class `'+ nttClass +'` should start with an uppercase !');
                                         foundInitError = true
@@ -286,14 +295,14 @@ function ModelUtil() {
                     } else {
                         //e.g. var apiModel    = new Model(config.bundle + "/api");
                         // => var apiModel = getContext('apiModel')
-                        console.debug('....model ', conf.bundle + "/"+c + 'Model');
-                        mObj[c+'Model'] = new Model(conf.bundle + "/" + c);
+                        console.debug('[ MODEL ][ '+ c +' ][ '+ conf.bundle +' ] loading model');
+                        mObj[c + 'Model'] = new Model(conf.bundle + "/" + c, conf);
                         mObj[c+'Model']
                             .onReady(
                             function onModelReady( err, bundle, connector, conn) {
                                 if (err) {
-                                    console.error('found error ...');
                                     console.error(err.stack||err.message||err);
+                                    process.exit(1);
                                 } else {
 
                                     if (!modelConnectors[bundle]) {
@@ -322,9 +331,11 @@ function ModelUtil() {
                                             return self.models[bundle][connector]['_connection']
                                         }
                                     }
+
+                                    done(connector, modelConnectors)
                                 }
 
-                                done(connector, modelConnectors)
+
                             })
                    }
 
@@ -361,6 +372,7 @@ function ModelUtil() {
             var models              = conf.content.connectors
                 , conn              = null
                 , foundInitError    = false
+                , connectorPath     = null
                 , entitiesManager   = null
                 , modelPath         = null
                 , entitiesPath      = null
@@ -385,14 +397,15 @@ function ModelUtil() {
                     }
 
                     conn            = getContext('modelConnectors')[bundle][name].conn;
-
+                    connectorPath   = _(conf.connectorsPath +'/'+ conf.content['connectors'][name].connector);
                     modelPath       = _(conf.modelsPath + '/' + name);
                     entitiesPath    = _(modelPath + '/entities');
 
                     //Getting Entities Manager thru connector.
-                    delete require.cache[_(conf.modelsPath + '/index.js', true)];//child
+                    delete require.cache[require.resolve(_(connectorPath + '/index.js', true))];//child
                     try {
-                        entitiesManager = new require( _(conf.modelsPath + '/index.js', true) )(conn)[name](conn, { model: name, bundle: bundle, database: conf.content['connectors'][name].database });
+                        //entitiesManager = new require( _(conf.modelsPath + '/index.js', true) )(conn)[name](conn, { model: name, bundle: bundle, database: conf.content['connectors'][name].database });
+                        entitiesManager = new require( _(connectorPath + '/index.js', true) )(conn, { model: name, bundle: bundle, database: conf.content['connectors'][name].database });
                     } catch (err) {
                         cb(err)
                     }
@@ -413,7 +426,7 @@ function ModelUtil() {
                         new entitiesManager[nttClass](conn);
                     }
 
-                    console.log('loaded model ', bundle+'/'+name);
+                    console.debug('[ MODEL ][ '+ name +' ][ '+ bundle +'] loaded model ');
                 }
             }
 
@@ -435,10 +448,10 @@ function ModelUtil() {
      * @param {string} [ bundle ] - Bundle name
      * @param {string} model - Model name
      *
-     * @return {object} model - Model entities
+     * @returns {object} model - Model entities
      * */
     getModel = function(bundle, model) {
-
+        
         var ctx       = getContext();
 
         if (arguments.length == 1 || !bundle) {
@@ -515,9 +528,16 @@ function ModelUtil() {
             }
         }
 
-        //if (!self.models) {
+        // if ( 
+        //     typeof(ctx.modelUtil.models) != 'undefined' 
+        //     && typeof(ctx.modelUtil.models) != 'undefined'
+        //     && typeof(ctx.modelUtil.models[bundle]) != 'undefined'
+        //     && typeof(ctx.modelUtil.models[bundle][model]) != 'undefined'
+        // ) {
+            
+        // } else {
             self.models = ModelUtil.instance.models
-        //}
+        // }
 
         if ( typeof(model) != 'undefined' && typeof(self.models[bundle]) != 'undefined' ) {
 
@@ -525,6 +545,7 @@ function ModelUtil() {
 
                 if ( typeof(self.models[bundle][model]['getConnection']) == 'undefined' ) {
                     self.models[bundle][model]['getConnection'] = function() {
+                        //console.debug('[ MODEL ][ '+ name +' ][ '+ bundle +'] getting model ...');
                         return self.models[bundle][model]['_connection']
                     }
                 }
@@ -533,6 +554,8 @@ function ModelUtil() {
             } catch (err) {
                 return undefined
             }
+        } else {
+            throw new Error('[ MODEL ][ '+ name +' ][ '+ bundle +'] No model found !');
         }
     }
 
@@ -543,11 +566,11 @@ function ModelUtil() {
      * @param {string} entityName
      * @param {object} conn
      *
-     * @return {object} entity
+     * @returns {object} entity
      * */
     getModelEntity = function(bundle, model, entityClassName, conn) {
         if ( typeof(entityClassName) != 'undefined' ) {
-            var cacheless   = (process.env.IS_CACHELESS == 'false') ? false : true;
+            var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
             try {
                 var shortName = entityClassName.substr(0, 1).toLowerCase() + entityClassName.substr(1);