Fix hasUndefined #163

Starcounter-Jack · May 1, 2017 · 17b141b · 17b141b
1 parent 84053cc
commit 17b141b
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 20 deletions.
diff --git a/src/json-patch-duplex.d.ts b/src/json-patch-duplex.d.ts
@@ -20,9 +20,9 @@ declare module jsonpatch {
     class JsonPatchError extends Error {
         message: string;
         name: string;
-        index: number;
-        operation: any;
-        tree: any;
+        index?: number;
+        operation?: any;
+        tree?: any;
         constructor(message: string, name: string, index?: number, operation?: any, tree?: any);
     }
     /**

diff --git a/src/json-patch-duplex.js b/src/json-patch-duplex.js
@@ -513,9 +513,11 @@ var jsonpatch;
         if (obj === undefined) {
             return true;
         }
-        if (typeof obj == "array" || typeof obj == "object") {
-            for (var i in obj) {
-                if (hasUndefined(obj[i])) {
+        if (obj && (_isArray(obj) || typeof obj === "object")) {
+            var objKeys = _objectKeys(obj);
+            var objKeysLength = objKeys.length;
+            for (var i = 0; i < objKeysLength; i++) {
+                if (hasUndefined(obj[objKeys[i]])) {
                     return true;
                 }
             }

diff --git a/src/json-patch-duplex.ts b/src/json-patch-duplex.ts
@@ -567,15 +567,16 @@ module jsonpatch {
     if (obj === undefined) {
       return true;
     }
+    if (obj && (_isArray(obj) || typeof obj === "object")) {
+      var objKeys = _objectKeys(obj);
+      var objKeysLength = objKeys.length;
 
-    if (typeof obj == "array" || typeof obj == "object") {
-      for (var i in obj) {
-        if (hasUndefined(obj[i])) {
+      for (var i = 0; i < objKeysLength; i++) {
+        if (hasUndefined(obj[objKeys[i]])) {
           return true;
         }
       }
     }
-
     return false;
   }
 

diff --git a/src/json-patch.d.ts b/src/json-patch.d.ts
@@ -16,9 +16,9 @@ declare module jsonpatch {
     class JsonPatchError extends Error {
         message: string;
         name: string;
-        index: number;
-        operation: any;
-        tree: any;
+        index?: number;
+        operation?: any;
+        tree?: any;
         constructor(message: string, name: string, index?: number, operation?: any, tree?: any);
     }
     /**

diff --git a/src/json-patch.js b/src/json-patch.js
@@ -290,9 +290,11 @@ var jsonpatch;
         if (obj === undefined) {
             return true;
         }
-        if (typeof obj == "array" || typeof obj == "object") {
-            for (var i in obj) {
-                if (hasUndefined(obj[i])) {
+        if (obj && (_isArray(obj) || typeof obj === "object")) {
+            var objKeys = _objectKeys(obj);
+            var objKeysLength = objKeys.length;
+            for (var i = 0; i < objKeysLength; i++) {
+                if (hasUndefined(obj[objKeys[i]])) {
                     return true;
                 }
             }

diff --git a/src/json-patch.ts b/src/json-patch.ts
@@ -308,15 +308,16 @@ module jsonpatch {
     if (obj === undefined) {
       return true;
     }
+    if (obj && (_isArray(obj) || typeof obj === "object")) {
+      var objKeys = _objectKeys(obj);
+      var objKeysLength = objKeys.length;
 
-    if (typeof obj == "array" || typeof obj == "object") {
-      for (var i in obj) {
-        if (hasUndefined(obj[i])) {
+      for (var i = 0; i < objKeysLength; i++) {
+        if (hasUndefined(obj[objKeys[i]])) {
           return true;
         }
       }
     }
-
     return false;
   }