reactronic 0.96.26020 → 0.96.26021

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

@@ -1,6 +1,6 @@
 export type Worker = {
     readonly id: number;
-    readonly hint: string;
+    readonly name: string;
     readonly isCanceled: boolean;
     readonly isFinished: boolean;
     cancel(error: Error, restartAfter?: Worker | null): void;

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

@@ -15,7 +15,7 @@ export declare class Changeset implements AbstractChangeset {
     readonly id: number;
     readonly options: SnapshotOptions;
     readonly parent?: Changeset;
-    get hint(): string;
+    get name(): string;
     get timestamp(): number;
     private revision;
     private bumper;
@@ -23,6 +23,7 @@ export declare class Changeset implements AbstractChangeset {
     obsolete: OperationFootprint[];
     sealed: boolean;
     constructor(options: SnapshotOptions | null, parent?: Changeset);
+    get caption(): string;
     static current: () => Changeset;
     static edit: () => Changeset;
     static markUsed: (cf: ContentFootprint, ov: ObjectVersion, fk: FieldKey, h: ObjectHandle, kind: Kind, weak: boolean) => void;

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

@@ -28,7 +28,7 @@ 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 name() { var _a; return (_a = this.options.hint) !== null && _a !== void 0 ? _a : "noname"; }
     get timestamp() { return this.revision; }
     constructor(options, parent) {
         this.id = ++Changeset.idGen;
@@ -40,6 +40,10 @@ export class Changeset {
         this.obsolete = [];
         this.sealed = false;
     }
+    get caption() {
+        const p = this.parent;
+        return `T${this.id}${p ? `^${p.id}` : ""}[${this.name}]`;
+    }
     lookupObjectVersion(h, fk, editing) {
         let ov = h.editing;
         if (ov && ov.changeset !== this) {
@@ -64,7 +68,7 @@ export class Changeset {
     getObjectVersion(h, fk) {
         const r = this.lookupObjectVersion(h, fk, false);
         if (r === EMPTY_OBJECT_VERSION)
-            throw misuse(`${Dump.obj(h, fk)} is not yet available for T${this.id}[${this.hint}] because ${h.editing ? `T${h.editing.changeset.id}[${h.editing.changeset.hint}]` : ""} is not yet applied (last applied T${h.applied.changeset.id}[${h.applied.changeset.hint}])`);
+            throw misuse(`${Dump.obj(h, fk)} is not yet available for ${this.caption} because ${h.editing ? h.editing.changeset.caption : ""} is not yet applied (last applied ${h.applied.changeset.caption})`);
         return r;
     }
     getEditableObjectVersion(h, fk, value, token) {
@@ -130,7 +134,7 @@ export class Changeset {
             if (value !== Meta.Handle) {
                 if (ov.changeset !== this || ov.former.objectVersion !== EMPTY_OBJECT_VERSION) {
                     if (this.options.token !== undefined && token !== this.options.token)
-                        throw misuse(`${this.hint} should not have side effects (trying to change ${Dump.snapshot(ov, fk)})`);
+                        throw misuse(`${this.name} should not have side effects (trying to change ${Dump.snapshot(ov, fk)})`);
                 }
             }
         }
@@ -145,7 +149,7 @@ export class Changeset {
             if (Changeset.oldest === undefined)
                 Changeset.oldest = this;
             if (Log.isOn && Log.opt.transaction)
-                Log.write("╔══", `s${this.revision}`, `${this.hint}`);
+                Log.write("╔══", `s${this.revision}`, `${this.name}`);
         }
         return result;
     }
@@ -272,7 +276,7 @@ export class Changeset {
     }
     unlinkHistory() {
         if (Log.isOn && Log.opt.gc)
-            Log.write("", "[G]", `Dismiss history below t${this.id}s${this.revision} (${this.hint})`);
+            Log.write("", "[G]", `Dismiss history below t${this.id}s${this.revision} (${this.name})`);
         this.items.forEach((ov, h) => {
             if (Log.isOn && Log.opt.gc && ov.former.objectVersion !== EMPTY_OBJECT_VERSION)
                 Log.write(" ", "  ", `${Dump.snapshot2(h, ov.former.objectVersion.changeset)} is ready for GC because overwritten by ${Dump.snapshot2(h, ov.changeset)}`);
@@ -353,7 +357,7 @@ export class Dump {
         }).join(", ");
     }
     static conflictingMemberHint(fk, ours, theirs) {
-        return `${theirs.changeset.hint} (${Dump.snapshot(theirs, fk)})`;
+        return `${theirs.changeset.name} (${Dump.snapshot(theirs, fk)})`;
     }
 }
 Dump.valueHint = (value) => "???";

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

@@ -1,7 +1,8 @@
 export { Meta } from "./Meta.js";
 export type AbstractChangeset = {
     readonly id: number;
-    readonly hint: string;
+    readonly name: string;
+    readonly caption: string;
     readonly timestamp: number;
     readonly sealed: boolean;
 };

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

@@ -41,7 +41,7 @@ export class ReactionImpl {
         }
         else if (Log.isOn && Log.opt.operation && (opts.logging === undefined ||
             opts.logging.operation === undefined || opts.logging.operation === true))
-            Log.write(Transaction.current.isFinished ? "" : "║", " (=)", `${Dump.snapshot2(ror.footprint.descriptor.ownerHandle, ror.changeset, this.fieldKey)} result is reused from T${ror.footprint.transaction.id}[${ror.footprint.transaction.hint}]`);
+            Log.write(Transaction.current.isFinished ? "" : "║", " (=)", `${Dump.snapshot2(ror.footprint.descriptor.ownerHandle, ror.changeset, this.fieldKey)} result is reused from ${ror.footprint.transaction.caption}`);
         const t = ror.footprint;
         Changeset.markUsed(t, ror.objectVersion, this.fieldKey, this.ownerHandle, t.options.kind, weak);
         return t;
@@ -254,7 +254,7 @@ class OperationFootprintImpl extends ContentFootprint {
         else if (this.descriptor.options.kind === Kind.transaction)
             cause = "   ◀◀   operation";
         else
-            cause = `   ◀◀   T${this.changeset.id}[${this.changeset.hint}]`;
+            cause = `   ◀◀   ${this.changeset.caption}`;
         return `${this.hint()}${cause}`;
     }
     briefWhy() {
@@ -310,7 +310,7 @@ class OperationFootprintImpl extends ContentFootprint {
                 if (tran.changeset === changeset) {
                 }
                 else if (!tran.isFinished && this !== footprint && !this.options.allowObsoleteToFinish)
-                    tran.cancel(new Error(`T${tran.id}[${tran.hint}] is canceled due to obsolete ${Dump.snapshot2(h, changeset, fk)} changed by T${changeset.id}[${changeset.hint}]`), null);
+                    tran.cancel(new Error(`${tran.caption} is canceled due to obsolete ${Dump.snapshot2(h, changeset, fk)} changed by ${changeset.caption}`), null);
             }
             else if (Log.isOn && (Log.opt.obsolete || ((_c = this.options.logging) === null || _c === void 0 ? void 0 : _c.obsolete)))
                 Log.write(" ", "x", `${this.hint()} is not obsolete due to its own change to ${Dump.snapshot2(h, changeset, fk, footprint)}`);
@@ -359,20 +359,20 @@ class OperationFootprintImpl extends ContentFootprint {
                 case Reentrance.preventWithError:
                     if (!opponent.transaction.isCanceled)
                         throw misuse(`${head.hint()} (${head.why()}) is not reentrant over ${opponent.hint()} (${opponent.why()})`);
-                    error = new Error(`T${this.transaction.id}[${this.transaction.hint}] is on hold/PreventWithError due to canceled T${opponent.transaction.id}[${opponent.transaction.hint}]`);
+                    error = new Error(`${this.transaction.caption} is on hold/PreventWithError due to canceled ${opponent.transaction.caption}`);
                     this.transaction.cancel(error, opponent.transaction);
                     break;
                 case Reentrance.waitAndRestart:
-                    error = new Error(`T${this.transaction.id}[${this.transaction.hint}] is on hold/WaitAndRestart due to active T${opponent.transaction.id}[${opponent.transaction.hint}]`);
+                    error = new Error(`${this.transaction.caption} is on hold/WaitAndRestart due to active ${opponent.transaction.caption}`);
                     this.transaction.cancel(error, opponent.transaction);
                     break;
                 case Reentrance.cancelAndWaitPrevious:
-                    error = new Error(`T${this.transaction.id}[${this.transaction.hint}] is on hold/CancelAndWaitPrevious due to active T${opponent.transaction.id}[${opponent.transaction.hint}]`);
+                    error = new Error(`${this.transaction.caption} is on hold/CancelAndWaitPrevious due to active ${opponent.transaction.caption}`);
                     this.transaction.cancel(error, opponent.transaction);
-                    opponent.transaction.cancel(new Error(`T${opponent.transaction.id}[${opponent.transaction.hint}] is canceled due to re-entering T${this.transaction.id}[${this.transaction.hint}]`), null);
+                    opponent.transaction.cancel(new Error(`${opponent.transaction.caption} is canceled due to re-entering ${this.transaction.caption}`), null);
                     break;
                 case Reentrance.cancelPrevious:
-                    opponent.transaction.cancel(new Error(`T${opponent.transaction.id}[${opponent.transaction.hint}] is canceled due to re-entering T${this.transaction.id}[${this.transaction.hint}]`), null);
+                    opponent.transaction.cancel(new Error(`${opponent.transaction.caption} is canceled due to re-entering ${this.transaction.caption}`), null);
                     break;
                 case Reentrance.runSideBySide:
                     break;
@@ -513,7 +513,7 @@ class OperationFootprintImpl extends ContentFootprint {
                     OperationFootprintImpl.propagateFieldChangeToListeners(true, since, ov, fk, h, obsolete);
         });
         obsolete.sort(compareReactionsByOrder);
-        (_a = changeset.options.journal) === null || _a === void 0 ? void 0 : _a.edited(JournalImpl.buildPatch(changeset.hint, changeset.items));
+        (_a = changeset.options.journal) === null || _a === void 0 ? void 0 : _a.edited(JournalImpl.buildPatch(changeset.name, changeset.items));
     }
     static discardAllListeners(changeset) {
         changeset.items.forEach((ov, h) => {
@@ -527,7 +527,7 @@ class OperationFootprintImpl extends ContentFootprint {
         if (collector !== undefined) {
             const former = ov.former.objectVersion.data[fk];
             if (former !== undefined && former instanceof ContentFootprint) {
-                const why = `T${ov.changeset.id}[${ov.changeset.hint}]`;
+                const why = ov.changeset.caption;
                 if (former instanceof OperationFootprintImpl) {
                     if ((former.obsoleteSince === MAX_REVISION || former.obsoleteSince <= 0)) {
                         former.obsoleteDueTo = why;
@@ -537,7 +537,7 @@ class OperationFootprintImpl extends ContentFootprint {
                     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${ov.changeset.id}[${ov.changeset.hint}] and will not run anymore`), null);
+                            formerSuccessor.transaction.cancel(new Error(`${formerSuccessor.transaction.caption} is canceled by ${ov.changeset.caption} and will not run anymore`), null);
                     }
                     else
                         former.successor = undefined;
@@ -721,7 +721,8 @@ function valueHint(value) {
 }
 function getMergedLoggingOptions(local) {
     const t = Transaction.current;
-    let res = Log.merge(t.options.logging, t.id > 1 ? 31 + t.id % 6 : 37, t.id > 1 ? `T${t.id}` : `-${Changeset.idGen.toString().replace(/[0-9]/g, "-")}`, Log.global);
+    const p = t.parent;
+    let res = Log.merge(t.options.logging, t.id > 1 ? 31 + t.id % 6 : 37, t.id > 1 ? `T${t.id}${p ? `^${p.id}` : ""}` : `-${Changeset.idGen.toString().replace(/[0-9]/g, "-")}`, Log.global);
     res = Log.merge({ margin1: t.margin }, undefined, undefined, res);
     if (OperationFootprintImpl.current)
         res = Log.merge({ margin2: OperationFootprintImpl.current.margin }, undefined, undefined, res);

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

@@ -6,7 +6,8 @@ import { Changeset } from "./Changeset.js";
 export declare abstract class Transaction implements Worker {
     static get current(): Transaction;
     abstract readonly id: number;
-    abstract readonly hint: string;
+    abstract readonly name: string;
+    abstract readonly caption: string;
     abstract readonly options: SnapshotOptions;
     abstract readonly timestamp: number;
     abstract readonly error: Error | undefined;
@@ -49,7 +50,8 @@ export declare class TransactionImpl extends Transaction {
     constructor(options: SnapshotOptions | null, parent?: TransactionImpl);
     static get curr(): TransactionImpl;
     get id(): number;
-    get hint(): string;
+    get name(): string;
+    get caption(): string;
     get options(): SnapshotOptions;
     get timestamp(): number;
     get error(): Error | undefined;

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

@@ -41,7 +41,8 @@ export class TransactionImpl extends Transaction {
     }
     static get curr() { return TransactionImpl.gCurr; }
     get id() { return this.changeset.id; }
-    get hint() { return this.changeset.hint; }
+    get name() { return this.changeset.name; }
+    get caption() { return this.changeset.caption; }
     get options() { return this.changeset.options; }
     get timestamp() { return this.changeset.timestamp; }
     get error() { return this.canceled; }
@@ -54,7 +55,7 @@ export class TransactionImpl extends Transaction {
         try {
             TransactionImpl.isInspectionMode = true;
             if (Log.isOn && Log.opt.transaction)
-                Log.write(" ", " ", `T${this.id}[${this.hint}] is being inspected by T${TransactionImpl.gCurr.id}[${TransactionImpl.gCurr.hint}]`);
+                Log.write(" ", " ", `${this.caption} is being inspected by ${TransactionImpl.gCurr.caption}`);
             return this.runImpl(undefined, func, ...args);
         }
         finally {
@@ -186,7 +187,7 @@ export class TransactionImpl extends Transaction {
                     if (this.after) {
                         yield this.after.whenFinished();
                         const options = {
-                            hint: `${this.hint} - restart after T${this.after.id}`,
+                            hint: `${this.name} - restart after T${this.after.id}`,
                             isolation: this.options.isolation === Isolation.joinToCurrentTransaction ? Isolation.disjoinFromOuterTransaction : this.options.isolation,
                             logging: this.changeset.options.logging,
                             token: this.changeset.options.token,
@@ -256,7 +257,7 @@ export class TransactionImpl extends Transaction {
             if (Log.isOn && Log.opt.transaction) {
                 Log.write("║", " [!]", `${error.message}`, undefined, " *** CANCEL ***");
                 if (after && after !== TransactionImpl.none)
-                    Log.write("║", " [!]", `T${t.id}[${t.hint}] will be restarted${t !== after ? ` after T${after.id}[${after.hint}]` : ""}`);
+                    Log.write("║", " [!]", `${t.caption} will be restarted${t !== after ? ` after ${after.caption}` : ""}`);
             }
             Changeset.discardAllListeners(t.changeset);
         }
@@ -268,7 +269,7 @@ export class TransactionImpl extends Transaction {
             this.tryResolveConflicts(conflicts);
     }
     tryResolveConflicts(conflicts) {
-        throw error(`T${this.id}[${this.hint}] conflicts with: ${Dump.conflicts(conflicts)}`, undefined);
+        throw error(`${this.caption} conflicts with: ${Dump.conflicts(conflicts)}`, undefined);
     }
     applyOrDiscard() {
         let obsolete;
@@ -317,7 +318,7 @@ export class TransactionImpl extends Transaction {
                 });
             }
             if (Log.opt.transaction)
-                Log.write(changeset.timestamp < UNDEFINED_REVISION ? "╚══" : "═══", `s${this.timestamp}`, `${this.hint} - ${error ? "CANCEL" : "APPLY"}(${this.changeset.items.size})${error ? ` - ${error}` : ""}`);
+                Log.write(changeset.timestamp < UNDEFINED_REVISION ? "╚══" : "═══", `s${this.timestamp}`, `${this.name} - ${error ? "CANCEL" : "APPLY"}(${this.changeset.items.size})${error ? ` - ${error}` : ""}`);
         }
         let obsolete = changeset.obsolete;
         if (changeset.parent) {

package/build/dist/source/core/TreeNode.js

@@ -491,7 +491,7 @@ function rebuildBodyImpl(node) {
             if (node.stamp === Number.MAX_SAFE_INTEGER) {
                 Transaction.outside(() => {
                     if (ReactiveSystem.isLogging)
-                        ReactiveSystem.setLoggingHint(node.element, node.key);
+                        ReactiveSystem.setLoggingHint(node, node.key);
                     manageReaction(node.body).configure({
                         order: node.level,
                     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.96.26020",
+  "version": "0.96.26021",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",