gina 0.1.1-alpha.98 → 0.1.2-alpha.1

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/locales/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -57,7 +57,7 @@ function Locales() {
 
         return regions
     }
-    
+
 
     return init()
 };

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

@@ -13,17 +13,15 @@ var merge       = lib.merge;
  * */
 function Make() {
     var self = {}, rec = {};
-    
+
     var setup = function () {
-        
+
         var opt         = {}
-            , filename  = null
             , targets   = [ 'currency', 'region' ]
             , tmp       = null
-            , dir       = __dirname
-            ;
+        ;
 
-        for (var i = 1, len = process.argv.length; i < len; ++i) {
+        for (let i = 1, len = process.argv.length; i < len; ++i) {
             if ( /^\-\-[-_0-9a-z]+\=/i.test( process.argv[i] ) ) {
                 tmp = process.argv[i].split(/\=/);
                 tmp[0] = tmp[0].replace(/\-\-/, '');
@@ -37,40 +35,40 @@ function Make() {
         if ( targets.indexOf(opt.target) < 0 )
             throw new Error('`--target=`'+ opt.target +' option is not allowed.');
 
+        if ( typeof(opt.region) != 'undefined' && /\,/.test(opt.region) ) {
+            var regions = opt.region.split(/\,/g);
+            for (let i=0, len=regions.length; i<len; ++i) {
+                let options = JSON.clone(opt);
+                options.region = regions[i];
+                generate(options)
+            }
+            return;
+        }
+        generate(opt)
+    }
+
+    var generate = function(opt) {
+
+        var filename    = null
+            , dir       = __dirname
+        ;
+
         filename = (opt.filename) ? opt.filename : _(dir +'/resources/'+ opt.target +'.csv', true);
 
         var region      = (opt.region) ? opt.region : 'en';
         var mappingFile = _(dir+ '/resources/'+ opt.target +'.mapping.json', true);
         var content     = null;
+        try {
+            rec.mapping = requireJSON(mappingFile);
+        } catch (err) {
+            throw err
+        }
 
-        rec.mapping = {
-            "name"                              : "full",
-            "official_name_en"                  : "officialName.short",
-            "ISO3166-1-Alpha-2"                 : "short",
-            "ISO3166-1-Alpha-3"                 : "long",
-            "M49"                               : "m49",
-            "ITU"                               : "itu",
-            "MARC"                              : "marc",
-            "WMO"                               : "wmo",
-            "DS"                                : "ds",
-            "Dial"                              : "dial",
-            "FIFA"                              : "fifa",
-            "FIPS"                              : "fips",
-            "GAUL"                              : "gaul",
-            "IOC"                               : "ioc",
-            "ISO4217-currency_alphabetic_code"  : "currency.code",
-            "ISO4217-currency_country_name"     : "currency.countryName",
-            "ISO4217-currency_minor_unit"       : "currency.minorUnit",
-            "ISO4217-currency_name"             : "currency.name",
-            "ISO4217-currency_numeric_code"     : "currency.numCode",
-            "is_independent"                    : "isIndependent",
-            "Capital"                           : "capital",
-            "Continent"                         : "continent",
-            "TLD"                               : "tld",
-            "Languages"                         : "languages",
-            "Geoname ID"                        : "geonameId",
-            "EDGAR"                             : "edgar"
-        };
+        try {
+            rec.mapping = requireJSON(mappingFile);
+        } catch (err) {
+            throw err
+        }
 
         if ( opt.region != 'en' ) {
             rec.mapping[ 'official_name_' + opt.region ] = JSON.clone(rec.mapping["official_name_en"]);
@@ -109,7 +107,7 @@ function Make() {
         }
         rec.mapping = newMapping;
     }
-    
+
     var save = function (filename, data) {
 
         if ( fs.existsSync(filename) ) {
@@ -216,10 +214,11 @@ function Make() {
 
             bodyCols    = [];
             bc          = 0;
-            for (var a = 0, aLen = arr.length; a < aLen; ++a) {
+            aLen = arr.length
+            for (let a = 0; a < aLen; ++a) {
                 aContent = arr[a].split(/"/g);
 
-                for (var ac = 0, acLen = aContent.length; ac < acLen; ++ac) {
+                for (let ac = 0, acLen = aContent.length; ac < acLen; ++ac) {
                     if ( ac == acLen-1 ) {
                         aContent[ac] = (aContent[ac].substr(0,1) == ';') ? aContent[ac].substr(1) : aContent[ac];
                         subArr = aContent[ac].split(/;/);
@@ -308,11 +307,10 @@ function Make() {
         }
 
         self.body = body;
-        
+
     }
 
     setup();
     process.exit(0);
-};
-
-module.exports = Make()
+}
+module.exports = Make();

package/framework/v0.1.2-alpha.1/core/locales/src/resources/region.mapping.json

@@ -0,0 +1,43 @@
+// extract from region.csv
+{
+  "name": "countryName",
+  "official_name_en": "officialStateName",
+  "Languages": "languages",
+  "Capital": "capital",
+  "Continent": "continent",
+  "is_independent": "isIndependent",
+  // ISO Standardized country code on 2 or 3 letters
+  "ISO3166-1-Alpha-2": "isoShort",
+  "ISO3166-1-Alpha-3": "isoLong",
+  // Standard Country or Area Codes for Statistical Use (Series M, No. 49)
+  // "M49": "m49",
+  // Country codes for the International Telecommunication Union (1 or 3 letters)
+  // "ITU": "itu",
+  // Country codes for the U.S. library of congress (2 or 3 letters)
+  // "MARC": "marc",
+  // Country codes for the World Meteorological Organization
+  // "WMO": "wmo",
+  // Country codes for the U.S. Departement of State
+  // "DS": "ds",
+  // Country codes for the FIFA association
+  // "FIFA": "fifa",
+  // Country codes for the US government (DEPRECATED)
+  // "FIPS": "fips",
+  // Country codes for the The Global Administrative Unit Layers (GAUL) used by the Food and Agriculture Organization (FAO) of the United Nations.
+  // "GAUL": "gaul",
+  // Country codes for the International Olympic Committee
+  // "IOC": "ioc",
+  // Country codes for the Electronic Data Gathering, Analysis, and Retrieval (EDGAR) Extensible Markup Language (XML) as used by the U.S. securities and exchnage commission
+  // "EDGAR": "edgar",
+  // Country codes for the Geoname database
+  // "Geoname ID": "geonameId",
+  // Country dial-in codes, telephone number prefixes
+  "Dial": "dial",
+  "ISO4217-currency_name": "currency.name",
+  "ISO4217-currency_alphabetic_code": "currency.alphacode",
+  // "ISO4217-currency_numeric_code": "currency.numCode",
+  "ISO4217-currency_minor_unit": "currency.minorUnit",
+  // "ISO4217-currency_country_name": "currency.countryName",
+  // Top level domain for the country
+  "TLD": "tld"
+}

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/model/entity.js

@@ -1,18 +1,18 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 var fs              = require('fs');
 var EventEmitter    = require('events').EventEmitter;
-var utils           = require('gina').utils;
-var console         = utils.logger;
-var helpers         = utils.helpers;
-var inherits        = utils.inherits;
-var merge           = utils.merge;
-var modelUtil       = new utils.Model();
+var lib             = require('gina').lib;
+var console         = lib.logger;
+var helpers         = lib.helpers;
+var inherits        = lib.inherits;
+var merge           = lib.merge;
+var modelUtil       = new lib.Model();
 
 /**
  * @class Model.EntitySuper class
@@ -42,7 +42,7 @@ function EntitySuper(conn, caller) {
         if (!EntitySuper[self.name]) {
             EntitySuper[self.name] = {}
         }
-        
+
         if ( !EntitySuper[self.name]._conn ) {
             EntitySuper[self.name]._conn = conn;
         }
@@ -53,7 +53,7 @@ function EntitySuper(conn, caller) {
             return EntitySuper[self.name].instance
         }
     }
-    
+
 
     /**
      * Set all main listenners at once
@@ -102,7 +102,7 @@ function EntitySuper(conn, caller) {
                 typeof(entity[methods[m]]) == 'function'
                 && m != 'onComplete'
             ) {
-                
+
                 if ( triggers.indexOf(shortName + '#' + methods[m]) < 0 ) {
                     events[i] = {
                         index: i,
@@ -111,13 +111,11 @@ function EntitySuper(conn, caller) {
                         entityName: entityName
                     };
 
-                    
+
                     triggers.push(shortName + '#' + methods[m]);
-                    
+
                     ++i;
                 }
-
-                    
             }
         }
 
@@ -157,49 +155,49 @@ function EntitySuper(conn, caller) {
                     return function () {
 
                         // retrieving local arguments, & binding it to the event callback
-                        
+
                         /**
                          * handle promises with async/await
-                         * 
+                         *
                          * NB.: Always use the prefix `db` inside an entity file
                          *      instead of using `this.getRelation(entityName)`
-                         * 
-                         * e.g.: 
+                         *
+                         * e.g.:
                          *  var recordJob   = promisify(db.jobEntity.insert);
                          *  await recordJob(jobObj)
-                         *      .then( function onJob(_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 + ' ]');
-                                    
+                                    console.debug('[ MODEL ][ ENTITY ] Setting promise 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                                        
+                                            // 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  +')');                                                
+                                                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
@@ -208,38 +206,38 @@ function EntitySuper(conn, caller) {
                                     }
                                 }
                             }
-                                                                                   
-                            promise.apply(null, arguments);                            
-                            cached.apply(promise, arguments); 
-                            return promise;    
+
+                            promise.apply(null, arguments);
+                            cached.apply(promise, arguments);
+                            return promise;
                         } //else is normal case
-                        
-                        cached.apply(this[m], arguments);                        
-                        
+
+                        cached.apply(this[m], arguments);
+
                         this[m].onComplete = function (cb) {
 
-                            //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                                        
+                                        // 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;
@@ -249,8 +247,8 @@ function EntitySuper(conn, caller) {
                                 }
                             }
                         }
-                        
-                            
+
+
 
                         return this[m] // chaining event & method
                     };
@@ -303,7 +301,7 @@ function EntitySuper(conn, caller) {
 
         var args = Array.prototype.slice.call(arguments);
         var trigger = args.splice(0, 1)[0];
-        
+
         if ( !/\#/.test(trigger) ) {
             throw new Error('trigger name not properly set: use `#` between the entity name and the method reference');
             process.exit(1)
@@ -336,7 +334,7 @@ function EntitySuper(conn, caller) {
                         .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];                     
+                            delete self._callbacks[trigger];
                         })
                 }
 
@@ -351,7 +349,7 @@ function EntitySuper(conn, caller) {
                         //     if (!this._arguments) {
                         //         this._arguments = {}
                         //     }
-                            
+
                         //     if ( typeof(this._arguments[trigger]) != 'undefined' ) {
                         //         delete this._arguments[trigger];
                         //     }
@@ -360,14 +358,14 @@ function EntitySuper(conn, caller) {
                             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;
                             }
-                            
+
                         })
                 }
             }
@@ -516,9 +514,31 @@ function EntitySuper(conn, caller) {
     /**
      * Get connection from entity
      * */
-    this.getConnection = function() {
-        var conn =  local.conn || self._conn;
-        return ( typeof(conn) != 'undefined' ) ? conn : null;
+    this.getConnection = function(scope, collection) {
+        var conn =  local.conn || self._conn || null;
+
+        if ( typeof(conn) == 'undefined' || !conn) {
+            return null;
+        }
+
+        if ( typeof(scope) == 'undefined' ) {
+            scope = '_default';
+        }
+        var currentCollection = '_default';
+        if ( typeof(collection) != 'undefined' ) {
+            currentCollection = collection;
+        }
+
+
+        // retrieve & return the collection
+        if ( typeof(conn.scope) != 'undefined' && typeof(conn._scope) == 'undefined' && typeof(conn.scope) != 'undefined' ) {
+            var newConn = conn.scope(scope).collection(currentCollection);
+            newConn.sdk = conn.sdk;
+            return newConn;
+        }
+
+        // return the cached collection
+        return conn;
     }
 
     this.getEntity = function(entity) {
@@ -526,7 +546,7 @@ 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'
         }
@@ -551,20 +571,20 @@ 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 +')');
                     }
-                    
+
                     // 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);    
-                        }                        
+                            new modelUtil.entities[self.bundle][self.model][entity](self.getConnection(), callerName);
+                        }
                     }
-                    
-                     
-                    return EntitySuper[callerName].instance._relations[entityName]                   
+
+
+                    return EntitySuper[callerName].instance._relations[entityName]
                 }
             }
 

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/model/index.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,16 +12,15 @@ var EventEmitter    = require('events').EventEmitter;
 var corePath        = getPath('gina').core;
 var Config          = require( corePath + '/config' );
 var config          = new Config();
-var utils           = require('gina').utils;
-var console         = utils.logger;
-var math            = utils.math;
-var inherits        = utils.inherits;
-//var merge           = utils.merge;
-var utilsConfig     = new utils.Config();
-var modelUtil       = new utils.Model();
+var lib             = require('gina').lib;
+var console         = lib.logger;
+var math            = lib.math;
+var inherits        = lib.inherits;
+//var merge           = lib.merge;
+var configLib     = new lib.Config();
+var modelUtil       = new lib.Model();
 var Module          = require('module');
 
-//UtilsConfig = Utils.Config(),
 //dev     = require(_(corePath + '/dev') ),
 
 
@@ -106,6 +105,7 @@ function Model(namespace, _config) {
         var bundle          = self.bundle;
         var model           = self.model;
         var modelDirName    = self.modelDirName;
+        var connectorPath   = null;
 
         // this is supposed to happen on load or for dev env; on reload, with a checksum
         var conf        = getConfigSync(bundle);
@@ -119,7 +119,7 @@ function Model(namespace, _config) {
             //TODO - More controls...
 
             //For now, I just need the F..ing entity name.
-            var connectorPath   = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
+            connectorPath       = local.connectorPath = _(GINA_FRAMEWORK_DIR +'/core/connectors/'+ self.connector);
             var modelPath       = local.modelPath = _(conf.path + '/' + modelDirName);
             var entitiesPath    = local.entitiesPath = _(modelPath + '/entities');
             console.debug('[ MODEL ][ ' + model +' ] Scanning model entities: ', entitiesPath +' - Existing path ? '+ fs.existsSync(entitiesPath) );
@@ -128,7 +128,7 @@ function Model(namespace, _config) {
                 new _(entitiesPath).mkdirSync();
             }
 
-            var connectorPath   = _(connectorPath + '/lib/connector.js');
+            connectorPath   = _(connectorPath + '/lib/connector.js');
             console.debug('[ MODEL ][ ' + model +' ] Loading connector: ' + connectorPath);
             //Getting Entities Manager.
             var exists = fs.existsSync(connectorPath);
@@ -157,7 +157,7 @@ function Model(namespace, _config) {
                 self.emit('model#ready', new Error('[ MODEL ][ '+ model +' ] No connector found'), self.bundle, self.name, conn)
             }
 
-        } else {
+        } else {
             console.warn('[ MODEL ][ ' + model +' ] no configuration found...');
             self.emit('model#ready', new Error('[ MODEL ][ ' + model +' ] no configuration found for your model: ' + model), self.bundle, self.name, null)
         }
@@ -175,7 +175,7 @@ function Model(namespace, _config) {
             connector.onReady( function(err, conn){
                 self.connectors[_connector].err = err;
                 self.connectors[_connector].conn = conn;
-                
+
                 callback(err, conn);
             });
 
@@ -215,13 +215,13 @@ function Model(namespace, _config) {
             env = configuration.Env.current;
             conf = configuration.Env.getConf(bundle, env);
         }
-        console.debug('[ MODEL ][ ' + _connector + ' ] env ', conf.env);         
+        console.debug('[ MODEL ][ ' + _connector + ' ] env ', conf.env);
         console.debug('[ MODEL ][ ' + _connector + ' ] configuration modelsPath ', conf.modelsPath);
-        console.debug('[ MODEL ][ ' + _connector + ' ] connectors ', connectors); 
+        console.debug('[ MODEL ][ ' + _connector + ' ] connectors ', connectors);
 
         // try {
 
-        //     var locals = _locals = utilsConfig.getSync('gina', 'locals.json')
+        //     var locals = _locals = configLib.getSync('gina', 'locals.json')
         // } catch (err) {
         //     console.emerg('[ MODEL ][ ' + _connector +' ] Error while calling `Model::getConfigSync()` '+ err.stack||err.message);
         //     if ( i < 10) {

package/framework/{v0.1.1-alpha.98 → v0.1.2-alpha.1}/core/model/template/entityFactory.js

@@ -1,6 +1,6 @@
 /*
  * This file is part of the gina package.
- * Copyright (c) 2009-2022 Rhinostone <contact@gina.io>
+ * Copyright (c) 2009-2023 Rhinostone <contact@gina.io>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.