j-templates 7.0.71 → 7.0.72

package/Store/Tree/observableScope.js

@@ -23,15 +23,14 @@ function CreateDynamicScope(getFunction, greedy, value) {
         dirty: false,
         destroyed: false,
         getFunction,
-        setCallback: function () {
-            return OnSet(scope);
-        },
+        setCallback: null,
         value,
         emitter: emitter_1.Emitter.Create(),
         emitters: null,
         onDestroyed: null,
         calcScopes: null,
     };
+    scope.setCallback = OnSet.bind(scope);
     return scope;
 }
 /**
@@ -80,18 +79,15 @@ function OnSetQueued(scope) {
  * @param scope The scope to mark for update.
  * @returns true if the scope is static or destroyed, false if queued or non-greedy scope emitted.
  */
-function OnSet(scope) {
-    if (scope.type === "static" || scope.destroyed)
-        return true;
-    if (scope.dirty)
-        return false;
-    scope.dirty = true;
-    if (scope.greedy) {
-        OnSetQueued(scope);
+function OnSet() {
+    if (this.dirty)
+        return;
+    this.dirty = true;
+    if (this.greedy) {
+        OnSetQueued(this);
         return;
     }
-    emitter_1.Emitter.Emit(scope.emitter, scope);
-    return false;
+    emitter_1.Emitter.Emit(this.emitter, this);
 }
 /**
  * Registers an emitter using SAME_STRATEGY.
@@ -401,9 +397,9 @@ function DestroyAllScopes(scopes) {
 function DestroyScope(scope) {
     if (!scope || scope.type === "static")
         return;
-    emitter_1.Emitter.Clear(scope.emitter);
-    const scopes = scope.calcScopes && Object.values(scope.calcScopes);
-    scopes && DestroyAllScopes(scopes);
+    emitter_1.Emitter.Destroy(scope.emitter);
+    for (const key in scope.calcScopes)
+        DestroyScope(scope.calcScopes[key]);
     scope.calcScopes = null;
     for (let x = 0; x < scope.emitters.length; x++)
         emitter_1.Emitter.Remove(scope.emitters[x], scope.setCallback);
@@ -513,9 +509,10 @@ var ObservableScope;
      * @param scope The scope to mark for update.
      */
     function Update(scope) {
-        if (!scope)
+        if (!scope || scope.type === "static")
             return;
-        OnSet(scope);
+        // OnSet(scope);
+        scope.setCallback();
     }
     ObservableScope.Update = Update;
     /**

package/Utils/emitter.d.ts

@@ -1,10 +1,11 @@
-export type EmitterCallback<T extends readonly any[] = any[]> = (...args: T) => boolean | void;
+export type EmitterCallback<T extends readonly any[] = any[]> = (...args: T) => void;
 export type Emitter = [number, ...EmitterCallback[]];
 export declare namespace Emitter {
     function Create(): Emitter;
     function GetId(emitter: Emitter): number;
     function On(emitter: Emitter, callback: EmitterCallback): void;
     function Emit(emitter: Emitter, ...args: any[]): void;
+    function Destroy(emitter: Emitter): void;
     function Remove(emitter: Emitter, callback: EmitterCallback): void;
     function Clear(emitter: Emitter): void;
     function Distinct(emitters: Emitter[]): void;

package/Utils/emitter.js

@@ -19,17 +19,26 @@ var Emitter;
     }
     Emitter.On = On;
     function Emit(emitter, ...args) {
+        if (emitter[0] === -1)
+            return;
         let writePos = 1;
         for (let x = 1; x < emitter.length; x++) {
-            if (emitter[x] !== null &&
-                emitter[x](...args) !== true)
+            if (emitter[x] !== null) {
+                emitter[x](...args);
                 emitter[writePos++] = emitter[x];
+            }
         }
         if (writePos < emitter.length)
             emitter.splice(writePos);
     }
     Emitter.Emit = Emit;
+    function Destroy(emitter) {
+        emitter[0] = -1;
+    }
+    Emitter.Destroy = Destroy;
     function Remove(emitter, callback) {
+        if (emitter[0] === -1)
+            return;
         const index = emitter.indexOf(callback);
         if (index >= 1)
             emitter[index] = null;

package/package.json

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