reactronic 0.22.103 → 0.22.107

package/README.md

@@ -196,7 +196,7 @@ class Component<P> extends React.Component<P> {
   @reaction // called immediately in response to changes
   ensureUpToDate(): void {
     if (this.shouldComponentUpdate())
-      nontransactional(() => this.setState({})) // ask React to re-render
+      Transaction.off(() => this.setState({})) // ask React to re-render
   } // ensureUpToDate is subscribed to render
 
   shouldComponentUpdate(): boolean {
@@ -310,7 +310,6 @@ function monitor(value: Monitor | null)
 function trace(value: Partial<TraceOptions>)
 
 function nonreactive<T>(func: F<T>, ...args: any[]): T
-function nontransactional<T>(func: F<T>, ...args: any[]): T
 function sensitive<T>(sensitivity: Sensitivity, func: F<T>, ...args: any[]): T
 
 // Options, ObjectOptions, Kind, Reentrance, Monitor, TraceOptions, ProfilingOptions

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

@@ -18,7 +18,6 @@ export declare class Rx {
     static setProfilingMode(enabled: boolean, options?: Partial<ProfilingOptions>): void;
 }
 export declare function nonreactive<T>(func: F<T>, ...args: any[]): T;
-export declare function nontransactional<T>(func: F<T>, ...args: any[]): T;
 export declare function sensitive<T>(sensitivity: boolean, func: F<T>, ...args: any[]): T;
 export declare function unobservable(proto: object, prop: PropertyKey): any;
 export declare function transaction(proto: object, prop: PropertyKey, pd: PropertyDescriptor): any;

package/build/dist/source/Rx.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.nontransactional = exports.nonreactive = exports.Rx = void 0;
+exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.nonreactive = exports.Rx = void 0;
 const Dbg_1 = require("./util/Dbg");
 const Options_1 = require("./Options");
 const Data_1 = require("./impl/Data");
 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 Rx {
     static why(brief = false) { return brief ? Operation_1.OperationController.briefWhy() : Operation_1.OperationController.why(); }
     static getController(method) { return Operation_1.OperationController.of(method); }
@@ -29,10 +28,6 @@ function nonreactive(func, ...args) {
     return Operation_1.OperationController.runWithin(undefined, func, ...args);
 }
 exports.nonreactive = nonreactive;
-function nontransactional(func, ...args) {
-    return Transaction_1.Transaction.off(func, ...args);
-}
-exports.nontransactional = nontransactional;
 function sensitive(sensitivity, func, ...args) {
     return Hooks_1.Hooks.sensitive(sensitivity, func, ...args);
 }

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

@@ -2,7 +2,7 @@ export { all, pause } from './util/Utils';
 export { SealedArray } from './util/SealedArray';
 export { SealedMap } from './util/SealedMap';
 export { SealedSet } from './util/SealedSet';
-export { MemberOptions, Kind, Reentrance, TraceOptions, ProfilingOptions, TraceLevel } from './Options';
+export { MemberOptions, SnapshotOptions, Kind, Reentrance, TraceOptions, ProfilingOptions, TraceLevel } from './Options';
 export { Worker } from './Worker';
 export { Controller } from './Controller';
 export { Ref, ToggleRef, BoolOnly, GivenTypeOnly } from './Ref';
@@ -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 { Rx, nonreactive, nontransactional, sensitive, unobservable, transaction, reaction, cached, options } from './Rx';
+export { Rx, nonreactive, 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.nontransactional = 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;
+exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = 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; } });
@@ -32,7 +32,6 @@ Object.defineProperty(exports, "TransactionJournal", { enumerable: true, get: fu
 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, "nontransactional", { enumerable: true, get: function () { return Rx_1.nontransactional; } });
 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; } });

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

@@ -9,23 +9,21 @@ export declare class Observable {
     value: any;
     observers?: Set<Observer>;
     get isOperation(): boolean;
-    get selfSnapshotId(): number | undefined;
+    get originSnapshotId(): number | undefined;
     constructor(value: any);
 }
