reactronic 0.24.118 → 0.24.120

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

@@ -37,9 +37,15 @@ export declare abstract class RxNode<E = unknown> {
     static frameDuration: number;
     static acquire<E = void>(driver: RxNodeDriver<E>, declaration?: RxNodeDecl<E>, preset?: RxNodeDecl<E>): RxNode<E>;
     static get isFirstUpdate(): boolean;
-    static get nodeStamp(): number;
+    static get key(): string;
+    static get stamp(): number;
+    static get triggers(): unknown;
+    static get priority(): Priority;
+    static set priority(value: Priority);
+    static get childrenShuffling(): boolean;
+    static set childrenShuffling(value: boolean);
     static triggerUpdate(node: RxNode<any>, triggers: unknown): void;
-    static updateNestedTreesThenDo(action: (error: unknown) => void): void;
+    static updateNestedNodesThenDo(action: (error: unknown) => void): void;
     static findMatchingHost<E = unknown, R = unknown>(node: RxNode<E>, match: SimpleDelegate<RxNode<E>, boolean>): RxNode<R> | undefined;
     static findMatchingPrevSibling<E = unknown, R = unknown>(node: RxNode<E>, match: SimpleDelegate<RxNode<E>, boolean>): RxNode<R> | undefined;
     static forEachChildRecursively<E = unknown>(node: RxNode<E>, action: SimpleDelegate<RxNode<E>>): void;

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

@@ -17,7 +17,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { MergeList } from '../util/MergeList.js';
-import { emitLetters, getCallerInfo } from './RxNodeUtils.js';
+import { emitLetters, getCallerInfo } from '../util/Utils.js';
 import { Reentrance } from '../Options.js';
 import { ObservableObject } from '../core/Mvcc.js';
 import { Transaction } from '../core/Transaction.js';
@@ -43,7 +43,7 @@ export class RxNode {
         else
             declaration = preset !== null && preset !== void 0 ? preset : {};
         let key = declaration.key;
-        const owner = gCurrent === null || gCurrent === void 0 ? void 0 : gCurrent.instance;
+        const owner = gOwnSeat === null || gOwnSeat === void 0 ? void 0 : gOwnSeat.instance;
         if (owner) {
             let existing = undefined;
             const children = owner.children;
@@ -75,11 +75,28 @@ export class RxNode {
         return result;
     }
     static get isFirstUpdate() {
-        return (gCurrent === null || gCurrent === void 0 ? void 0 : gCurrent.instance.stamp) === 1;
+        return RxNodeImpl.ownSeat.instance.stamp === 1;
     }
-    static get nodeStamp() {
-        var _a;
-        return (_a = gCurrent === null || gCurrent === void 0 ? void 0 : gCurrent.instance.stamp) !== null && _a !== void 0 ? _a : -1;
+    static get key() {
+        return RxNodeImpl.ownSeat.instance.key;
+    }
+    static get stamp() {
+        return RxNodeImpl.ownSeat.instance.stamp;
+    }
+    static get triggers() {
+        return RxNodeImpl.ownSeat.instance.declaration.triggers;
+    }
+    static get priority() {
+        return RxNodeImpl.ownSeat.instance.priority;
+    }
+    static set priority(value) {
+        RxNodeImpl.ownSeat.instance.priority = value;
+    }
+    static get childrenShuffling() {
+        return RxNodeImpl.ownSeat.instance.childrenShuffling;
+    }
+    static set childrenShuffling(value) {
+        RxNodeImpl.ownSeat.instance.childrenShuffling = value;
     }
     static triggerUpdate(node, triggers) {
         const impl = node;
@@ -89,8 +106,8 @@ export class RxNode {
             triggerUpdateViaSeat(impl.seat);
         }
     }
-    static updateNestedTreesThenDo(action) {
-        runUpdateNestedTreesThenDo(undefined, action);
+    static updateNestedNodesThenDo(action) {
+        runUpdateNestedNodesThenDo(undefined, action);
     }
     static findMatchingHost(node, match) {
         let p = node.host;
@@ -209,8 +226,9 @@ __decorate([
     raw,
     __metadata("design:type", RxNodeVariable)
 ], RxNodeContextImpl.prototype, "variable", void 0);
-class RxNodeImpl {
+class RxNodeImpl extends RxNode {
     constructor(key, driver, declaration, owner) {
+        super();
         const thisAsUnknown = this;
         this.key = key;
         this.driver = driver;
@@ -253,14 +271,14 @@ class RxNodeImpl {
             throw new Error('reactronic can be configured only for elements with independent update mode and only inside initialize');
         return RxSystem.getReaction(this.update).configure(options);
     }
-    static get current() {
-        if (!gCurrent)
+    static get ownSeat() {
+        if (!gOwnSeat)
             throw new Error('current element is undefined');
-        return gCurrent;
+        return gOwnSeat;
     }
     static tryUseNodeVariableValue(variable) {
         var _a, _b;
-        let node = RxNodeImpl.current.instance;
+        let node = RxNodeImpl.ownSeat.instance;
         while (((_a = node.context) === null || _a === void 0 ? void 0 : _a.variable) !== variable && node.owner !== node)
             node = node.outer.seat.instance;
         return (_b = node.context) === null || _b === void 0 ? void 0 : _b.value;
@@ -273,7 +291,7 @@ class RxNodeImpl {
         return result;
     }
     static setNodeVariableValue(variable, value) {
-        const node = RxNodeImpl.current.instance;
+        const node = RxNodeImpl.ownSeat.instance;
         const owner = node.owner;
         const hostCtx = unobs(() => { var _a; return (_a = owner.context) === null || _a === void 0 ? void 0 : _a.value; });
         if (value && value !== hostCtx) {
@@ -314,10 +332,10 @@ __decorate([
 function getNodeKey(node) {
     return node.stamp >= 0 ? node.key : undefined;
 }
-function runUpdateNestedTreesThenDo(error, action) {
+function runUpdateNestedNodesThenDo(error, action) {
     var _a;
-    const curr = RxNodeImpl.current;
-    const owner = curr.instance;
+    const ownSeat = RxNodeImpl.ownSeat;
+    const owner = ownSeat.instance;
     const children = owner.children;
     if (children.isMergeInProgress) {
         let promised = undefined;
@@ -349,7 +367,7 @@ function runUpdateNestedTreesThenDo(error, action) {
                         partition = childNode;
                 }
                 if (!Transaction.isCanceled && (p1 !== undefined || p2 !== undefined))
-                    promised = startIncrementalUpdate(curr, children, p1, p2).then(() => action(error), e => action(e));
+                    promised = startIncrementalUpdate(ownSeat, children, p1, p2).then(() => action(error), e => action(e));
             }
         }
         finally {
@@ -461,12 +479,12 @@ function updateNow(seat) {
                     const driver = node.driver;
                     result = driver.update(node);
                     if (result instanceof Promise)
-                        result.then(v => { runUpdateNestedTreesThenDo(undefined, NOP); return v; }, e => { console.log(e); runUpdateNestedTreesThenDo(e !== null && e !== void 0 ? e : new Error('unknown error'), NOP); });
+                        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
-                        runUpdateNestedTreesThenDo(undefined, NOP);
+                        runUpdateNestedNodesThenDo(undefined, NOP);
                 }
                 catch (e) {
-                    runUpdateNestedTreesThenDo(e, NOP);
+                    runUpdateNestedNodesThenDo(e, NOP);
                     console.log(`Update failed: ${node.key}`);
                     console.log(`${e}`);
                 }
@@ -515,23 +533,23 @@ function runDisposalLoop() {
 }
 function wrapToRunInside(func) {
     let wrappedToRunInside;
-    const current = gCurrent;
-    if (current)
+    const outer = gOwnSeat;
+    if (outer)
         wrappedToRunInside = (...args) => {
-            return runInside(current, func, ...args);
+            return runInside(outer, func, ...args);
         };
     else
         wrappedToRunInside = func;
     return wrappedToRunInside;
 }
 function runInside(seat, func, ...args) {
-    const outer = gCurrent;
+    const outer = gOwnSeat;
     try {
-        gCurrent = seat;
+        gOwnSeat = seat;
         return func(...args);
     }
     finally {
-        gCurrent = outer;
+        gOwnSeat = outer;
     }
 }
 function triggersAreEqual(a1, a2) {
@@ -584,6 +602,6 @@ function defaultReject(error) {
 }
 Promise.prototype.then = reactronicDomHookedThen;
 const NOP = (...args) => { };
-let gCurrent = undefined;
+let gOwnSeat = undefined;
 let gFirstToDispose = undefined;
 let gLastToDispose = undefined;

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

@@ -7,3 +7,6 @@ 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 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,3 +53,49 @@ export function pause(timeout) {
         setTimeout(resolve.bind(null, () => resolve), timeout);
     });
 }
+export function emitLetters(n) {
+    if (n < 0)
+        throw new Error(`emitLetters: argument (${n}) should not be negative or zero`);
+    let result = '';
+    while (n >= 0) {
+        const r = n % 26;
+        n = Math.floor(n / 26) - 1;
+        result = String.fromCharCode(65 + r) + result;
+    }
+    return result;
+}
+export function objectHasMember(obj, member) {
+    return obj === Object(obj) && !Array.isArray(obj) && member in obj;
+}
+export function getCallerInfo(prefix) {
+    const restore = Error.stackTraceLimit = 20;
+    const error = new Error();
+    const stack = error.stack || '';
+    Error.stackTraceLimit = restore;
+    const lines = stack.split('\n');
+    let i = lines.findIndex(x => x.indexOf('.acquire') >= 0);
+    i = i >= 0 ? i + 2 : 5;
+    let caller = extractFunctionAndLocation(lines[i]);
+    let location = caller;
+    if (caller.func.endsWith('.update')) {
+        i = i - 1;
+        caller = extractFunctionAndLocation(lines[i]);
+        location = extractFunctionAndLocation(lines[i + 1]);
+    }
+    else {
+        while (!caller.func && i > 0) {
+            i = i - 1;
+            caller = extractFunctionAndLocation(lines[i]);
+        }
+        location = extractFunctionAndLocation(lines[i + 1]);
+    }
+    const result = `${prefix}·${caller.func}@${location.file}`;
+    return result;
+}
+function extractFunctionAndLocation(s) {
+    const match = s.match(/(?:\s*at\s+)?(?:(\S+)\s\()?(?:.*?)([^\/\(\):]+)(?:(:|\d)*\)?)$/);
+    return {
+        func: (match === null || match === void 0 ? void 0 : match[1]) || '',
+        file: (match === null || match === void 0 ? void 0 : match[2]) || '',
+    };
+}

package/package.json

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

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

@@ -1,3 +0,0 @@
-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/core/RxNodeUtils.js

@@ -1,46 +0,0 @@
-export function emitLetters(n) {
-    if (n < 0)
-        throw new Error(`emitLetters: argument (${n}) should not be negative or zero`);
-    let result = '';
-    while (n >= 0) {
-        const r = n % 26;
-        n = Math.floor(n / 26) - 1;
-        result = String.fromCharCode(65 + r) + result;
-    }
-    return result;
-}
-export function objectHasMember(obj, member) {
-    return obj === Object(obj) && !Array.isArray(obj) && member in obj;
-}
-export function getCallerInfo(prefix) {
-    const restore = Error.stackTraceLimit = 20;
-    const error = new Error();
-    const stack = error.stack || '';
-    Error.stackTraceLimit = restore;
-    const lines = stack.split('\n');
-    let i = lines.findIndex(x => x.indexOf('.acquire') >= 0);
-    i = i >= 0 ? i + 2 : 5;
-    let caller = extractFunctionAndLocation(lines[i]);
-    let location = caller;
-    if (caller.func.endsWith('.update')) {
-        i = i - 1;
-        caller = extractFunctionAndLocation(lines[i]);
-        location = extractFunctionAndLocation(lines[i + 1]);
-    }
-    else {
-        while (!caller.func && i > 0) {
-            i = i - 1;
-            caller = extractFunctionAndLocation(lines[i]);
-        }
-        location = extractFunctionAndLocation(lines[i + 1]);
-    }
-    const result = `${prefix}·${caller.func}@${location.file}`;
-    return result;
-}
-function extractFunctionAndLocation(s) {
-    const match = s.match(/(?:\s*at\s+)?(?:(\S+)\s\()?(?:.*?)([^\/\(\):]+)(?:(:|\d)*\)?)$/);
-    return {
-        func: (match === null || match === void 0 ? void 0 : match[1]) || '',
-        file: (match === null || match === void 0 ? void 0 : match[2]) || '',
-    };
-}