reactronic 0.21.604 → 0.22.104

package/README.md

@@ -196,7 +196,7 @@ class Component<P> extends React.Component<P> {
   @reaction // called immediately in response to changes
   ensureUpToDate(): void {
     if (this.shouldComponentUpdate())
-      standalone(() => this.setState({})) // ask React to re-render
+      Transaction.off(() => this.setState({})) // ask React to re-render
   } // ensureUpToDate is subscribed to render
 
   shouldComponentUpdate(): boolean {
@@ -208,7 +208,7 @@ class Component<P> extends React.Component<P> {
   }
 
   componentWillUnmount(): void {
-    standalone(Rx.dispose, this)
+    Transaction.run(null, Rx.dispose, this)
   }
 }
 ```
@@ -310,7 +310,6 @@ function monitor(value: Monitor | null)
 function trace(value: Partial<TraceOptions>)
 
 function nonreactive<T>(func: F<T>, ...args: any[]): T
-function standalone<T>(func: F<T>, ...args: any[]): T
 function sensitive<T>(sensitivity: Sensitivity, func: F<T>, ...args: any[]): T
 
 // Options, ObjectOptions, Kind, Reentrance, Monitor, TraceOptions, ProfilingOptions
@@ -417,11 +416,13 @@ class Transaction implements Worker {
   whenFinished(): Promise<void>
   join<T>(p: Promise<T>): Promise<T>
 
-  static create(hint: string): Transaction
-  static run<T>(hint: string, func: F<T>, ...args: any[]): T
-  static runEx<T>(hint: string, standalone: boolean, sidebyside: boolean,
-    trace: Partial<TraceOptions | undefined>, func: F<T>, ...args: any[]): T
-  static standalone<T>(func: F<T>, ...args: any[]): T
+  static create(options: SnapshotOptions | null): Transaction
+  static run<T>(options: SnapshotOptions | null, func: F<T>, ...args: any[]): T
+  static off<T>(func: F<T>, ...args: any[]): T
+
+  static isFrameOver(everyN: number, timeLimit: number): boolean
+  static requestNextFrame(sleepTime: number): Promise<void>
+  static isCanceled: boolean
 }
 
 // Controller

package/build/dist/source/Ref.js

@@ -57,7 +57,7 @@ class ToggleRef extends Ref {
     toggle() {
         const o = this.owner;
         const p = this.name;
-        Transaction_1.Transaction.runAs({ hint: `toggle ${o.constructor.name}.${p}` }, () => {
+        Transaction_1.Transaction.run({ hint: `toggle ${o.constructor.name}.${p}` }, () => {
             const v = o[p];
             const isOn = v === this.valueOn || (v instanceof Ref && this.valueOn instanceof Ref &&
                 Ref.sameRefs(v, this.valueOn));

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

@@ -18,7 +18,6 @@ export declare class Rx {
     static setProfilingMode(enabled: boolean, options?: Partial<ProfilingOptions>): void;
 }
 export declare function nonreactive<T>(func: F<T>, ...args: any[]): T;
-export declare function standalone<T>(func: F<T>, ...args: any[]): T;
 export declare function sensitive<T>(sensitivity: boolean, func: F<T>, ...args: any[]): T;
 export declare function unobservable(proto: object, prop: PropertyKey): any;
 export declare function transaction(proto: object, prop: PropertyKey, pd: PropertyDescriptor): any;

package/build/dist/source/Rx.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.standalone = exports.nonreactive = exports.Rx = void 0;
+exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.nonreactive = exports.Rx = void 0;
 const Dbg_1 = require("./util/Dbg");
 const Options_1 = require("./Options");
 const Data_1 = require("./impl/Data");
 const Snapshot_1 = require("./impl/Snapshot");
 const Hooks_1 = require("./impl/Hooks");
 const Operation_1 = require("./impl/Operation");
-const Transaction_1 = require("./impl/Transaction");
 class Rx {
     static why(brief = false) { return brief ? Operation_1.OperationController.briefWhy() : Operation_1.OperationController.why(); }
     static getController(method) { return Operation_1.OperationController.of(method); }
@@ -29,10 +28,6 @@ function nonreactive(func, ...args) {
     return Operation_1.OperationController.runWithin(undefined, func, ...args);
 }
 exports.nonreactive = nonreactive;
-function standalone(func, ...args) {
-    return Operation_1.OperationController.runWithin(undefined, Transaction_1.Transaction.standalone, func, ...args);
-}
-exports.standalone = standalone;
 function sensitive(sensitivity, func, ...args) {
     return Hooks_1.Hooks.sensitive(sensitivity, func, ...args);
 }

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

@@ -11,4 +11,4 @@ export { Snapshot } from './impl/Snapshot';
 export { Transaction } from './impl/Transaction';
 export { Monitor } from './impl/Monitor';
 export { TransactionJournal } from './impl/TransactionJournal';
-export { Rx, nonreactive, standalone, sensitive, unobservable, transaction, reaction, cached, options } from './Rx';
+export { Rx, nonreactive, sensitive, unobservable, transaction, reaction, cached, options } from './Rx';

package/build/dist/source/api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.standalone = exports.nonreactive = exports.Rx = exports.TransactionJournal = exports.Monitor = exports.Transaction = exports.Snapshot = exports.ObservableObject = exports.ToggleRef = exports.Ref = exports.Controller = exports.TraceLevel = exports.Reentrance = exports.Kind = exports.SealedSet = exports.SealedMap = exports.SealedArray = exports.pause = exports.all = void 0;
+exports.options = exports.cached = exports.reaction = exports.transaction = exports.unobservable = exports.sensitive = exports.nonreactive = exports.Rx = exports.TransactionJournal = exports.Monitor = exports.Transaction = exports.Snapshot = exports.ObservableObject = exports.ToggleRef = exports.Ref = exports.Controller = exports.TraceLevel = exports.Reentrance = exports.Kind = exports.SealedSet = exports.SealedMap = exports.SealedArray = exports.pause = exports.all = void 0;
 var Utils_1 = require("./util/Utils");
 Object.defineProperty(exports, "all", { enumerable: true, get: function () { return Utils_1.all; } });
 Object.defineProperty(exports, "pause", { enumerable: true, get: function () { return Utils_1.pause; } });
@@ -32,7 +32,6 @@ Object.defineProperty(exports, "TransactionJournal", { enumerable: true, get: fu
 var Rx_1 = require("./Rx");
 Object.defineProperty(exports, "Rx", { enumerable: true, get: function () { return Rx_1.Rx; } });
 Object.defineProperty(exports, "nonreactive", { enumerable: true, get: function () { return Rx_1.nonreactive; } });
-Object.defineProperty(exports, "standalone", { enumerable: true, get: function () { return Rx_1.standalone; } });
 Object.defineProperty(exports, "sensitive", { enumerable: true, get: function () { return Rx_1.sensitive; } });
 Object.defineProperty(exports, "unobservable", { enumerable: true, get: function () { return Rx_1.unobservable; } });
 Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return Rx_1.transaction; } });

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

@@ -35,7 +35,7 @@ class MonitorImpl extends Monitor {
         MonitorImpl.deactivate(this, this.internals.deactivationDelay);
     }
     static create(hint, activationDelay, deactivationDelay) {
-        return Transaction_1.Transaction.runAs({ hint: 'Monitor.create' }, MonitorImpl.doCreate, hint, activationDelay, deactivationDelay);
+        return Transaction_1.Transaction.run({ hint: 'Monitor.create' }, MonitorImpl.doCreate, hint, activationDelay, deactivationDelay);
     }
     static enter(mon, worker) {
         mon.enter(worker);
@@ -53,7 +53,7 @@ class MonitorImpl extends Monitor {
     static activate(mon, delay) {
         if (delay >= 0) {
             if (mon.internals.activationTimeout === undefined)
-                mon.internals.activationTimeout = setTimeout(() => Transaction_1.Transaction.runAs({ hint: 'Monitor.activate', standalone: 'isolated' }, MonitorImpl.activate, mon, -1), delay);
+                mon.internals.activationTimeout = setTimeout(() => Transaction_1.Transaction.run({ hint: 'Monitor.activate', standalone: 'isolated' }, MonitorImpl.activate, mon, -1), delay);
         }
         else if (mon.counter > 0)
             mon.isActive = true;
@@ -61,7 +61,7 @@ class MonitorImpl extends Monitor {
     static deactivate(mon, delay) {
         if (delay >= 0) {
             clearTimeout(mon.internals.deactivationTimeout);
-            mon.internals.deactivationTimeout = setTimeout(() => Transaction_1.Transaction.runAs({ hint: 'Monitor.deactivate', standalone: 'isolated' }, MonitorImpl.deactivate, mon, -1), delay);
+            mon.internals.deactivationTimeout = setTimeout(() => Transaction_1.Transaction.run({ hint: 'Monitor.deactivate', standalone: 'isolated' }, MonitorImpl.deactivate, mon, -1), delay);
         }
         else if (mon.counter <= 0) {
             mon.isActive = false;

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

@@ -27,7 +27,7 @@ class OperationController extends Controller_1.Controller {
     get error() { return this.use().operation.error; }
     get stamp() { return this.use().revision.snapshot.timestamp; }
     get isUpToDate() { return this.use().isUpToDate; }
-    markObsolete() { Transaction_1.Transaction.runAs({ hint: Dbg_1.Dbg.isOn ? `markObsolete(${Snapshot_1.Dump.obj(this.ownHolder, this.memberName)})` : 'markObsolete()' }, OperationController.markObsolete, this); }
+    markObsolete() { Transaction_1.Transaction.run({ hint: Dbg_1.Dbg.isOn ? `markObsolete(${Snapshot_1.Dump.obj(this.ownHolder, this.memberName)})` : 'markObsolete()' }, OperationController.markObsolete, this); }
     pullLastResult(args) { return this.useOrRun(true, args).value; }
     useOrRun(weak, args) {
         var _a;
@@ -141,7 +141,7 @@ class OperationController extends Controller_1.Controller {
         if (op.controller !== this) {
             const hint = Dbg_1.Dbg.isOn ? `${Snapshot_1.Dump.obj(this.ownHolder, m)}/boot` : 'MethodController/init';
             const standalone = r.snapshot.sealed || r.prev.revision !== Snapshot_1.ROOT_REV;
-            op = Transaction_1.Transaction.runAs({ hint, standalone, token: this }, () => {
+            op = Transaction_1.Transaction.run({ hint, standalone, token: this }, () => {
                 const h = this.ownHolder;
                 let r2 = Snapshot_1.Snapshot.current().getCurrentRevision(h, m);
                 let op2 = r2.data[m];
@@ -164,7 +164,7 @@ class OperationController extends Controller_1.Controller {
         const hint = Dbg_1.Dbg.isOn ? `${Snapshot_1.Dump.obj(this.ownHolder, this.memberName)}${args && args.length > 0 && (typeof args[0] === 'number' || typeof args[0] === 'string') ? ` - ${args[0]}` : ''}` : `${Snapshot_1.Dump.obj(this.ownHolder, this.memberName)}`;
         let oc = existing;
         const opts = { hint, standalone, journal: options.journal, trace: options.trace, token };
-        const result = Transaction_1.Transaction.runAs(opts, (argsx) => {
+        const result = Transaction_1.Transaction.run(opts, (argsx) => {
             if (!oc.operation.transaction.isCanceled) {
                 oc = this.edit();
                 if (Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.operation)
@@ -415,17 +415,17 @@ class Operation extends Data_1.Observable {
             standalone: 'isolated',
             trace: Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.monitor ? undefined : Dbg_1.Dbg.global
         };
-        OperationController.runWithin(undefined, Transaction_1.Transaction.runAs, options, Monitor_1.MonitorImpl.enter, mon, this.transaction);
+        OperationController.runWithin(undefined, Transaction_1.Transaction.run, options, Monitor_1.MonitorImpl.enter, mon, this.transaction);
     }
     monitorLeave(mon) {
-        Transaction_1.Transaction.standalone(() => {
+        Transaction_1.Transaction.off(() => {
             const leave = () => {
                 const options = {
                     hint: 'Monitor.leave',
                     standalone: 'isolated',
                     trace: Dbg_1.Dbg.isOn && Dbg_1.Dbg.trace.monitor ? undefined : Dbg_1.Dbg.DefaultLevel
                 };
-                OperationController.runWithin(undefined, Transaction_1.Transaction.runAs, options, Monitor_1.MonitorImpl.leave, mon, this.transaction);
+                OperationController.runWithin(undefined, Transaction_1.Transaction.run, options, Monitor_1.MonitorImpl.leave, mon, this.transaction);
             };
             this.transaction.whenFinished().then(leave, leave);
         });
@@ -444,7 +444,8 @@ class Operation extends Data_1.Observable {
     static markUsed(observable, r, m, h, kind, weak) {
         if (kind !== Options_1.Kind.Transaction) {
             const op = Operation.current;
-            if (op && op.options.kind !== Options_1.Kind.Transaction && m !== Data_1.Meta.Holder) {
+            if (op && op.options.kind !== Options_1.Kind.Transaction &&
+                op.transaction === Transaction_1.Transaction.current && m !== Data_1.Meta.Holder) {
                 const ctx = Snapshot_1.Snapshot.current();
                 if (ctx !== r.snapshot)
                     ctx.bumpBy(r.snapshot.timestamp);

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

@@ -21,9 +21,9 @@ export declare abstract class Transaction implements Worker {
     abstract readonly isFinished: boolean;
     whenFinished(): Promise<void>;
     static create(options: SnapshotOptions | null): Transaction;
-    static run<T>(func: F<T>, ...args: any[]): T;
-    static runAs<T>(options: SnapshotOptions | null, func: F<T>, ...args: any[]): T;
+    static run<T>(options: SnapshotOptions | null, func: F<T>, ...args: any[]): T;
     static standalone<T>(func: F<T>, ...args: any[]): T;
+    static off<T>(func: F<T>, ...args: any[]): T;
     static isFrameOver(everyN?: number, timeLimit?: number): boolean;
     static requestNextFrame(sleepTime?: number): Promise<void>;
     static get isCanceled(): boolean;

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

@@ -19,9 +19,9 @@ class Transaction {
         return __awaiter(this, void 0, void 0, function* () { });
     }
     static create(options) { return new TransactionImpl(options); }
-    static run(func, ...args) { return TransactionImpl.run(func, ...args); }
-    static runAs(options, func, ...args) { return TransactionImpl.runAs(options, func, ...args); }
+    static run(options, func, ...args) { return TransactionImpl.run(options, func, ...args); }
     static standalone(func, ...args) { return TransactionImpl.standalone(func, ...args); }
+    static off(func, ...args) { return TransactionImpl.off(func, ...args); }
     static isFrameOver(everyN = 1, timeLimit = 14) { return TransactionImpl.isFrameOver(everyN, timeLimit); }
     static requestNextFrame(sleepTime = 0) { return TransactionImpl.requestNextFrame(sleepTime); }
     static get isCanceled() { return TransactionImpl.current.isCanceled; }
@@ -115,17 +115,14 @@ class TransactionImpl extends Transaction {
                 yield this.acquirePromise();
         });
     }
-    static run(func, ...args) {
-        return TransactionImpl.runAs(null, func, ...args);
-    }
-    static runAs(options, func, ...args) {
+    static run(options, func, ...args) {
         const t = TransactionImpl.acquire(options);
         const root = t !== TransactionImpl.curr;
         t.guard();
         let result = t.runImpl(options === null || options === void 0 ? void 0 : options.trace, func, ...args);
         if (root) {
             if (result instanceof Promise) {
-                result = TransactionImpl.standalone(() => {
+                result = TransactionImpl.off(() => {
                     return t.wrapToRetry(t.wrapToWaitUntilFinish(result), func, ...args);
                 });
             }
@@ -134,6 +131,9 @@ class TransactionImpl extends Transaction {
         return result;
     }
     static standalone(func, ...args) {
+        return TransactionImpl.run({ standalone: true }, func, ...args);
+    }
+    static off(func, ...args) {
         const outer = TransactionImpl.curr;
         try {
             TransactionImpl.curr = TransactionImpl.none;
@@ -184,7 +184,7 @@ class TransactionImpl extends Transaction {
                             trace: this.snapshot.options.trace,
                             token: this.snapshot.options.token,
                         };
-                        return TransactionImpl.runAs(options, func, ...args);
+                        return TransactionImpl.run(options, func, ...args);
                     }
                     else
                         throw error;
@@ -230,7 +230,7 @@ class TransactionImpl extends Transaction {
             if (this.sealed && this.pending === 0) {
                 const reactions = this.applyOrDiscard();
                 TransactionImpl.curr = outer;
-                TransactionImpl.standalone(Snapshot_1.Snapshot.enqueueReactionsToRun, reactions);
+                TransactionImpl.off(Snapshot_1.Snapshot.enqueueReactionsToRun, reactions);
             }
             else
                 TransactionImpl.curr = outer;

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

@@ -24,7 +24,7 @@ class TransactionJournalImpl extends TransactionJournal {
     get canUndo() { return this._items.length > 0 && this._position > 0; }
     get canRedo() { return this._position < this._items.length; }
     remember(p) {
-        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.remember', standalone: 'isolated' }, () => {
+        Transaction_1.Transaction.run({ hint: 'TransactionJournal.remember', standalone: 'isolated' }, () => {
             const items = this._items = this._items.toMutable();
             if (items.length >= this._capacity)
                 items.shift();
@@ -35,7 +35,7 @@ class TransactionJournalImpl extends TransactionJournal {
         });
     }
     undo(count = 1) {
-        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.undo', standalone: 'isolated' }, () => {
+        Transaction_1.Transaction.run({ hint: 'TransactionJournal.undo', standalone: 'isolated' }, () => {
             let i = this._position - 1;
             while (i >= 0 && count > 0) {
                 const patch = this._items[i];
@@ -46,7 +46,7 @@ class TransactionJournalImpl extends TransactionJournal {
         });
     }
     redo(count = 1) {
-        Transaction_1.Transaction.runAs({ hint: 'TransactionJournal.redo', standalone: 'isolated' }, () => {
+        Transaction_1.Transaction.run({ hint: 'TransactionJournal.redo', standalone: 'isolated' }, () => {
             let i = this._position;
             while (i < this._items.length && count > 0) {
                 const patch = this._items[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reactronic",
-  "version": "0.21.604",
+  "version": "0.22.104",
   "description": "Reactronic - Transactional Reactive State Management",
   "main": "build/dist/source/api.js",
   "types": "build/dist/source/api.d.ts",