j-templates 8.0.3 → 8.0.5

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/Utils/json.js

@@ -171,11 +171,6 @@ function JsonDiffFactory() {
             return oldValue.length !== newValue.length;
         }
         let allChildrenChanged = true;
-        if (newValue.length !== oldValue.length)
-            resp.push({
-                path: path.concat("length"),
-                value: newValue.length,
-            });
         if (newValue.length > 0 || oldValue.length > 0) {
             for (let y = 0; y < newValue.length; y++) {
                 const arrayPath = path.concat(y);
@@ -187,6 +182,11 @@ function JsonDiffFactory() {
         }
         else
             allChildrenChanged = false;
+        if (newValue.length !== oldValue.length)
+            resp.push({
+                path: path.concat("length"),
+                value: newValue.length,
+            });
         return allChildrenChanged;
     }
     /**

package/package.json

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