gina 0.1.1-alpha.179 → 0.1.1-alpha.180

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js.map

@@ -1,8 +1,8 @@
 {
 "version":3,
-"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.179/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
+"file":"/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.180/core/asset/plugin/dist/vendor/gina/js/gina.onload.min.js",
 "lineCount":5,
 "mappings":"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",
-"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.179/core/asset/plugin/src/vendor/gina/utils/loader.js"],
+"sources":["/usr/local/lib/node_modules/gina/framework/v0.1.1-alpha.180/core/asset/plugin/src/vendor/gina/utils/loader.js"],
 "names":["window","gina","options","test","JSON","parse","decodeURIComponent","version","bundle","routes","routing","re","RegExp","String","fromCharCode","route","location","search","href","slice","match","Array","isArray","length","matched","split","err","link","links","document","head","getElementsByTagName","i","len","found","cssPath","createElement","media","rel","type","appendChild","Toolbar"]
 }

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/core/connectors/couchbase/index.js

@@ -314,7 +314,7 @@ function Couchbase(conn, infos) {
 
                         // normal case
                         if (
-                            !foundSpecialLeftCase /**&& !foundSpecialRightCase*/
+                            !foundSpecialLeftCase
                             || Array.isArray(queryParams) && queryParams.length == 0
                         ) {
                             queryParams = JSON.clone(args);
@@ -327,13 +327,48 @@ function Couchbase(conn, infos) {
                     }
 
                     var query = null, execQuery = null, _collection = null;
-                    // values by default
+                    // adhoc option: @param {boolean} options.adhoc [ true | false ]
+                    // default is set to false
+                    //queryOptions.adhoc = false;
+
+                    // scan consistency level: @param {number} options.consistency [ 1 | 2 | 3 ]
+                    // Default is set to 1
+                    //
+                    // Default
+                    //  code        : NOT_BOUNDED
+                    //  number      : 1
+                    //  description : This is the default (for single-statement requests).
+                    //
+                    // Request plus
+                    //  code        : REQUEST_PLUS
+                    //  number      : 2
+                    //  description : This implements strong consistency per request.
+                    //                Update cycle every «20ms for memdb & 200ms for forestdb»
+                    //
+                    // Statement plus
+                    //  code        : STATEMENT_PLUS
+                    //  number      : 3
+                    //  description : This implements strong consistency per statement.
+                    //                Update cycle every «20ms for memdb & 200ms for forestdb»
+                    //
+                    //
+                    // For more, visit :
+                    // - https://blog.couchbase.com/high-performance-consistency/
+                    // - https://developer.couchbase.com/documentation/server/current/architecture/querying-data-with-n1ql.html
+                    // Query options values by default
                     var queryOptions = {
                         // Do not turn off the adhoc flag for each query since
                         // only a finite number of query plans (currently 5000) can be stored in the SDK
                         adhoc: false, // false to use plan optimization, but need a statement `name param` or `num param`
                         consistency: 1 // NOT_BOUNDED, but STATEMENT_PLUS is set by default for insert & update
                     };
+
+
+                    if ( /^(insert|update)/i.test(statement) ) {
+                        queryOptions.adhoc = true;
+                        queryOptions.consistency = 3; // STATEMENT_PLUS
+                    }
+
                     if ( sdkVersion > 2 ) { // starting from SDK v3
                         // _collection = queryStatement.match(/\_collection(\s+\=|=)(.*)(\'|\")/);
                         // if (_collection.length > 0) {
@@ -360,40 +395,9 @@ function Couchbase(conn, infos) {
                         // @param {object} options
                         // @param {string} options.sample
 
-                        // adhoc option: @param {boolean} options.adhoc [ true | false ]
-                        // default is set to false
-                        //queryOptions.adhoc = false;
-
-                        // scan consistency level: @param {number} options.consistency [ 1 | 2 | 3 ]
-                        // Default is set to 1
-                        //
-                        // Default
-                        //  code        : NOT_BOUNDED
-                        //  number      : 1
-                        //  description : This is the default (for single-statement requests).
-                        //
-                        // Request plus
-                        //  code        : REQUEST_PLUS
-                        //  number      : 2
-                        //  description : This implements strong consistency per request.
-                        //
-                        // Statement plus
-                        //  code        : STATEMENT_PLUS
-                        //  number      : 3
-                        //  description : This implements strong consistency per statement.
-                        //
-                        //
-                        // For more, visit :
-                        // - https://blog.couchbase.com/high-performance-consistency/
-                        // - https://developer.couchbase.com/documentation/server/current/architecture/querying-data-with-n1ql.html
-                        // queryOptions.consistency = 2; // 3
-                                // .adhoc(queryOptions.adhoc)
-                                // .consistency(queryOptions.consistency)
-                        //if ( /^(insert|update)/i.test(statement) ) {
-                        queryOptions.adhoc = true;
-                        queryOptions.consistency = 3; // NOT_BOUNDED
-                        query.consistency(3); // NOT_BOUNDED
-                        //}
+
+                        // Setting up consistency
+                        query.consistency(queryOptions.consistency);
                         // merge options
                         for (var qOpt in queryOptions) {
                             if ( typeof(query[ qOpt ]) == 'undefined' ) {
@@ -757,6 +761,7 @@ function Couchbase(conn, infos) {
             } else {
                 // prepared statement
                 query = N1qlQuery.fromString(queryString);
+                query.consistency(queryOptions.consistency);
                 // merge options
                 for (var qOpt in queryOptions) {
                     if ( typeof(query[ qOpt ]) == 'undefined' ) {

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/core/plugins/lib/validator/src/main.js

@@ -6308,12 +6308,15 @@
             var caseValue = null, caseType = null;
             var localRules = null, caseName = null;
             var localRuleObj = null, skipTest = null;
+            var localFieldType  = null;
 
             //console.debug('parsing ', fields, $fields, rules);
             if ( typeof(rules) != 'undefined' ) {
 
                 for (var field in fields) {
 
+                    localFieldType = $fields[field].getAttribute('type');
+
                     if ( isGFFCtx && typeof($fields[field]) == 'undefined' ) {
                         //throw new Error('field `'+ field +'` found for your form rule ('+ $formOrElement.id +'), but not found in $field collection.\nPlease, check your HTML or remove `'+ field +'` declaration from your rule.')
                         console.warn('field `'+ field +'` found for your form rule ('+ $formOrElement.id +'), but not found in $field collection.\nPlease, check your HTML or remove `'+ field +'` declaration from your rule if this is a mistake.');
@@ -6338,7 +6341,7 @@
                     if (
                         isGFFCtx
                         && $fields[field].tagName.toLowerCase() == 'input'
-                        && /(checkbox)/i.test($fields[field].getAttribute('type'))
+                        && /^(checkbox)$/i.test(localFieldType)
                     ) {
                         if (
                             !$fields[field].checked
@@ -6352,10 +6355,17 @@
                                 exclude: true
                             }
 
-                        } else if ( !$fields[field].checked && typeof(rules[field]) == 'undefined' ) {
+                        } else if ( /**^(checkbox)$/i.test(localFieldType) && */!$fields[field].checked && typeof(rules[field]) == 'undefined' ) {
                             continue;
                         }
                     }
+                    else if (
+                        isGFFCtx
+                        && $fields[field].tagName.toLowerCase() == 'input'
+                        && /^(radio)$/i.test(localFieldType)
+                    ) {
+                        console.debug('Radio: ', $fields[field].id, $fields[field].checked, $fields[field].value)
+                    }
 
 
 

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/core/server.isaac.js

@@ -189,7 +189,7 @@ function ServerEngineClass(options) {
                                 // false & true case
                                 if ( /^(false|true|on)$/i.test(a[1]) )
                                     a[1] = ( /^(true|on)$/i.test(a[1]) ) ? true : false;
-                                else if (a[1].indexOf('%') > -1)
+                                else if (a[1] && a[1].indexOf('%') > -1)
                                     a[1] = decodeURIComponent(a[1]);
 
                                 if (/^(\{|\[)/.test(a[1]) ) {

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/lib/cmd/framework/link.js

@@ -51,7 +51,6 @@ var console     = lib.logger;
 
     var link = function(opt, cmd) {
         console.debug('Linking framework');
-
         var err = null, folder = new _(self.projectLocation);
 
         if ( folder.isValidPath() && isValidName(self.projectName) ) {

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/lib/logger/src/containers/file/index.js

@@ -10,7 +10,11 @@ const net                 = require('net');
 
 var helpers = null;
 
-const merge     = require(__dirname + '/../../../../merge');
+var merge     = require(__dirname + '/../../../../merge');
+if ( typeof(merge) != 'function' ) {
+    // if needed for unit tests
+    merge = eval(fs.readFileSync(__dirname +'/../../../../merge/src/main.js').toString())
+}
 
 function FileContainer(opt, loggers) {
     var self = {

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/lib/logger/src/containers/mq/index.js

@@ -4,8 +4,11 @@ const fs          = require('fs');
 const net         = require('net');
 const util        = require('util');
 const promisify   = util.promisify;
-const merge       = require(__dirname +'/../../../../merge');
-
+var merge         = require(__dirname +'/../../../../merge');
+if ( typeof(merge) != 'function' ) {
+    // if needed for unit tests
+    merge = eval(fs.readFileSync(__dirname +'/../../../../merge/src/main.js').toString())
+}
 function MqContainer(opt, loggers) {
     var self = {
         // flow or container name/id

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/lib/logger/src/main.js

@@ -13,8 +13,9 @@ var promisify           = util.promisify;
 const { EventEmitter }  = require('events');
 
 // During initial pre-install & post-install, `colors` might not be installed !
-var colors          = null;
-var frameworkPath   = __dirname +'/../../../../..';
+var colors              = null;
+var frameworkPath       = __dirname +'/../../../../..';
+// var frameworkVersion    = require(frameworkPath + '/package.json').version;
 try {
     colors = require('colors') || require(frameworkPath +'/node_modules/colors');
 } catch (err) {
@@ -28,6 +29,10 @@ var inherits        = require('../../inherits');
 var helpers         = require('../../../helpers');
 
 // BO - publishing hack
+if ( typeof(merge) != 'function' ) {
+    // if needed for unit tests
+    merge = eval(fs.readFileSync(__dirname +'/../../merge/src/main.js').toString())
+}
 if ( typeof(JSON.clone) == 'undefined' ) {
     require(__dirname +'/../../../helpers/prototypes')()
 }

package/framework/{v0.1.1-alpha.179 → v0.1.1-alpha.180}/lib/merge/src/main.js

@@ -4,8 +4,8 @@ function Merge() {
     var newTarget           = []
         //, keyComparison     = 'id' // use for collections merging [{ id: 'val1' }, { id: 'val2' }, {id: 'val3' }, ...]
     ;
-        
-    
+
+
     /**
      *
      * @param {object} target - Target object
@@ -15,11 +15,12 @@ function Merge() {
      * @returns {object} [result]
      * */
     var browse = function (target, source) {
-        
+
         if ( typeof(target) == 'undefined' ) {
             target = ( typeof(source) != 'undefined' && Array.isArray(source)) ? [] : {}
         }
 
+
         var override = false;
         if (( typeof(arguments[arguments.length-1]) == 'boolean' )) {
             override = arguments[arguments.length-1]
@@ -66,7 +67,7 @@ function Merge() {
                             if (!target) {
                                 target = { name: null }
                             }
-                                                        
+
                             src     = target[ name ];
                             copy    = options[ name ];
 
@@ -120,10 +121,9 @@ function Merge() {
 
 
 
-                                //[propose] Supposed to go deep... deep... deep...
+                                //[proposal] Supposed to go deep... deep... deep...
                                 if ( !override ) {
                                     // add those in copy not in clone (target)
-
                                     for (var prop in copy) {
                                         if (typeof(clone[ prop ]) == 'undefined') {
                                             if ( Array.isArray(copy[ prop ]) && Array.isArray(clone[ prop ]) ) {
@@ -136,28 +136,12 @@ function Merge() {
                                         }
                                     }
 
-
-
-
                                     // Never move original objects, clone them
                                     if (typeof(src) != 'boolean' && !createMode ) {//if property is not boolean
 
                                         // Attention: might lead to a `Maximum call stack size exceeded` Error message
                                         target[ name ] = browse(clone, copy, override);
 
-                                        // this does not work ... target is returned before the end of process.nextTick !!!
-                                        // process.nextTick(function onBrowse() {
-                                        //     target[name] = browse(clone, copy, override)
-                                        // });
-
-                                        // nextTickCalled = true;
-                                        // process.nextTick(function onBrowse() {
-                                        //     nextTickCalled = false;
-                                        //     //target[ name ] = browse(clone, copy, override);
-                                        //     return browse(clone, copy, override);
-                                        // });
-
-
                                     } else if (createMode) {
                                         target[ name ] = clone;
                                     }
@@ -181,7 +165,7 @@ function Merge() {
                                 }
 
                             } else if (copy !== undefined) {
-                                //[propose]Don't override existing if prop defined or override @ false
+                                //[proposal] Don't override existing if prop defined or override @ false
                                 if (
                                     typeof(src) != 'undefined'
                                     && src != null
@@ -202,26 +186,15 @@ function Merge() {
         }
 
         newTarget = [];
-        
-        
-        
-        // return { 
-        //     'setKeyComparison' : function(key) {
-        //         mergeArray.key = key;
-        //         return target;
-        //     }
-        // } || target
-            
-        return target;
 
+        return target;
     };
 
     // Will not merge functions items: this is normal
-    // Merging arrays is OK, but merging collections is still experimental        
+    // Merging arrays is OK, but merging collections is still experimental
     var mergeArray = function(options, target, override) {
         newTarget = [];
-                
-        
+
         var newTargetIds = []
             , keyComparison = browse.getKeyComparison()
             , a             = null
@@ -234,7 +207,7 @@ function Merge() {
             if (
                 typeof(options[0]) == 'object'
                 && typeof(options[0][keyComparison]) != 'undefined'
-                && typeof(target[0]) == 'object' 
+                && typeof(target[0]) == 'object'
                 && typeof(target[0][keyComparison]) != 'undefined'
             ) {
 
@@ -242,42 +215,42 @@ function Merge() {
                 for (var nt = 0, ntLen = newTarget.length; nt < ntLen; ++nt) {
                     newTargetIds.push(newTarget[nt][keyComparison]);
                 }
-                
-                var _options    = JSON.clone(options);                
+
+                var _options    = JSON.clone(options);
                 var index       = 0;
                 a = 0;
                 aLen = _options.length;
                 for (var n = next || 0, nLen = target.length; n < nLen; ++n) {
-                    
+
                     // if (newTargetIds.indexOf(target[n][keyComparison]) == -1) {
                     //     newTargetIds.push(target[n][keyComparison]);
-                        
+
                     //     //newTarget.push(target[n]);
                     //     //++index;
                     // }
-                    
+
                     label:
                     for (a = a || 0; a < aLen; ++a) {
-                    
+
                         if (_options[a][keyComparison] === target[n][keyComparison] ) {
 
                             if (newTargetIds.indexOf(_options[a][keyComparison]) > -1) {
-                                
+
                                 newTarget[index] = _options[a];
                                 ++index;
-                                
+
                             } else if (newTargetIds.indexOf(_options[a][keyComparison]) == -1) {
 
-                                newTargetIds.push(_options[a][keyComparison]);                                
+                                newTargetIds.push(_options[a][keyComparison]);
                                 //newTarget.push(_options[a]);
                                 newTarget[index] = _options[a];
                                 ++index;
                             }
 
                             break label;
-                            
-                        } else if (newTargetIds.indexOf(_options[a][keyComparison]) == -1) {                            
-                            
+
+                        } else if (newTargetIds.indexOf(_options[a][keyComparison]) == -1) {
+
                             newTargetIds.push(_options[a][keyComparison]);
                             newTarget.push(_options[a]);
                         }
@@ -315,7 +288,7 @@ function Merge() {
             }
         }
 
-        if (newTarget.length == 0 && target.length > 0) {            
+        if (newTarget.length == 0 && target.length > 0) {
             // ok, but don't merge objects
             a = 0;
             for (; a < target.length; ++a ) {
@@ -324,23 +297,23 @@ function Merge() {
                 }
             }
         }
-        
+
         if ( target.length > 0 ) {
-            
+
             // if collection, comparison will be done uppon the `id` attribute
             if (
-                typeof(options[0]) != 'undefined' 
-                && typeof (options[0]) == 'object' 
-                && options[0] != null 
+                typeof(options[0]) != 'undefined'
+                && typeof (options[0]) == 'object'
+                && options[0] != null
                 && typeof(options[0][keyComparison]) != 'undefined'
-                && typeof(target[0]) == 'object' 
+                && typeof(target[0]) == 'object'
                 && typeof(target[0][keyComparison]) != 'undefined'
             ) {
 
                 newTarget       = (Array.isArray(target)) ? Array.from(target) : JSON.clone(target);
                 var _options    = JSON.clone(options);
                 var next        = null;
-                
+
                 i = 0;
                 a = 0; aLen = newTarget.length;
                 for (; a < aLen; ++a) {
@@ -348,27 +321,27 @@ function Merge() {
                 }
                 a = 0;
                 for (; a < aLen; ++a) {
-                    
+
                     end:
                         for (var n = next || 0, nLen = _options.length; n < nLen; ++n) {
-                            
+
                             if (
                                 _options[n] != null && typeof(_options[n][keyComparison]) != 'undefined' && _options[n][keyComparison] !== newTarget[a][keyComparison]
 
                             ) {
-                            
+
                                 if ( newTargetIds.indexOf(_options[n][keyComparison]) == -1 ) {
                                     newTarget.push(_options[n]);
                                     newTargetIds.push(_options[n][keyComparison]);
 
-                                    next = n+1; 
+                                    next = n+1;
 
                                     if (aLen < nLen)
                                         ++aLen;
 
-                                    break end; 
+                                    break end;
                                 }
-                                                               
+
                             } else if( _options[n] != null && typeof(_options[n][keyComparison]) != 'undefined' && _options[n][keyComparison] === newTarget[a][keyComparison] ) {
 
                                 next = n+1;
@@ -388,30 +361,33 @@ function Merge() {
 
             } else { // normal case `arrays`
                 a = 0;
+                // in case there is no keyComparison in options[*].props
+                var localKeyComparison = null;
                 for (; a < options.length; ++a ) {
+                    localKeyComparison = (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) ) ? Object.getOwnPropertyNames(options[a])[0] : null;
                     if ( target.indexOf(options[a]) > -1 && override) {
                         target.splice(target.indexOf(options[a]), 1, options[a])
                     } else if ( typeof(newTarget[a]) == 'undefined' && typeof(options[a]) == 'object' ) {
-                        // merge using index   
+                        // merge using index
                         newTarget = target;
 
                         if (typeof (newTarget[a]) == 'undefined')
                             newTarget[a] = {};
-                                                    
-                            
+
+
                         for (let k in options[a]) {
                             if (!newTarget[a].hasOwnProperty(k)) {
                                 newTarget[a][k] = options[a][k]
                             }
-                        }   
-                        
+                        }
+
                     } else {
                         // fixing a = [25]; b = [25,25];
                         // result must be [25,25]
                         if (
                             !override
-                            && newTarget.indexOf(options[a]) > -1 
-                            && typeof(options[a]) == 'number'
+                            && newTarget.indexOf(options[a]) > -1
+                            && /number/i.test( typeof(options[a]) )
                             // ok but not if @ same position
                             //&& options[a] !== newTarget[a]
                         ) {
@@ -419,11 +395,9 @@ function Merge() {
                                 newTarget.push(options[a]);
                                 continue
                             }
-                            
-                            //break;
                         }
-                            
-                        
+
+                        // Collection with keyComparison
                         if (
                             typeof (target[a]) != 'undefined'
                             && !/null/i.test(target[a])
@@ -436,11 +410,25 @@ function Merge() {
                                 newTarget[a] = options[a]
                             else
                                newTarget[a] = target[a]
-                        } else if (newTarget.indexOf(options[a]) == -1 /**&& typeof(options[a]) == 'string'*/) {
+                        }
+                        // array with string key
+                        else if (newTarget.indexOf(options[a]) == -1 && typeof(options[a]) != 'object') {
                             newTarget.push(options[a]);
                         }
-                        
-                        
+                        // collection without keyComparison
+                        else if (
+                            typeof (target[a]) != 'undefined'
+                            && !/null/i.test(target[a])
+                            && typeof (target[a][localKeyComparison]) != 'undefined'
+                            && typeof (options[a]) != 'undefined'
+                            && typeof (options[a][localKeyComparison]) != 'undefined'
+                            && target[a][localKeyComparison] == options[a][localKeyComparison]
+                        ) {
+                            if (override)
+                                newTarget[a] = options[a]
+                            else
+                               newTarget[a] = target[a]
+                        }
                     }
                 }
             }
@@ -489,32 +477,32 @@ function Merge() {
     }
 
     browse.setKeyComparison = function(keyComparison) {
-        
+
         mergeArray.keyComparison = keyComparison;
-        
+
         return browse
     }
-    
+
     browse.getKeyComparison = function() {
-        
+
         var keyComparison = mergeArray.keyComparison || 'id';
-        
+
         // reset for the next merge
         mergeArray.keyComparison = 'id';
-        
+
         return keyComparison
     }
-    
+
     // clone target & source to prevent mutations from the originals
-    // if (!browse.originalValueshasBeenCached) {            
+    // if (!browse.originalValueshasBeenCached) {
     //     for (let a = 0, aLen = arguments.length; a < aLen; a++) {
     //         if ( typeof(arguments[a]) == 'object' ) {
     //             arguments[a] = JSON.clone(arguments[a]);
     //         }
     //     }
-    //     browse.originalValueshasBeenCached = true;            
+    //     browse.originalValueshasBeenCached = true;
     // }
-    
+
     return browse
 }