gina 0.1.1-alpha.18 → 0.1.1-alpha.180

package/framework/{v0.1.1-alpha.18 → 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
 }
 

package/framework/{v0.1.1-alpha.18 → v0.1.1-alpha.180}/lib/model.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.
@@ -15,7 +15,7 @@ var math        = require('./math');
 /**
  * Model uitl
  *
- * @package     Gina.Utils
+ * @package     Gina.Lib
  * @author      Rhinostone <contact@gina.io>
  * @api public
  * */
@@ -102,7 +102,7 @@ function ModelUtil() {
     * */
     this.setModelEntity = function(bundle, model, name, module) {
         var cacheless   = (process.env.NODE_ENV_IS_DEV == 'false') ? false : true;
-        
+
         if (arguments.length > 1) {
             if (!self.entities) {
                 self.entities = {}
@@ -209,7 +209,7 @@ function ModelUtil() {
     this.loadAllModels = function(bundles, configuration, env, cb) {
 
         var loadModel = function(b, bundles, configuration, env, cb) {
-            
+
             var modelObject     = getContext('modelUtil').entities[bundles[b]] // to check if already laoded
                 , bundle        = bundles[b]
                 , len           = bundles.length
@@ -223,7 +223,7 @@ function ModelUtil() {
                 var mObj = {};
 
                 var models = connectors;
-                
+
                 if ( !models || typeof(models) == 'undefined' ) {
                     console.warn('no models attached to connector '+ connector);
                 }
@@ -383,7 +383,7 @@ function ModelUtil() {
             for (var bundle in self.models) {
 
                 for (var name in self.models[bundle]) { //name as connector name
-                    
+
                     self.models[bundle][name] = {};
 
                     if ( typeof(self.models[bundle][name]['_connection']) == 'undefined' ) {
@@ -451,7 +451,7 @@ function ModelUtil() {
      * @returns {object} model - Model entities
      * */
     getModel = function(bundle, model) {
-        
+
         var ctx       = getContext();
 
         if (arguments.length == 1 || !bundle) {
@@ -528,13 +528,13 @@ function ModelUtil() {
             }
         }
 
-        // if ( 
-        //     typeof(ctx.modelUtil.models) != 'undefined' 
+        // if (
+        //     typeof(ctx.modelUtil.models) != 'undefined'
         //     && typeof(ctx.modelUtil.models) != 'undefined'
         //     && typeof(ctx.modelUtil.models[bundle]) != 'undefined'
         //     && typeof(ctx.modelUtil.models[bundle][model]) != 'undefined'
         // ) {
-            
+
         // } else {
             self.models = ModelUtil.instance.models
         // }