gina 0.0.9-p91c → 0.1.1-alpha.3

package/{core → framework/v0.1.1-alpha.3/core}/locales/index.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.
@@ -12,13 +12,13 @@ var fs              = require('fs');
  * Gina.Core.Locales Class
  *
  * @package    Gina.Core
- * @author     Rhinostone <gina@rhinostone.com>
+ * @author     Rhinostone <contact@gina.io>
  */
 
 function Locales() {
 
     var _require = function(path) {
-        var cacheless = (process.env.IS_CACHELESS == 'false') ? false : true;
+        var cacheless = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
         if (cacheless) {
             try {
                 delete require.cache[require.resolve(path)];
@@ -49,7 +49,8 @@ function Locales() {
         for (var f = 0, len = files.length; f < len; ++f) {
             if ( ! /^\./.test(files[f]) || f == len-1 ) {
                 key         = files[f].split(/\./)[0];
-                regions[i]  = { lang: key, content: _require( dir + '/' + files[f] ) }
+                regions[i]  = { lang: key, content: _require( dir + '/' + files[f] ) };
+                ++i
             }
         }
 

package/{core → framework/v0.1.1-alpha.3/core}/locales/src/make.js

@@ -1,10 +1,10 @@
 // imports
 var fs          = require('fs');
-var utils       = require('./../../utils') || require.cache[require.resolve('./../../utils')];
-var helpers     = utils.helpers;
-var console     = utils.logger;
-var inherits    = utils.inherits;
-var merge       = utils.merge;
+var lib         = require('./../../../lib') || require.cache[require.resolve('./../../../lib')];
+var helpers     = lib.helpers;
+var console     = lib.logger;
+var inherits    = lib.inherits;
+var merge       = lib.merge;
 
 
 /**
@@ -15,8 +15,7 @@ function Make() {
     var self = {}, rec = {};
     
     var setup = function () {
-
-
+        
         var opt         = {}
             , filename  = null
             , targets   = [ 'currency', 'region' ]
@@ -74,7 +73,10 @@ function Make() {
         };
 
         if ( opt.region != 'en' ) {
-            rec.mapping[ 'official_name_' + opt.region ] = "officialName.short"
+            rec.mapping[ 'official_name_' + opt.region ] = JSON.clone(rec.mapping["official_name_en"]);
+            // remove default
+            delete rec.mapping["official_name_en"];
+            console.debug('region set to ', opt.region);
         }
 
         cleanMapping();
@@ -100,9 +102,10 @@ function Make() {
     }
 
     var cleanMapping = function() {
-        var newMapping = {};
-        for (var map in rec.mapping) {
-            newMapping[map.replace(/(^[\s]|((?![_-\s+a-zA-Z0-9]).)*)/g, '')] = rec.mapping[map]
+        var newMapping = {}, key = null;
+        for (let map in rec.mapping) {
+            key = map.replace(/(^[\s]|((?![_-\s+a-zA-Z0-9]).)*)/g, '');
+            newMapping[key] = rec.mapping[map]
         }
         rec.mapping = newMapping;
     }
@@ -156,7 +159,7 @@ function Make() {
 
                     if (o === key) {
 
-                        var _args = JSON.parse(JSON.stringify(args));
+                        var _args = JSON.clone(args);
                         _args.splice(0, 1);
 
                         for (var a = i, aLen = _args.length; a < aLen; ++a) {

package/{core → framework/v0.1.1-alpha.3/core}/model/entity.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.
@@ -20,7 +20,7 @@ var modelUtil       = new utils.Model();
  *
  * @package     Gina
  * @namespace   Gina.Model
- * @author      Rhinostone <gina@rhinostone.com>
+ * @author      Rhinostone <contact@gina.io>
  * @api         Public
  */
 function EntitySuper(conn, caller) {
@@ -33,7 +33,7 @@ function EntitySuper(conn, caller) {
     var local           = {}
     var self            = this;
     var caller          = caller || undefined;
-    var cacheless       = (process.env.IS_CACHELESS == 'false') ? false : true;
+    var cacheless       = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
 
     var init = function(conn, caller) {
 
@@ -42,6 +42,10 @@ function EntitySuper(conn, caller) {
         if (!EntitySuper[self.name]) {
             EntitySuper[self.name] = {}
         }
+        
+        if ( !EntitySuper[self.name]._conn ) {
+            EntitySuper[self.name]._conn = conn;
+        }
 
         if ( !EntitySuper[self.name].instance ) {
             return setListeners(caller)
@@ -49,91 +53,7 @@ function EntitySuper(conn, caller) {
             return EntitySuper[self.name].instance
         }
     }
-
-    // TODO - remove this ...
-    // var loadMembers = function(caller) {
-    //
-    //     var filename    = self._filename
-    //         , imports   = ''
-    //         , str       = fs.readFileSync(filename).toString()
-    //         , source    = str;
-    //
-    //     var first   = source.indexOf('{') + 1
-    //     var last    = source.lastIndexOf('}') -1;
-    //
-    //     // extract imports
-    //     imports = str.substring(0, first)
-    //         .replace(/function(.*)/, '')
-    //         .replace(/require\(/g, 'module.require(')
-    //         .replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)|(\/\/.*)/g, '');//remove comments
-    //
-    //     // extract function body
-    //     source = source.substring(first, last);
-    //
-    //     source = 'var module = arguments[0];\n\r' + imports + source;
-    //
-    //
-    //
-    //     var EntityOrigin = new Function(source);
-    //     for (var c in self) {
-    //         if (!EntityOrigin[c])
-    //             EntityOrigin.prototype[c] = self[c]
-    //     }
-    //
-    //     var obj = new EntityOrigin(module);
-    //
-    //
-    //
-    //     var methodList      = {}
-    //         , args          = []
-    //         , variables     = ''
-    //         , placeholder   = ''
-    //         , functionBody  = '';
-    //
-    //     obj._methods = [];
-    //     for (var prop in obj) {
-    //         if (typeof(obj[prop]) != 'function') continue;
-    //
-    //         str         = obj[prop].toString();
-    //         variables   = str.match(/\((.*)\)/g)[0];
-    //         args        = [];
-    //
-    //         if (variables.length) {
-    //             variables = variables.replace(/\(|\)/g, '').replace(/\s*/g, '');
-    //             if (variables) args = variables.split(/\,/g);
-    //         }
-    //
-    //         first   = str.indexOf('{') + 1
-    //         last    = str.lastIndexOf('}') - 1;
-    //         str     = str.substring(first, last);
-    //
-    //         if (!self[prop]) {
-    //             if (typeof(obj[prop]) == 'function') {
-    //                 self[prop] = obj[prop];
-    //                 self._methods.push(prop);
-    //             }
-    //         }
-    //     }
-    //
-    //
-    //     if (caller) {
-    //         if ( !EntitySuper[caller].instance ) {
-    //             EntitySuper[caller].instance = {
-    //                 _relations: {}
-    //             }
-    //         }
-    //
-    //     } else {
-    //         if ( !EntitySuper[self.name].instance ) {
-    //             EntitySuper[self.name].instance = {
-    //                 _relations: {}
-    //             }
-    //         }
-    //     }
-    //
-    //     return setListeners(caller)
-    //
-    // }
+    
 
     /**
      * Set all main listenners at once
@@ -162,7 +82,7 @@ function EntitySuper(conn, caller) {
         var eventName = '';
         for (var prop in entity) {
             eventName = shortName +'#'+ prop;
-            if ( typeof(entity[prop]) == 'function' && new RegExp('(' + eventName + '\'|' + eventName + '\"|' + eventName + '$)').test(entity[prop].toString()) ) {
+            if (self._methods.indexOf(prop) < 0 && typeof(entity[prop]) == 'function' && new RegExp('(' + eventName + '\'|' + eventName + '\"|' + eventName + '$)').test(entity[prop].toString()) ) {
                 self._methods.push(prop)
             }
         }
@@ -177,20 +97,27 @@ function EntitySuper(conn, caller) {
             , methods = self._methods;
 
 
-        for (var f = 0, fLen = methods.length; f < fLen; ++f) {
+        for (var m = 0, mLen = methods.length; m < mLen; ++m) {
             if (
-                typeof(entity[methods[f]]) == 'function'
-                && f != 'onComplete'
+                typeof(entity[methods[m]]) == 'function'
+                && m != 'onComplete'
             ) {
+                
+                if ( triggers.indexOf(shortName + '#' + methods[m]) < 0 ) {
+                    events[i] = {
+                        index: i,
+                        shortName: shortName + '#' + methods[m],
+                        method: methods[m],
+                        entityName: entityName
+                    };
 
-                events[i] = {
-                    shortName: shortName + '#' + methods[f],
-                    method: methods[f],
-                    entityName: entityName
-                };
+                    
+                    triggers.push(shortName + '#' + methods[m]);
+                    
+                    ++i;
+                }
 
-                triggers.push(shortName + '#' + methods[f]);
-                ++i;
+                    
             }
         }
 
@@ -206,7 +133,7 @@ function EntitySuper(conn, caller) {
 
         for (var i = 0; i < events.length; ++i) {
 
-            entity.removeAllListeners(events[i].shortName); // added on october 1st to prevent adding new listners on each new querie
+            entity.removeAllListeners(events[i].shortName); // added to prevent adding new listners on each new querie
             //console.debug('placing event: '+ events[i].shortName +'\n');
             f       = events[i].method;
             fSource = entity[f].toString();
@@ -214,7 +141,7 @@ function EntitySuper(conn, caller) {
             // only if method content is about the event
             if (methods.indexOf(f) > -1 && new RegExp('(' + events[i].shortName + '\'|' + events[i].shortName + '\"|' + events[i].shortName + '$)').test(fSource)) {
 
-
+                // CRUD | model's methods, for the n1ql, look into connector/<connectorName>/index.js
                 entity[f] = (function onEntityEvent(e, m, i, source) {
 
                     var cached      = entity[m];
@@ -226,79 +153,108 @@ function EntitySuper(conn, caller) {
                         variables = variables.replace(/\(|\)/g, '').replace(/\s*/g, '');
                         if (variables) args = variables.split(/\,/g);
                     }
-
                     // TODO - retrieve argument while the method is being rewritten
                     return function () {
 
                         // retrieving local arguments, & binding it to the event callback
-
-                        cached.apply(this[m], arguments);
-
+                        
+                        /**
+                         * handle promises with async/await
+                         * 
+                         * NB.: Always use the prefix `db` inside an entity file
+                         *      instead of using `this.getRelation(entityName)`
+                         * 
+                         * e.g.: 
+                         *  var recordJob   = promisify(db.jobEntity.insert);
+                         *  await recordJob(jobObj)
+                         *      .then( function onJob(_jobObj) {                        
+                         *          jobObj = _jobObj;
+                         *      })
+                         *      .catch( function onJobErr(_err) {
+                         *          jobErr = _err;
+                         *      });
+                         * 
+                         */
+                        if ( typeof(this[m]) == 'undefined' && typeof(arguments[arguments.length-1]) == 'function' ) {
+                            
+                            var promise = function() {
+                                var cb = arguments[arguments.length-1];
+                                
+                                if (entity._triggers.indexOf(events[i].shortName) > -1) {
+                                    console.debug('[ MODEL ][ ENTITY ] Setting listener for: [ ' + self.model + '/' + events[i].entityName + '::' + events[i].shortName + ' ]');
+                                    
+                                    if (typeof(entity._arguments) == 'undefined' || typeof(entity._arguments) != 'undefined' && typeof(entity._arguments[events[i].shortName]) == 'undefined') {
+                                        
+                                        if (entity.listenerCount(events[i].shortName) > 0) {
+                                            entity.removeAllListeners([events[i].shortName])
+                                        }
+                                            
+                                        entity.once(events[i].shortName, function () { // cannot be `entity.on` for prod/stage
+                                            // check if not already fired                                        
+                                            if (entity._callbacks[events[i].shortName]) {
+                                                
+                                                entity.removeAllListeners([events[i].shortName]);
+                                                console.log('\nFIRING #1 - promise ' + events[i].shortName +'('+ events[i].index  +')');                                                
+                                                cb.apply(this, arguments);
+                                            }                                                
+                                        });
+                                            
+    
+                                        // backing up callback
+                                        entity._callbacks[events[i].shortName] = cb;
+                                    } else { // in case the event is not ready yet
+                                        console.log('\nFIRING #2 - promise' + events[i].shortName);
+                                        cb.apply(entity[m], entity._arguments[events[i].shortName])
+                                    }
+                                }
+                            }
+                                                                                   
+                            promise.apply(null, arguments);                            
+                            cached.apply(promise, arguments); 
+                            return promise;    
+                        } //else is normal case
+                        
+                        cached.apply(this[m], arguments);                        
+                        
                         this[m].onComplete = function (cb) {
 
-                            console.debug('setting listener for: [ ' + self.model + '/' + events[i].entityName + '::' + events[i].shortName + ' ]');
-
-                            //Setting local listener : normal case
+                            //Setting local listener : normal case                            
                             if (entity._triggers.indexOf(events[i].shortName) > -1) {
-
+                                console.debug('[ MODEL ][ ENTITY ] Setting listener for: [ ' + self.model + '/' + events[i].entityName + '::' + events[i].shortName + ' ]');
+                                
                                 if (typeof(entity._arguments) == 'undefined' || typeof(entity._arguments) != 'undefined' && typeof(entity._arguments[events[i].shortName]) == 'undefined') {
+                                    
+                                    if (entity.listenerCount(events[i].shortName) > 0) {
+                                        entity.removeAllListeners([events[i].shortName])
+                                    }
+                                        
                                     entity.once(events[i].shortName, function () { // cannot be `entity.on` for prod/stage
-                                        // check if not already fired
-                                        if (entity._callbacks[events[i].shortName])
+                                        // check if not already fired                                        
+                                        if (entity._callbacks[events[i].shortName]) {
+                                            
+                                            entity.removeAllListeners([events[i].shortName]);
+                                            console.log('\nFIRING #1 ' + events[i].shortName +'('+ events[i].index  +')');
                                             cb.apply(this[m], arguments);
+                                            //cb.apply(this, arguments);
+                                        }
+                                            
                                     });
+                                        
 
                                     // backing up callback
                                     entity._callbacks[events[i].shortName] = cb;
                                 } else { // in case the event is not ready yet
+                                    console.log('\nFIRING #2 ' + events[i].shortName);
                                     cb.apply(entity[m], entity._arguments[events[i].shortName])
                                 }
                             }
                         }
+                        
+                            
 
                         return this[m] // chaining event & method
                     };
 
-
-                    // var func = function () {
-                    //
-                    //     // retrieving local arguments, & binding it to the event callback
-                    //
-                    //     cached.apply(this[m], arguments);
-                    //
-                    //     this[m].onComplete = function (cb) {
-                    //
-                    //         console.debug('setting listener for: [ ' + self.model + '/' + events[i].entityName + '::' + events[i].shortName + ' ]');
-                    //
-                    //         //Setting local listener : normal case
-                    //         if (entity._triggers.indexOf(events[i].shortName) > -1) {
-                    //
-                    //             if (typeof(entity._arguments) == 'undefined' || typeof(entity._arguments) != 'undefined' && typeof(entity._arguments[events[i].shortName]) == 'undefined') {
-                    //                 entity.once(events[i].shortName, function () { // cannot be `entity.on` for prod/stage
-                    //                     // check if not already fired
-                    //                     if (entity._callbacks[events[i].shortName])
-                    //                         cb.apply(this[m], arguments);
-                    //                 });
-                    //
-                    //                 // backing up callback
-                    //                 entity._callbacks[events[i].shortName] = cb;
-                    //             } else { // in case the event is not ready yet
-                    //                 cb.apply(entity[m], entity._arguments[events[i].shortName])
-                    //             }
-                    //         }
-                    //     }
-                    //
-                    //     return this[m] // chaining event & method
-                    // };
-                    //
-                    // var funcStr = func.toString();
-                    // var first   = funcStr.indexOf('{') + 1
-                    // var last    = funcStr.lastIndexOf('}') -1;
-                    //
-                    // funcStr = funcStr.substring(first, last);
-                    //
-                    // return new Function(variables, funcStr)
-
                 }(events[i].shortName, f, i, fSource));
 
                 // just for display purpose: will be overriden by the previous code
@@ -347,8 +303,7 @@ function EntitySuper(conn, caller) {
 
         var args = Array.prototype.slice.call(arguments);
         var trigger = args.splice(0, 1)[0];
-
-        //self.removeAllListener(trigger);
+        
         if ( !/\#/.test(trigger) ) {
             throw new Error('trigger name not properly set: use `#` between the entity name and the method reference');
             process.exit(1)
@@ -376,25 +331,44 @@ function EntitySuper(conn, caller) {
 
                 if ( self._triggers.indexOf(events[i].shortName) > -1 ) {
                     // reusable event
-                    self.on(events[i].shortName, function () {
-                        //debugger;
-                        this._callbacks[trigger.replace(/[0-9]/g, '')].apply(this[method], arguments);
-                        delete self._callbacks[trigger];
-                    })
+                    self
+                        //.off(events[i].shortName, function(){ delete self._callbacks[trigger]; })
+                        .on(events[i].shortName, function () {
+                            console.log('\nFIRING #3 ' + trigger);
+                            this._callbacks[trigger.replace(/[0-9]/g, '')].apply(this[method], arguments);
+                            delete self._callbacks[trigger];                     
+                        })
                 }
 
             } else {
                 if ( typeof(self._callbacks[trigger]) != 'undefined' ) {
+                    console.log('\nFIRING #4 ' + trigger);
                     self._callbacks[trigger].apply(this, args);
                     delete self._callbacks[trigger];
                 } else {
-                    self.once(trigger, function () {// patched for Air Liquide: case when emit occurs before listener is ready
-                        if (!this._arguments) {
-                            this._arguments = {}
-                        }
-                        // retrieving local arguments, & binding it to the event callback
-                        this._arguments[trigger] = arguments;
-                    })
+                    self
+                        // .off(trigger, function(){
+                        //     if (!this._arguments) {
+                        //         this._arguments = {}
+                        //     }
+                            
+                        //     if ( typeof(this._arguments[trigger]) != 'undefined' ) {
+                        //         delete this._arguments[trigger];
+                        //     }
+                        // })
+                        .once(trigger, function () {// patched for Air Liquide: case when emit occurs before listener is ready
+                            if (!this._arguments) {
+                                this._arguments = {}
+                            }
+                            
+                            // retrieving local arguments, & binding it to the event callback
+                            if ( typeof(this._arguments[trigger]) == 'undefined' ) {
+                                console.log('\nFIRING #5 ' + trigger);
+                                
+                                this._arguments[trigger] = arguments;
+                            }
+                            
+                        })
                 }
             }
         }
@@ -543,7 +517,7 @@ function EntitySuper(conn, caller) {
      * Get connection from entity
      * */
     this.getConnection = function() {
-        var conn =  local.conn ;
+        var conn =  local.conn || self._conn;
         return ( typeof(conn) != 'undefined' ) ? conn : null;
     }
 
@@ -551,7 +525,8 @@ function EntitySuper(conn, caller) {
 
         var ntt = entity;
         entity = entity.substr(0,1).toUpperCase() + entity.substr(1);
-
+        var nttName = entity;
+        
         if ( !/Entity$/.test(entity) ) {
             entity = entity + 'Entity'
         }
@@ -576,14 +551,25 @@ function EntitySuper(conn, caller) {
                     if ( typeof(modelUtil.entities[self.bundle][self.model][entity]) != 'function' ) {
                         throw new Error('Model entity not found: `'+ entity + '` while trying to call '+ callerName +'Entity.getEntity('+ entity +')');
                     }
-                    new modelUtil.entities[self.bundle][self.model][entity](self.getConnection(), callerName);
-                    return EntitySuper[callerName].instance._relations[entityName]
+                    
+                    // fixed on May 2019, 21st : need for `this.getEntity(...)` inside the model
+                    if (  typeof(EntitySuper[callerName].instance._relations[entityName]) == 'undefined' ) {
+                        
+                        if ( typeof(EntitySuper[entityName]) != 'undefined' && typeof(EntitySuper[entityName].instance) != 'undefined' ) {
+                            
+                            EntitySuper[callerName].instance._relations[entityName] = new modelUtil.entities[self.bundle][self.model][entity](self.getConnection(), callerName)
+                        } else { // regular case
+                            new modelUtil.entities[self.bundle][self.model][entity](self.getConnection(), callerName);    
+                        }                        
+                    }
+                    
+                     
+                    return EntitySuper[callerName].instance._relations[entityName]                   
                 }
             }
 
         } catch (err) {
             throw err;
-            return null
         }
     }
 
@@ -592,32 +578,6 @@ function EntitySuper(conn, caller) {
     }
 
 
-
-    ///**
-    // * Get config
-    // *
-    // * @param {string} [name] - Conf name without extension.
-    // * @return {object} result
-    // *
-    // * TODO - Protect result
-    // * */
-    //this.getConfig = function(name) {
-    //    var tmp = null;
-    //
-    //    if ( typeof(name) != 'undefined' ) {
-    //        try {
-    //            // needs to be read only
-    //            tmp = JSON.stringify(local.options.conf.content[name]);
-    //            return JSON.parse(tmp)
-    //        } catch (err) {
-    //            return undefined
-    //        }
-    //    } else {
-    //        tmp = JSON.stringify(local.options.conf);
-    //        return JSON.parse(tmp)
-    //    }
-    //}
-
     return init(conn, caller)
 };