j-templates 8.0.4 → 8.0.5

package/Store/Tree/observableNode.js

@@ -399,10 +399,6 @@ var ObservableNode;
             }
             return;
         }
-        // Assign every change before emitting any, so the diff lands atomically. Emitting per
-        // assignment let synchronous readers see partial states, e.g. an array's new length
-        // before its new elements were written.
-        // const updates = new Map<any, Set<string | number>>();
         const pathTuples = [["", root]];
         for (let x = 0; x < diffResult.length; x++) {
             const { path, value } = diffResult[x];
@@ -424,12 +420,7 @@ var ObservableNode;
             const assignValue = pathTuples[y][1];
             assignValue[path[y]] = value;
             ObservableNode.Update(assignValue, path[y]);
-            /* let props = updates.get(assignValue);
-            if (props === undefined) updates.set(assignValue, (props = new Set()));
-            props.add(path[y]); */
         }
-        /* for (const [assignValue, props] of updates)
-          for (const prop of props) ObservableNode.Update(assignValue, prop as any); */
     }
     ObservableNode.ApplyDiff = ApplyDiff;
     /**

package/Utils/emitter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Emitter = void 0;
+const array_1 = require("./array");
 const scheduling_1 = require("./scheduling");
 const pendingCompactEmitters = new Set();
 function Compact(emitter) {
@@ -39,9 +40,17 @@ var Emitter;
         emitter.push(callback);
     }
     Emitter.On = On;
+    const emitterStack = [];
+    const modifiedDuringEmit = new Set();
     function Emit(emitter, ...args) {
+        emitterStack.push(emitter);
         for (let x = emitter[0] + 1; x < emitter.length; x++)
-            emitter[x](...args);
+            emitter[x]?.(...args);
+        emitterStack.pop();
+        if (modifiedDuringEmit.delete(emitter)) {
+            (0, array_1.RemoveNulls)(emitter);
+            emitter[0] = 0;
+        }
     }
     Emitter.Emit = Emit;
     function Remove(emitter, callback) {
@@ -49,12 +58,19 @@ var Emitter;
             return;
         const startIndex = emitter[0] + 1;
         const index = emitter.indexOf(callback, startIndex);
-        if (index > 0) {
+        if (index < 1)
+            return;
+        const emitterStackIndex = emitterStack.indexOf(emitter);
+        if (emitterStackIndex < 0) {
             emitter[0]++;
             emitter[index] = emitter[startIndex];
             emitter[startIndex] = null;
             Compact(emitter);
         }
+        else {
+            emitter[index] = null;
+            modifiedDuringEmit.add(emitter);
+        }
     }
     Emitter.Remove = Remove;
     function Clear(emitter) {

package/package.json

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