reactronic 0.24.303 → 0.24.305

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

@@ -18,6 +18,7 @@ export type MemberOptions = {
     readonly triggeringArgs: boolean;
     readonly throttling: number;
     readonly reentrance: Reentrance;
+    readonly allowObsoleteToFinish: boolean;
     readonly journal: Journal | undefined;
     readonly indicator: Indicator | null;
     readonly logging?: Partial<LoggingOptions>;

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

@@ -24,6 +24,7 @@ export declare class OptionsImpl implements MemberOptions {
     readonly triggeringArgs: boolean;
     readonly throttling: number;
     readonly reentrance: Reentrance;
+    readonly allowObsoleteToFinish: boolean;
     readonly journal: Journal | undefined;
     readonly indicator: Indicator | null;
     readonly logging?: Partial<LoggingOptions>;

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

@@ -33,6 +33,7 @@ const DEFAULT_OPTIONS = Object.freeze({
     triggeringArgs: false,
     throttling: Number.MAX_SAFE_INTEGER,
     reentrance: Reentrance.preventWithError,
+    allowObsoleteToFinish: false,
     journal: undefined,
     indicator: null,
     logging: undefined,
@@ -48,6 +49,7 @@ export class OptionsImpl {
         this.triggeringArgs = merge(DEFAULT_OPTIONS.triggeringArgs, existing.triggeringArgs, patch.triggeringArgs, implicit);
         this.throttling = merge(DEFAULT_OPTIONS.throttling, existing.throttling, patch.throttling, implicit);
         this.reentrance = merge(DEFAULT_OPTIONS.reentrance, existing.reentrance, patch.reentrance, implicit);
+        this.allowObsoleteToFinish = merge(DEFAULT_OPTIONS.allowObsoleteToFinish, existing.allowObsoleteToFinish, patch.allowObsoleteToFinish, implicit);
         this.journal = merge(DEFAULT_OPTIONS.journal, existing.journal, patch.journal, implicit);
         this.indicator = merge(DEFAULT_OPTIONS.indicator, existing.indicator, patch.indicator, implicit);
         this.logging = merge(DEFAULT_OPTIONS.logging, existing.logging, patch.logging, implicit);

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

@@ -189,7 +189,8 @@ export class OperationImpl {
     static markObsolete(self) {
         const ror = self.peek(undefined);
         const ctx = ror.changeset;
-        ror.launch.markObsoleteDueTo(ror.launch, self.fieldKey, EMPTY_OBJECT_VERSION.changeset, EMPTY_HANDLE, BOOT_CAUSE, ctx.timestamp, ctx.obsolete);
+        const obsolete = ror.launch.transaction.isFinished ? ctx.obsolete : ror.launch.transaction.changeset.obsolete;
+        ror.launch.markObsoleteDueTo(ror.launch, self.fieldKey, EMPTY_OBJECT_VERSION.changeset, EMPTY_HANDLE, BOOT_CAUSE, ctx.timestamp, obsolete);
     }
 }
 class Launch extends FieldVersion {
@@ -307,7 +308,7 @@ class Launch extends FieldVersion {
                 const tran = this.transaction;
                 if (tran.changeset === changeset) {
                 }
-                else if (!tran.isFinished && this !== observable)
+                else if (!tran.isFinished && this !== observable && !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);
             }
             else if (Log.isOn && (Log.opt.obsolete || ((_c = this.options.logging) === null || _c === void 0 ? void 0 : _c.obsolete)))
@@ -533,7 +534,11 @@ class Launch extends FieldVersion {
                     else
                         former.successor = undefined;
                 }
-                (_a = former.observers) === null || _a === void 0 ? void 0 : _a.forEach(s => s.markObsoleteDueTo(former, fk, ov.changeset, h, why, timestamp, obsolete));
+                (_a = former.observers) === null || _a === void 0 ? void 0 : _a.forEach(s => {
+                    const t = s.transaction;
+                    const o = t.isFinished ? obsolete : t.changeset.obsolete;
+                    return s.markObsoleteDueTo(former, fk, ov.changeset, h, why, timestamp, o);
+                });
             }
         }
         if (curr instanceof Launch) {

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

@@ -355,6 +355,7 @@ __decorate([
     reactive,
     options({
         reentrance: Reentrance.cancelPrevious,
+        allowObsoleteToFinish: true,
         triggeringArgs: true,
         noSideEffects: false,
     }),

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;

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); }

package/package.json

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