reactronic 0.24.301 → 0.24.303

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

@@ -1,4 +1,4 @@
-export { all, pause } from "./util/Utils.js";
+export { all, pause, proceedSyncOrAsync } from "./util/Utils.js";
 export { MergeList } from "./util/MergeList.js";
 export type { MergedItem, MergeListReader } from "./util/MergeList.js";
 export { SealedArray } from "./util/SealedArray.js";

package/build/dist/source/api.js

@@ -1,4 +1,4 @@
-export { all, pause } from "./util/Utils.js";
+export { all, pause, proceedSyncOrAsync } from "./util/Utils.js";
 export { MergeList } from "./util/MergeList.js";
 export { SealedArray } from "./util/SealedArray.js";
 export { SealedMap } from "./util/SealedMap.js";

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

@@ -38,7 +38,7 @@ export declare class Changeset implements AbstractChangeset {
     static dispose(obj: any): void;
     static doDispose(ctx: Changeset, h: ObjectHandle): ObjectVersion;
     private isNewObjectVersionRequired;
-    acquire(outer: Changeset): void;
+    acquire(outer: Changeset): boolean;
     bumpBy(timestamp: number): void;
     rebase(): ObjectVersion[] | undefined;
     private merge;
@@ -52,7 +52,7 @@ export declare class Changeset implements AbstractChangeset {
 }
 export declare class Dump {
     static valueHint: (value: any) => string;
-    static obj(h: ObjectHandle | undefined, fk?: FieldKey | undefined, stamp?: number, snapshotId?: number, originSnapshotId?: number, value?: any): string;
+    static obj(h: ObjectHandle | undefined, fk?: FieldKey | undefined, stamp?: number, changesetId?: number, lastEditorChangesetId?: number, value?: any): string;
     static snapshot2(h: ObjectHandle, s: AbstractChangeset, fk?: FieldKey, o?: FieldVersion): string;
     static snapshot(ov: ObjectVersion, fk?: FieldKey): string;
     static conflicts(conflicts: ObjectVersion[]): string;

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

@@ -76,7 +76,7 @@ export class Changeset {
                 const revision = fk === Meta.Handle ? 1 : ov.revision + 1;
                 const data = Object.assign({}, fk === Meta.Handle ? value : ov.data);
                 Meta.set(data, Meta.Handle, h);
-                Meta.set(data, Meta.Revision, new FieldVersion(revision));
+                Meta.set(data, Meta.Revision, new FieldVersion(revision, this.id));
                 ov = new ObjectVersion(this, ov, data);
                 this.items.set(h, ov);
                 h.editing = ov;
@@ -95,11 +95,12 @@ export class Changeset {
             if (existing === undefined || existing.content !== content || sensitivity) {
                 const existingContent = existing === null || existing === void 0 ? void 0 : existing.content;
                 if (ov.former.objectVersion.data[fk] === existing) {
-                    existing = ov.data[fk] = new FieldVersion(content);
+                    existing = ov.data[fk] = new FieldVersion(content, this.id);
                     Changeset.markEdited(existingContent, content, true, ov, fk, h);
                 }
                 else {
                     existing.content = content;
+                    existing.lastEditorChangesetId = this.id;
                     Changeset.markEdited(existingContent, content, true, ov, fk, h);
                 }
             }
@@ -136,7 +137,8 @@ export class Changeset {
         return ov.changeset !== this && !this.sealed;
     }
     acquire(outer) {
-        if (!this.sealed && this.revision === UNDEFINED_REVISION) {
+        const result = !this.sealed && this.revision === UNDEFINED_REVISION;
+        if (result) {
             const ahead = this.options.token === undefined || outer.revision === UNDEFINED_REVISION;
             this.revision = ahead ? Changeset.stampGen : outer.revision;
             Changeset.pending.push(this);
@@ -145,6 +147,7 @@ export class Changeset {
             if (Log.isOn && Log.opt.transaction)
                 Log.write("╔══", `s${this.revision}`, `${this.hint}`);
         }
+        return result;
     }
     bumpBy(timestamp) {
         if (timestamp > this.bumper)
@@ -313,7 +316,7 @@ Changeset.propagateAllChangesThroughSubscriptions = (changeset) => { };
 Changeset.revokeAllSubscriptions = (changeset) => { };
 Changeset.enqueueReactiveFunctionsToRun = (reactive) => { };
 export class Dump {
-    static obj(h, fk, stamp, snapshotId, originSnapshotId, value) {
+    static obj(h, fk, stamp, changesetId, lastEditorChangesetId, value) {
         const member = fk !== undefined ? `.${fk.toString()}` : "";
         let result;
         if (h !== undefined) {
@@ -321,7 +324,7 @@ export class Dump {
             if (stamp === undefined)
                 result = `${h.hint}${member}${v} #${h.id}`;
             else
-                result = `${h.hint}${member}${v} #${h.id}t${snapshotId}s${stamp}${originSnapshotId !== undefined && originSnapshotId !== 0 ? `t${originSnapshotId}` : ""}`;
+                result = `${h.hint}${member}${v} #${h.id}t${changesetId}s${stamp}${lastEditorChangesetId !== undefined ? `e${lastEditorChangesetId}` : ""}`;
         }
         else
             result = `boot${member}`;
@@ -329,12 +332,12 @@ export class Dump {
     }
     static snapshot2(h, s, fk, o) {
         var _a;
-        return Dump.obj(h, fk, s.timestamp, s.id, o === null || o === void 0 ? void 0 : o.originSnapshotId, (_a = o === null || o === void 0 ? void 0 : o.content) !== null && _a !== void 0 ? _a : Meta.Undefined);
+        return Dump.obj(h, fk, s.timestamp, s.id, o === null || o === void 0 ? void 0 : o.lastEditorChangesetId, (_a = o === null || o === void 0 ? void 0 : o.content) !== null && _a !== void 0 ? _a : Meta.Undefined);
     }
     static snapshot(ov, fk) {
         const h = Meta.get(ov.data, Meta.Handle);
         const fv = fk !== undefined ? ov.data[fk] : undefined;
-        return Dump.obj(h, fk, ov.changeset.timestamp, ov.changeset.id, fv === null || fv === void 0 ? void 0 : fv.originSnapshotId);
+        return Dump.obj(h, fk, ov.changeset.timestamp, ov.changeset.id, fv === null || fv === void 0 ? void 0 : fv.lastEditorChangesetId);
     }
     static conflicts(conflicts) {
         return conflicts.map(ours => {

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

@@ -8,9 +8,9 @@ export type AbstractChangeset = {
 export declare class FieldVersion<T = any> {
     content: T;
     observers?: Set<Observer>;
+    lastEditorChangesetId: number;
     get isLaunch(): boolean;
-    get originSnapshotId(): number | undefined;
-    constructor(content: T);
+    constructor(content: T, lastEditorChangesetId: number);
 }
 export type Observer = {
     readonly order: number;

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

@@ -3,8 +3,7 @@ import { Meta } from "./Meta.js";
 export { Meta } from "./Meta.js";
 export class FieldVersion {
     get isLaunch() { return false; }
-    get originSnapshotId() { return 0; }
-    constructor(content) { this.content = content; }
+    constructor(content, lastEditorChangesetId) { this.content = content; this.lastEditorChangesetId = lastEditorChangesetId; }
 }
 export class ObjectVersion {
     constructor(changeset, former, data) {

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

@@ -16,9 +16,9 @@ export declare class IndicatorImpl extends Indicator {
     busyDuration: number;
     readonly internals: {
         whenBusy: Promise<void> | undefined;
-        resolveWhenBusy: ((value?: void | undefined) => void) | undefined;
+        resolveWhenBusy: ((value?: void) => void) | undefined;
         whenIdle: Promise<void> | undefined;
-        resolveWhenIdle: ((value?: void | undefined) => void) | undefined;
+        resolveWhenIdle: ((value?: void) => void) | undefined;
         started: number;
         activationDelay: number;
         activationTimeout: undefined;

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

@@ -100,7 +100,7 @@ export class JournalImpl extends Journal {
                     const content = undoing ? vp.formerContent : vp.freshContent;
                     const ov = ctx.getEditableObjectVersion(h, fk, content);
                     if (ov.changeset === ctx) {
-                        ov.data[fk] = new FieldVersion(content);
+                        ov.data[fk] = new FieldVersion(content, ctx.id);
                         const existing = ov.former.objectVersion.data[fk];
                         Changeset.markEdited(existing, content, existing !== content, ov, fk, h);
                     }

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

@@ -122,7 +122,7 @@ export class Mvcc {
     }
     static decorateData(isObservable, proto, fk) {
         if (isObservable) {
-            Meta.acquire(proto, Meta.Initial)[fk] = new FieldVersion(undefined);
+            Meta.acquire(proto, Meta.Initial)[fk] = new FieldVersion(undefined, 0);
             const get = function () {
                 const h = Mvcc.acquireHandle(this);
                 return Mvcc.observable.get(h, fk, this);
@@ -181,7 +181,7 @@ export class Mvcc {
             h = new ObjectHandle(obj, obj, Mvcc.observable, ov, obj.constructor.name);
             Meta.set(ov.data, Meta.Handle, h);
             Meta.set(obj, Meta.Handle, h);
-            Meta.set(ov.data, Meta.Revision, new FieldVersion(1));
+            Meta.set(ov.data, Meta.Revision, new FieldVersion(1, 0));
         }
         return h;
     }

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

@@ -36,6 +36,7 @@ export declare class MvccArray<T> extends MvccObject {
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T): T;
     reduceRight(callbackfn: (previousValue: T, currentValue: T, currentIndex: number, array: T[]) => T, initialValue: T): T;
     reduceRight<U>(callbackfn: (previousValue: U, currentValue: T, currentIndex: number, array: T[]) => U, initialValue: U): U;
+    find(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): T | undefined;
     find<S extends T>(predicate: (this: void, value: T, index: number, obj: T[]) => value is S, thisArg?: any): S | undefined;
     findIndex(predicate: (value: T, index: number, obj: T[]) => unknown, thisArg?: any): number;
     fill(value: T, start?: number, end?: number): this;

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

@@ -47,12 +47,12 @@ export class MvccArray extends MvccObject {
     }
 }
 export class TransactionalArray extends MvccArray {
-    constructor(args) {
-        super(false, args !== undefined ? new Array(args) : new Array());
+    constructor(...args) {
+        super(false, new Array(...args));
     }
 }
 export class ObservableArray extends MvccArray {
-    constructor(args) {
-        super(true, args !== undefined ? new Array(args) : new Array());
+    constructor(...args) {
+        super(true, new Array(...args));
     }
 }

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

@@ -51,7 +51,6 @@ declare class Launch extends FieldVersion implements Observer {
     successor: Launch | undefined;
     constructor(transaction: Transaction, operation: OperationImpl, changeset: AbstractChangeset, former: Launch | OptionsImpl, clone: boolean);
     get isLaunch(): boolean;
-    get originSnapshotId(): number;
     hint(): string;
     get order(): number;
     get ["#this#"](): string;
@@ -80,7 +79,7 @@ declare class Launch extends FieldVersion implements Observer {
     private static revokeAllSubscriptions;
     private static propagateFieldChangeThroughSubscriptions;
     private static enqueueReactiveFunctionsToRun;
-    private static createFieldVersion;
+    private static migrateFieldVersion;
     private static processQueuedReactiveOperations;
     private unsubscribeFromAllObservables;
     private subscribeTo;

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

@@ -194,7 +194,7 @@ export class OperationImpl {
 }
 class Launch extends FieldVersion {
     constructor(transaction, operation, changeset, former, clone) {
-        super(undefined);
+        super(undefined, 0);
         this.margin = Launch.current ? Launch.current.margin + 1 : 1;
         this.transaction = transaction;
         this.operation = operation;
@@ -205,6 +205,7 @@ class Launch extends FieldVersion {
             this.cause = former.obsoleteDueTo;
             this.args = former.args;
             if (clone) {
+                this.lastEditorChangesetId = former.lastEditorChangesetId;
                 this.result = former.result;
                 this.error = former.error;
                 this.started = former.started;
@@ -213,6 +214,7 @@ class Launch extends FieldVersion {
                 this.successor = former.successor;
             }
             else {
+                this.lastEditorChangesetId = changeset.id;
                 this.result = undefined;
                 this.error = undefined;
                 this.started = 0;
@@ -222,6 +224,7 @@ class Launch extends FieldVersion {
             }
         }
         else {
+            this.lastEditorChangesetId = changeset.id;
             this.options = former;
             this.cause = undefined;
             this.args = BOOT_ARGS;
@@ -234,8 +237,7 @@ class Launch extends FieldVersion {
         }
     }
     get isLaunch() { return true; }
-    get originSnapshotId() { return this.changeset.id; }
-    hint() { return `${Dump.snapshot2(this.operation.ownerHandle, this.changeset, this.operation.fieldKey)}`; }
+    hint() { return `${Dump.snapshot2(this.operation.ownerHandle, this.changeset, this.operation.fieldKey, this)}`; }
     get order() { return this.options.order; }
     get ["#this#"]() {
         return `Operation: ${this.why()}`;
@@ -287,7 +289,7 @@ class Launch extends FieldVersion {
         var _a, _b, _c;
         if (this.observables !== undefined) {
             const skip = !observable.isLaunch &&
-                changeset === this.changeset;
+                changeset.id === this.lastEditorChangesetId;
             if (!skip) {
                 const why = `${Dump.snapshot2(h, changeset, fk, observable)}    ◀◀    ${outer}`;
                 const isReactive = this.options.kind === Kind.reactive;
@@ -309,7 +311,7 @@ class Launch extends FieldVersion {
                     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);
             }
             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)}`);
+                Log.write(" ", "x", `${this.hint()} is not obsolete due to its own change to ${Dump.snapshot2(h, changeset, fk, observable)}`);
         }
     }
     relaunchIfNotUpToDate(now, nothrow) {
@@ -557,12 +559,12 @@ class Launch extends FieldVersion {
         if (isReactiveLoopRequired)
             OperationImpl.proceedWithinGivenLaunch(undefined, Launch.processQueuedReactiveOperations);
     }
-    static createFieldVersion(fv, target) {
+    static migrateFieldVersion(fv, target) {
         let result;
         if (fv instanceof Launch)
             result = new Launch(target, fv.operation, target.changeset, fv, true);
         else
-            result = new FieldVersion(fv === null || fv === void 0 ? void 0 : fv.content);
+            result = new FieldVersion(fv.content, fv.lastEditorChangesetId);
         return result;
     }
     static processQueuedReactiveOperations() {
@@ -602,14 +604,14 @@ class Launch extends FieldVersion {
                 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, ov.changeset, fk)}${subscription.usageCount > 1 ? ` (${subscription.usageCount} times)` : ""}`);
+                    Log.write("║", "  ∞", `${this.hint()} is subscribed to ${Dump.snapshot2(h, ov.changeset, fk, observable)}${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, ov.changeset, fk)}`);
+                Log.write("║", "  x", `${this.hint()} is obsolete and is NOT subscribed to ${Dump.snapshot2(h, ov.changeset, fk, observable)}`);
         }
         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, ov.changeset, fk)}`);
+                Log.write("║", "  x", `${this.hint()} is NOT subscribed to already obsolete ${Dump.snapshot2(h, ov.changeset, fk, observable)}`);
         }
         return ok;
     }
@@ -655,7 +657,7 @@ class Launch extends FieldVersion {
         Changeset.propagateAllChangesThroughSubscriptions = Launch.propagateAllChangesThroughSubscriptions;
         Changeset.revokeAllSubscriptions = Launch.revokeAllSubscriptions;
         Changeset.enqueueReactiveFunctionsToRun = Launch.enqueueReactiveFunctionsToRun;
-        TransactionImpl.createFieldVersion = Launch.createFieldVersion;
+        TransactionImpl.migrateFieldVersion = Launch.migrateFieldVersion;
         Mvcc.createOperation = Launch.createOperation;
         Mvcc.rememberOperationOptions = Launch.rememberOperationOptions;
         Promise.prototype.then = reactronicHookedThen;
@@ -693,7 +695,7 @@ function valueHint(value) {
     else if (value instanceof Map)
         result = `Map(${value.size})`;
     else if (value instanceof Launch)
-        result = `#${value.operation.ownerHandle.id}t${value.changeset.id}s${value.changeset.timestamp}${value.originSnapshotId !== undefined && value.originSnapshotId !== 0 ? `t${value.originSnapshotId}` : ""}`;
+        result = `#${value.operation.ownerHandle.id}t${value.changeset.id}s${value.changeset.timestamp}${value.lastEditorChangesetId !== undefined && value.lastEditorChangesetId !== 0 ? `t${value.lastEditorChangesetId}` : ""}`;
     else if (value === Meta.Undefined)
         result = "undefined";
     else if (typeof (value) === "string")

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

@@ -1,9 +1,9 @@
 import { LoggingOptions } from "../Logging.js";
 import { MergeListReader, MergedItem } from "../util/MergeList.js";
 import { MemberOptions } from "../Options.js";
-export type Script<T> = (el: T, basis: () => void) => void;
-export type ScriptAsync<T> = (el: T, basis: () => Promise<void>) => Promise<void>;
-export type Handler<T = unknown, R = void> = (el: T) => R;
+export type Script<E> = (el: E, basis: () => void) => void;
+export type ScriptAsync<E> = (el: E, basis: () => Promise<void>) => Promise<void>;
+export type Handler<E = unknown, R = void> = (el: E) => R;
 export declare enum Mode {
     default = 0,
     independentUpdate = 1,
@@ -61,6 +61,7 @@ export type RxNodeDecl<E = unknown> = {
     key?: string;
     mode?: Mode;
     creation?: Script<E>;
+    creationAsync?: ScriptAsync<E>;
     destruction?: Script<E>;
     triggers?: unknown;
     basis?: RxNodeDecl<E>;
@@ -83,10 +84,10 @@ export type RxNodeContext<T extends Object = Object> = {
 export declare abstract class BaseDriver<E = unknown> implements RxNodeDriver<E> {
     readonly name: string;
     readonly isPartition: boolean;
-    readonly initialize?: Handler<E, void> | undefined;
-    constructor(name: string, isPartition: boolean, initialize?: Handler<E, void> | undefined);
+    readonly initialize?: Handler<E> | undefined;
+    constructor(name: string, isPartition: boolean, initialize?: Handler<E> | undefined);
     abstract allocate(node: RxNode<E>): E;
-    create(node: RxNode<E>): void;
+    create(node: RxNode<E>): void | Promise<void>;
     destroy(node: RxNode<E>, isLeader: boolean): boolean;
     mount(node: RxNode<E>): void;
     update(node: RxNode<E>): void | Promise<void>;

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

@@ -16,8 +16,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { misuse } from "../util/Dbg.js";
 import { MergeList } from "../util/MergeList.js";
-import { emitLetters, getCallerInfo } from "../util/Utils.js";
+import { emitLetters, getCallerInfo, proceedSyncOrAsync } from "../util/Utils.js";
 import { Isolation, Reentrance } from "../Options.js";
 import { ObservableObject } from "../core/Mvcc.js";
 import { Transaction } from "../core/Transaction.js";
@@ -105,7 +106,7 @@ export class RxNode {
         triggerDeactivation(impl.seat, true, true);
     }
     static updateNestedNodesThenDo(action) {
-        runUpdateNestedNodesThenDo(undefined, action);
+        runUpdateNestedNodesThenDo(RxNodeImpl.ownSeat, undefined, action);
     }
     static markAsMounted(node, yes) {
         const n = node;
@@ -152,7 +153,7 @@ export class BaseDriver {
     create(node) {
         var _a;
         (_a = this.initialize) === null || _a === void 0 ? void 0 : _a.call(this, node.element);
-        invokeCreationUsingBasisChain(node.element, node.declaration);
+        return invokeCreationUsingBasisChain(node.element, node.declaration);
     }
     destroy(node, isLeader) {
         invokeDestructionUsingBasisChain(node.element, node.declaration);
@@ -161,7 +162,7 @@ export class BaseDriver {
     mount(node) {
     }
     update(node) {
-        invokeScriptUsingBasisChain(node.element, node.declaration);
+        return invokeScriptUsingBasisChain(node.element, node.declaration);
     }
     child(ownerNode, childDriver, childDeclaration, childBasis) {
         return undefined;
@@ -199,20 +200,40 @@ function getModeUsingBasisChain(declaration) {
     return (_a = declaration === null || declaration === void 0 ? void 0 : declaration.mode) !== null && _a !== void 0 ? _a : ((declaration === null || declaration === void 0 ? void 0 : declaration.basis) ? getModeUsingBasisChain(declaration === null || declaration === void 0 ? void 0 : declaration.basis) : Mode.default);
 }
 function invokeScriptUsingBasisChain(element, declaration) {
+    let result = undefined;
     const basis = declaration.basis;
     const script = declaration.script;
-    if (script)
-        script(element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP);
+    const scriptAsync = declaration.scriptAsync;
+    if (script && scriptAsync) {
+        throw misuse("'script' and 'scriptAsync' cannot be defined together");
+    }
+    if (script) {
+        result = script(element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP);
+    }
+    else if (scriptAsync) {
+        result = scriptAsync(element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP_ASYNC);
+    }
     else if (basis)
-        invokeScriptUsingBasisChain(element, basis);
+        result = invokeScriptUsingBasisChain(element, basis);
+    return result;
 }
 function invokeCreationUsingBasisChain(element, declaration) {
+    let result = undefined;
     const basis = declaration.basis;
     const creation = declaration.creation;
-    if (creation)
-        creation(element, basis ? () => invokeCreationUsingBasisChain(element, basis) : NOP);
+    const creationAsync = declaration.creationAsync;
+    if (creation && creationAsync) {
+        throw misuse("'creation' and 'creationAsync' cannot be defined together");
+    }
+    if (creation) {
+        result = creation(element, basis ? () => invokeCreationUsingBasisChain(element, basis) : NOP);
+    }
+    else if (creationAsync) {
+        result = creationAsync(element, basis ? () => invokeCreationUsingBasisChain(element, basis) : NOP_ASYNC);
+    }
     else if (basis)
-        invokeCreationUsingBasisChain(element, basis);
+        result = invokeCreationUsingBasisChain(element, basis);
+    return result;
 }
 function invokeDestructionUsingBasisChain(element, declaration) {
     const basis = declaration.basis;
@@ -344,49 +365,50 @@ __decorate([
 function getNodeKey(node) {
     return node.stamp >= 0 ? node.key : undefined;
 }
-function runUpdateNestedNodesThenDo(error, action) {
-    var _a;
-    const ownSeat = RxNodeImpl.ownSeat;
-    const owner = ownSeat.instance;
-    const children = owner.children;
-    if (children.isMergeInProgress) {
-        let promised = undefined;
-        try {
-            children.endMerge(error);
-            for (const child of children.removedItems(true))
-                triggerDeactivation(child, true, true);
-            if (!error) {
-                const sequential = children.isStrict;
-                let p1 = undefined;
-                let p2 = undefined;
-                let mounting = false;
-                let partition = owner;
-                for (const child of children.items()) {
-                    if (Transaction.isCanceled)
-                        break;
-                    const childNode = child.instance;
-                    const isPart = childNode.driver.isPartition;
-                    const host = isPart ? owner : partition;
-                    mounting = markToMountIfNecessary(mounting, host, child, children, sequential);
-                    const p = (_a = childNode.priority) !== null && _a !== void 0 ? _a : Priority.realtime;
-                    if (p === Priority.realtime)
-                        triggerUpdateViaSeat(child);
-                    else if (p === Priority.normal)
-                        p1 = push(child, p1);
-                    else
-                        p2 = push(child, p2);
-                    if (isPart)
-                        partition = childNode;
+function runUpdateNestedNodesThenDo(ownSeat, error, action) {
+    runInside(ownSeat, () => {
+        var _a;
+        const owner = ownSeat.instance;
+        const children = owner.children;
+        if (children.isMergeInProgress) {
+            let promised = undefined;
+            try {
+                children.endMerge(error);
+                for (const child of children.removedItems(true))
+                    triggerDeactivation(child, true, true);
+                if (!error) {
+                    const sequential = children.isStrict;
+                    let p1 = undefined;
+                    let p2 = undefined;
+                    let mounting = false;
+                    let partition = owner;
+                    for (const child of children.items()) {
+                        if (Transaction.isCanceled)
+                            break;
+                        const childNode = child.instance;
+                        const isPart = childNode.driver.isPartition;
+                        const host = isPart ? owner : partition;
+                        mounting = markToMountIfNecessary(mounting, host, child, children, sequential);
+                        const p = (_a = childNode.priority) !== null && _a !== void 0 ? _a : Priority.realtime;
+                        if (p === Priority.realtime)
+                            triggerUpdateViaSeat(child);
+                        else if (p === Priority.normal)
+                            p1 = push(child, p1);
+                        else
+                            p2 = push(child, p2);
+                        if (isPart)
+                            partition = childNode;
+                    }
+                    if (!Transaction.isCanceled && (p1 !== undefined || p2 !== undefined))
+                        promised = startIncrementalUpdate(ownSeat, children, p1, p2).then(() => action(error), e => action(e));
                 }
-                if (!Transaction.isCanceled && (p1 !== undefined || p2 !== undefined))
-                    promised = startIncrementalUpdate(ownSeat, children, p1, p2).then(() => action(error), e => action(e));
+            }
+            finally {
+                if (!promised)
+                    action(error);
             }
         }
-        finally {
-            if (!promised)
-                action(error);
-        }
-    }
+    });
 }
 function markToMountIfNecessary(mounting, host, seat, children, sequential) {
     const node = seat.instance;
@@ -489,13 +511,10 @@ function updateNow(seat) {
                     node.children.beginMerge();
                     const driver = node.driver;
                     result = driver.update(node);
-                    if (result instanceof Promise)
-                        result.then(v => { runUpdateNestedNodesThenDo(undefined, NOP); return v; }, e => { console.log(e); runUpdateNestedNodesThenDo(e !== null && e !== void 0 ? e : new Error("unknown error"), NOP); });
-                    else
-                        runUpdateNestedNodesThenDo(undefined, NOP);
+                    result = proceedSyncOrAsync(result, v => { runUpdateNestedNodesThenDo(seat, undefined, NOP); return v; }, e => { console.log(e); runUpdateNestedNodesThenDo(seat, e !== null && e !== void 0 ? e : new Error("unknown error"), NOP); });
                 }
                 catch (e) {
-                    runUpdateNestedNodesThenDo(e, NOP);
+                    runUpdateNestedNodesThenDo(seat, e, NOP);
                     console.log(`Update failed: ${node.key}`);
                     console.log(`${e}`);
                 }
@@ -613,6 +632,7 @@ function defaultReject(error) {
 }
 Promise.prototype.then = reactronicDomHookedThen;
 const NOP = (...args) => { };
+const NOP_ASYNC = (...args) => __awaiter(void 0, void 0, void 0, function* () { });
 let gOwnSeat = undefined;
 let gFirstToDispose = undefined;
 let gLastToDispose = undefined;

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

@@ -62,7 +62,7 @@ export declare class TransactionImpl extends Transaction {
     cancel(error: Error, restartAfter?: Worker | null): this;
     get isCanceled(): boolean;
     get isFinished(): boolean;
-    whenFinished(): Promise<void>;
+    whenFinished(includingParent?: boolean): Promise<void>;
     static run<T>(options: SnapshotOptions | null, func: F<T>, ...args: any[]): T;
     static isolate<T>(func: F<T>, ...args: any[]): T;
     static outside<T>(func: F<T>, ...args: any[]): T;
@@ -84,6 +84,6 @@ export declare class TransactionImpl extends Transaction {
     private acquirePromise;
     private static getCurrentChangeset;
     private static getEditableChangeset;
-    static createFieldVersion: (fv: FieldVersion, target: Transaction) => FieldVersion;
+    static migrateFieldVersion: (fv: FieldVersion, target: Transaction) => FieldVersion;
     static _init(): void;
 }

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

@@ -108,9 +108,11 @@ export class TransactionImpl extends Transaction {
     get isFinished() {
         return this.sealed && this.pending === 0;
     }
-    whenFinished() {
+    whenFinished(includingParent) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isFinished)
+            if (includingParent && this.parent)
+                yield this.parent.whenFinished(includingParent);
+            else if (!this.isFinished)
                 yield this.acquirePromise();
         });
     }
@@ -209,6 +211,7 @@ export class TransactionImpl extends Transaction {
     runImpl(logging, func, ...args) {
         let result;
         const outer = TransactionImpl.curr;
+        const p = this.parent;
         try {
             if (outer === TransactionImpl.none) {
                 TransactionImpl.frameStartTime = performance.now();
@@ -216,7 +219,9 @@ export class TransactionImpl extends Transaction {
             }
             TransactionImpl.curr = this;
             this.pending++;
-            this.changeset.acquire(outer.changeset);
+            const acquired = this.changeset.acquire(outer.changeset);
+            if (acquired && p)
+                p.run(() => p.pending++);
             result = func(...args);
             if (this.sealed && this.pending === 1) {
                 if (!this.canceled)
@@ -234,6 +239,8 @@ export class TransactionImpl extends Transaction {
             this.pending--;
             if (this.sealed && this.pending === 0) {
                 const reactive = this.applyOrDiscard();
+                if (p)
+                    p.runImpl(undefined, () => p.pending--);
                 TransactionImpl.curr = outer;
                 TransactionImpl.outside(Changeset.enqueueReactiveFunctionsToRun, reactive);
             }
@@ -312,9 +319,17 @@ 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}` : ""}`);
         }
-        if (!error && !this.parent)
+        let obsolete = changeset.obsolete;
+        if (changeset.parent) {
+            if (changeset.obsolete.length > 0) {
+                for (const o of changeset.obsolete)
+                    changeset.parent.obsolete.push(o);
+                obsolete = [];
+            }
+        }
+        else if (!error)
             Changeset.propagateAllChangesThroughSubscriptions(changeset);
-        return changeset.obsolete;
+        return obsolete;
     }
     applyObjectChanges(h, ov) {
         const parent = this.parent;
@@ -342,7 +357,7 @@ export class TransactionImpl extends Transaction {
         const fv = ov.data[fk];
         const fvParent = ovParent.data[fk];
         if (fv.isLaunch) {
-            const migrated = TransactionImpl.createFieldVersion(fv, tParent);
+            const migrated = TransactionImpl.migrateFieldVersion(fv, tParent);
             if (ovParent.former.objectVersion.data[fk] !== fvParent) {
                 let observers = fvParent.observers;
                 if (observers) {
@@ -462,7 +477,7 @@ TransactionImpl.curr = TransactionImpl.none;
 TransactionImpl.inspection = false;
 TransactionImpl.frameStartTime = 0;
 TransactionImpl.frameOverCounter = 0;
-TransactionImpl.createFieldVersion = function (fv, target) {
+TransactionImpl.migrateFieldVersion = function (fv, target) {
     throw misuse("this implementation of cloneLaunch should never be called");
 };
 TransactionImpl._init();

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

@@ -7,6 +7,7 @@ export declare class Utils {
 export declare function UNDEF(...args: any[]): never;
 export declare function all(promises: Array<Promise<any>>): Promise<any[]>;
 export declare function pause<T>(timeout: number): Promise<T>;
+export declare function proceedSyncOrAsync<T>(result: T | Promise<T>, success: (v: any) => T, failure: (e: any) => T): T | Promise<T>;
 export declare function emitLetters(n: number): string;
 export declare function objectHasMember<T>(obj: any, member: string): obj is T;
 export declare function getCallerInfo(prefix: string): string;

package/build/dist/source/util/Utils.js

@@ -53,6 +53,14 @@ export function pause(timeout) {
         setTimeout(resolve.bind(null, () => resolve), timeout);
     });
 }
+export function proceedSyncOrAsync(result, success, failure) {
+    let r;
+    if (result instanceof Promise)
+        r = result.then(v => success(v), e => failure(e));
+    else
+        r = success(result);
+    return r;
+}
 export function emitLetters(n) {
     if (n < 0)
         throw new Error(`emitLetters: argument (${n}) should not be negative or zero`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.24.301",
+  "version": "0.24.303",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",
@@ -40,7 +40,7 @@
     "eslint": "8.57.0",
     "react": "18.3.1",
     "ts-node": "10.9.2",
-    "typescript": "5.3.2"
+    "typescript": "5.5.4"
   },
   "scripts": {
     "build": "eslint source/**.ts test/**.test.ts react/**.tsx && tsc",