gina 0.1.1-alpha.180 → 0.1.1-alpha.182

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/helpers/json/src/main.js

@@ -20,36 +20,12 @@ 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
      *
-     * @returns {string} filename - path
+     * @param {string} filename - path to json content
+     *
+     * @return {object} jsonObject
      * */
     requireJSON = function(filename){
 

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/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.182}/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.182/lib/domain/LICENSE

@@ -0,0 +1,9 @@
+License (MIT)
+
+Copyright © 2023 Martin-Luther ETOUMAN <martin-luther.etouman@gina.io>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/framework/{v0.1.1-alpha.180 → v0.1.1-alpha.182}/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.182}/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.182",
   "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.182/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