j-templates 7.0.82 → 7.0.84

package/Store/Tree/observableScope.js

@@ -143,6 +143,9 @@ function RegisterEmitter(emitter) {
         case SAME_STRATEGY:
             RegisterSame(watchState, emitter);
             break;
+        case INIT_STRATEGY:
+            watchState.emitters = [];
+            watchState.strategy = PUSH_STRATEGY;
         case PUSH_STRATEGY:
             RegisterPush(watchState, emitter);
             break;
@@ -177,9 +180,10 @@ function GetScopeValue(scope) {
  * Each strategy represents a different approach to tracking and deduplicating dependencies.
  */
 const SAME_STRATEGY = 1;
-const PUSH_STRATEGY = 2;
-const DISTINCT_STRATEGY = 3;
-const SHRINK_STRATEGY = 4;
+const INIT_STRATEGY = 2;
+const PUSH_STRATEGY = 3;
+const DISTINCT_STRATEGY = 4;
+const SHRINK_STRATEGY = 5;
 let watchState = null;
 /**
  * Executes a callback while tracking all scope and emitter dependencies.
@@ -193,11 +197,11 @@ function WatchFunction(callback, currentCalc, initialEmitters) {
     watchState = {
         emitterIndex: 0,
         value: null,
-        emitters: initialEmitters ?? [],
+        emitters: initialEmitters,
         emitterSet: null,
         currentCalc,
         nextCalc: null,
-        strategy: initialEmitters === null ? PUSH_STRATEGY : SAME_STRATEGY,
+        strategy: initialEmitters === null ? INIT_STRATEGY : SAME_STRATEGY,
     };
     watchState.value = callback();
     const resultState = watchState;
@@ -294,6 +298,8 @@ function CalcScope(callback, idOverride) {
  * @param distinct Whether emitters are already unique (sorted and deduplicated).
  */
 function UpdateEmitters(scope, state) {
+    if (state.strategy === INIT_STRATEGY)
+        return;
     if (scope.emitters === null) {
         for (let x = 0; x < state.emitters.length; x++)
             emitter_1.Emitter.On(state.emitters[x], scope.setCallback);
@@ -343,10 +349,9 @@ function DestroyAllScopes(scopes) {
 function DestroyScope(scope) {
     if (!scope || scope.type === "static")
         return;
-    // Emitter.Destroy(scope.emitter);
+    emitter_1.Emitter.Clear(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);
     scope.value = undefined;

package/package.json

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