optimize PR #35, redo TypeScript; write test. Performance not visibly…

… affected because of the optimization
Starcounter-Jack · Jan 5, 2015 · c404e06 · c404e06
1 parent 1ea71b9
commit c404e06
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/src/json-patch-duplex.js b/src/json-patch-duplex.js
@@ -479,7 +479,7 @@ var jsonpatch;
             var oldVal = mirror[key];
             if (obj.hasOwnProperty(key)) {
                 var newVal = obj[key];
-                if (oldVal instanceof Object && newVal instanceof Object) {
+                if (typeof oldVal == "object" && oldVal != null && typeof newVal == "object" && newVal != null) {
                     _generate(oldVal, newVal, patches, path + "/" + escapePathComponent(key));
                 } else {
                     if (oldVal != newVal) {

diff --git a/src/json-patch-duplex.ts b/src/json-patch-duplex.ts
@@ -500,7 +500,7 @@ module jsonpatch {
       var oldVal = mirror[key];
       if (obj.hasOwnProperty(key)) {
         var newVal = obj[key];
-        if (oldVal instanceof Object) {
+        if (typeof oldVal == "object" && oldVal != null && typeof newVal == "object" && newVal != null) {
           _generate(oldVal, newVal, patches, path + "/" + escapePathComponent(key));
         }
         else {

diff --git a/test/spec/duplexSpec.js b/test/spec/duplexSpec.js
@@ -674,6 +674,24 @@ describe("duplex", function () {
         {op: "replace", path: "/user/lastName", value: "Collins"}
       ]);
     });
+
+    it('should replace null with object', function () {
+      var objA = {user: null};
+      var objB = {user: {}};
+
+      expect(jsonpatch.compare(objA, objB)).toEqual([
+        {op: "replace", path: "/user", value: {}}
+      ]);
+    });
+
+    it('should replace object with null', function () {
+      var objA = {user: {}};
+      var objB = {user: null};
+
+      expect(jsonpatch.compare(objA, objB)).toEqual([
+        {op: "replace", path: "/user", value: null}
+      ]);
+    });
   });