reactronic 0.21.601 → 0.21.602

package/build/dist/source/impl/Data.d.ts

@@ -33,7 +33,7 @@ export declare class ObjectRevision {
         revision: ObjectRevision;
     };
     readonly data: any;
-    readonly changes: Map<MemberName, Observer>;
+    readonly changes: Set<MemberName>;
     readonly conflicts: Map<MemberName, ObjectRevision>;
     constructor(snapshot: AbstractSnapshot, prev: ObjectRevision | undefined, data: object);
 }

package/build/dist/source/impl/Data.js

@@ -16,7 +16,7 @@ class ObjectRevision {
         this.snapshot = snapshot;
         this.prev = { revision: prev || this };
         this.data = data;
-        this.changes = new Map();
+        this.changes = new Set();
         this.conflicts = new Map();
         if (Dbg_1.Dbg.isOn)
             Object.freeze(this);

package/build/dist/source/impl/Operation.d.ts

@@ -79,7 +79,7 @@ declare class Operation extends Observable implements Observer {
     private static propagateAllChangesThroughSubscriptions;
     private static revokeAllSubscriptions;
     private static propagateMemberChangeThroughSubscriptions;
-    private static enqueueDetectedReactions;
+    private static enqueueReactionsToRun;
     private static runQueuedReactionsLoop;
     private unsubscribeFromAllObservables;
     private subscribeTo;

package/build/dist/source/impl/Operation.js

@@ -269,7 +269,10 @@ class Operation extends Data_1.Observable {
     markObsoleteDueTo(observable, cause, since, reactions) {
         var _a, _b, _c;
         if (this.observables !== undefined) {
-            if (observable.isOperation || this !== cause.revision.changes.get(cause.memberName)) {
+            const skip = !observable.isOperation &&
+                cause.revision.snapshot === this.revision.snapshot &&
+                cause.revision.changes.has(cause.memberName);
+            if (!skip) {
                 this.unsubscribeFromAllObservables();
                 this.obsoleteDueTo = cause;
                 this.obsoleteSince = since;
@@ -407,6 +410,7 @@ class Operation extends Data_1.Observable {
             Dbg_1.Dbg.log('║', `${op}`, `${this.hint()} ${message}`, ms, highlight);
         if (ms > (main ? Hooks_1.Hooks.mainThreadBlockingWarningThreshold : Hooks_1.Hooks.asyncActionDurationWarningThreshold))
             Dbg_1.Dbg.log('', '[!]', this.why(), ms, main ? '    *** main thread is too busy ***' : '    *** async is too long ***');
+        this.cause = undefined;
         if (this.options.monitor)
             this.monitorLeave(this.options.monitor);
     }
@@ -456,7 +460,7 @@ class Operation extends Data_1.Observable {
         }
     }
     static markEdited(oldValue, newValue, edited, r, m, h) {
-        edited ? r.changes.set(m, Operation.current) : r.changes.delete(m);
+        edited ? r.changes.add(m) : r.changes.delete(m);
         if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.write)
             edited ? Dbg_1.Dbg.log('║', '  ✎', `${Snapshot_1.Dump.rev(r, m)} is changed from ${valueHint(oldValue, m)} to ${valueHint(newValue, m)}`) : Dbg_1.Dbg.log('║', '  ✎', `${Snapshot_1.Dump.rev(r, m)} is changed from ${valueHint(oldValue, m)} to ${valueHint(newValue, m)}`, undefined, ' (same as previous)');
     }
@@ -524,10 +528,10 @@ class Operation extends Data_1.Observable {
             curr.observers = undefined;
         }
     }
-    static enqueueDetectedReactions(snapshot) {
+    static enqueueReactionsToRun(reactions) {
         const queue = Operation.queuedReactions;
         const isReactionLoopRequired = queue.length === 0;
-        for (const r of snapshot.reactions)
+        for (const r of reactions)
             queue.push(r);
         if (isReactionLoopRequired)
             OperationController.runWithin(undefined, Operation.runQueuedReactionsLoop);
@@ -618,7 +622,7 @@ class Operation extends Data_1.Observable {
         Snapshot_1.Snapshot.isConflicting = Operation.isConflicting;
         Snapshot_1.Snapshot.propagateAllChangesThroughSubscriptions = Operation.propagateAllChangesThroughSubscriptions;
         Snapshot_1.Snapshot.revokeAllSubscriptions = Operation.revokeAllSubscriptions;
-        Snapshot_1.Snapshot.enqueueDetectedReactions = Operation.enqueueDetectedReactions;
+        Snapshot_1.Snapshot.enqueueReactionsToRun = Operation.enqueueReactionsToRun;
         Hooks_1.Hooks.createControllerAndGetHook = Operation.createControllerAndGetHook;
         Hooks_1.Hooks.rememberOperationOptions = Operation.rememberOperationOptions;
         Promise.prototype.then = reactronicHookedThen;

package/build/dist/source/impl/Snapshot.d.ts

@@ -17,8 +17,8 @@ export declare class Snapshot implements AbstractSnapshot {
     get timestamp(): number;
     private stamp;
     private bumper;
-    readonly changeset: Map<ObjectHolder, ObjectRevision>;
-    readonly reactions: Observer[];
+    changeset: Map<ObjectHolder, ObjectRevision>;
+    reactions: Observer[];
     sealed: boolean;
     constructor(options: SnapshotOptions | null);
     static current: () => Snapshot;
@@ -28,7 +28,7 @@ export declare class Snapshot implements AbstractSnapshot {
     static isConflicting: (oldValue: any, newValue: any) => boolean;
     static propagateAllChangesThroughSubscriptions: (snapshot: Snapshot) => void;
     static revokeAllSubscriptions: (snapshot: Snapshot) => void;
-    static enqueueDetectedReactions: (snapshot: Snapshot) => void;
+    static enqueueReactionsToRun: (reactions: Array<Observer>) => void;
     seekRevision(h: ObjectHolder, m: MemberName): ObjectRevision;
     getCurrentRevision(h: ObjectHolder, m: MemberName): ObjectRevision;
     getEditableRevision(h: ObjectHolder, m: MemberName, value: any, token?: any): ObjectRevision;
@@ -40,7 +40,7 @@ export declare class Snapshot implements AbstractSnapshot {
     bumpBy(timestamp: number): void;
     rebase(): ObjectRevision[] | undefined;
     private static merge;
-    applyOrDiscard(error?: any): void;
+    applyOrDiscard(error?: any): Array<Observer>;
     static sealObjectRevision(h: ObjectHolder, r: ObjectRevision): void;
     static sealObservable(observable: Observable | symbol, m: MemberName, typeName: string): void;
     collectGarbage(): void;

package/build/dist/source/impl/Snapshot.js

@@ -27,6 +27,8 @@ Object.defineProperty(Data_1.ObjectHolder.prototype, '#this', {
         return result;
     },
 });
+const EMPTY_ARRAY = Object.freeze([]);
+const EMPTY_MAP = Utils_1.Utils.freezeMap(new Map());
 class Snapshot {
     constructor(options) {
         this.id = ++Snapshot.idGen;
@@ -208,6 +210,7 @@ class Snapshot {
         }
         if (!error)
             Snapshot.propagateAllChangesThroughSubscriptions(this);
+        return this.reactions;
     }
     static sealObjectRevision(h, r) {
         if (!r.changes.has(Data_1.Meta.Disposed))
@@ -229,6 +232,8 @@ class Snapshot {
         }
     }
     collectGarbage() {
+        this.changeset = EMPTY_MAP;
+        this.reactions = EMPTY_ARRAY;
         if (Dbg_1.Dbg.isOn) {
             Utils_1.Utils.freezeMap(this.changeset);
             Object.freeze(this.reactions);
@@ -238,7 +243,7 @@ class Snapshot {
     }
     static freezeObjectRevision(r) {
         Object.freeze(r.data);
-        Utils_1.Utils.freezeMap(r.changes);
+        Utils_1.Utils.freezeSet(r.changes);
         Utils_1.Utils.freezeMap(r.conflicts);
         return r;
     }
@@ -269,12 +274,10 @@ class Snapshot {
             if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.gc && r.prev.revision !== exports.ROOT_REV)
                 Dbg_1.Dbg.log(' ', '  ', `${Dump.rev(r.prev.revision)} is ready for GC because overwritten by ${Dump.rev(r)}`);
             if (Snapshot.garbageCollectionSummaryInterval < Number.MAX_SAFE_INTEGER) {
-                if (r.prev.revision !== exports.ROOT_REV) {
+                if (r.prev.revision !== exports.ROOT_REV)
                     Snapshot.totalObjectRevisionCount--;
-                }
-                if (r.changes.has(Data_1.Meta.Disposed)) {
+                if (r.changes.has(Data_1.Meta.Disposed))
                     Snapshot.totalObjectHolderCount--;
-                }
             }
             r.prev.revision = exports.ROOT_REV;
         });
@@ -309,7 +312,7 @@ Snapshot.markEdited = Utils_1.UNDEF;
 Snapshot.isConflicting = Utils_1.UNDEF;
 Snapshot.propagateAllChangesThroughSubscriptions = (snapshot) => { };
 Snapshot.revokeAllSubscriptions = (snapshot) => { };
-Snapshot.enqueueDetectedReactions = (snapshot) => { };
+Snapshot.enqueueReactionsToRun = (reactions) => { };
 class Dump {
     static obj(h, m, stamp, op, xop, typeless) {
         const member = m !== undefined ? `.${m.toString()}` : '';

package/build/dist/source/impl/Transaction.js

@@ -228,9 +228,9 @@ class TransactionImpl extends Transaction {
         finally {
             this.pending--;
             if (this.sealed && this.pending === 0) {
-                this.applyOrDiscard();
+                const reactions = this.applyOrDiscard();
                 TransactionImpl.curr = outer;
-                TransactionImpl.standalone(Snapshot_1.Snapshot.enqueueDetectedReactions, this.snapshot);
+                TransactionImpl.standalone(Snapshot_1.Snapshot.enqueueReactionsToRun, reactions);
             }
             else
                 TransactionImpl.curr = outer;
@@ -259,10 +259,11 @@ class TransactionImpl extends Transaction {
         throw (0, Dbg_1.error)(`T${this.id}[${this.hint}] conflicts with: ${Snapshot_1.Dump.conflicts(conflicts)}`, undefined);
     }
     applyOrDiscard() {
+        let reactions;
         try {
             if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
                 Dbg_1.Dbg.log('╠═', '', '', undefined, 'changes');
-            this.snapshot.applyOrDiscard(this.canceled);
+            reactions = this.snapshot.applyOrDiscard(this.canceled);
             this.snapshot.collectGarbage();
             if (this.promise) {
                 if (this.canceled && !this.after)
@@ -277,6 +278,7 @@ class TransactionImpl extends Transaction {
             (0, Dbg_1.fatal)(e);
             throw e;
         }
+        return reactions;
     }
     acquirePromise() {
         if (!this.promise) {

package/build/dist/source/util/Utils.d.ts

@@ -1,7 +1,7 @@
 export declare type F<T> = (...args: any[]) => T;
 export declare class Utils {
-    static freezeSet<T>(obj?: Set<T>): void;
-    static freezeMap<K, V>(obj?: Map<K, V>): void;
+    static freezeSet<T>(obj?: Set<T>): Set<T> | undefined;
+    static freezeMap<K, V>(obj?: Map<K, V>): Map<K, V> | undefined;
     static copyAllMembers(source: any, target: any): any;
 }
 export declare function UNDEF(...args: any[]): never;

package/build/dist/source/util/Utils.js

@@ -19,6 +19,7 @@ class Utils {
             Object.defineProperty(obj, 'clear', pd);
             Object.freeze(obj);
         }
+        return obj;
     }
     static freezeMap(obj) {
         if (obj instanceof Map) {
@@ -28,6 +29,7 @@ class Utils {
             Object.defineProperty(obj, 'clear', pd);
             Object.freeze(obj);
         }
+        return obj;
     }
     static copyAllMembers(source, target) {
         for (const m of Object.getOwnPropertyNames(source))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.21.601",
+  "version": "0.21.602",
   "description": "Reactronic - Transactional Reactive State Management",
   "main": "build/dist/source/api.js",
   "types": "build/dist/source/api.d.ts",