reactronic 0.21.522 → 0.21.526

package/README.md

@@ -300,6 +300,7 @@ function unobservable(proto, prop) // field only
 function transaction(proto, prop, pd) // method only
 function reaction(proto, prop, pd) // method only
 function cached(proto, prop, pd) // method only
+function options(value: Partial<MemberOptions>): F<any>
 
 function noSideEffects(value: boolean) // transaction & cached & reaction
 function sensitiveArgs(value: boolean) // cached & reaction
@@ -324,6 +325,19 @@ interface Options {
   readonly trace?: Partial<TraceOptions>
 }
 
+export interface MemberOptions {
+  readonly kind: Kind
+  readonly standalone: StandaloneMode
+  readonly order: number
+  readonly noSideEffects: boolean
+  readonly sensitiveArgs: boolean
+  readonly throttling: number // milliseconds, -1 is immediately, Number.MAX_SAFE_INTEGER is never
+  readonly reentrance: Reentrance
+  readonly journal: TransactionJournal | undefined
+  readonly monitor: Monitor | null
+  readonly trace?: Partial<TraceOptions>
+}
+
 enum Kind {
   Plain = 0,
   Transaction = 1,
@@ -430,7 +444,7 @@ abstract class Controller<T> {
 class Reactronic {
   static why(short: boolean = false): string
   static getMethodCache<T>(method: F<T>): Cache<T>
-  static configureCurrentMethod(options: Partial<Options>): Options
+  static configureCurrentOperation(options: Partial<Options>): Options
   // static configureObject<T extends object>(obj: T, options: Partial<ObjectOptions>): void
   // static assign<T, P extends keyof T>(obj: T, prop: P, value: T[P], sensitivity: Sensitivity)
   static takeSnapshot<T>(obj: T): T

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

@@ -1,16 +1,18 @@
 import { TraceOptions } from './Trace';
+import { StandaloneMode } from './impl/Data';
 export { TraceOptions, ProfilingOptions, TraceLevel } from './Trace';
 import { TransactionJournal } from './impl/TransactionJournal';
 import { Monitor } from './impl/Monitor';
 export interface SnapshotOptions {
     readonly hint?: string;
-    readonly standalone?: boolean;
+    readonly standalone?: StandaloneMode;
     readonly journal?: TransactionJournal;
     readonly trace?: Partial<TraceOptions>;
     readonly token?: any;
 }
 export interface MemberOptions {
     readonly kind: Kind;
+    readonly standalone: StandaloneMode;
     readonly order: number;
     readonly noSideEffects: boolean;
     readonly sensitiveArgs: boolean;

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

@@ -5,7 +5,7 @@ export declare class Reactronic {
     static why(brief?: boolean): string;
     static getController<T>(method: F<T>): Controller<T>;
     static pullLastResult<T>(method: F<Promise<T>>, args?: any[]): T | undefined;
-    static configureCurrentMethod(options: Partial<MemberOptions>): MemberOptions;
+    static configureCurrentOperation(options: Partial<MemberOptions>): MemberOptions;
     static takeSnapshot<T>(obj: T): T;
     static dispose(obj: any): void;
     static get reactionsAutoStartDisabled(): boolean;

package/build/dist/source/Reactronic.js

@@ -12,7 +12,7 @@ class Reactronic {
     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 configureCurrentMethod(options) { return Operation_1.OperationController.configureImpl(undefined, options); }
+    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); }
     static get reactionsAutoStartDisabled() { return Hooks_1.Hooks.reactionsAutoStartDisabled; }

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

@@ -23,7 +23,7 @@ export interface ProfilingOptions {
     garbageCollectionSummaryInterval: number;
 }
 export declare const TraceLevel: {
-    Error: TraceOptions;
+    ErrorsOnly: TraceOptions;
     Transactions: TraceOptions;
     Operations: TraceOptions;
     Debug: TraceOptions;

package/build/dist/source/Trace.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TraceLevel = void 0;
 exports.TraceLevel = {
-    Error: {
+    ErrorsOnly: {
         silent: false,
         transaction: false,
         operation: false,

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

@@ -9,8 +9,10 @@ export declare class Observable {
     value: any;
     observers?: Set<Observer>;
     get isOperation(): boolean;
+    get selfSnapshotId(): number | undefined;
     constructor(value: any);
 }
+export declare type StandaloneMode = boolean | 'isolated';
 export interface Observer {
     readonly order: number;
     readonly observables: Map<Observable, MemberInfo> | undefined;

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

@@ -8,6 +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; }
 }
 exports.Observable = Observable;
 class ObjectRevision {

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

@@ -1,7 +1,7 @@
 import { F } from '../util/Utils';
 import { MemberOptions, Kind, Reentrance } from '../Options';
 import { TraceOptions, ProfilingOptions } from '../Trace';
-import { MemberName, ObjectHolder } from './Data';
+import { MemberName, ObjectHolder, StandaloneMode } from './Data';
 import { TransactionJournal } from './TransactionJournal';
 import { Monitor } from './Monitor';
 export declare abstract class ObservableObject {
@@ -12,6 +12,7 @@ export declare class OptionsImpl implements MemberOptions {
     readonly getter: Function;
     readonly setter: Function;
     readonly kind: Kind;
+    readonly standalone: StandaloneMode;
     readonly order: number;
     readonly noSideEffects: boolean;
     readonly sensitiveArgs: boolean;
@@ -37,10 +38,10 @@ export declare class Hooks implements ProxyHandler<ObjectHolder> {
     getOwnPropertyDescriptor(h: ObjectHolder, m: MemberName): PropertyDescriptor | undefined;
     ownKeys(h: ObjectHolder): Array<string | symbol>;
     static decorateData(observable: boolean, proto: any, m: MemberName): any;
-    static decorateOperation(implicit: boolean, decorator: Function, options: Partial<MemberOptions>, proto: any, member: MemberName, pd: PropertyDescriptor): any;
+    static decorateOperation(implicit: boolean, decorator: Function, options: Partial<MemberOptions>, proto: any, member: MemberName, pd: PropertyDescriptor | undefined): any;
     static decorateOperationParametrized(decorator: Function, options: Partial<MemberOptions>): F<any>;
     static acquireObjectHolder(obj: any): ObjectHolder;
-    static createObjectHolder(unobservable: any, blank: any, hint: string): ObjectHolder;
+    static createObjectHolder(proto: any, unobservable: any, blank: any, hint: string): ObjectHolder;
     static setProfilingMode(enabled: boolean, options?: Partial<ProfilingOptions>): void;
     static sensitive<T>(sensitivity: boolean, func: F<T>, ...args: any[]): T;
     static setHint<T>(obj: T, hint: string | undefined): T;

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

@@ -10,12 +10,7 @@ class ObservableObject {
     constructor() {
         const proto = new.target.prototype;
         const initial = Data_1.Meta.getFrom(proto, Data_1.Meta.Initial);
-        const h = Hooks.createObjectHolder(this, initial, new.target.name);
-        if (!Hooks.reactionsAutoStartDisabled) {
-            const reactions = Data_1.Meta.getFrom(proto, Data_1.Meta.Reactions);
-            for (const member in reactions)
-                h.proxy[member][Data_1.Meta.Controller].markObsolete();
-        }
+        const h = Hooks.createObjectHolder(proto, this, initial, new.target.name);
         return h.proxy;
     }
     [Symbol.toStringTag]() {
@@ -26,6 +21,7 @@ class ObservableObject {
 exports.ObservableObject = ObservableObject;
 const DEFAULT_OPTIONS = Object.freeze({
     kind: Options_1.Kind.Plain,
+    standalone: false,
     order: 0,
     noSideEffects: false,
     sensitiveArgs: false,
@@ -40,6 +36,7 @@ class OptionsImpl {
         this.getter = getter !== undefined ? getter : existing.getter;
         this.setter = setter !== undefined ? setter : existing.setter;
         this.kind = merge(DEFAULT_OPTIONS.kind, existing.kind, patch.kind, implicit);
+        this.standalone = merge(DEFAULT_OPTIONS.standalone, existing.standalone, patch.standalone, implicit);
         this.order = merge(DEFAULT_OPTIONS.order, existing.order, patch.order, implicit);
         this.noSideEffects = merge(DEFAULT_OPTIONS.noSideEffects, existing.noSideEffects, patch.noSideEffects, implicit);
         this.sensitiveArgs = merge(DEFAULT_OPTIONS.sensitiveArgs, existing.sensitiveArgs, patch.sensitiveArgs, implicit);
@@ -81,13 +78,14 @@ class Hooks {
             let curr = r.data[m];
             if (curr !== undefined || (r.prev.revision.snapshot === Snapshot_1.ROOT_REV.snapshot && (m in h.unobservable) === false)) {
                 if (curr === undefined || curr.value !== value || Hooks.sensitivity) {
+                    const old = curr === null || curr === void 0 ? void 0 : curr.value;
                     if (r.prev.revision.data[m] === curr) {
                         curr = r.data[m] = new Data_1.Observable(value);
-                        Snapshot_1.Snapshot.markEdited(value, true, r, m, h);
+                        Snapshot_1.Snapshot.markEdited(old, value, true, r, m, h);
                     }
                     else {
                         curr.value = value;
-                        Snapshot_1.Snapshot.markEdited(value, true, r, m, h);
+                        Snapshot_1.Snapshot.markEdited(old, value, true, r, m, h);
                     }
                 }
             }
@@ -184,10 +182,13 @@ class Hooks {
         }
         return h;
     }
-    static createObjectHolder(unobservable, blank, hint) {
+    static createObjectHolder(proto, unobservable, blank, hint) {
         const ctx = Snapshot_1.Snapshot.edit();
         const h = new Data_1.ObjectHolder(unobservable, undefined, Hooks.proxy, Snapshot_1.ROOT_REV, hint);
         ctx.getEditableRevision(h, Data_1.Meta.Holder, blank);
+        if (!Hooks.reactionsAutoStartDisabled)
+            for (const m in Data_1.Meta.getFrom(proto, Data_1.Meta.Reactions))
+                h.proxy[m][Data_1.Meta.Controller].markObsolete();
         return h;
     }
     static setProfilingMode(enabled, options) {

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

@@ -53,7 +53,7 @@ class MonitorImpl extends Monitor {
     static activate(mon, delay) {
         if (delay >= 0) {
             if (mon.internals.activationTimeout === undefined)
-                mon.internals.activationTimeout = setTimeout(() => Transaction_1.Transaction.runAs({ hint: 'Monitor.activate', standalone: true }, MonitorImpl.activate, mon, -1), delay);
+                mon.internals.activationTimeout = setTimeout(() => Transaction_1.Transaction.runAs({ hint: 'Monitor.activate', standalone: 'isolated' }, MonitorImpl.activate, mon, -1), delay);
         }
         else if (mon.counter > 0)
             mon.isActive = true;
@@ -61,7 +61,7 @@ class MonitorImpl extends Monitor {
     static deactivate(mon, delay) {
         if (delay >= 0) {
             clearTimeout(mon.internals.deactivationTimeout);
-            mon.internals.deactivationTimeout = setTimeout(() => Transaction_1.Transaction.runAs({ hint: 'Monitor.deactivate', standalone: true }, MonitorImpl.deactivate, mon, -1), delay);
+            mon.internals.deactivationTimeout = setTimeout(() => Transaction_1.Transaction.runAs({ hint: 'Monitor.deactivate', standalone: 'isolated' }, MonitorImpl.deactivate, mon, -1), delay);
         }
         else if (mon.counter <= 0) {
             mon.isActive = false;

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

@@ -51,8 +51,10 @@ declare class Operation extends Observable implements Observer {
     successor: Operation | undefined;
     constructor(controller: OperationController, revision: ObjectRevision, prev: Operation | OptionsImpl);
     get isOperation(): boolean;
+    get selfSnapshotId(): number;
     hint(): string;
     get order(): number;
+    get ['#this'](): string;
     why(): string;
     briefWhy(): string;
     dependencies(): string[];
@@ -77,7 +79,7 @@ declare class Operation extends Observable implements Observer {
     private static propagateMemberChangeThroughSubscriptions;
     private unsubscribeFromAllObservables;
     private subscribeTo;
-    private static isValid;
+    private static canSubscribe;
     private static createControllerAndGetHook;
     private static rememberOperationOptions;
     static init(): void;

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

@@ -30,6 +30,7 @@ class OperationController extends Controller_1.Controller {
     markObsolete() { Transaction_1.Transaction.runAs({ hint: Dbg_1.Dbg.isOn ? `markObsolete(${Snapshot_1.Dump.obj(this.ownHolder, this.memberName)})` : 'markObsolete()' }, OperationController.markObsolete, this); }
     pullLastResult(args) { return this.useOrRun(true, args).value; }
     useOrRun(weak, args) {
+        var _a;
         let oc = this.peek(args);
         const ctx = oc.snapshot;
         const op = oc.operation;
@@ -37,7 +38,9 @@ class OperationController extends Controller_1.Controller {
         if (!oc.isUpToDate && oc.revision.data[Data_1.Meta.Disposed] === undefined
             && (!weak || op.cause === ROOT_TRIGGER || !op.successor ||
                 op.successor.transaction.isFinished)) {
-            const standalone = weak || opts.kind === Options_1.Kind.Reaction ||
+            const outerOpts = (_a = Operation.current) === null || _a === void 0 ? void 0 : _a.options;
+            const standalone = weak || opts.standalone || opts.kind === Options_1.Kind.Reaction ||
+                (opts.kind === Options_1.Kind.Transaction && outerOpts && (outerOpts.noSideEffects || outerOpts.kind === Options_1.Kind.Cache)) ||
                 (opts.kind === Options_1.Kind.Cache && (oc.revision.snapshot.sealed ||
                     oc.revision.prev.revision !== Snapshot_1.ROOT_REV));
             const token = opts.noSideEffects ? this : undefined;
@@ -69,7 +72,7 @@ class OperationController extends Controller_1.Controller {
             throw (0, Dbg_1.misuse)('a method is expected with reactronic decorator');
         op.options = new Hooks_1.OptionsImpl(op.options.getter, op.options.setter, op.options, options, false);
         if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.write)
-            Dbg_1.Dbg.log('║', '  ✎', `${op.hint()}.options = ...`);
+            Dbg_1.Dbg.log('║', '  ✎', `${op.hint()}.options are changed`);
         return op.options;
     }
     static runWithin(op, func, ...args) {
@@ -104,7 +107,7 @@ class OperationController extends Controller_1.Controller {
     peek(args) {
         const ctx = Snapshot_1.Snapshot.current();
         const r = ctx.seekRevision(this.ownHolder, this.memberName);
-        const op = this.peekFromRevision(r);
+        const op = this.peekFromRevision(r, args);
         const isValid = op.options.kind !== Options_1.Kind.Transaction && op.cause !== ROOT_TRIGGER &&
             (ctx === op.revision.snapshot || ctx.timestamp < op.obsoleteSince) &&
             (!op.options.sensitiveArgs || args === undefined ||
@@ -122,16 +125,17 @@ class OperationController extends Controller_1.Controller {
         const m = this.memberName;
         const ctx = Snapshot_1.Snapshot.edit();
         const r = ctx.getEditableRevision(h, m, Data_1.Meta.Holder, this);
-        let op = this.peekFromRevision(r);
+        let op = this.peekFromRevision(r, undefined);
         if (op.revision !== r) {
             const op2 = new Operation(this, r, op);
-            op = r.data[m] = op2.reenterOver(op);
+            r.data[m] = op2.reenterOver(op);
             ctx.bumpBy(r.prev.revision.snapshot.timestamp);
-            Snapshot_1.Snapshot.markEdited(op, true, r, m, h);
+            Snapshot_1.Snapshot.markEdited(op, op2, true, r, m, h);
+            op = op2;
         }
         return { operation: op, isUpToDate: true, snapshot: ctx, revision: r };
     }
-    peekFromRevision(r) {
+    peekFromRevision(r, args) {
         const m = this.memberName;
         let op = r.data[m];
         if (op.controller !== this) {
@@ -143,9 +147,13 @@ class OperationController extends Controller_1.Controller {
                 let op2 = r2.data[m];
                 if (op2.controller !== this) {
                     r2 = Snapshot_1.Snapshot.edit().getEditableRevision(h, m, Data_1.Meta.Holder, this);
-                    op2 = r2.data[m] = new Operation(this, r2, op2);
-                    op2.cause = ROOT_TRIGGER;
-                    Snapshot_1.Snapshot.markEdited(op2, true, r2, m, h);
+                    const t = new Operation(this, r2, op2);
+                    if (args)
+                        t.args = args;
+                    t.cause = ROOT_TRIGGER;
+                    r2.data[m] = t;
+                    Snapshot_1.Snapshot.markEdited(op2, t, true, r2, m, h);
+                    op2 = t;
                 }
                 return op2;
             });
@@ -159,7 +167,7 @@ class OperationController extends Controller_1.Controller {
         const result = Transaction_1.Transaction.runAs(opts, (argsx) => {
             if (!oc.operation.transaction.isCanceled) {
                 oc = this.edit();
-                if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.transaction || Dbg_1.Dbg.trace.operation || Dbg_1.Dbg.trace.obsolete))
+                if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.operation)
                     Dbg_1.Dbg.log('║', '  𝑓', `${oc.operation.why()}`);
                 oc.operation.run(this.ownHolder.proxy, argsx);
             }
@@ -167,7 +175,7 @@ class OperationController extends Controller_1.Controller {
                 oc = this.peek(argsx);
                 if (oc.operation.options.kind === Options_1.Kind.Transaction || !oc.isUpToDate) {
                     oc = this.edit();
-                    if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.transaction || Dbg_1.Dbg.trace.operation || Dbg_1.Dbg.trace.obsolete))
+                    if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.operation)
                         Dbg_1.Dbg.log('║', '  𝑓', `${oc.operation.why()}`);
                     oc.operation.run(this.ownHolder.proxy, argsx);
                 }
@@ -208,8 +216,12 @@ class Operation extends Data_1.Observable {
         this.successor = undefined;
     }
     get isOperation() { return true; }
+    get selfSnapshotId() { return this.revision.snapshot.id; }
     hint() { return `${Snapshot_1.Dump.rev(this.revision, this.controller.memberName)}`; }
     get order() { return this.options.order; }
+    get ['#this']() {
+        return `Operation: ${this.why()}`;
+    }
     why() {
         let ms = Date.now();
         const prev = this.revision.prev.revision.data[this.controller.memberName];
@@ -221,7 +233,7 @@ class Operation extends Data_1.Observable {
         else if (this.controller.options.kind === Options_1.Kind.Transaction)
             trigger = '   <<   operation';
         else
-            trigger = `   <<   called within ${this.revision.snapshot.hint}`;
+            trigger = `   <<   T${this.revision.snapshot.id}[${this.revision.snapshot.hint}]`;
         return `${this.hint()}${trigger}   (${ms !== Infinity ? `${ms}ms since previous run` : 'initial run'})`;
     }
     briefWhy() {
@@ -366,18 +378,18 @@ class Operation extends Data_1.Observable {
         if (this.result instanceof Promise) {
             this.result = this.result.then(value => {
                 this.value = value;
-                this.leave(false, '  □ ', '- finished ', ' OK ──┘');
+                this.leave(false, '  ⚐', '- finished  ', ' OK ──┘');
                 return value;
             }, error => {
                 this.error = error;
-                this.leave(false, '  □ ', '- finished ', 'ERR ──┘');
+                this.leave(false, '  ⚐', '- finished  ', 'ERR ──┘');
                 throw error;
             });
             if (Dbg_1.Dbg.isOn) {
                 if (Dbg_1.Dbg.trace.operation)
                     Dbg_1.Dbg.log('║', '_/', `${this.hint()} - leave... `, 0, 'ASYNC ──┐');
                 else if (Dbg_1.Dbg.trace.transaction)
-                    Dbg_1.Dbg.log('║', '  ', `${this.hint()}... `, 0, 'ASYNC');
+                    Dbg_1.Dbg.log('║', '  ', `${this.why()} ...`, 0, 'ASYNC');
             }
         }
         else {
@@ -398,8 +410,8 @@ class Operation extends Data_1.Observable {
     monitorEnter(mon) {
         const options = {
             hint: 'Monitor.enter',
-            standalone: true,
-            trace: Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.monitor ? undefined : Dbg_1.Dbg.global,
+            standalone: 'isolated',
+            trace: Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.monitor ? undefined : Dbg_1.Dbg.global
         };
         OperationController.runWithin(undefined, Transaction_1.Transaction.runAs, options, Monitor_1.MonitorImpl.enter, mon, this.transaction);
     }
@@ -408,8 +420,8 @@ class Operation extends Data_1.Observable {
             const leave = () => {
                 const options = {
                     hint: 'Monitor.leave',
-                    standalone: true,
-                    trace: Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.monitor ? undefined : Dbg_1.Dbg.DefaultLevel,
+                    standalone: 'isolated',
+                    trace: Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.monitor ? undefined : Dbg_1.Dbg.DefaultLevel
                 };
                 OperationController.runWithin(undefined, Transaction_1.Transaction.runAs, options, Monitor_1.MonitorImpl.leave, mon, this.transaction);
             };
@@ -440,10 +452,10 @@ class Operation extends Data_1.Observable {
             }
         }
     }
-    static markEdited(value, edited, r, m, h) {
+    static markEdited(oldValue, newValue, edited, r, m, h) {
         edited ? r.changes.set(m, Operation.current) : 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)} = ${valueHint(value)}`) : Dbg_1.Dbg.log('║', '  ✎', `${Snapshot_1.Dump.rev(r, m)} = ${valueHint(value)}`, undefined, ' (same as previous)');
+            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)');
     }
     static isConflicting(oldValue, newValue) {
         let result = oldValue !== newValue;
@@ -515,29 +527,33 @@ class Operation extends Data_1.Observable {
         this.observables = undefined;
     }
     subscribeTo(observable, r, m, h, timestamp) {
-        var _a, _b;
-        const isValid = Operation.isValid(observable, r, m, h, timestamp);
-        if (isValid) {
+        var _a, _b, _c;
+        const ok = Operation.canSubscribe(observable, r, m, h, timestamp);
+        if (ok) {
             let times = 0;
             if (Hooks_1.Hooks.repetitiveUsageWarningThreshold < Number.MAX_SAFE_INTEGER) {
                 const existing = this.observables.get(observable);
                 times = existing ? existing.usageCount + 1 : 1;
             }
-            if (!observable.observers)
-                observable.observers = new Set();
-            const info = { revision: r, memberName: 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)))
-                Dbg_1.Dbg.log('║', '  ∞ ', `${this.hint()} is subscribed to ${Snapshot_1.Dump.rev(r, m)}${info.usageCount > 1 ? ` (${info.usageCount} times)` : ''}`);
+            if (this.observables !== undefined) {
+                if (!observable.observers)
+                    observable.observers = new Set();
+                const info = { revision: r, memberName: 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)))
+                    Dbg_1.Dbg.log('║', '  ∞ ', `${this.hint()} is subscribed to ${Snapshot_1.Dump.rev(r, m)}${info.usageCount > 1 ? ` (${info.usageCount} times)` : ''}`);
+            }
+            else if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.read || ((_b = this.options.trace) === null || _b === void 0 ? void 0 : _b.read)))
+                Dbg_1.Dbg.log('║', '  x ', `${this.hint()} is obsolete and is NOT subscribed to ${Snapshot_1.Dump.rev(r, m)}`);
         }
         else {
-            if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.read || ((_b = this.options.trace) === null || _b === void 0 ? void 0 : _b.read)))
+            if (Dbg_1.Dbg.isOn && (Dbg_1.Dbg.trace.read || ((_c = this.options.trace) === null || _c === void 0 ? void 0 : _c.read)))
                 Dbg_1.Dbg.log('║', '  x ', `${this.hint()} is NOT subscribed to already obsolete ${Snapshot_1.Dump.rev(r, m)}`);
         }
-        return isValid;
+        return ok;
     }
-    static isValid(observable, r, m, h, timestamp) {
+    static canSubscribe(observable, r, m, h, timestamp) {
         let result = !r.snapshot.sealed || observable === h.head.data[m];
         if (result && timestamp !== -1)
             result = !(observable instanceof Operation && timestamp >= observable.obsoleteSince);
@@ -615,7 +631,7 @@ function propagationHint(cause, full) {
     full && result.push(cause.revision.snapshot.hint);
     return result;
 }
-function valueHint(value) {
+function valueHint(value, m) {
     let result = '';
     if (Array.isArray(value))
         result = `Array(${value.length})`;
@@ -624,13 +640,13 @@ function valueHint(value) {
     else if (value instanceof Map)
         result = `Map(${value.size})`;
     else if (value instanceof Operation)
-        result = `<rerun over ${Snapshot_1.Dump.rev(value.revision.prev.revision)}>`;
+        result = `${Snapshot_1.Dump.rev(value.revision, m)}`;
     else if (value === Data_1.Meta.Disposed)
         result = '<disposed>';
     else if (value !== undefined && value !== null)
         result = value.toString().slice(0, 20);
     else
-        result = '◌';
+        result = '∅';
     return result;
 }
 function getMergedTraceOptions(local) {

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

@@ -24,7 +24,7 @@ export declare class Snapshot implements AbstractSnapshot {
     static current: () => Snapshot;
     static edit: () => Snapshot;
     static markUsed: (observable: Observable, r: ObjectRevision, m: MemberName, h: ObjectHolder, kind: Kind, weak: boolean) => void;
-    static markEdited: (value: any, edited: boolean, r: ObjectRevision, m: MemberName, h: ObjectHolder) => void;
+    static markEdited: (oldValue: any, newValue: any, edited: boolean, r: ObjectRevision, m: MemberName, h: ObjectHolder) => void;
     static isConflicting: (oldValue: any, newValue: any) => boolean;
     static propagateAllChangesThroughSubscriptions: (snapshot: Snapshot) => void;
     static revokeAllSubscriptions: (snapshot: Snapshot) => 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, typeless?: boolean): string;
+    static obj(h: ObjectHolder | undefined, m?: MemberName | undefined, stamp?: number, op?: number, xop?: number, typeless?: boolean): string;
     static rev(r: ObjectRevision, m?: MemberName): string;
     static conflicts(conflicts: ObjectRevision[]): string;
     static conflictingMemberHint(m: MemberName, ours: ObjectRevision, theirs: ObjectRevision): string;

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

@@ -10,11 +10,11 @@ const SealedSet_1 = require("../util/SealedSet");
 const Data_1 = require("./Data");
 exports.MAX_TIMESTAMP = Number.MAX_SAFE_INTEGER;
 exports.UNDEFINED_TIMESTAMP = exports.MAX_TIMESTAMP - 1;
-Object.defineProperty(Data_1.ObjectHolder.prototype, '<snapshot>', {
+Object.defineProperty(Data_1.ObjectHolder.prototype, '#this', {
     configurable: false, enumerable: false,
     get() {
         const result = {};
-        const data = Snapshot.current().getCurrentRevision(this, '<snapshot>').data;
+        const data = Snapshot.current().getCurrentRevision(this, '#this').data;
         for (const m in data) {
             const v = data[m];
             if (v instanceof Data_1.Observable)
@@ -71,6 +71,8 @@ class Snapshot {
                 this.changeset.set(h, r);
                 h.editing = r;
                 h.editors++;
+                if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.write)
+                    Dbg_1.Dbg.log('║', '  ⎘', `${Dump.obj(h)} is cloned`);
             }
         }
         else
@@ -78,7 +80,7 @@ class Snapshot {
         return r;
     }
     static takeSnapshot(obj) {
-        return obj[Data_1.Meta.Holder]['<snapshot>'];
+        return obj[Data_1.Meta.Holder]['#this'];
     }
     static dispose(obj) {
         const ctx = Snapshot.edit();
@@ -90,7 +92,7 @@ class Snapshot {
         const r = ctx.getEditableRevision(h, Data_1.Meta.Disposed, Data_1.Meta.Disposed);
         if (r !== exports.ROOT_REV) {
             r.data[Data_1.Meta.Disposed] = Data_1.Meta.Disposed;
-            Snapshot.markEdited(Data_1.Meta.Disposed, true, r, Data_1.Meta.Disposed, h);
+            Snapshot.markEdited(Data_1.Meta.Disposed, Data_1.Meta.Disposed, true, r, Data_1.Meta.Disposed, h);
         }
         return r;
     }
@@ -132,7 +134,7 @@ class Snapshot {
                             conflicts = [];
                         conflicts.push(r);
                     }
-                    if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
+                    if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.transaction)
                         Dbg_1.Dbg.log('╠╝', '', `${Dump.rev(r)} is merged with ${Dump.rev(h.head)} among ${merged} properties with ${r.conflicts.size} conflicts.`);
                 }
             });
@@ -193,7 +195,7 @@ class Snapshot {
             }
         });
         if (Dbg_1.Dbg.isOn) {
-            if (Dbg_1.Dbg.trace.change) {
+            if (Dbg_1.Dbg.trace.change && !error) {
                 this.changeset.forEach((r, h) => {
                     const members = [];
                     r.changes.forEach((o, m) => members.push(m.toString()));
@@ -308,15 +310,16 @@ Snapshot.isConflicting = Utils_1.UNDEF;
 Snapshot.propagateAllChangesThroughSubscriptions = (snapshot) => { };
 Snapshot.revokeAllSubscriptions = (snapshot) => { };
 class Dump {
-    static obj(h, m, stamp, op, typeless) {
+    static obj(h, m, stamp, op, xop, 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}`;
+            : stamp === undefined ? `${h.hint}${member} #${h.id}` : `${h.hint}${member} #${h.id}t${op}v${stamp}${xop !== undefined && xop !== 0 ? `t${xop}` : ''}`;
     }
     static rev(r, m) {
         const h = Data_1.Meta.get(r.data, Data_1.Meta.Holder);
-        return Dump.obj(h, m, r.snapshot.timestamp, r.snapshot.id);
+        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);
     }
     static conflicts(conflicts) {
         return conflicts.map(ours => {
@@ -328,11 +331,11 @@ class Dump {
         }).join(', ');
     }
     static conflictingMemberHint(m, ours, theirs) {
-        return `${theirs.snapshot.hint} on ${Dump.rev(theirs, m)}`;
+        return `${theirs.snapshot.hint} (${Dump.rev(theirs, m)})`;
     }
 }
 exports.Dump = Dump;
-exports.ROOT_REV = new Data_1.ObjectRevision(new Snapshot({ hint: 'root' }), undefined, {});
+exports.ROOT_REV = new Data_1.ObjectRevision(new Snapshot({ hint: 'root-rev' }), undefined, {});
 exports.DefaultSnapshotOptions = Object.freeze({
     hint: 'noname',
     standalone: false,

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

@@ -24,7 +24,7 @@ export declare abstract class Transaction implements Worker {
     static run<T>(func: F<T>, ...args: any[]): T;
     static runAs<T>(options: SnapshotOptions | null, func: F<T>, ...args: any[]): T;
     static standalone<T>(func: F<T>, ...args: any[]): T;
-    static isTimeOver(everyN?: number): boolean;
-    static requestMoreTime(): Promise<void>;
+    static isFrameOver(everyN?: number): boolean;
+    static requestNextFrame(): Promise<void>;
     static get isCanceled(): boolean;
 }

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

@@ -22,8 +22,8 @@ class Transaction {
     static run(func, ...args) { return TransactionImpl.run(func, ...args); }
     static runAs(options, func, ...args) { return TransactionImpl.runAs(options, func, ...args); }
     static standalone(func, ...args) { return TransactionImpl.standalone(func, ...args); }
-    static isTimeOver(everyN = 1) { return TransactionImpl.isTimeOver(everyN); }
-    static requestMoreTime() { return TransactionImpl.requestMoreTime(); }
+    static isFrameOver(everyN = 1) { return TransactionImpl.isFrameOver(everyN); }
+    static requestNextFrame() { return TransactionImpl.requestNextFrame(); }
     static get isCanceled() { return TransactionImpl.current.isCanceled; }
 }
 exports.Transaction = Transaction;
@@ -124,10 +124,11 @@ class TransactionImpl extends Transaction {
         t.guard();
         let result = t.runImpl(options === null || options === void 0 ? void 0 : options.trace, func, ...args);
         if (root) {
-            if (result instanceof Promise)
+            if (result instanceof Promise) {
                 result = TransactionImpl.standalone(() => {
                     return t.wrapToRetry(t.wrapToWaitUntilFinish(result), func, ...args);
                 });
+            }
             t.seal();
         }
         return result;
@@ -142,7 +143,7 @@ class TransactionImpl extends Transaction {
             TransactionImpl.curr = outer;
         }
     }
-    static isTimeOver(everyN = 1) {
+    static isFrameOver(everyN = 1) {
         TransactionImpl.checkCount++;
         let result = TransactionImpl.checkCount % everyN === 0;
         if (result) {
@@ -151,13 +152,15 @@ class TransactionImpl extends Transaction {
         }
         return result;
     }
-    static requestMoreTime(sleepTime = 0) {
+    static requestNextFrame(sleepTime = 0) {
         return (0, Utils_1.pause)(sleepTime);
     }
     static acquire(options) {
-        return (options === null || options === void 0 ? void 0 : options.standalone) || TransactionImpl.curr.isFinished
-            ? new TransactionImpl(options)
-            : TransactionImpl.curr;
+        const curr = TransactionImpl.curr;
+        if ((options === null || options === void 0 ? void 0 : options.standalone) || curr.isFinished || curr.options.standalone === 'isolated')
+            return new TransactionImpl(options);
+        else
+            return TransactionImpl.curr;
     }
     guard() {
         if (this.sealed && TransactionImpl.curr !== this)
@@ -177,7 +180,7 @@ class TransactionImpl extends Transaction {
                         yield this.after.whenFinished();
                         const options = {
                             hint: `${this.hint} - restart after T${this.after.id}`,
-                            standalone: true,
+                            standalone: this.options.standalone === 'isolated' ? 'isolated' : true,
                             trace: this.snapshot.options.trace,
                             token: this.snapshot.options.token,
                         };
@@ -261,7 +264,7 @@ class TransactionImpl extends Transaction {
     applyOrDiscard() {
         try {
             if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.change)
-                Dbg_1.Dbg.log('╠══', '', '', undefined, ' changes');
+                Dbg_1.Dbg.log('╠═', '', '', undefined, 'changes');
             this.snapshot.applyOrDiscard(this.canceled);
             this.snapshot.collectGarbage();
             if (this.promise) {

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

@@ -24,7 +24,7 @@ class TransactionJournalImpl extends TransactionJournal {
     get canUndo() { return this._items.length > 0 && this._position > 0; }
     get canRedo() { return this._position < this._items.length; }
     remember(p) {
-        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.remember', standalone: true }, () => {
+        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.remember', standalone: 'isolated' }, () => {
             const items = this._items = this._items.toMutable();
             if (items.length >= this._capacity)
                 items.shift();
@@ -35,7 +35,7 @@ class TransactionJournalImpl extends TransactionJournal {
         });
     }
     undo(count = 1) {
-        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.undo', standalone: true }, () => {
+        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.undo', standalone: 'isolated' }, () => {
             let i = this._position - 1;
             while (i >= 0 && count > 0) {
                 const patch = this._items[i];
@@ -46,7 +46,7 @@ class TransactionJournalImpl extends TransactionJournal {
         });
     }
     redo(count = 1) {
-        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.redo', standalone: true }, () => {
+        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.redo', standalone: 'isolated' }, () => {
             let i = this._position;
             while (i < this._items.length && count > 0) {
                 const patch = this._items[i];
@@ -61,7 +61,7 @@ class TransactionJournalImpl extends TransactionJournal {
         changeset.forEach((r, h) => {
             const p = { current: {}, former: {} };
             const old = r.prev.revision !== Snapshot_1.ROOT_REV ? r.prev.revision.data : undefined;
-            r.changes.forEach((o, m) => {
+            r.changes.forEach((episode, m) => {
                 p.current[m] = unseal(r.data[m]);
                 if (old)
                     p.former[m] = unseal(old[m]);
@@ -79,14 +79,14 @@ class TransactionJournalImpl extends TransactionJournal {
         patch.objects.forEach((p, obj) => {
             const h = Data_1.Meta.get(obj, Data_1.Meta.Holder);
             const data = undo ? p.former : p.current;
-            if (data[Data_1.Meta.Disposed] !== Data_1.Meta.Disposed) {
+            if (data[Data_1.Meta.Disposed] === undefined) {
                 for (const m in data) {
                     const value = data[m];
                     const r = ctx.getEditableRevision(h, m, value);
                     if (r.snapshot === ctx) {
                         r.data[m] = new Data_1.Observable(value);
                         const v = r.prev.revision.data[m];
-                        Snapshot_1.Snapshot.markEdited(value, v !== value, r, m, h);
+                        Snapshot_1.Snapshot.markEdited(v, value, v !== value, r, m, h);
                     }
                 }
             }

package/package.json

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