reactronic 0.22.510 → 0.23.100

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

@@ -1,7 +1,7 @@
-export declare type BoolOnly<T> = Pick<T, {
+export type BoolOnly<T> = Pick<T, {
     [P in keyof T]: T[P] extends boolean ? P : never;
 }[keyof T]>;
-export declare type GivenTypeOnly<T, V> = Pick<T, {
+export type GivenTypeOnly<T, V> = Pick<T, {
     [P in keyof T]: T[P] extends V ? P : never;
 }[keyof T]>;
 declare global {

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

@@ -49,7 +49,7 @@ export declare class Changeset implements AbstractChangeset {
     static _init(): void;
 }
 export declare class Dump {
-    static valueHint: (value: any, m?: MemberName) => string;
+    static valueHint: (value: any) => string;
     static obj(h: ObjectHandle | undefined, m?: MemberName | undefined, stamp?: number, snapshotId?: number, originSnapshotId?: number, value?: any): string;
     static snapshot2(h: ObjectHandle, s: AbstractChangeset, m?: MemberName, o?: Observable): string;
     static snapshot(os: ObjectSnapshot, m?: MemberName): string;

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

@@ -27,6 +27,8 @@ Object.defineProperty(ObjectHandle.prototype, '#this#', {
 const EMPTY_ARRAY = Object.freeze([]);
 const EMPTY_MAP = Utils.freezeMap(new Map());
 export class Changeset {
+    get hint() { var _a; return (_a = this.options.hint) !== null && _a !== void 0 ? _a : 'noname'; }
+    get timestamp() { return this.revision; }
     constructor(options) {
         this.id = ++Changeset.idGen;
         this.options = options !== null && options !== void 0 ? options : DefaultSnapshotOptions;
@@ -36,8 +38,6 @@ export class Changeset {
         this.reactive = [];
         this.sealed = false;
     }
-    get hint() { var _a; return (_a = this.options.hint) !== null && _a !== void 0 ? _a : 'noname'; }
-    get timestamp() { return this.revision; }
     lookupObjectSnapshot(h, m) {
         let os = h.editing;
         if (os && os.changeset !== this) {
@@ -55,7 +55,7 @@ export class Changeset {
     getObjectSnapshot(h, m) {
         const r = this.lookupObjectSnapshot(h, m);
         if (r === EMPTY_SNAPSHOT)
-            throw misuse(`cannot use data from a transaction started after the current one T${this.id}[${this.hint}]: ${Dump.obj(h, m)} (head is T${h.head.changeset.id}[${h.head.changeset.hint}]${h.editing ? `, uncommitted T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ''})`);
+            throw misuse(`${Dump.obj(h, m)} is not yet available for T${this.id}[${this.hint}] because of uncommitted ${h.editing ? `T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ''} (last committed T${h.head.changeset.id}[${h.head.changeset.hint}])`);
         return r;
     }
     getEditableObjectSnapshot(h, m, value, token) {
@@ -73,7 +73,7 @@ export class Changeset {
                 h.editing = os;
                 h.editors++;
                 if (Log.isOn && Log.opt.write)
-                    Log.write('║', ' ⎘⎘', `${Dump.obj(h)} - new snapshot is created (revision ${revision})`);
+                    Log.write('║', ' ++', `${Dump.obj(h)} - new snapshot is created (revision ${revision})`);
             }
         }
         else
@@ -106,7 +106,7 @@ export class Changeset {
                 }
             }
             if (os === EMPTY_SNAPSHOT)
-                throw misuse(`cannot use data from a transaction started after the current one T${this.id}[${this.hint}]: ${Dump.snapshot(os, m)} (head is T${h.head.changeset.id}[${h.head.changeset.hint}]${h.editing ? `, uncommitted T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ''})`);
+                throw misuse(`${Dump.snapshot(os, m)} is not yet available for T${this.id}[${this.hint}] because of uncommitted ${h.editing ? `T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ''} (last committed T${h.head.changeset.id}[${h.head.changeset.hint}])`);
         }
         return os.changeset !== this && !this.sealed;
     }
@@ -118,7 +118,7 @@ export class Changeset {
             if (Changeset.oldest === undefined)
                 Changeset.oldest = this;
             if (Log.isOn && Log.opt.transaction)
-                Log.write('╔══', `v${this.revision}`, `${this.hint}`);
+                Log.write('╔══', `s${this.revision}`, `${this.hint}`);
         }
     }
     bumpBy(timestamp) {
@@ -206,11 +206,11 @@ export class Changeset {
                     const members = [];
                     os.changes.forEach((o, m) => members.push(m.toString()));
                     const s = members.join(', ');
-                    Log.write('║', '√', `${Dump.snapshot2(h, os.changeset)} (${s}) is ${os.former.snapshot === EMPTY_SNAPSHOT ? 'constructed' : `applied on top of ${Dump.snapshot2(h, os.former.snapshot.changeset)}`}`);
+                    Log.write('║', '√', `${Dump.snapshot2(h, os.changeset)} (${s}) is ${os.former.snapshot === EMPTY_SNAPSHOT ? 'constructed' : `applied over #${h.id}t${os.former.snapshot.changeset.id}s${os.former.snapshot.changeset.timestamp}`}`);
                 });
             }
             if (Log.opt.transaction)
-                Log.write(this.revision < UNDEFINED_REVISION ? '╚══' : '═══', `v${this.revision}`, `${this.hint} - ${error ? 'CANCEL' : 'APPLY'}(${this.items.size})${error ? ` - ${error}` : ''}`);
+                Log.write(this.revision < UNDEFINED_REVISION ? '╚══' : '═══', `s${this.revision}`, `${this.hint} - ${error ? 'CANCEL' : 'APPLY'}(${this.items.size})${error ? ` - ${error}` : ''}`);
         }
         if (!error)
             Changeset.propagateAllChangesThroughSubscriptions(this);
@@ -263,7 +263,7 @@ export class Changeset {
     }
     unlinkHistory() {
         if (Log.isOn && Log.opt.gc)
-            Log.write('', '[G]', `Dismiss history below v${this.revision}t${this.id} (${this.hint})`);
+            Log.write('', '[G]', `Dismiss history below t${this.id}s${this.revision} (${this.hint})`);
         this.items.forEach((os, h) => {
             if (Log.isOn && Log.opt.gc && os.former.snapshot !== EMPTY_SNAPSHOT)
                 Log.write(' ', '  ', `${Dump.snapshot2(h, os.former.snapshot.changeset)} is ready for GC because overwritten by ${Dump.snapshot2(h, os.changeset)}`);
@@ -319,7 +319,7 @@ export class Dump {
             if (stamp === undefined)
                 result = `${h.hint}${member}${v} #${h.id}`;
             else
-                result = `${h.hint}${member}${v} #${h.id}t${snapshotId}v${stamp}${originSnapshotId !== undefined && originSnapshotId !== 0 ? `t${originSnapshotId}` : ''}`;
+                result = `${h.hint}${member}${v} #${h.id}t${snapshotId}s${stamp}${originSnapshotId !== undefined && originSnapshotId !== 0 ? `t${originSnapshotId}` : ''}`;
         }
         else
             result = `boot${member}`;
@@ -347,8 +347,8 @@ export class Dump {
         return `${theirs.changeset.hint} (${Dump.snapshot(theirs, m)})`;
     }
 }
-Dump.valueHint = (value, m) => '???';
-export const EMPTY_SNAPSHOT = new ObjectSnapshot(new Changeset({ hint: '<empty>' }), undefined, {});
+Dump.valueHint = (value) => '???';
+export const EMPTY_SNAPSHOT = new ObjectSnapshot(new Changeset({ hint: '<boot>' }), undefined, {});
 export const DefaultSnapshotOptions = Object.freeze({
     hint: 'noname',
     separation: false,

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

@@ -12,7 +12,7 @@ export declare class Observable {
     get originSnapshotId(): number | undefined;
     constructor(content: any);
 }
-export declare type SeparationMode = boolean | 'isolated' | 'disposal';
+export type SeparationMode = boolean | 'isolated' | 'disposal';
 export interface Observer {
     readonly order: number;
     readonly observables: Map<Observable, Subscription> | undefined;
@@ -21,7 +21,7 @@ export interface Observer {
     markObsoleteDueTo(observable: Observable, m: MemberName, changeset: AbstractChangeset, h: ObjectHandle, outer: string, since: number, reactive: Array<Observer>): void;
     runIfNotUpToDate(now: boolean, nothrow: boolean): void;
 }
-export declare type MemberName = PropertyKey;
+export type MemberName = PropertyKey;
 export interface Subscription {
     readonly memberHint: string;
     readonly usageCount: number;
@@ -51,7 +51,7 @@ export declare class ObjectHandle {
     constructor(data: any, proxy: any, handler: ProxyHandler<ObjectHandle>, head: ObjectSnapshot, hint: string);
     static getHint(obj: object, full: boolean): string | undefined;
 }
-export declare type PatchSet = Map<object, Map<MemberName, ValuePatch>>;
+export type PatchSet = Map<object, Map<MemberName, ValuePatch>>;
 export interface ValuePatch {
     memberName: MemberName;
     patchKind: 'update' | 'add' | 'remove';

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

@@ -2,9 +2,9 @@ import { Log } from '../util/Dbg';
 import { Meta } from './Meta';
 export { Meta } from './Meta';
 export class Observable {
-    constructor(content) { this.content = content; }
     get isOperation() { return false; }
     get originSnapshotId() { return 0; }
+    constructor(content) { this.content = content; }
 }
 export class ObjectSnapshot {
     constructor(changeset, former, data) {

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

@@ -1,6 +1,6 @@
 import { ObservableObject } from './Mvcc';
 import { ObjectHandle, ObjectSnapshot, PatchSet } from './Data';
-export declare type Saver = (patch: PatchSet) => Promise<void>;
+export type Saver = (patch: PatchSet) => Promise<void>;
 export declare abstract class Journal extends ObservableObject {
     abstract capacity: number;
     abstract readonly edits: ReadonlyArray<PatchSet>;

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

@@ -9,13 +9,8 @@ import { Mvcc, OptionsImpl } from './Mvcc';
 import { JournalImpl } from './Journal';
 const BOOT_ARGS = [];
 const BOOT_CAUSE = '<boot>';
-const EMPTY_HANDLE = new ObjectHandle(undefined, undefined, Mvcc.observable, EMPTY_SNAPSHOT, '<empty>');
+const EMPTY_HANDLE = new ObjectHandle(undefined, undefined, Mvcc.observable, EMPTY_SNAPSHOT, '<boot>');
 export class OperationController extends Controller {
-    constructor(h, m) {
-        super();
-        this.objectHandle = h;
-        this.memberName = m;
-    }
     configure(options) { return OperationController.configureImpl(this, options); }
     get options() { return this.peek(undefined).operation.options; }
     get unobservable() { return this.peek(undefined).operation.content; }
@@ -26,6 +21,11 @@ export class OperationController extends Controller {
     get isUpToDate() { return this.use().isUpToDate; }
     markObsolete() { Transaction.run({ hint: Log.isOn ? `markObsolete(${Dump.obj(this.objectHandle, this.memberName)})` : 'markObsolete()' }, OperationController.markObsolete, this); }
     pullLastResult(args) { return this.useOrRun(true, args).content; }
+    constructor(h, m) {
+        super();
+        this.objectHandle = h;
+        this.memberName = m;
+    }
     useOrRun(weak, args) {
         var _a;
         let oc = this.peek(args);
@@ -69,7 +69,7 @@ export class OperationController extends Controller {
             throw misuse('reactronic decorator is only applicable to methods');
         op.options = new OptionsImpl(op.options.getter, op.options.setter, op.options, options, false);
         if (Log.isOn && Log.opt.write)
-            Log.write('║', '  ✎', `${op.hint()}.options are changed`);
+            Log.write('║', '  =', `${op.hint()}.options are changed`);
         return op.options;
     }
     static runWithin(op, func, ...args) {
@@ -136,7 +136,7 @@ export class OperationController extends Controller {
         let op = os.data[m];
         if (op.controller !== this) {
             if (os.changeset !== EMPTY_SNAPSHOT.changeset) {
-                const hint = Log.isOn ? `${Dump.obj(this.objectHandle, m)}/boot` : 'MethodController/init';
+                const hint = Log.isOn ? `${Dump.obj(this.objectHandle, m)}/init` : 'MethodController/init';
                 const separation = os.changeset.sealed || os.former.snapshot !== EMPTY_SNAPSHOT;
                 op = Transaction.run({ hint, separation, token: this }, () => {
                     const h = this.objectHandle;
@@ -163,7 +163,7 @@ export class OperationController extends Controller {
                 os.data[m] = t;
                 op = t;
                 if (Log.isOn && Log.opt.write)
-                    Log.write('║', ' ⎘⎘', `${Dump.obj(this.objectHandle, m)} - new snapshot is created outside of transaction (revision ${os.revision})`);
+                    Log.write('║', ' ++', `${Dump.obj(this.objectHandle, m)} is initialized (revision ${os.revision})`);
             }
         }
         return op;
@@ -176,7 +176,7 @@ export class OperationController extends Controller {
             if (!oc.operation.transaction.isCanceled) {
                 oc = this.edit();
                 if (Log.isOn && Log.opt.operation)
-                    Log.write('║', '  𝑓', `${oc.operation.why()}`);
+                    Log.write('║', '  o', `${oc.operation.why()}`);
                 oc.operation.run(this.objectHandle.proxy, argsx);
             }
             else {
@@ -184,7 +184,7 @@ export class OperationController extends Controller {
                 if (oc.operation.options.kind === Kind.Transactional || !oc.isUpToDate) {
                     oc = this.edit();
                     if (Log.isOn && Log.opt.operation)
-                        Log.write('║', '  𝑓', `${oc.operation.why()}`);
+                        Log.write('║', '  o', `${oc.operation.why()}`);
                     oc.operation.run(this.objectHandle.proxy, argsx);
                 }
             }
@@ -232,11 +232,11 @@ class Operation extends Observable {
     why() {
         let cause;
         if (this.cause)
-            cause = `   <<   ${this.cause}`;
+            cause = `   ◀◀   ${this.cause}`;
         else if (this.controller.options.kind === Kind.Transactional)
-            cause = '   <<   operation';
+            cause = '   ◀◀   operation';
         else
-            cause = `   <<   T${this.changeset.id}[${this.changeset.hint}]`;
+            cause = `   ◀◀   T${this.changeset.id}[${this.changeset.hint}]`;
         return `${this.hint()}${cause}`;
     }
     briefWhy() {
@@ -275,14 +275,14 @@ class Operation extends Observable {
             const skip = !observable.isOperation &&
                 changeset === this.changeset;
             if (!skip) {
-                const why = `${Dump.snapshot2(h, changeset, m, observable)}    <<    ${outer}`;
+                const why = `${Dump.snapshot2(h, changeset, m, observable)}    ◀◀    ${outer}`;
                 const isReactive = this.options.kind === Kind.Reactive;
                 this.obsoleteDueTo = why;
                 this.obsoleteSince = since;
                 if (Log.isOn && (Log.opt.obsolete || ((_a = this.options.logging) === null || _a === void 0 ? void 0 : _a.obsolete)))
                     Log.write(Log.opt.transaction && !Changeset.current().sealed ? '║' : ' ', isReactive ? '█' : '▒', isReactive && changeset === EMPTY_SNAPSHOT.changeset
-                        ? `${this.hint()} is a reactive and will run automatically (order ${this.options.order})`
-                        : `${this.hint()} is obsolete due to ${Dump.snapshot2(h, changeset, m)} since v${since}${isReactive ? ` and will run automatically (order ${this.options.order})` : ''}`);
+                        ? `${this.hint()} is reactive and will run automatically (order ${this.options.order})`
+                        : `${this.hint()} is obsolete due to ${Dump.snapshot2(h, changeset, m)} since s${since}${isReactive ? ` and will run automatically (order ${this.options.order})` : ''}`);
                 this.unsubscribeFromAllObservables();
                 if (isReactive)
                     reactive.push(this);
@@ -465,7 +465,7 @@ class Operation extends Observable {
     static markEdited(oldValue, newValue, edited, os, m, h) {
         edited ? os.changes.add(m) : os.changes.delete(m);
         if (Log.isOn && Log.opt.write)
-            edited ? Log.write('║', '  ✎', `${Dump.snapshot2(h, os.changeset, m)} is changed from ${valueHint(oldValue, m)} to ${valueHint(newValue, m)}`) : Log.write('║', '  ✎', `${Dump.snapshot2(h, os.changeset, m)} is changed from ${valueHint(oldValue, m)} to ${valueHint(newValue, m)}`, undefined, ' (same as previous)');
+            edited ? Log.write('║', '  =', `${Dump.snapshot2(h, os.changeset, m)} is changed: ${valueHint(oldValue)} ▸▸ ${valueHint(newValue)}`) : Log.write('║', '  =', `${Dump.snapshot2(h, os.changeset, m)} is changed: ${valueHint(oldValue)} ▸▸ ${valueHint(newValue)}`, undefined, ' (same as previous)');
     }
     static isConflicting(oldValue, newValue) {
         let result = oldValue !== newValue;
@@ -577,14 +577,14 @@ class Operation extends Observable {
                 observable.observers.add(this);
                 this.observables.set(observable, subscription);
                 if (Log.isOn && (Log.opt.read || ((_a = this.options.logging) === null || _a === void 0 ? void 0 : _a.read)))
-                    Log.write('║', '  ∞ ', `${this.hint()} is subscribed to ${Dump.snapshot2(h, os.changeset, m)}${subscription.usageCount > 1 ? ` (${subscription.usageCount} times)` : ''}`);
+                    Log.write('║', '  ∞', `${this.hint()} is subscribed to ${Dump.snapshot2(h, os.changeset, m)}${subscription.usageCount > 1 ? ` (${subscription.usageCount} times)` : ''}`);
             }
             else if (Log.isOn && (Log.opt.read || ((_b = this.options.logging) === null || _b === void 0 ? void 0 : _b.read)))
-                Log.write('║', '  x ', `${this.hint()} is obsolete and is NOT subscribed to ${Dump.snapshot2(h, os.changeset, m)}`);
+                Log.write('║', '  x', `${this.hint()} is obsolete and is NOT subscribed to ${Dump.snapshot2(h, os.changeset, m)}`);
         }
         else {
             if (Log.isOn && (Log.opt.read || ((_c = this.options.logging) === null || _c === void 0 ? void 0 : _c.read)))
-                Log.write('║', '  x ', `${this.hint()} is NOT subscribed to already obsolete ${Dump.snapshot2(h, os.changeset, m)}`);
+                Log.write('║', '  x', `${this.hint()} is NOT subscribed to already obsolete ${Dump.snapshot2(h, os.changeset, m)}`);
         }
         return ok;
     }
@@ -656,7 +656,7 @@ class Operation extends Observable {
 Operation.current = undefined;
 Operation.queuedReactiveFunctions = [];
 Operation.deferredReactiveFunctions = [];
-function valueHint(value, m) {
+function valueHint(value) {
     let result = '';
     if (Array.isArray(value))
         result = `Array(${value.length})`;
@@ -665,11 +665,11 @@ function valueHint(value, m) {
     else if (value instanceof Map)
         result = `Map(${value.size})`;
     else if (value instanceof Operation)
-        result = `${Dump.snapshot2(value.controller.objectHandle, value.changeset, m)}`;
+        result = `#${value.controller.objectHandle.id}t${value.changeset.id}s${value.changeset.timestamp}${value.originSnapshotId !== undefined && value.originSnapshotId !== 0 ? `t${value.originSnapshotId}` : ''}`;
     else if (value === Meta.Undefined)
         result = 'undefined';
     else if (typeof (value) === 'string')
-        result = `"${value.toString().slice(0, 20)}"`;
+        result = `"${value.toString().slice(0, 20)}${value.length > 20 ? '...' : ''}"`;
     else if (value !== undefined && value !== null)
         result = value.toString().slice(0, 40);
     else

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

@@ -1,4 +1,4 @@
-export declare type GetItemKey<T = unknown> = (item: T) => string | undefined;
+export type GetItemKey<T = unknown> = (item: T) => string | undefined;
 export interface CollectionReader<T> {
     readonly strict: boolean;
     readonly count: number;

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

@@ -1,4 +1,4 @@
-export declare type F<T> = (...args: any[]) => T;
+export type F<T> = (...args: any[]) => T;
 export declare class Utils {
     static freezeSet<T>(obj?: Set<T>): Set<T> | undefined;
     static freezeMap<K, V>(obj?: Map<K, V>): Map<K, V> | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.22.510",
+  "version": "0.23.100",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",
@@ -31,16 +31,16 @@
   },
   "homepage": "https://github.com/nezaboodka/reactronic/blob/master/README.md#readme",
   "devDependencies": {
-    "@types/node": "18.11.9",
-    "@types/react": "18.0.25",
-    "@typescript-eslint/eslint-plugin": "5.42.1",
-    "@typescript-eslint/parser": "5.42.1",
+    "@types/node": "18.11.18",
+    "@types/react": "18.0.26",
+    "@typescript-eslint/eslint-plugin": "5.47.1",
+    "@typescript-eslint/parser": "5.47.1",
     "ava": "4.3.3",
     "c8": "7.12.0",
-    "eslint": "8.27.0",
+    "eslint": "8.30.0",
     "react": "18.2.0",
     "ts-node": "10.9.1",
-    "typescript": "4.8.4"
+    "typescript": "4.9.4"
   },
   "scripts": {
     "build": "eslint source/**/*.ts test/**/*.ts react/**/*.tsx && tsc",