reactronic 0.24.302 → 0.24.304

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;

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

@@ -137,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);
@@ -146,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)

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

@@ -56,7 +56,6 @@ export declare abstract class RxNode<E = unknown> {
     static setDefaultLoggingOptions(logging?: LoggingOptions): void;
 }
 export type RxNodeDecl<E = unknown> = {
-    isAsync?: boolean;
     script?: Script<E>;
     scriptAsync?: ScriptAsync<E>;
     key?: string;

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

@@ -106,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;
@@ -365,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;
@@ -510,10 +511,10 @@ function updateNow(seat) {
                     node.children.beginMerge();
                     const driver = node.driver;
                     result = driver.update(node);
-                    result = proceedSyncOrAsync(result, v => { runUpdateNestedNodesThenDo(undefined, NOP); return v; }, e => { console.log(e); runUpdateNestedNodesThenDo(e !== null && e !== void 0 ? e : new Error("unknown error"), 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}`);
                 }

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

@@ -20,7 +20,7 @@ export declare abstract class Transaction implements Worker {
     abstract cancel(error: Error, retryAfterOrIgnore?: Worker | null): this;
     abstract readonly isCanceled: boolean;
     abstract readonly isFinished: boolean;
-    whenFinished(): Promise<void>;
+    whenFinished(includingParent?: boolean): Promise<void>;
     static create(options: SnapshotOptions | null, parent?: Transaction): Transaction;
     static run<T>(options: SnapshotOptions | null, func: F<T>, ...args: any[]): T;
     static isolate<T>(func: F<T>, ...args: any[]): T;
@@ -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;

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

@@ -14,7 +14,7 @@ import { Meta } from "./Data.js";
 import { Changeset, Dump, EMPTY_OBJECT_VERSION, UNDEFINED_REVISION } from "./Changeset.js";
 export class Transaction {
     static get current() { return TransactionImpl.current; }
-    whenFinished() {
+    whenFinished(includingParent) {
         return __awaiter(this, void 0, void 0, function* () { });
     }
     static create(options, parent) { return new TransactionImpl(options, parent); }
@@ -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;
@@ -328,17 +343,11 @@ export class TransactionImpl extends Transaction {
         const ovParent = csParent.getEditableObjectVersion(h, Meta.Undefined, undefined);
         if (ov.former.objectVersion.changeset === EMPTY_OBJECT_VERSION.changeset) {
             for (const fk in ov.data) {
-                if (fk === Meta.Revision) {
-                    console.log("(!)");
-                }
                 TransactionImpl.migrateFieldVersionToAnotherTransaction(h, fk, ov, ovParent, tParent);
             }
         }
         else {
             ov.changes.forEach((o, fk) => {
-                if (fk === Meta.Revision) {
-                    console.log("(!)");
-                }
                 TransactionImpl.migrateFieldVersionToAnotherTransaction(h, fk, ov, ovParent, tParent);
             });
         }

package/package.json

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