j-templates 6.1.3 → 6.1.5

package/Store/Tree/observableScope.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservableScope = exports.ObservableScopeWrapper = exports.ObservableScopeValue = void 0;
 exports.CalcScope = CalcScope;
+const array_1 = require("../../Utils/array");
 const emitter_1 = require("../../Utils/emitter");
 const list_1 = require("../../Utils/list");
 class ObservableScopeValue {
@@ -206,23 +207,11 @@ function UpdateEmitters(scope) {
         return;
     }
     emitter_1.Emitter.Sort(right);
-    const left = scope.emitters;
-    let leftIndex = 0;
-    let rightIndex = 0;
-    for (; leftIndex < left.length; leftIndex++) {
-        let y = rightIndex;
-        for (; y < right.length && left[leftIndex] !== right[y]; y++)
-            emitter_1.Emitter.On(right[rightIndex], scope.setCallback);
-        if (y === right.length)
-            emitter_1.Emitter.Remove(left[leftIndex], scope.setCallback);
-        else {
-            for (let x = rightIndex; x < y; x++)
-                emitter_1.Emitter.On(right[x], scope.setCallback);
-            rightIndex = y + 1;
-        }
-    }
-    for (; rightIndex < right.length; rightIndex++)
-        emitter_1.Emitter.On(right[rightIndex], scope.setCallback);
+    (0, array_1.ReconcileSortedArrays)(scope.emitters, right, function (emitter) {
+        emitter_1.Emitter.On(emitter, scope.setCallback);
+    }, function (emitter) {
+        emitter_1.Emitter.Remove(emitter, scope.setCallback);
+    });
     scope.emitters = right;
 }
 function DestroyScope(scope) {

package/Utils/array.d.ts

@@ -1,2 +1,3 @@
 export declare function RemoveNulls(array: (unknown | null)[], startIndex?: number): void;
 export declare function ArrayDiff(source: any[], target: any[]): boolean;
+export declare function ReconcileSortedArrays<T>(left: T[], right: T[], add: (value: T) => void, remove: (value: T) => void): void;

package/Utils/array.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RemoveNulls = RemoveNulls;
 exports.ArrayDiff = ArrayDiff;
+exports.ReconcileSortedArrays = ReconcileSortedArrays;
 function RemoveNulls(array, startIndex = 0) {
     let nullIndex = startIndex;
     for (; nullIndex < array.length && array[nullIndex] !== null; nullIndex++) { }
@@ -24,3 +25,21 @@ function ArrayDiff(source, target) {
     for (; x < source.length && source[x] === target[x]; x++) { }
     return x < source.length;
 }
+function ReconcileSortedArrays(left, right, add, remove) {
+    let leftIndex = 0;
+    let rightIndex = 0;
+    while (leftIndex < left.length && rightIndex < right.length) {
+        let y = rightIndex;
+        for (; y < right.length && left[leftIndex] !== right[y]; y++) { }
+        if (y === right.length)
+            remove(left[leftIndex]);
+        else {
+            for (let z = rightIndex; z < y; z++)
+                add(right[z]);
+            rightIndex = y + 1;
+        }
+        leftIndex++;
+    }
+    for (; rightIndex < right.length; rightIndex++)
+        add(right[rightIndex]);
+}

package/Utils/emitter.js

@@ -33,7 +33,7 @@ var Emitter;
     }
     Emitter.Remove = Remove;
     function Clear(emitter) {
-        emitter.splice(0);
+        emitter.splice(1);
     }
     Emitter.Clear = Clear;
     function Sort(emitters) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-templates",
-  "version": "6.1.3",
+  "version": "6.1.5",
   "description": "j-templates",
   "license": "MIT",
   "repository": "https://github.com/TypesInCode/jTemplates",