gina 0.1.1-alpha.180 → 0.1.1-alpha.181

package/framework/v0.1.1-alpha.181/helpers/json/src/main.js

@@ -0,0 +1,361 @@
+/*
+ * This file is part of the gina package.
+ * 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 console = require('./../../../lib/logger');
+/**
+ * JSONHelper
+ *
+ * @package     Gina.Lib.Helpers
+ * @author      Rhinostone <contact@gina.io>
+ * @api public
+ * */
+
+module.exports = function(){
+
+    // `JSON.clone()` is a prototype defined in `GINA_DIR//lib/prototypes.json_clone`
+
+    encodeRFC5987ValueChars = function(str) {
+        // return encodeURIComponent(str).
+        //   // Bien que la RFC 3986 réserve "!", RFC 5987 ne réserve pas ce caractère,
+        //   // il n'est donc pas nécessaire l'échapper
+        //   replace(/['()*]/g, c => '%' + c.charCodeAt(0).toString(16)). // i.e., %27 %28 %29 %2a
+        //   // on notera que l'encodage valide pour "*" est %2A et qui faut donc appeler toUpperCase()
+        //   // pour encoder exactement.
+
+        //   // Selon la RFC 5987 ce qui suit n'est pas nécessairement requis
+        //   // on peut donc bénéficier d'un peu plus de lisibilité : |`^
+        //   replace(/%(7C|60|5E)/g, (str, hex) => String.fromCharCode(parseInt(hex, 16)));
+
+        // return encodeURIComponent(str).replace(/[!'()*]/g, function(c) {
+        //     return '%' + c.charCodeAt(0).toString(16);
+        //   });
+
+        return encodeURIComponent(str).
+        // Bien que la RFC 3986 réserve "!", RFC 5987 ne réserve pas ce caractère,
+        // il n'est donc pas nécessaire l'échapper
+        replace(/['()]/g, escape). // c'est-à-dire %27 %28 %29
+        replace(/\*/g, '%2A').
+            // Selon la RFC 5987 ce qui suit n'est pas nécessairement requis
+            // on peut donc bénéficier d'un peu plus de lisibilité : |`^
+            replace(/%(?:7C|60|5E)/g, unescape);
+    };
+
+    /**
+     * Load a json file and removing comments if found
+     *
+     * @param {string} filename - path to json content
+     *
+     * @return {object} jsonObject
+     * */
+    requireJSON = function(filename){
+
+        //console.debug('[ Helpers ][ requireJSON ] ', filename);
+
+        var i                       = null
+            , len                   = null
+            , commentsWithSlashes = null
+            , jsonStr               = null
+        ;
+
+        try {
+            if ( typeof(process.env.NODE_ENV_IS_DEV) != 'undefined' && /true/i.test(process.env.NODE_ENV_IS_DEV) ) {
+                delete require.cache[filename];
+            }
+            jsonStr = fs.readFileSync(filename).toString();
+        } catch (err) {
+            if ( typeof(console.emerg) != 'undefined' ) {
+                console.emerg(err.stack);
+                process.exit(1);
+            }
+            throw err
+        }
+
+
+        /** block style comments */
+        if ( /\/\*\*/.test(jsonStr) ) {
+            jsonStr   = jsonStr.replace(/(\/\*([^*]|[\r\n]|(\*+([^*\/]|[\r\n])))*\*+\/)/g, '');
+        }
+
+        // line style comments
+        commentsWithSlashes = jsonStr.match(/\/\/(.*)?/g);
+
+        len = ( commentsWithSlashes) ? commentsWithSlashes.length : 0;
+        if (commentsWithSlashes && len > 0) {
+            i = 0;
+            for(; i< len; ++i) {
+                // ignore urls
+                if ( /(\:|\")/.test( jsonStr.substr(jsonStr.indexOf(commentsWithSlashes[i])-1,1) ) )
+                    continue;
+
+                jsonStr = jsonStr.replace(commentsWithSlashes[i], '');
+            }
+        }
+
+        try {
+            return JSON.parse(jsonStr)
+        } catch (err) {
+            var pos     = null
+                , msg   = null
+                , error = null
+            ;
+            var stack   = err.stack.match(/position(\s|\s+)\d+/);
+            if ( Array.isArray(stack) && stack.length > 0) {
+                pos     = stack[0].replace(/[^\d+]/g, '');
+                jsonStr = jsonStr.substr(0, pos) + '--(ERROR !)--\n' + jsonStr.substr(pos);
+                msg     = (jsonStr.length > 400) ?  '...'+ jsonStr.substr(pos-200, 300) +'...' : jsonStr;
+                error = new Error('[ requireJSON ] could not parse `'+ filename +'`:' +'\n\rSomething is wrong around this portion:\n\r'+msg+'<strong style="color:red">"</strong>\n\rPlease check your file: `'+ filename +'`'+ '\n\r<strong style="color:red">'+err.stack+'</strong>\n');
+            } else {
+                error = new Error('[ requireJSON ] could not parse `'+ filename +'`:' +'\n\rSomething is wrong with the content of your file.\n\rPlease check the syntax of your file : `'+ filename +'`'+ '\n\r<strong style="color:red">'+err.stack+'</strong>\n');
+            }
+
+            if ( !/\/controllers/i.test(err.stack) && typeof(console.emerg) != 'undefined' ) {
+                console.emerg(error.message);
+                process.exit(1);
+            }
+            throw error;
+        }
+    };
+
+    // var isEncoded = function(uri) {
+    //     uri = uri || '';
+    //     return uri !== decodeURIComponent(uri);
+    // }
+
+    /**
+     * Convert JSON string with structured keys to object
+     *
+     * @param {string} JSON string with structured keys
+     * */
+    parseBodyString = function(bodyStr){
+        try {
+            bodyStr = decodeURIComponent(bodyStr);
+        } catch (err) {
+            // Already decoded - ignoring
+        }
+
+        // false & true case
+        if ( /(\"false\"|\"true\"|\"on\")/.test(bodyStr) ) {
+            bodyStr = bodyStr.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
+        }
+        if ( /(\"null\")/i.test(bodyStr) ) {
+            bodyStr = bodyStr.replace(/\"null\"/ig, null);
+        }
+
+        return parseBody(bodyStr);
+    }
+
+    var parseCollection = function (collection, obj) {
+
+        for(var i = 0, len = collection.length; i<len; ++i) {
+            obj[i] = parseObject(collection[i], obj);
+        }
+
+        return obj
+    }
+
+    var parseObject = function (tmp, obj) {
+        var el      = []
+            , key   = null
+        ;
+
+        if (!obj) {
+            obj = {}
+        }
+
+        for (let o in tmp) {
+
+            el[0]   = o;
+            el[1]   = tmp[o];
+
+            if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
+                key = el[0].replace(/\]/g, '').split(/\[/g);
+                obj = parseLocalObj(obj, key, 0, el[1])
+            } else {
+                obj[ el[0] ] = el[1]
+            }
+        }
+
+        return obj
+    }
+
+    var parseBody = function(body) {
+        var obj             = null
+            , tmp           = null
+            , arr           = null
+            , isArrayType   = null
+        ;
+        if ( /^(\{|\[|\%7B|\%5B)/.test(body) ) {
+            try {
+                isArrayType = ( /^(\{|\%7B)/.test(body) ) ? false : true;
+                obj = ( isArrayType ) ? [] : {};
+
+                if ( /^(\%7B|\%5B)/.test(body) ) {
+                    tmp = JSON.parse(decodeURIComponent(body))
+                } else {
+                    tmp = JSON.parse(body)
+                }
+
+                if ( Array.isArray(tmp) ) {
+                    obj = parseCollection(tmp, obj)
+                } else {
+                    obj = parseObject(tmp, obj)
+                }
+
+                return obj
+            } catch (err) {
+                console.error('[365] could not parse body:\n' + body)
+            }
+
+        } else {
+            obj = {};
+            arr = body.split(/&/g);
+            if ( /(\"false\"|\"true\"|\"on\")/.test(body) )
+                body = body.replace(/\"false\"/g, false).replace(/\"true\"/g, true).replace(/\"on\"/g, true);
+
+
+            var el      = {}
+                , value = null
+                , key   = null;
+
+            for (var i = 0, len = arr.length; i < len; ++i) {
+                if (!arr[i]) continue;
+
+                arr[i] = decodeURIComponent(arr[i]);
+
+                if ( /^\{/.test(arr[i]) || /\=\{/.test(arr[i]) || /\=\[/.test(arr[i]) ) {
+                    try {
+                        if (/^\{/.test(arr[i])) {
+                            obj = JSON.parse(arr[i]);
+                            break;
+                        } else {
+                            el = arr[i].match(/\=(.*)/);
+                            el[0] =  arr[i].split(/\=/)[0];
+                            obj[ el[0] ] = JSON.parse( el[1] );
+                        }
+
+
+                    } catch (err) {
+                        console.error('[parseBody#1] could not parse body:\n' + arr[i])
+                    }
+                } else {
+                    el = arr[i].split(/=/);
+                    if ( /\{\}\"\:/.test(el[1]) ) { //might be a json
+                        try {
+                            el[1] = JSON.parse(el[1])
+                        } catch (err) {
+                            console.error('[parseBody#2] could not parse body:\n' + el[1])
+                        }
+                    }
+
+                    if ( typeof(el[1]) == 'string' && !/\[object /.test(el[1])) {
+                        key     = null;
+                        el[0]   = decodeURIComponent(el[0]);
+                        el[1]   = decodeURIComponent(el[1]);
+
+                        if ( /^(.*)\[(.*)\]/.test(el[0]) ) { // some[field] ?
+                            key = el[0].replace(/\]/g, '').split(/\[/g);
+                            obj = parseLocalObj(obj, key, 0, el[1])
+                        } else {
+                            obj[ el[0] ] = el[1]
+                        }
+                    }
+                }
+            }
+
+            return obj
+        }
+    }
+
+    // var parseLocalObj = function(obj, key, k, value) {
+
+    //     if ( typeof(obj[ key[k] ]) == 'undefined' ) {
+    //         obj[ key[k] ] = {};
+    //     }
+
+    //     for (var prop in obj) {
+
+    //         if (k == key.length-1) {
+
+    //             if (prop == key[k]) {
+    //                 obj[prop] = ( typeof(value) != 'undefined' ) ? value : '';
+    //             }
+
+    //         } else if ( key.indexOf(prop) > -1 ) {
+    //             ++k;
+    //             if ( !obj[prop][ key[k] ] )
+    //                 obj[prop][ key[k] ] = {};
+
+
+    //             parseLocalObj(obj[prop], key, k, value)
+
+    //         }
+    //     }
+
+    //     return obj;
+    // }
+
+    var parseLocalObj = function(obj, key, k, value) {
+
+        for (let i=0,len=key.length; i<len; i++) {
+            // by default
+            let _key = key[k];
+            if (i == k) {
+                // Array or Object ?
+                if ( typeof(obj[ key[k] ]) == 'undefined' || typeof(obj[ key[k] ]) == 'string' ) {
+                    if ( Array.isArray(obj) ) {
+                        // index
+                        // _key = obj.length;
+                        _key = ~~key[k];
+                        obj[ _key ] = ( /^\d+$/.test(key[k+1]) ) ? [] : {};
+                    } else {
+                        obj[ key[k] ] = ( /^\d+$/.test(key[k+1]) ) ? [] : {};
+                    }
+                }
+
+                // Assinging value
+                if (k == key.length-1) {
+                    let _value = ( typeof(value) != 'undefined' ) ? value : '';
+                    if ( Array.isArray( obj[key[k]] ) ) {
+                        obj[key[k]].push(_value);
+                        // _key = (obj.length > 0) ? obj.length-1 : 0;
+                        // obj[ _key ] = _value;
+                    }
+                    else {
+                        obj[ key[k] ] = _value;
+                    }
+                    break;
+                }
+                // Assinging index or key
+                else {
+                    if ( /^\d+$/.test(key[k]) && !Array.isArray(obj) ) {
+                        obj = [];
+                        // _key = (obj.length > 0) ? obj.length-1 : 0;
+                    }
+                    // Handle unstructured array from object
+                    // E.G.: design[1][id] where design is starting with `1` index instead of `0`
+                    // if ( Array.isArray(obj) ) {
+                    //     // current Index
+                    //     _key = ~~key[k];
+                    //     // _key = (obj.length > 0) ? obj.length-1 : 0;
+                    // }
+                    // Init array or object
+                    if ( typeof(obj[ _key ]) == 'undefined' ) {
+                        // obj[ _key ] = ( /^\d+$/.test(key[k+1]) ) ? [] : {};
+                        obj[ _key ] = null;
+                    }
+
+                    parseLocalObj(obj[ _key ], key, k+1, value);
+                }
+            }
+        }
+
+        return obj;
+    }
+
+};//EO JSONHelper.

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.181}/lib/cmd/helper.js

@@ -2,6 +2,7 @@ const { execSync } = require('child_process');
 var fs          = require('fs');
 var console     = lib.logger;
 var merge       = lib.merge;
+var inherits    = lib.inherits;
 var Collection  = lib.Collection;
 var helpers     = require( getPath('gina').helpers);
 /**
@@ -80,7 +81,12 @@ function CmdHelper(cmd, client, debug) {
 
 
     // merging with default
-    cmd = merge(cmd, self);
+    var _cmd = JSON.clone(cmd);
+
+    _cmd = merge(_cmd, self);
+    for (let prop in _cmd) {
+        cmd[prop] = _cmd[prop]
+    }
 
     var getParams = function () {
 
@@ -1211,6 +1217,7 @@ function CmdHelper(cmd, client, debug) {
             process.exit()
         }
     }
+
 };
 
 module.exports = CmdHelper;

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

@@ -924,7 +924,8 @@ function Collection(content, options) {
         if (foundResults.length > 0 ) {
             var arr = foundResults.toRaw();
             for (var a = 0, aLen = arr.length; a < aLen; ++a) {
-                arr[a] = merge( JSON.clone(set), arr[a]);
+                arr[a] = merge(JSON.clone(set), arr[a]);
+                // arr[a] = merge(set, arr[a]);
                 for (var r = 0, rLen = result.length; r < rLen; ++r) {
                     if ( typeof(result[r][key]) == 'undefined' && key == '_uuid' && typeof(result[r]['id']) != 'undefined' ) {
                         key = 'id';

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

@@ -302,6 +302,8 @@ function Logger() {
         // setting up `opt`
         // this is done to repespect arrays order
         var newDefaultOptions = merge(JSON.clone(defaultOptions), userOptions);
+        // var newDefaultOptions = merge(defaultOptions, userOptions);
+
         defaultOptions = JSON.clone(newDefaultOptions);
         newDefaultOptions = null;
         if (userOptions && userOptions.flows) {

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

@@ -2,6 +2,7 @@
 function Merge() {
 
     var newTarget           = []
+        , originalValueshasBeenCached = false
         //, keyComparison     = 'id' // use for collections merging [{ id: 'val1' }, { id: 'val2' }, {id: 'val3' }, ...]
     ;
 
@@ -14,7 +15,33 @@ function Merge() {
      *
      * @returns {object} [result]
      * */
-    var browse = function (target, source) {
+    var browse = function (_target, _source) {
+
+        var target = _target, source = _source;
+
+        // clone target & source to prevent mutations from the originals
+        if (!originalValueshasBeenCached) {
+            if ( typeof(_target) == 'object' && Array.isArray(_target) ) {
+                // target = _target.slice();
+            } else if ( typeof(_target) == 'object' ) {
+                // try {
+                    // if ( typeof(_target['modelUtil']) != 'undefined' && typeof(_target['loggerInstance']) != 'undefined' ) {
+                    //     console.info('Pause ... this is something')
+                    // }
+                    // target = JSON.clone(_target);
+                // } catch(cloneErr) { // might be a complex object
+                //     console.warn('Merge ignoring complex object backup: '+ cloneErr.stack);
+                // }
+            }
+
+            // if ( typeof(_source) == 'object' && Array.isArray(_source) ) {
+            //     source = _source.slice();
+            // } else if ( typeof(_source) == 'object' && !Array.isArray(_source) ) {
+            //     source = JSON.clone(_source);
+            // }
+
+            originalValueshasBeenCached = true;
+        }
 
         if ( typeof(target) == 'undefined' ) {
             target = ( typeof(source) != 'undefined' && Array.isArray(source)) ? [] : {}
@@ -186,6 +213,7 @@ function Merge() {
         }
 
         newTarget = [];
+        originalValueshasBeenCached = false;
 
         return target;
     };
@@ -206,6 +234,7 @@ function Merge() {
             // if collection, comparison will be done uppon the `id` attribute by default unless you call .setKeyComparison('someField')
             if (
                 typeof(options[0]) == 'object'
+                && options[0] != null
                 && typeof(options[0][keyComparison]) != 'undefined'
                 && typeof(target[0]) == 'object'
                 && typeof(target[0][keyComparison]) != 'undefined'
@@ -362,9 +391,17 @@ function Merge() {
             } else { // normal case `arrays`
                 a = 0;
                 // in case there is no keyComparison in options[*].props
-                var localKeyComparison = null;
+                var localKeyComparison = null, ownPropertyNames = null;
                 for (; a < options.length; ++a ) {
-                    localKeyComparison = (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) ) ? Object.getOwnPropertyNames(options[a])[0] : null;
+                    ownPropertyNames = null;
+                    if (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) && options[a] != null ) {
+                        ownPropertyNames = Object.getOwnPropertyNames(options[a])
+                    }
+                    if ( typeof(ownPropertyNames) != 'undefined' && ownPropertyNames != null) {
+                        ownPropertyNames = ownPropertyNames[0] || null
+                    }
+                    // localKeyComparison = (typeof(options) != 'undefined' && typeof(options[a]) == 'object' && !Array.isArray(options[a]) ) ? ownPropertyNames : null;
+                    localKeyComparison = ownPropertyNames;
                     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' ) {
@@ -493,10 +530,12 @@ function Merge() {
         return keyComparison
     }
 
-    // clone target & source to prevent mutations from the originals
+    // // clone target & source to prevent mutations from the originals
     // if (!browse.originalValueshasBeenCached) {
     //     for (let a = 0, aLen = arguments.length; a < aLen; a++) {
-    //         if ( typeof(arguments[a]) == 'object' ) {
+    //         if ( typeof(arguments[a]) == 'object' && Array.isArray(arguments[a])) {
+    //             arguments[a] = arguments[a].slice();
+    //         } else if ( typeof(arguments[a]) == 'object' ) {
     //             arguments[a] = JSON.clone(arguments[a]);
     //         }
     //     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.180",
+  "version": "0.1.1-alpha.181",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -51,7 +51,7 @@
   "bin": {
     "gina": "./bin/gina"
   },
-  "main": "./framework/v0.1.1-alpha.180/core/gna",
+  "main": "./framework/v0.1.1-alpha.181/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js",
     "postpublish": "node ./script/post_publish.js",

package/utils/prototypes.json_clone.js

@@ -38,6 +38,7 @@ function JSONClone(source, target) {
         , srcObjProps   = Object.getOwnPropertyNames(source)
         , len           = srcObjProps.length || 0
         , keys          = Object.keys(source)
+        , warn          = null
     ;
 
     while (i<len) {
@@ -47,7 +48,7 @@ function JSONClone(source, target) {
             continue;
         }
         if (source[key] === undefined) {
-            var warn = new Error('JSON.clone(...) possible error detected: source['+key+'] is undefined !! Key `'+ key +'` should not be left `undefined`. Assigning to `null`');
+            warn = new Error('JSON.clone(...) possible error detected: source['+key+'] is undefined !! Key `'+ key +'` should not be left `undefined`. Assigning to `null`');
             warn.stack = warn.stack.replace(/^Error\:\s+/g, '');
             if ( typeof(warn.message) != 'undefined' ) {
                 warn.message = warn.message.replace(/^Error\:\s+/g, '');
@@ -55,7 +56,38 @@ function JSONClone(source, target) {
             console.warn(warn);
             target[key] = null
         } else {
-            target[key] = (typeof target[key] == 'undefined' ) ? JSONClone(source[key], null) : target[key];
+            // try {
+
+                // if (key == 'contexts') {
+                // // if ( typeof(target[key]) == 'undefined' && target[key] != 'null' && typeof(source[key]) == 'object' && !Array.isArray(source[key]) && typeof(source[key]) != 'object' &&  !/\[native code\]/.test(source[key].constructor) ) {
+                //     console.log('Kyeyyyyy ', key);
+
+                //     target[key] = {}.toString.call(source[key]);
+                //     // target[key] = {};
+                //     i++;
+                //     continue;
+                // }
+
+
+                target[key] = (typeof(target[key]) == 'undefined' ) ? JSONClone(source[key], null) : target[key];
+            // } catch (jsonErr) {
+            //     // warn = new Error('JSON.clone(...) Exception detected @ source['+key+']\nKey: '+ key +'\nType: '+ (typeof(source[key])) + '\nisArray ? '+ Array.isArray(source[key]) +'\n');
+            //     // warn.stack = warn.stack.replace(/^Error\:\s+/g, '');
+            //     // if ( typeof(warn.message) != 'undefined' ) {
+            //     //     warn.message = warn.message.replace(/^Error\:\s+/g, '');
+            //     // }
+            //     // console.warn(warn);
+            //     // console.warn('key: '+ key, '\nvalue: ', source[key], jsonErr);
+
+            //     console.warn('JSON.clone(...) Complex Object Exception detected @ source['+key+']\nConstructor: '+ source.constructor +'\nKey: '+ key +'\nType: '+ (typeof(source[key])) + '\nisArray ? '+ Array.isArray(source[key]) +'\nTarget[key]: '+ target[key] +'\n'+jsonErr.stack);
+            //     // Break to avoid memory leak
+            //     break;
+
+            //     // throw new Error('JSON.clone(...) Complex Object Exception detected @ source['+key+']\nKey: '+ key +'\nType: '+ (typeof(source[key])) + '\nisArray ? '+ Array.isArray(source[key]) +'\n'+jsonErr.stack)
+
+            //     // throw jsonErr;
+            // }
+
         }
 
         i++;

package/framework/v0.1.1-alpha.180/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.180