extract triggering .listen() and .onChange() callbacks

exment · Jan 7, 2020 · 268f082 · 268f082
1 parent 957a3d8
commit 268f082
Showing 1 changed file with 29 additions and 19 deletions.
diff --git a/src/Schema.ts b/src/Schema.ts
@@ -387,33 +387,18 @@ export abstract class Schema {
                 hasChange = (value !== this[_field]);
             }
 
-            const hasDataListener = this.$listeners[field];
-            if (hasChange && (this.onChange || hasDataListener)) {
-                const dataChange: DataChange = {
+            if (hasChange && (this.onChange || this.$listeners[field])) {
+                changes.push({
                     field,
                     value: change || value,
                     previousValue: this[_field]
-                };
-
-                if (hasDataListener) {
-                    this.$listeners[field](dataChange);
-                }
-
-                if (this.onChange) {
-                    changes.push(dataChange);
-                }
+                });
             }
 
             this[_field] = value;
         }
 
-        if (this.onChange && changes.length > 0) {
-            try {
-                this.onChange(changes);
-            } catch (e) {
-                Schema.onError(e);
-            }
-        }
+        this._triggerChanges(changes);
 
         return this;
     }
@@ -797,4 +782,29 @@ export abstract class Schema {
             return new (type as any)();
         }
     }
+
+    private _triggerChanges(changes: DataChange[]) {
+        if (changes.length > 0) {
+            for (let i = 0; i < changes.length; i++) {
+                const change = changes[i];
+                const listener = this.$listeners[change.field];
+                if (listener) {
+                    try {
+                        listener(change);
+                    } catch (e) {
+                        Schema.onError(e);
+                    }
+                }
+            }
+
+            if (this.onChange) {
+                try {
+                    this.onChange(changes);
+                } catch (e) {
+                    Schema.onError(e);
+                }
+            }
+        }
+
+    }
 }