reactronic 0.22.206 → 0.22.210

package/README.md

@@ -310,7 +310,7 @@ function sensitive<T>(sensitivity: Sensitivity, func: F<T>, ...args: any[]): T
 export interface SnapshotOptions {
   readonly hint?: string
   readonly standalone?: StandaloneMode
-  readonly journal?: EditJournal
+  readonly journal?: Journal
   readonly logging?: Partial<LoggingOptions>
   readonly token?: any
 }
@@ -323,7 +323,7 @@ interface MemberOptions {
   readonly triggeringArgs: boolean
   readonly throttling: number // milliseconds, -1 is immediately, Number.MAX_SAFE_INTEGER is never
   readonly reentrance: Reentrance
-  readonly journal: EditJournal | undefined
+  readonly journal: Journal | undefined
   readonly monitor: Monitor | null
   readonly logging?: Partial<LoggingOptions>
 }

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

@@ -1,12 +1,12 @@
 import { LoggingOptions } from './Logging';
 import { StandaloneMode } from './impl/Data';
 export { LoggingOptions, ProfilingOptions, LoggingLevel } from './Logging';
-import { EditJournal } from './impl/EditJournal';
+import { Journal } from './impl/Journal';
 import { Monitor } from './impl/Monitor';
 export interface SnapshotOptions {
     readonly hint?: string;
     readonly standalone?: StandaloneMode;
-    readonly journal?: EditJournal;
+    readonly journal?: Journal;
     readonly logging?: Partial<LoggingOptions>;
     readonly token?: any;
 }
@@ -18,7 +18,7 @@ export interface MemberOptions {
     readonly triggeringArgs: boolean;
     readonly throttling: number;
     readonly reentrance: Reentrance;
-    readonly journal: EditJournal | undefined;
+    readonly journal: Journal | undefined;
     readonly monitor: Monitor | null;
     readonly logging?: Partial<LoggingOptions>;
 }

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

@@ -10,5 +10,5 @@ export { ObservableObject } from './impl/Hooks';
 export { Snapshot } from './impl/Snapshot';
 export { Transaction } from './impl/Transaction';
 export { Monitor } from './impl/Monitor';
-export { EditJournal } from './impl/EditJournal';
+export { Journal } from './impl/Journal';
 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.nonreactive = exports.Rx = exports.EditJournal = exports.Monitor = exports.Transaction = exports.Snapshot = exports.ObservableObject = exports.ToggleRef = exports.Ref = exports.Controller = exports.LoggingLevel = 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.Journal = exports.Monitor = exports.Transaction = exports.Snapshot = exports.ObservableObject = exports.ToggleRef = exports.Ref = exports.Controller = exports.LoggingLevel = 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; } });
@@ -27,8 +27,8 @@ var Transaction_1 = require("./impl/Transaction");
 Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return Transaction_1.Transaction; } });
 var Monitor_1 = require("./impl/Monitor");
 Object.defineProperty(exports, "Monitor", { enumerable: true, get: function () { return Monitor_1.Monitor; } });
-var EditJournal_1 = require("./impl/EditJournal");
-Object.defineProperty(exports, "EditJournal", { enumerable: true, get: function () { return EditJournal_1.EditJournal; } });
+var Journal_1 = require("./impl/Journal");
+Object.defineProperty(exports, "Journal", { enumerable: true, get: function () { return Journal_1.Journal; } });
 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; } });

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

