object-manipulation - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

index.js

 class ObjectManager{}
 
 ObjectManager.getDiffList = function(obj1, obj2){
-
   if (this.isFunction(obj1) || this.isFunction(obj2)){
@@ -14,34 +13,21 @@ throw 'Invalid argument. Function given, object expected.';
 
-  for (let key in obj1){
-    if (this.isValue(obj1[key])){
-      diff[key] = this.compareValues(obj1[key], obj2[key]);
-    }else{
-      if (this.isObject(obj2[key]) || this.isArray(obj2[key])){
-        if (JSON.stringify(obj1[key]) == JSON.stringify(obj2[key])){
-          diff[key] = 'equal';
-        }else{
-          diff[key] = this.getDiffList(obj1[key], obj2[key]);
-        }
-      }else{
-        diff[key] = this.compareValues(obj1[key], obj2[key]);
-      }
+  var keyList = Object.keys(obj1);
+  for (let key in obj2){
+    if (keyList.indexOf(key) == -1){
+      keyList.push(key);
     }
   }
 
-  for (let key in obj2){
-    if (typeof(diff[key]) == 'string'){
-      continue;
-    }
-
+  for (let key of keyList){
     if (this.isValue(obj1[key])){
-      diff[key] = this.compareValues(obj1[key], obj2[key]);
+      if (this.isValue(obj2[key])){
+        diff[key] = this.compareValues(obj1[key], obj2[key]);
+      }else{
+        diff[key] = 'new';
+      }
     }else{
-      if (this.isObject(obj2[key]) || this.isArray(obj2[key])){
-        if (JSON.stringify(obj1[key]) == JSON.stringify(obj2[key])){
-          diff[key] = 'equal';
-        }else{
-          diff[key] = this.getDiffList(obj1[key], obj2[key]);
-        }
+      if (this.isValue(obj2[key])){
+        diff[key] = 'new';
       }else{
-        diff[key] = this.compareValues(obj1[key], obj2[key]);
+        diff[key] = this.getDiffList(obj1[key], obj2[key]);
       }
@@ -89,7 +75,7 @@ }
   //Has the item added?
-  if (typeof(original) == 'undefined' && typeof(current) != 'undefined'){
+  if (original === undefined && current !== undefined){
     return 'new';
   }
   //Has the item been removed?
-  if (typeof(current) == 'undefined' && typeof(original) != 'undefined'){
+  if (original !== undefined && current === undefined){
     return 'deleted';
@@ -122,21 +108,16 @@ }
 ObjectManager.merge = function (obj1, obj2, recursive = true){
-  if (typeof(obj1) != "object"){
-    obj1 = {};
+  if ( this.isValue(obj1) || this.isValue(obj2) ){
+    return obj2;
   }
-  if (typeof(obj2) != "object"){
-    obj2 = {};
-  }
+
   for (var attrname in obj2){
-    if (recursive){
-      if (typeof(obj2[attrname]) == 'object' && typeof(obj1[attrname])){
-        obj1[attrname] = module.exports.merge(obj1[attrname], obj2[attrname]);
-      }else{
-        if (typeof(obj2[attrname]) != 'undefined'){
-          obj1[attrname] = obj2[attrname];
-        }
+    if (!this.isValue(obj2[attrname])){
+      if (!this.isValue(obj1[attrname])){
+        obj1[attrname] = this.merge(obj1[attrname], obj2[attrname]);
+        continue;
       }
-    }else{
-      obj1[attrname] = obj2[attrname];
     }
+    obj1[attrname] = obj2[attrname];
   }
+
   return obj1;
@@ -143,0 +124,0 @@ };

package.json

 {
   "name": "object-manipulation",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "nodejs object manipulation library",
@@ -5,0 +5,0 @@ "main": "index.js",

No alert changes

Worsened metrics

Total package byte prevSize

5428

decreased by-11.8%

Lines of code

139

decreased by-12.03%

No dependency changes