Merge pull request #212 from Starcounter-Jack/Use-Maps

Use Map and WeakMap to remove leaks and enhance perf

.travis.yml

@@ -1,8 +1,4 @@
 language: node_js
-dist: trusty
-before_script:
-  - npm install
-node_js: 6
+node_js: 8
 script:
-  - npm test
-  - npm run bench
+  - npm test && npm run bench

dist/fast-json-patch.js

@@ -1,4 +1,4 @@
-/*! fast-json-patch, version: 2.0.6 */
+/*! fast-json-patch, version: 2.0.7 */
 var jsonpatch =
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -741,10 +741,10 @@ exports.JsonPatchError = helpers_2.PatchError;
 exports.deepClone = helpers_2._deepClone;
 exports.escapePathComponent = helpers_2.escapePathComponent;
 exports.unescapePathComponent = helpers_2.unescapePathComponent;
-var beforeDict = [];
+var beforeDict = new WeakMap();
 var Mirror = (function () {
     function Mirror(obj) {
-        this.observers = [];
+        this.observers = new Map();
         this.obj = obj;
     }
     return Mirror;
@@ -757,26 +757,13 @@ var ObserverInfo = (function () {
     return ObserverInfo;
 }());
 function getMirror(obj) {
-    for (var i = 0, length = beforeDict.length; i < length; i++) {
-        if (beforeDict[i].obj === obj) {
-            return beforeDict[i];
-        }
-    }
+    return beforeDict.get(obj);
 }
 function getObserverFromMirror(mirror, callback) {
-    for (var j = 0, length = mirror.observers.length; j < length; j++) {
-        if (mirror.observers[j].callback === callback) {
-            return mirror.observers[j].observer;
-        }
-    }
+    return mirror.observers.get(callback);
 }
 function removeObserverFromMirror(mirror, observer) {
-    for (var j = 0, length = mirror.observers.length; j < length; j++) {
-        if (mirror.observers[j].observer === observer) {
-            mirror.observers.splice(j, 1);
-            return;
-        }
-    }
+    mirror.observers.delete(observer.callback);
 }
 /**
  * Detach an observer from an object
@@ -790,15 +777,15 @@ exports.unobserve = unobserve;
  */
 function observe(obj, callback) {
     var patches = [];
-    var root = obj;
     var observer;
     var mirror = getMirror(obj);
     if (!mirror) {
         mirror = new Mirror(obj);
-        beforeDict.push(mirror);
+        beforeDict.set(obj, mirror);
     }
     else {
-        observer = getObserverFromMirror(mirror, callback);
+        var observerInfo = getObserverFromMirror(mirror, callback);
+        observer = observerInfo && observerInfo.observer;
     }
     if (observer) {
         return observer;
@@ -853,21 +840,15 @@ function observe(obj, callback) {
             }
         }
     };
-    mirror.observers.push(new ObserverInfo(callback, observer));
+    mirror.observers.set(callback, new ObserverInfo(callback, observer));
     return observer;
 }
 exports.observe = observe;
 /**
  * Generate an array of patches from an observer
  */
 function generate(observer) {
-    var mirror;
-    for (var i = 0, length = beforeDict.length; i < length; i++) {
-        if (beforeDict[i].obj === observer.object) {
-            mirror = beforeDict[i];
-            break;
-        }
-    }
+    var mirror = beforeDict.get(observer.object);
     _generate(mirror.value, observer.object, observer.patches, "");
     if (observer.patches.length) {
         core_1.applyPatch(mirror.value, observer.patches);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-json-patch",
-  "version": "2.0.6",
+  "version": "2.0.7",
   "description": "Fast implementation of JSON-Patch (RFC-6902) with duplex (observe changes) capabilities",
   "homepage": "https://github.com/Starcounter-Jack/JSON-Patch",
   "keywords": [

src/duplex.ts

@@ -26,50 +26,38 @@ export interface Observer<T> {
   callback: (patches: Operation[]) => void;
 }
 
-var beforeDict = [];
+var beforeDict = new WeakMap();
 
 class Mirror {
   obj: any;
-  observers = [];
+  observers : Map<Function, ObserverInfo> = new Map();
+  value: Object | Array<any>;
 
-  constructor(obj: any) {
+  constructor(obj: Object) {
     this.obj = obj;
   }
 }
 
 class ObserverInfo {
-  callback: any;
-  observer: any;
+  callback: Function;
+  observer: ObserverInfo;
 
-  constructor(callback, observer) {
+  constructor(callback: Function, observer: ObserverInfo) {
     this.callback = callback;
     this.observer = observer;
   }
 }
 
-function getMirror(obj: any): any {
-  for (var i = 0, length = beforeDict.length; i < length; i++) {
-    if (beforeDict[i].obj === obj) {
-      return beforeDict[i];
-    }
-  }
+function getMirror(obj: Object): Mirror {
+  return beforeDict.get(obj);
 }
 
-function getObserverFromMirror(mirror: any, callback): any {
-  for (var j = 0, length = mirror.observers.length; j < length; j++) {
-    if (mirror.observers[j].callback === callback) {
-      return mirror.observers[j].observer;
-    }
-  }
+function getObserverFromMirror(mirror: Mirror, callback): ObserverInfo {
+  return mirror.observers.get(callback)
 }
 
-function removeObserverFromMirror(mirror: any, observer): any {
-  for (var j = 0, length = mirror.observers.length; j < length; j++) {
-    if (mirror.observers[j].observer === observer) {
-      mirror.observers.splice(j, 1);
-      return;
-    }
-  }
+function removeObserverFromMirror(mirror: Mirror, observer): void {
+  mirror.observers.delete(observer.callback);
 }
 
 /**
@@ -82,17 +70,17 @@ export function unobserve<T>(root: T, observer: Observer<T>) {
 /**
  * Observes changes made to an object, which can then be retrieved using generate
  */
-export function observe<T>(obj: any, callback?: (patches: Operation[]) => void): Observer<T> {
+export function observe<T>(obj: Object|Array<T>, callback?: (patches: Operation[]) => void): Observer<T> {
   var patches = [];
-  var root = obj;
   var observer;
   var mirror = getMirror(obj);
 
   if (!mirror) {
     mirror = new Mirror(obj);
-    beforeDict.push(mirror);
+    beforeDict.set(obj, mirror);
   } else {
-    observer = getObserverFromMirror(mirror, callback);
+    const observerInfo = getObserverFromMirror(mirror, callback);
+    observer = observerInfo && observerInfo.observer;
   }
 
   if (observer) {
@@ -155,22 +143,16 @@ export function observe<T>(obj: any, callback?: (patches: Operation[]) => void):
     }
   };
 
-  mirror.observers.push(new ObserverInfo(callback, observer));
+  mirror.observers.set(callback, new ObserverInfo(callback, observer));
 
   return observer;
 }
 
 /**
  * Generate an array of patches from an observer
  */
-export function generate<T>(observer: Observer<T>): Operation[] {
-  var mirror;
-  for (var i = 0, length = beforeDict.length; i < length; i++) {
-    if (beforeDict[i].obj === observer.object) {
-      mirror = beforeDict[i];
-      break;
-    }
-  }
+export function generate<T>(observer: Observer<Object>): Operation[] {
+  var mirror = beforeDict.get(observer.object);
   _generate(mirror.value, observer.object, observer.patches, "");
   if (observer.patches.length) {
     applyPatch(mirror.value, observer.patches);
@@ -237,7 +219,7 @@ function _generate(mirror, obj, patches, path) {
 /**
  * Create an array of patches from the differences in two objects
  */
-export function compare(tree1: any, tree2: any): Operation[] {
+export function compare(tree1: Object | Array<any>, tree2: Object | Array<any>): Operation[] {
   var patches = [];
   _generate(tree1, tree2, patches, '');
   return patches;

tsconfig.json

@@ -3,6 +3,9 @@
         "target": "es5",
         "outDir": "lib/",
         "module": "commonjs",
+        "lib": [
+            "es2016", "dom"
+        ],
         "noEmitHelpers": false,
         "declaration": true,
         "removeComments": false,