@@ -28,13 +28,13 @@ export interface ObservableInfo {
 }
 export declare class ObjectRevision {
     readonly snapshot: AbstractSnapshot;
-    readonly prev: {
+    readonly former: {
         revision: ObjectRevision;
     };
     readonly data: any;
     readonly changes: Set<MemberName>;
     readonly conflicts: Map<MemberName, ObjectRevision>;
-    constructor(snapshot: AbstractSnapshot, prev: ObjectRevision | undefined, data: object);
+    constructor(snapshot: AbstractSnapshot, former: ObjectRevision | undefined, data: object);
 }
 export declare class ObjectHolder {
     private static generator;
@@ -53,11 +53,6 @@ export interface Patch {
     objects: Map<object, ObjectPatch>;
 }
 export interface ObjectPatch {
-    current: any;
+    data: any;
     former: any;
 }
-export interface DataRequest {
-    holder: ObjectHolder;
-    member: MemberName;
-    revision: ObjectRevision;
-}

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

@@ -12,9 +12,9 @@ class Observable {
 }
 exports.Observable = Observable;
 class ObjectRevision {
-    constructor(snapshot, prev, data) {
+    constructor(snapshot, former, data) {
         this.snapshot = snapshot;
-        this.prev = { revision: prev || this };
+        this.former = { revision: former || this };
         this.data = data;
         this.changes = new Set();
         this.conflicts = new Map();

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

@@ -2,7 +2,7 @@ import { F } from '../util/Utils';
 import { MemberOptions, Kind, Reentrance } from '../Options';
 import { LoggingOptions, ProfilingOptions } from '../Logging';
 import { MemberName, ObjectHolder, StandaloneMode } from './Data';
-import { EditJournal } from './EditJournal';
+import { Journal } from './Journal';
 import { Monitor } from './Monitor';
 export declare abstract class ObservableObject {
     constructor();
@@ -18,7 +18,7 @@ export declare class OptionsImpl implements MemberOptions {
     readonly triggeringArgs: boolean;
     readonly throttling: number;
     readonly reentrance: Reentrance;
-    readonly journal: EditJournal | undefined;
+    readonly journal: Journal | undefined;
     readonly monitor: Monitor | null;
     readonly logging?: Partial<LoggingOptions>;
     static readonly INITIAL: Readonly<OptionsImpl>;

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

@@ -76,10 +76,10 @@ class Hooks {
         const r = Snapshot_1.Snapshot.edit().getEditableRevision(h, m, value);
         if (r !== Snapshot_1.ROOT_REV) {
             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 || (r.former.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) {
+                    if (r.former.revision.data[m] === curr) {
                         curr = r.data[m] = new Data_1.Observable(value);
                         Snapshot_1.Snapshot.markEdited(old, value, true, r, m, h);
                     }

package/build/dist/source/impl/{EditJournal.d.ts → Journal.d.ts}

@@ -1,40 +1,34 @@
 import { ObservableObject } from './Hooks';
 import { ObjectHolder, ObjectRevision, Patch } from './Data';
-export declare abstract class EditJournal extends ObservableObject {
+export declare type Saver = (patch: Patch) => Promise<void>;
+export declare abstract class Journal extends ObservableObject {
     abstract capacity: number;
-    abstract autoSave: boolean;
-    abstract readonly isSaving: boolean;
     abstract readonly edits: ReadonlyArray<Patch>;
+    abstract readonly unsaved: Patch;
     abstract readonly canUndo: boolean;
     abstract readonly canRedo: boolean;
+    abstract edited(patch: Patch): void;
+    abstract saved(patch: Patch): void;
     abstract undo(count?: number): void;
     abstract redo(count?: number): void;
-    abstract save(): void;
-    abstract register(patch: Patch): void;
-    static create(): EditJournal;
+    static create(): Journal;
 }
-export declare class EditJournalImpl extends EditJournal {
+export declare class JournalImpl extends Journal {
     private _capacity;
-    private _autoSave;
-    private _isSaving;
     private _edits;
+    private _unsaved;
     private _position;
-    private _saved;
     get capacity(): number;
     set capacity(value: number);
-    get autoSave(): boolean;
-    set autoSave(value: boolean);
-    get isSaving(): boolean;
     get edits(): ReadonlyArray<Patch>;
+    get unsaved(): Patch;
     get canUndo(): boolean;
     get canRedo(): boolean;
+    edited(p: Patch): void;
+    saved(patch: Patch): void;
     undo(count?: number): void;
     redo(count?: number): void;
-    save(): void;
-    getUnsaved(): Patch | undefined;
-    beginSave(): void;
-    endSave(success: boolean): void;
-    register(p: Patch): void;
     static buildPatch(hint: string, changeset: Map<ObjectHolder, ObjectRevision>): Patch;
-    static applyPatch(patch: Patch, undo: boolean): void;
+    static applyPatch(patch: Patch, undoing: boolean): void;
+    mergePatchToUnsaved(patch: Patch, undoing: boolean): void;
 }

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

@@ -0,0 +1,138 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JournalImpl = exports.Journal = void 0;
+const Hooks_1 = require("./Hooks");
+const Data_1 = require("./Data");
+const Snapshot_1 = require("./Snapshot");
+const Transaction_1 = require("./Transaction");
+const Sealant_1 = require("../util/Sealant");
+class Journal extends Hooks_1.ObservableObject {
+    static create() { return new JournalImpl(); }
+}
+exports.Journal = Journal;
+class JournalImpl extends Journal {
+    constructor() {
+        super(...arguments);
+        this._capacity = 5;
+        this._edits = [];
+        this._unsaved = { hint: 'unsaved', objects: new Map() };
+        this._position = 0;
+    }
+    get capacity() { return this._capacity; }
+    set capacity(value) { this._capacity = value; if (value < this._edits.length)
+        this._edits.splice(0, this._edits.length - value); }
+    get edits() { return this._edits; }
+    get unsaved() { return this._unsaved; }
+    get canUndo() { return this._edits.length > 0 && this._position > 0; }
+    get canRedo() { return this._position < this._edits.length; }
+    edited(p) {
+        Transaction_1.Transaction.run({ hint: 'EditJournal.edited', standalone: 'isolated' }, () => {
+            const items = this._edits = this._edits.toMutable();
+            if (items.length >= this._capacity)
+                items.shift();
+            else
+                items.splice(this._position);
+            this.mergePatchToUnsaved(p, false);
+            items.push(p);
+            this._position = items.length;
+        });
+    }
+    saved(patch) {
+        if (this._unsaved === patch)
+            this._unsaved = { hint: 'unsaved', objects: new Map() };
+        else
+            throw new Error('not implemented');
+    }
+    undo(count = 1) {
+        Transaction_1.Transaction.run({ hint: 'Journal.undo', standalone: 'isolated' }, () => {
+            let i = this._position - 1;
+            while (i >= 0 && count > 0) {
+                const patch = this._edits[i];
+                JournalImpl.applyPatch(patch, true);
+                this.mergePatchToUnsaved(patch, true);
+                i--, count--;
+            }
+            this._position = i + 1;
+        });
+    }
+    redo(count = 1) {
+        Transaction_1.Transaction.run({ hint: 'Journal.redo', standalone: 'isolated' }, () => {
+            let i = this._position;
+            while (i < this._edits.length && count > 0) {
+                const patch = this._edits[i];
+                JournalImpl.applyPatch(patch, false);
+                this.mergePatchToUnsaved(patch, false);
+                i++, count--;
+            }
+            this._position = i;
+        });
+    }
+    static buildPatch(hint, changeset) {
+        const patch = { hint, objects: new Map() };
+        changeset.forEach((r, h) => {
+            const op = { data: {}, former: {} };
+            const former = r.former.revision !== Snapshot_1.ROOT_REV ? r.former.revision.data : undefined;
+            r.changes.forEach(m => {
+                op.data[m] = unseal(r.data[m]);
+                if (former)
+                    op.former[m] = unseal(former[m]);
+            });
+            if (!former) {
+                delete op.data[Data_1.Meta.Disposed];
+                op.former[Data_1.Meta.Disposed] = Data_1.Meta.Disposed;
+            }
+            patch.objects.set(h.proxy, op);
+        });
+        return patch;
+    }
+    static applyPatch(patch, undoing) {
+        const ctx = Snapshot_1.Snapshot.edit();
+        patch.objects.forEach((op, obj) => {
+            const h = Data_1.Meta.get(obj, Data_1.Meta.Holder);
+            const data = undoing ? op.former : op.data;
+            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.former.revision.data[m];
+                        Snapshot_1.Snapshot.markEdited(v, value, v !== value, r, m, h);
+                    }
+                }
+            }
+            else
+                Snapshot_1.Snapshot.doDispose(ctx, h);
+        });
+    }
+    mergePatchToUnsaved(patch, undoing) {
+        const unsaved = this._unsaved;
+        patch.objects.forEach((op, obj) => {
+            let merged = unsaved.objects.get(obj);
+            if (!merged)
+                unsaved.objects.set(obj, merged = { data: {}, former: {} });
+            const data = undoing ? op.former : op.data;
+            const former = undoing ? op.data : op.former;
+            for (const m in data) {
+                const value = data[m];
+                if (value !== merged.former[m]) {
+                    merged.data[m] = value;
+                    if (m in merged.former === false)
+                        merged.former[m] = former[m];
+                }
+                else {
+                    delete merged.data[m];
+                    delete merged.former[m];
+                    if (Object.keys(merged.data).length === 0)
+                        unsaved.objects.delete(obj);
+                }
+            }
+        });
+    }
+}
+exports.JournalImpl = JournalImpl;
+function unseal(observable) {
+    const result = observable.value;
+    const createCopy = result === null || result === void 0 ? void 0 : result[Sealant_1.Sealant.CreateCopy];
+    return createCopy !== undefined ? createCopy.call(result) : result;
+}

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

@@ -50,7 +50,7 @@ declare class Operation extends Observable implements Observer {
     obsoleteDueTo: string | undefined;
     obsoleteSince: number;
     successor: Operation | undefined;
-    constructor(controller: OperationController, snapshot: AbstractSnapshot, prev: Operation | OptionsImpl);
+    constructor(controller: OperationController, snapshot: AbstractSnapshot, former: Operation | OptionsImpl);
     get isOperation(): boolean;
     get originSnapshotId(): number;
     hint(): string;

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

@@ -9,7 +9,7 @@ const Snapshot_1 = require("./Snapshot");
 const Transaction_1 = require("./Transaction");
 const Monitor_1 = require("./Monitor");
 const Hooks_1 = require("./Hooks");
-const EditJournal_1 = require("./EditJournal");
+const Journal_1 = require("./Journal");
 const BOOT_ARGS = [];
 const BOOT_CAUSE = '<boot>';
 const ROOT_HOLDER = new Data_1.ObjectHolder(undefined, undefined, Hooks_1.Hooks.proxy, Snapshot_1.ROOT_REV, '<root>');
@@ -42,7 +42,7 @@ class OperationController extends Controller_1.Controller {
             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));
+                    oc.revision.former.revision !== Snapshot_1.ROOT_REV));
             const token = opts.noSideEffects ? this : undefined;
             const oc2 = this.run(oc, standalone, opts, token, args);
             const ctx2 = oc2.operation.snapshot;
@@ -129,7 +129,7 @@ class OperationController extends Controller_1.Controller {
         if (op.snapshot !== r.snapshot) {
             const op2 = new Operation(this, r.snapshot, op);
             r.data[m] = op2.reenterOver(op);
-            ctx.bumpBy(r.prev.revision.snapshot.timestamp);
+            ctx.bumpBy(r.former.revision.snapshot.timestamp);
             Snapshot_1.Snapshot.markEdited(op, op2, true, r, m, h);
             op = op2;
         }
@@ -141,7 +141,7 @@ class OperationController extends Controller_1.Controller {
         if (op.controller !== this) {
             if (r.snapshot !== Snapshot_1.ROOT_REV.snapshot) {
                 const hint = Dbg_1.Log.isOn ? `${Snapshot_1.Dump.obj(this.ownHolder, m)}/boot` : 'MethodController/init';
-                const standalone = r.snapshot.sealed || r.prev.revision !== Snapshot_1.ROOT_REV;
+                const standalone = r.snapshot.sealed || r.former.revision !== Snapshot_1.ROOT_REV;
                 op = Transaction_1.Transaction.run({ hint, standalone, token: this }, () => {
                     const h = this.ownHolder;
                     let r2 = Snapshot_1.Snapshot.current().getCurrentRevision(h, m);
@@ -205,20 +205,20 @@ class OperationController extends Controller_1.Controller {
 }
 exports.OperationController = OperationController;
 class Operation extends Data_1.Observable {
-    constructor(controller, snapshot, prev) {
+    constructor(controller, snapshot, former) {
         super(undefined);
         this.margin = Operation.current ? Operation.current.margin + 1 : 1;
         this.transaction = Transaction_1.Transaction.current;
         this.controller = controller;
         this.snapshot = snapshot;
         this.observables = new Map();
-        if (prev instanceof Operation) {
-            this.options = prev.options;
-            this.args = prev.args;
-            this.cause = prev.obsoleteDueTo;
+        if (former instanceof Operation) {
+            this.options = former.options;
+            this.args = former.args;
+            this.cause = former.obsoleteDueTo;
         }
         else {
-            this.options = prev;
+            this.options = former;
             this.args = BOOT_ARGS;
             this.cause = undefined;
         }
@@ -486,11 +486,11 @@ class Operation extends Data_1.Observable {
             if (!r.changes.has(Data_1.Meta.Disposed))
                 r.changes.forEach((o, m) => Operation.propagateMemberChangeThroughSubscriptions(false, since, r, m, h, reactions));
             else
-                for (const m in r.prev.revision.data)
+                for (const m in r.former.revision.data)
                     Operation.propagateMemberChangeThroughSubscriptions(true, since, r, m, h, reactions);
         });
         reactions.sort(compareReactionsByOrder);
-        (_a = snapshot.options.journal) === null || _a === void 0 ? void 0 : _a.register(EditJournal_1.EditJournalImpl.buildPatch(snapshot.hint, snapshot.changeset));
+        (_a = snapshot.options.journal) === null || _a === void 0 ? void 0 : _a.edited(Journal_1.JournalImpl.buildPatch(snapshot.hint, snapshot.changeset));
     }
     static revokeAllSubscriptions(snapshot) {
         snapshot.changeset.forEach((r, h) => r.changes.forEach((o, m) => Operation.propagateMemberChangeThroughSubscriptions(true, snapshot.timestamp, r, m, h, undefined)));
@@ -499,24 +499,24 @@ class Operation extends Data_1.Observable {
         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 former = r.former.revision.data[m];
+            if (former !== undefined && former instanceof Data_1.Observable) {
                 const why = `T${r.snapshot.id}[${r.snapshot.hint}]`;
-                if (prev instanceof Operation) {
-                    if ((prev.obsoleteSince === Snapshot_1.MAX_TIMESTAMP || prev.obsoleteSince <= 0)) {
-                        prev.obsoleteDueTo = why;
-                        prev.obsoleteSince = timestamp;
-                        prev.unsubscribeFromAllObservables();
+                if (former instanceof Operation) {
+                    if ((former.obsoleteSince === Snapshot_1.MAX_TIMESTAMP || former.obsoleteSince <= 0)) {
+                        former.obsoleteDueTo = why;
+                        former.obsoleteSince = timestamp;
+                        former.unsubscribeFromAllObservables();
                     }
-                    const prevSuccessor = prev.successor;
-                    if (prevSuccessor !== curr) {
-                        if (prevSuccessor && !prevSuccessor.transaction.isFinished)
-                            prevSuccessor.transaction.cancel(new Error(`T${prevSuccessor.transaction.id}[${prevSuccessor.transaction.hint}] is canceled by T${r.snapshot.id}[${r.snapshot.hint}] and will not run anymore`), null);
+                    const formerSuccessor = former.successor;
+                    if (formerSuccessor !== curr) {
+                        if (formerSuccessor && !formerSuccessor.transaction.isFinished)
+                            formerSuccessor.transaction.cancel(new Error(`T${formerSuccessor.transaction.id}[${formerSuccessor.transaction.hint}] is canceled by T${r.snapshot.id}[${r.snapshot.hint}] and will not run anymore`), null);
                     }
                     else
-                        prev.successor = undefined;
+                        former.successor = undefined;
                 }
-                (_a = prev.observers) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markObsoleteDueTo(prev, m, r.snapshot, h, why, timestamp, reactions));
+                (_a = former.observers) === null || _a === void 0 ? void 0 : _a.forEach(c => c.markObsoleteDueTo(former, m, r.snapshot, h, why, timestamp, reactions));
             }
         }
         if (curr instanceof Operation) {

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

@@ -51,7 +51,7 @@ class Snapshot {
         if (!r) {
             r = h.head;
             while (r !== exports.ROOT_REV && r.snapshot.timestamp > this.timestamp)
-                r = r.prev.revision;
+                r = r.former.revision;
         }
         return r;
     }
@@ -101,7 +101,7 @@ class Snapshot {
         if (this.sealed && r.snapshot !== exports.ROOT_REV.snapshot)
             throw (0, Dbg_1.misuse)(`observable property ${Dump.obj(h, m)} can only be modified inside transaction`);
         if (m !== Data_1.Meta.Holder && value !== Data_1.Meta.Holder) {
-            if (r.snapshot !== this || r.prev.revision !== exports.ROOT_REV) {
+            if (r.snapshot !== this || r.former.revision !== exports.ROOT_REV) {
                 if (this.options.token !== undefined && token !== this.options.token)
                     throw (0, Dbg_1.misuse)(`${this.hint} should not have side effects (trying to change ${Dump.rev(r, m)})`);
             }
@@ -129,7 +129,7 @@ class Snapshot {
         let conflicts = undefined;
         if (this.changeset.size > 0) {
             this.changeset.forEach((r, h) => {
-                if (r.prev.revision !== h.head) {
+                if (r.former.revision !== h.head) {
                     const merged = this.merge(h, r);
                     if (r.conflicts.size > 0) {
                         if (!conflicts)
@@ -172,7 +172,7 @@ class Snapshot {
                 }
             }
             else {
-                const conflict = Snapshot.isConflicting(head.data[m], ours.prev.revision.data[m]);
+                const conflict = Snapshot.isConflicting(head.data[m], ours.former.revision.data[m]);
                 if (conflict)
                     ours.conflicts.set(m, head);
                 if (Dbg_1.Log.isOn && Dbg_1.Log.opt.change)
@@ -180,7 +180,7 @@ class Snapshot {
             }
         });
         Utils_1.Utils.copyAllMembers(merged, ours.data);
-        ours.prev.revision = head;
+        ours.former.revision = head;
         return counter;
     }
     applyOrDiscard(error) {
@@ -194,7 +194,7 @@ class Snapshot {
                 h.head = r;
                 if (Snapshot.garbageCollectionSummaryInterval < Number.MAX_SAFE_INTEGER) {
                     Snapshot.totalObjectRevisionCount++;
-                    if (r.prev.revision === exports.ROOT_REV)
+                    if (r.former.revision === exports.ROOT_REV)
                         Snapshot.totalObjectHolderCount++;
                 }
             }
@@ -205,7 +205,7 @@ class Snapshot {
                     const members = [];
                     r.changes.forEach((o, m) => members.push(m.toString()));
                     const s = members.join(', ');
-                    Dbg_1.Log.write('║', '√', `${Dump.rev2(h, r.snapshot)} (${s}) is ${r.prev.revision === exports.ROOT_REV ? 'constructed' : `applied on top of ${Dump.rev2(h, r.prev.revision.snapshot)}`}`);
+                    Dbg_1.Log.write('║', '√', `${Dump.rev2(h, r.snapshot)} (${s}) is ${r.former.revision === exports.ROOT_REV ? 'constructed' : `applied on top of ${Dump.rev2(h, r.former.revision.snapshot)}`}`);
                 });
             }
             if (Dbg_1.Log.opt.transaction)
@@ -219,7 +219,7 @@ class Snapshot {
         if (!r.changes.has(Data_1.Meta.Disposed))
             r.changes.forEach((o, m) => Snapshot.sealObservable(r.data[m], m, h.proxy.constructor.name));
         else
-            for (const m in r.prev.revision.data)
+            for (const m in r.former.revision.data)
                 r.data[m] = Data_1.Meta.Disposed;
         if (Dbg_1.Log.isOn)
             Snapshot.freezeObjectRevision(r);
@@ -264,15 +264,15 @@ class Snapshot {
         if (Dbg_1.Log.isOn && Dbg_1.Log.opt.gc)
             Dbg_1.Log.write('', '[G]', `Dismiss history below v${this.stamp}t${this.id} (${this.hint})`);
         this.changeset.forEach((r, h) => {
-            if (Dbg_1.Log.isOn && Dbg_1.Log.opt.gc && r.prev.revision !== exports.ROOT_REV)
-                Dbg_1.Log.write(' ', '  ', `${Dump.rev2(h, r.prev.revision.snapshot)} is ready for GC because overwritten by ${Dump.rev2(h, r.snapshot)}`);
+            if (Dbg_1.Log.isOn && Dbg_1.Log.opt.gc && r.former.revision !== exports.ROOT_REV)
+                Dbg_1.Log.write(' ', '  ', `${Dump.rev2(h, r.former.revision.snapshot)} is ready for GC because overwritten by ${Dump.rev2(h, r.snapshot)}`);
             if (Snapshot.garbageCollectionSummaryInterval < Number.MAX_SAFE_INTEGER) {
-                if (r.prev.revision !== exports.ROOT_REV)
+                if (r.former.revision !== exports.ROOT_REV)
                     Snapshot.totalObjectRevisionCount--;
                 if (r.changes.has(Data_1.Meta.Disposed))
                     Snapshot.totalObjectHolderCount--;
             }
-            r.prev.revision = exports.ROOT_REV;
+            r.former.revision = exports.ROOT_REV;
         });
         this.changeset = EMPTY_MAP;
         this.reactions = EMPTY_ARRAY;

package/package.json

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

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

@@ -1,135 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EditJournalImpl = exports.EditJournal = void 0;
-const Hooks_1 = require("./Hooks");
-const Data_1 = require("./Data");
-const Snapshot_1 = require("./Snapshot");
-const Transaction_1 = require("./Transaction");
-const Sealant_1 = require("../util/Sealant");
-class EditJournal extends Hooks_1.ObservableObject {
-    static create() { return new EditJournalImpl(); }
-}
-exports.EditJournal = EditJournal;
-class EditJournalImpl extends EditJournal {
-    constructor() {
-        super(...arguments);
-        this._capacity = 5;
-        this._autoSave = false;
-        this._isSaving = false;
-        this._edits = [];
-        this._position = 0;
-        this._saved = 0;
-    }
-    get capacity() { return this._capacity; }
-    set capacity(value) { this._capacity = value; if (value < this._edits.length)
-        this._edits.splice(0, this._edits.length - value); }
-    get autoSave() { return this._autoSave; }
-    set autoSave(value) { this._autoSave = value; }
-    get isSaving() { return this._isSaving; }
-    get edits() { return this._edits; }
-    get canUndo() { return this._edits.length > 0 && this._position > 0; }
-    get canRedo() { return this._position < this._edits.length; }
-    undo(count = 1) {
-        Transaction_1.Transaction.run({ hint: 'EditJournal.undo', standalone: 'isolated' }, () => {
-            let i = this._position - 1;
-            while (i >= 0 && count > 0) {
-                const patch = this._edits[i];
-                EditJournalImpl.applyPatch(patch, true);
-                i--, count--;
-            }
-            this._position = i + 1;
-        });
-    }
-    redo(count = 1) {
-        Transaction_1.Transaction.run({ hint: 'EditJournal.redo', standalone: 'isolated' }, () => {
-            let i = this._position;
-            while (i < this._edits.length && count > 0) {
-                const patch = this._edits[i];
-                EditJournalImpl.applyPatch(patch, false);
-                i++, count--;
-            }
-            this._position = i;
-        });
-    }
-    save() {
-    }
-    getUnsaved() {
-        let result = undefined;
-        const length = Math.abs(this._position - this._saved);
-        if (length !== 0) {
-            result = { hint: 'unsaved changes', objects: new Map() };
-            const direction = Math.sign(this._position - this._saved);
-            let i = 0;
-            while (i < length) {
-                const patch = this._edits[this._position + direction * (i + 1)];
-                patch.objects.forEach((p, obj) => {
-                });
-                i++;
-            }
-        }
-        return result;
-    }
-    beginSave() {
-        this._isSaving = true;
-    }
-    endSave(success) {
-        if (success)
-            this._saved = this._position;
-        this._isSaving = false;
-    }
-    register(p) {
-        Transaction_1.Transaction.run({ hint: 'EditJournal.remember', standalone: 'isolated' }, () => {
-            const items = this._edits = this._edits.toMutable();
-            if (items.length >= this._capacity)
-                items.shift();
-            else
-                items.splice(this._position);
-            items.push(p);
-            this._position = items.length;
-        });
-    }
-    static buildPatch(hint, changeset) {
-        const patch = { hint, objects: new Map() };
-        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((episode, m) => {
-                p.current[m] = unseal(r.data[m]);
-                if (old)
-                    p.former[m] = unseal(old[m]);
-            });
-            if (!old) {
-                delete p.current[Data_1.Meta.Disposed];
-                p.former[Data_1.Meta.Disposed] = Data_1.Meta.Disposed;
-            }
-            patch.objects.set(h.proxy, p);
-        });
-        return patch;
-    }
-    static applyPatch(patch, undo) {
-        const ctx = Snapshot_1.Snapshot.edit();
-        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] === 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(v, value, v !== value, r, m, h);
-                    }
-                }
-            }
-            else
-                Snapshot_1.Snapshot.doDispose(ctx, h);
-        });
-    }
-}
-exports.EditJournalImpl = EditJournalImpl;
-function unseal(observable) {
-    const result = observable.value;
-    const createCopy = result === null || result === void 0 ? void 0 : result[Sealant_1.Sealant.CreateCopy];
-    return createCopy !== undefined ? createCopy.call(result) : result;
-}