reactronic 0.21.527 → 0.21.601

package/README.md

@@ -200,7 +200,7 @@ class Component<P> extends React.Component<P> {
   } // ensureUpToDate is subscribed to render
 
   shouldComponentUpdate(): boolean {
-    return !Reactronic.getController(this.render).isUpToDate
+    return !Rx.getController(this.render).isUpToDate
   }
 
   componentDidMount(): void {
@@ -208,7 +208,7 @@ class Component<P> extends React.Component<P> {
   }
 
   componentWillUnmount(): void {
-    standalone(Reactronic.dispose, this)
+    standalone(Rx.dispose, this)
   }
 }
 ```

package/build/dist/source/Ref.d.ts

@@ -14,10 +14,10 @@ export declare class Ref<T = any> {
     nonreactiveValue(): T;
     observe(): T;
     unobserve(): T;
-    static to<O = any>(owner: O): {
+    static to<O extends object = object>(owner: O): {
         readonly [P in keyof O]-?: Ref<O[P]>;
     };
-    static toToggle<O = any>(owner: O): {
+    static toToggle<O extends object = object>(owner: O): {
         readonly [P in keyof BoolOnly<O>]: ToggleRef<O[P]>;
     };
     static toCustomToggle<T, O extends object = any>(owner: O, value1: T, value2: T): {

package/build/dist/source/Ref.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToggleRef = exports.Ref = void 0;
 const Transaction_1 = require("./impl/Transaction");
-const Reactronic_1 = require("./Reactronic");
+const Rx_1 = require("./Rx");
 class Ref {
     constructor(owner, name, index = -1) {
         this.owner = owner;
@@ -22,7 +22,7 @@ class Ref {
             this.owner[this.name][this.index] = value;
     }
     nonreactiveValue() {
-        return (0, Reactronic_1.nonreactive)(() => this.value);
+        return (0, Rx_1.nonreactive)(() => this.value);
     }
     observe() {
         return this.value;

package/build/dist/source/{Reactronic.d.ts → Rx.d.ts}

@@ -1,7 +1,7 @@
 import { F } from './util/Utils';
 import { Controller } from './Controller';
 import { MemberOptions, TraceOptions, ProfilingOptions } from './Options';
-export declare class Reactronic {
+export declare class Rx {
     static why(brief?: boolean): string;
     static getController<T>(method: F<T>): Controller<T>;
     static pullLastResult<T>(method: F<Promise<T>>, args?: any[]): T | undefined;

package/build/dist/source/{Reactronic.js → Rx.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.standalone = exports.nonreactive = exports.Reactronic = void 0;
+exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.standalone = exports.nonreactive = exports.Rx = void 0;
 const Dbg_1 = require("./util/Dbg");
 const Options_1 = require("./Options");
 const Data_1 = require("./impl/Data");
@@ -8,10 +8,10 @@ const Snapshot_1 = require("./impl/Snapshot");
 const Hooks_1 = require("./impl/Hooks");
 const Operation_1 = require("./impl/Operation");
 const Transaction_1 = require("./impl/Transaction");
-class Reactronic {
+class Rx {
     static why(brief = false) { return brief ? Operation_1.OperationController.briefWhy() : Operation_1.OperationController.why(); }
     static getController(method) { return Operation_1.OperationController.of(method); }
-    static pullLastResult(method, args) { return Reactronic.getController(method).pullLastResult(args); }
+    static pullLastResult(method, args) { return Rx.getController(method).pullLastResult(args); }
     static configureCurrentOperation(options) { return Operation_1.OperationController.configureImpl(undefined, options); }
     static takeSnapshot(obj) { return Snapshot_1.Snapshot.takeSnapshot(obj); }
     static dispose(obj) { Snapshot_1.Snapshot.dispose(obj); }
@@ -24,7 +24,7 @@ class Reactronic {
     static getTraceHint(obj, full = false) { return Data_1.ObjectHolder.getHint(obj, full); }
     static setProfilingMode(enabled, options) { Hooks_1.Hooks.setProfilingMode(enabled, options); }
 }
-exports.Reactronic = Reactronic;
+exports.Rx = Rx;
 function nonreactive(func, ...args) {
     return Operation_1.OperationController.runWithin(undefined, func, ...args);
 }

package/build/dist/source/api.d.ts

@@ -11,4 +11,4 @@ export { Snapshot } from './impl/Snapshot';
 export { Transaction } from './impl/Transaction';
 export { Monitor } from './impl/Monitor';
 export { TransactionJournal } from './impl/TransactionJournal';
-export { Reactronic, nonreactive, standalone, sensitive, unobservable, transaction, reaction, cached, options } from './Reactronic';
+export { Rx, nonreactive, standalone, sensitive, unobservable, transaction, reaction, cached, options } from './Rx';

package/build/dist/source/api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.standalone = exports.nonreactive = exports.Reactronic = exports.TransactionJournal = exports.Monitor = exports.Transaction = exports.Snapshot = exports.ObservableObject = exports.ToggleRef = exports.Ref = exports.Controller = exports.TraceLevel = exports.Reentrance = exports.Kind = exports.SealedSet = exports.SealedMap = exports.SealedArray = exports.pause = exports.all = void 0;
+exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.standalone = exports.nonreactive = exports.Rx = exports.TransactionJournal = exports.Monitor = exports.Transaction = exports.Snapshot = exports.ObservableObject = exports.ToggleRef = exports.Ref = exports.Controller = exports.TraceLevel = exports.Reentrance = exports.Kind = exports.SealedSet = exports.SealedMap = exports.SealedArray = exports.pause = exports.all = void 0;
 var Utils_1 = require("./util/Utils");
 Object.defineProperty(exports, "all", { enumerable: true, get: function () { return Utils_1.all; } });
 Object.defineProperty(exports, "pause", { enumerable: true, get: function () { return Utils_1.pause; } });
@@ -29,13 +29,13 @@ var Monitor_1 = require("./impl/Monitor");
 Object.defineProperty(exports, "Monitor", { enumerable: true, get: function () { return Monitor_1.Monitor; } });
 var TransactionJournal_1 = require("./impl/TransactionJournal");
 Object.defineProperty(exports, "TransactionJournal", { enumerable: true, get: function () { return TransactionJournal_1.TransactionJournal; } });
-var Reactronic_1 = require("./Reactronic");
-Object.defineProperty(exports, "Reactronic", { enumerable: true, get: function () { return Reactronic_1.Reactronic; } });
-Object.defineProperty(exports, "nonreactive", { enumerable: true, get: function () { return Reactronic_1.nonreactive; } });
-Object.defineProperty(exports, "standalone", { enumerable: true, get: function () { return Reactronic_1.standalone; } });
-Object.defineProperty(exports, "sensitive", { enumerable: true, get: function () { return Reactronic_1.sensitive; } });
-Object.defineProperty(exports, "unobservable", { enumerable: true, get: function () { return Reactronic_1.unobservable; } });
-Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return Reactronic_1.transaction; } });
-Object.defineProperty(exports, "reaction", { enumerable: true, get: function () { return Reactronic_1.reaction; } });
-Object.defineProperty(exports, "cached", { enumerable: true, get: function () { return Reactronic_1.cached; } });
-Object.defineProperty(exports, "options", { enumerable: true, get: function () { return Reactronic_1.options; } });
+var Rx_1 = require("./Rx");
+Object.defineProperty(exports, "Rx", { enumerable: true, get: function () { return Rx_1.Rx; } });
+Object.defineProperty(exports, "nonreactive", { enumerable: true, get: function () { return Rx_1.nonreactive; } });
+Object.defineProperty(exports, "standalone", { enumerable: true, get: function () { return Rx_1.standalone; } });
+Object.defineProperty(exports, "sensitive", { enumerable: true, get: function () { return Rx_1.sensitive; } });
+Object.defineProperty(exports, "unobservable", { enumerable: true, get: function () { return Rx_1.unobservable; } });
+Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return Rx_1.transaction; } });
+Object.defineProperty(exports, "reaction", { enumerable: true, get: function () { return Rx_1.reaction; } });
+Object.defineProperty(exports, "cached", { enumerable: true, get: function () { return Rx_1.cached; } });
+Object.defineProperty(exports, "options", { enumerable: true, get: function () { return Rx_1.options; } });

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

@@ -34,7 +34,8 @@ export declare class OperationController extends Controller<any> {
 }
 declare class Operation extends Observable implements Observer {
     static current?: Operation;
-    static deferredReactions: Operation[];
+    static queuedReactions: Array<Observer>;
+    static deferredReactions: Array<Operation>;
     readonly margin: number;
     readonly transaction: Transaction;
     readonly controller: OperationController;
@@ -62,6 +63,7 @@ declare class Operation extends Observable implements Observer {
     run(proxy: any, args: any[] | undefined): void;
     markObsoleteDueTo(observable: Observable, cause: MemberInfo, since: number, reactions: Observer[]): void;
     runIfNotUpToDate(now: boolean, nothrow: boolean): void;
+    isNotUpToDate(): boolean;
     reenterOver(head: Operation): this;
     private static run;
     private enter;
@@ -77,6 +79,8 @@ declare class Operation extends Observable implements Observer {
     private static propagateAllChangesThroughSubscriptions;
     private static revokeAllSubscriptions;
     private static propagateMemberChangeThroughSubscriptions;
+    private static enqueueDetectedReactions;
+    private static runQueuedReactionsLoop;
     private unsubscribeFromAllObservables;
     private subscribeTo;
     private static canSubscribe;

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

@@ -102,7 +102,7 @@ class OperationController extends Controller_1.Controller {
     }
     static dependencies() {
         const op = Operation.current;
-        return op ? op.dependencies() : ['Reactronic.dependencies should be called from inside of reactive method'];
+        return op ? op.dependencies() : ['Rx.dependencies should be called from inside of reactive method'];
     }
     peek(args) {
         const ctx = Snapshot_1.Snapshot.current();
@@ -298,8 +298,7 @@ class Operation extends Data_1.Observable {
         const interval = Date.now() + this.started;
         const hold = t ? t - interval : 0;
         if (now || hold < 0) {
-            if (!this.error && (this.options.kind === Options_1.Kind.Transaction ||
-                !this.successor || this.successor.transaction.isCanceled)) {
+            if (this.isNotUpToDate()) {
                 try {
                     const op = this.controller.useOrRun(false, undefined);
                     if (op.result instanceof Promise)
@@ -323,6 +322,10 @@ class Operation extends Data_1.Observable {
                 this.addToDeferredReactions();
         }
     }
+    isNotUpToDate() {
+        return !this.error && (this.options.kind === Options_1.Kind.Transaction ||
+            !this.successor || this.successor.transaction.isCanceled);
+    }
     reenterOver(head) {
         let error = undefined;
         const opponent = head.successor;
@@ -480,21 +483,26 @@ class Operation extends Data_1.Observable {
     static revokeAllSubscriptions(snapshot) {
         snapshot.changeset.forEach((r, h) => r.changes.forEach((o, m) => Operation.propagateMemberChangeThroughSubscriptions(true, snapshot.timestamp, r, m, h, undefined)));
     }
-    static propagateMemberChangeThroughSubscriptions(discard, timestamp, r, m, h, reactions) {
+    static propagateMemberChangeThroughSubscriptions(unsubscribe, timestamp, r, m, h, reactions) {
         var _a;
+        const curr = r.data[m];
         if (reactions) {
             const prev = r.prev.revision.data[m];
             if (prev !== undefined && prev instanceof Data_1.Observable) {
                 const cause = { revision: r, memberName: m, usageCount: 0 };
-                if (prev instanceof Operation && (prev.obsoleteSince === Snapshot_1.MAX_TIMESTAMP || prev.obsoleteSince <= 0)) {
-                    prev.obsoleteDueTo = cause;
-                    prev.obsoleteSince = timestamp;
-                    prev.unsubscribeFromAllObservables();
+                if (prev instanceof Operation) {
+                    if ((prev.obsoleteSince === Snapshot_1.MAX_TIMESTAMP || prev.obsoleteSince <= 0)) {
+                        prev.obsoleteDueTo = cause;
+                        prev.obsoleteSince = timestamp;
+                        prev.unsubscribeFromAllObservables();
+                    }
+                    const opponent = prev.successor;
+                    if (opponent !== curr && opponent && !opponent.transaction.isFinished)
+                        opponent.transaction.cancel(new Error(`T${opponent.transaction.id}[${opponent.transaction.hint}] is canceled by T${r.snapshot.id}[${r.snapshot.hint}] and will not run anymore`), null);
                 }
                 (_a = prev.observers) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markObsoleteDueTo(prev, cause, timestamp, reactions));
             }
         }
-        const curr = r.data[m];
         if (curr instanceof Operation) {
             if (curr.revision === r && curr.observables !== undefined) {
                 if (Hooks_1.Hooks.repetitiveUsageWarningThreshold < Number.MAX_SAFE_INTEGER) {
@@ -503,7 +511,7 @@ class Operation extends Data_1.Observable {
                             Dbg_1.Dbg.log('', '[!]', `${curr.hint()} uses ${Snapshot_1.Dump.rev(hint.revision, hint.memberName)} ${hint.usageCount} times (consider remembering it in a local variable)`, 0, ' *** WARNING ***');
                     });
                 }
-                if (discard)
+                if (unsubscribe)
                     curr.unsubscribeFromAllObservables();
             }
         }
@@ -516,6 +524,24 @@ class Operation extends Data_1.Observable {
             curr.observers = undefined;
         }
     }
+    static enqueueDetectedReactions(snapshot) {
+        const queue = Operation.queuedReactions;
+        const isReactionLoopRequired = queue.length === 0;
+        for (const r of snapshot.reactions)
+            queue.push(r);
+        if (isReactionLoopRequired)
+            OperationController.runWithin(undefined, Operation.runQueuedReactionsLoop);
+    }
+    static runQueuedReactionsLoop() {
+        const queue = Operation.queuedReactions;
+        let i = 0;
+        while (i < queue.length) {
+            const reaction = queue[i];
+            reaction.runIfNotUpToDate(false, true);
+            i++;
+        }
+        Operation.queuedReactions = [];
+    }
     unsubscribeFromAllObservables() {
         var _a;
         (_a = this.observables) === null || _a === void 0 ? void 0 : _a.forEach((hint, value) => {
@@ -592,6 +618,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;
         Hooks_1.Hooks.createControllerAndGetHook = Operation.createControllerAndGetHook;
         Hooks_1.Hooks.rememberOperationOptions = Operation.rememberOperationOptions;
         Promise.prototype.then = reactronicHookedThen;
@@ -618,6 +645,7 @@ class Operation extends Data_1.Observable {
     }
 }
 Operation.current = undefined;
+Operation.queuedReactions = [];
 Operation.deferredReactions = [];
 function propagationHint(cause, full) {
     const result = [];

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

@@ -28,6 +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;
     seekRevision(h: ObjectHolder, m: MemberName): ObjectRevision;
     getCurrentRevision(h: ObjectHolder, m: MemberName): ObjectRevision;
     getEditableRevision(h: ObjectHolder, m: MemberName, value: any, token?: any): ObjectRevision;

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

@@ -309,6 +309,7 @@ Snapshot.markEdited = Utils_1.UNDEF;
 Snapshot.isConflicting = Utils_1.UNDEF;
 Snapshot.propagateAllChangesThroughSubscriptions = (snapshot) => { };
 Snapshot.revokeAllSubscriptions = (snapshot) => { };
+Snapshot.enqueueDetectedReactions = (snapshot) => { };
 class Dump {
     static obj(h, m, stamp, op, xop, typeless) {
         const member = m !== undefined ? `.${m.toString()}` : '';

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

@@ -230,16 +230,13 @@ class TransactionImpl extends Transaction {
             if (this.sealed && this.pending === 0) {
                 this.applyOrDiscard();
                 TransactionImpl.curr = outer;
-                TransactionImpl.standalone(TransactionImpl.runReactions, this);
+                TransactionImpl.standalone(Snapshot_1.Snapshot.enqueueDetectedReactions, this.snapshot);
             }
             else
                 TransactionImpl.curr = outer;
         }
         return result;
     }
-    static runReactions(t) {
-        t.snapshot.reactions.forEach(x => x.runIfNotUpToDate(false, true));
-    }
     static seal(t, error, after) {
         if (!t.canceled && error) {
             t.canceled = error;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.21.527",
+  "version": "0.21.601",
   "description": "Reactronic - Transactional Reactive State Management",
   "main": "build/dist/source/api.js",
   "types": "build/dist/source/api.d.ts",
@@ -29,17 +29,17 @@
   },
   "homepage": "https://github.com/nezaboodka/reactronic/blob/master/README.md#readme",
   "devDependencies": {
-    "@types/node": "16.11.11",
+    "@types/node": "17.0.0",
     "@types/react": "17.0.37",
-    "@typescript-eslint/eslint-plugin": "5.5.0",
-    "@typescript-eslint/parser": "5.5.0",
+    "@typescript-eslint/eslint-plugin": "5.7.0",
+    "@typescript-eslint/parser": "5.7.0",
     "ava": "3.15.0",
-    "eslint": "8.3.0",
+    "eslint": "8.4.1",
     "nyc": "15.1.0",
     "react": "17.0.2",
     "ts-node": "10.4.0",
     "tsconfig-paths": "3.12.0",
-    "typescript": "4.4.3"
+    "typescript": "4.5.4"
   },
   "scripts": {
     "build": "eslint source/**/*.ts test/**/*.ts react/**/*.tsx && tsc",