-export declare type StandaloneMode = boolean | 'isolated';
+export declare type StandaloneMode = boolean | 'isolated' | 'disposal';
 export interface Observer {
     readonly order: number;
-    readonly observables: Map<Observable, MemberInfo> | undefined;
+    readonly observables: Map<Observable, ObservableInfo> | undefined;
     readonly obsoleteSince: number;
     hint(nop?: boolean): string;
     markObsoleteDueTo(observable: Observable, memberName: MemberName, snapshot: AbstractSnapshot, holder: ObjectHolder, outer: string, since: number, reactions: Observer[]): void;
     runIfNotUpToDate(now: boolean, nothrow: boolean): void;
 }
 export declare type MemberName = PropertyKey;
-export interface MemberInfo {
-    readonly holder: ObjectHolder;
-    readonly snapshot: AbstractSnapshot;
-    readonly memberName: MemberName;
+export interface ObservableInfo {
+    readonly memberHint: string;
     readonly usageCount: number;
 }
 export declare class ObjectRevision {

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

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "Meta", { enumerable: true, get: function () { re
 class Observable {
     constructor(value) { this.value = value; }
     get isOperation() { return false; }
-    get selfSnapshotId() { return 0; }
+    get originSnapshotId() { return 0; }
 }
 exports.Observable = Observable;
 class ObjectRevision {

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

@@ -1,7 +1,7 @@
 import { F } from '../util/Utils';
 import { MemberOptions } from '../Options';
 import { Controller } from '../Controller';
-import { MemberName, ObjectHolder, Observable, Observer, MemberInfo, AbstractSnapshot } from './Data';
+import { MemberName, ObjectHolder, Observable, Observer, ObservableInfo, AbstractSnapshot } from './Data';
 import { Transaction } from './Transaction';
 import { OptionsImpl } from './Hooks';
 export declare class OperationController extends Controller<any> {
@@ -40,7 +40,7 @@ declare class Operation extends Observable implements Observer {
     readonly transaction: Transaction;
     readonly controller: OperationController;
     readonly snapshot: AbstractSnapshot;
-    observables: Map<Observable, MemberInfo> | undefined;
+    observables: Map<Observable, ObservableInfo> | undefined;
     options: OptionsImpl;
     cause: string | undefined;
     args: any[];
@@ -52,7 +52,7 @@ declare class Operation extends Observable implements Observer {
     successor: Operation | undefined;
     constructor(controller: OperationController, snapshot: AbstractSnapshot, prev: Operation | OptionsImpl);
     get isOperation(): boolean;
-    get selfSnapshotId(): number;
+    get originSnapshotId(): number;
     hint(): string;
     get order(): number;
     get ['#this'](): string;

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

@@ -216,7 +216,7 @@ class Operation extends Data_1.Observable {
         this.successor = undefined;
     }
     get isOperation() { return true; }
-    get selfSnapshotId() { return this.snapshot.id; }
+    get originSnapshotId() { return this.snapshot.id; }
     hint() { return `${Snapshot_1.Dump.rev2(this.controller.ownHolder, this.snapshot, this.controller.memberName)}`; }
     get order() { return this.options.order; }
     get ['#this']() {
@@ -510,9 +510,9 @@ class Operation extends Data_1.Observable {
         if (curr instanceof Operation) {
             if (curr.snapshot === r.snapshot && curr.observables !== undefined) {
                 if (Hooks_1.Hooks.repetitiveUsageWarningThreshold < Number.MAX_SAFE_INTEGER) {
-                    curr.observables.forEach((hint, v) => {
-                        if (hint.usageCount > Hooks_1.Hooks.repetitiveUsageWarningThreshold)
-                            Dbg_1.Dbg.log('', '[!]', `${curr.hint()} uses ${Snapshot_1.Dump.rev2(hint.holder, hint.snapshot, hint.memberName)} ${hint.usageCount} times (consider remembering it in a local variable)`, 0, ' *** WARNING ***');
+                    curr.observables.forEach((info, v) => {
+                        if (info.usageCount > Hooks_1.Hooks.repetitiveUsageWarningThreshold)
+                            Dbg_1.Dbg.log('', '[!]', `${curr.hint()} uses ${info.memberHint} ${info.usageCount} times (consider remembering it in a local variable)`, 0, ' *** WARNING ***');
                     });
                 }
                 if (unsubscribe)
@@ -548,11 +548,11 @@ class Operation extends Data_1.Observable {
     }
     unsubscribeFromAllObservables() {
         var _a;
-        (_a = this.observables) === null || _a === void 0 ? void 0 : _a.forEach((hint, value) => {
+        (_a = this.observables) === null || _a === void 0 ? void 0 : _a.forEach((info, value) => {
             var _a;
             value.observers.delete(this);
             if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.read || ((_a = this.options.trace) === null || _a === void 0 ? void 0 : _a.read)))
-                Dbg_1.Dbg.log(Dbg_1.Dbg.trace.transaction && !Snapshot_1.Snapshot.current().sealed ? '║' : ' ', '-', `${this.hint()} is unsubscribed from ${Snapshot_1.Dump.rev2(hint.holder, hint.snapshot, hint.memberName)}`);
+                Dbg_1.Dbg.log(Dbg_1.Dbg.trace.transaction && !Snapshot_1.Snapshot.current().sealed ? '║' : ' ', '-', `${this.hint()} is unsubscribed from ${info.memberHint}`);
         });
         this.observables = undefined;
     }
@@ -568,7 +568,7 @@ class Operation extends Data_1.Observable {
             if (this.observables !== undefined) {
                 if (!observable.observers)
                     observable.observers = new Set();
-                const info = { holder: h, snapshot: r.snapshot, memberName: m, usageCount: times };
+                const info = { memberHint: Snapshot_1.Dump.rev2(h, r.snapshot, m), usageCount: times };
                 observable.observers.add(this);
                 this.observables.set(observable, info);
                 if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.read || ((_a = this.options.trace) === null || _a === void 0 ? void 0 : _a.read)))

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

@@ -39,7 +39,7 @@ export declare class Snapshot implements AbstractSnapshot {
     acquire(outer: Snapshot): void;
     bumpBy(timestamp: number): void;
     rebase(): ObjectRevision[] | undefined;
-    private static merge;
+    private merge;
     applyOrDiscard(error?: any): Array<Observer>;
     static sealObjectRevision(h: ObjectHolder, r: ObjectRevision): void;
     static sealObservable(observable: Observable | symbol, m: MemberName, typeName: string): void;
@@ -49,7 +49,7 @@ export declare class Snapshot implements AbstractSnapshot {
     static _init(): void;
 }
 export declare class Dump {
-    static obj(h: ObjectHolder | undefined, m?: MemberName | undefined, stamp?: number, op?: number, xop?: number, typeless?: boolean): string;
+    static obj(h: ObjectHolder | undefined, m?: MemberName | undefined, stamp?: number, snapshotId?: number, originSnapshotId?: number, typeless?: boolean): string;
     static rev2(h: ObjectHolder, s: AbstractSnapshot, m?: MemberName, value?: Observable): string;
     static rev(r: ObjectRevision, m?: MemberName): string;
     static conflicts(conflicts: ObjectRevision[]): string;

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

@@ -130,7 +130,7 @@ class Snapshot {
         if (this.changeset.size > 0) {
             this.changeset.forEach((r, h) => {
                 if (r.prev.revision !== h.head) {
-                    const merged = Snapshot.merge(h, r);
+                    const merged = this.merge(h, r);
                     if (r.conflicts.size > 0) {
                         if (!conflicts)
                             conflicts = [];
@@ -154,19 +154,21 @@ class Snapshot {
         }
         return conflicts;
     }
-    static merge(h, ours) {
+    merge(h, ours) {
         let counter = 0;
         const head = h.head;
-        const disposed = head.changes.has(Data_1.Meta.Disposed);
+        const headDisposed = head.changes.has(Data_1.Meta.Disposed);
         const merged = Object.assign({}, head.data);
         ours.changes.forEach((o, m) => {
             counter++;
             merged[m] = ours.data[m];
-            if (disposed || m === Data_1.Meta.Disposed) {
-                if (disposed !== (m === Data_1.Meta.Disposed)) {
-                    if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
-                        Dbg_1.Dbg.log('║╠', '', `${Dump.rev2(h, ours.snapshot, m)} <> ${Dump.rev2(h, head.snapshot, m)}`, 0, ' *** CONFLICT ***');
-                    ours.conflicts.set(m, head);
+            if (headDisposed || m === Data_1.Meta.Disposed) {
+                if (headDisposed !== (m === Data_1.Meta.Disposed)) {
+                    if (headDisposed || this.options.standalone !== 'disposal') {
+                        if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
+                            Dbg_1.Dbg.log('║╠', '', `${Dump.rev2(h, ours.snapshot, m)} <> ${Dump.rev2(h, head.snapshot, m)}`, 0, ' *** CONFLICT ***');
+                        ours.conflicts.set(m, head);
+                    }
                 }
             }
             else {
@@ -309,19 +311,19 @@ Snapshot.propagateAllChangesThroughSubscriptions = (snapshot) => { };
 Snapshot.revokeAllSubscriptions = (snapshot) => { };
 Snapshot.enqueueReactionsToRun = (reactions) => { };
 class Dump {
-    static obj(h, m, stamp, op, xop, typeless) {
+    static obj(h, m, stamp, snapshotId, originSnapshotId, typeless) {
         const member = m !== undefined ? `.${m.toString()}` : '';
         return h === undefined
             ? `root${member}`
-            : stamp === undefined ? `${h.hint}${member} #${h.id}` : `${h.hint}${member} #${h.id}t${op}v${stamp}${xop !== undefined && xop !== 0 ? `t${xop}` : ''}`;
+            : stamp === undefined ? `${h.hint}${member} #${h.id}` : `${h.hint}${member} #${h.id}t${snapshotId}v${stamp}${originSnapshotId !== undefined && originSnapshotId !== 0 ? `t${originSnapshotId}` : ''}`;
     }
     static rev2(h, s, m, value) {
-        return Dump.obj(h, m, s.timestamp, s.id, value === null || value === void 0 ? void 0 : value.selfSnapshotId);
+        return Dump.obj(h, m, s.timestamp, s.id, value === null || value === void 0 ? void 0 : value.originSnapshotId);
     }
     static rev(r, m) {
         const h = Data_1.Meta.get(r.data, Data_1.Meta.Holder);
         const value = m !== undefined ? r.data[m] : undefined;
-        return Dump.obj(h, m, r.snapshot.timestamp, r.snapshot.id, value === null || value === void 0 ? void 0 : value.selfSnapshotId);
+        return Dump.obj(h, m, r.snapshot.timestamp, r.snapshot.id, value === null || value === void 0 ? void 0 : value.originSnapshotId);
     }
     static conflicts(conflicts) {
         return conflicts.map(ours => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.22.103",
+  "version": "0.22.107",
   "description": "Reactronic - Transactional Reactive State Management",
   "main": "build/dist/source/api.js",
   "types": "build/dist/source/api.d.ts",
@@ -29,12 +29,12 @@
   },
   "homepage": "https://github.com/nezaboodka/reactronic/blob/master/README.md#readme",
   "devDependencies": {
-    "@types/node": "17.0.0",
-    "@types/react": "17.0.37",
-    "@typescript-eslint/eslint-plugin": "5.7.0",
-    "@typescript-eslint/parser": "5.7.0",
+    "@types/node": "17.0.7",
+    "@types/react": "17.0.38",
+    "@typescript-eslint/eslint-plugin": "5.9.0",
+    "@typescript-eslint/parser": "5.9.0",
     "ava": "3.15.0",
-    "eslint": "8.4.1",
+    "eslint": "8.6.0",
     "nyc": "15.1.0",
     "react": "17.0.2",
     "ts-node": "10.4.0",