reactronic 0.24.117 → 0.24.119

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

@@ -17,6 +17,6 @@ export { Transaction } from './core/Transaction.js';
 export { Monitor } from './core/Monitor.js';
 export { Journal } from './core/Journal.js';
 export { RxSystem, raw, obs, transactional, reactive, cached, transaction, unobs, sensitive, options } from './RxSystem.js';
-export { RxNode, Mode, Priority, BaseDriver, RxNodeVariable } from './tree/RxTree.js';
-export type { Delegate, SimpleDelegate, RxNodeDecl, RxNodeDriver, RxNodeContext } from './tree/RxTree.js';
+export { RxNode, Mode, Priority, BaseDriver, RxNodeVariable } from './core/RxNode.js';
+export type { Delegate, SimpleDelegate, RxNodeDecl, RxNodeDriver, RxNodeContext } from './core/RxNode.js';
 export { Clock } from './Clock.js';

package/build/dist/source/api.js

@@ -13,5 +13,5 @@ export { Transaction } from './core/Transaction.js';
 export { Monitor } from './core/Monitor.js';
 export { Journal } from './core/Journal.js';
 export { RxSystem, raw, obs, transactional, reactive, cached, transaction, unobs, sensitive, options } from './RxSystem.js';
-export { RxNode, Mode, Priority, BaseDriver, RxNodeVariable } from './tree/RxTree.js';
+export { RxNode, Mode, Priority, BaseDriver, RxNodeVariable } from './core/RxNode.js';
 export { Clock } from './Clock.js';

package/build/dist/source/{tree/RxTree.d.ts → core/RxNode.d.ts}

@@ -35,11 +35,11 @@ export declare abstract class RxNode<E = unknown> {
     static readonly longFrameDuration = 300;
     static currentUpdatePriority: Priority;
     static frameDuration: number;
-    static declare<E = void>(driver: RxNodeDriver<E>, declaration?: RxNodeDecl<E>, preset?: RxNodeDecl<E>): RxNode<E>;
+    static acquire<E = void>(driver: RxNodeDriver<E>, declaration?: RxNodeDecl<E>, preset?: RxNodeDecl<E>): RxNode<E>;
     static get isFirstUpdate(): boolean;
     static get nodeStamp(): number;
     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/{tree/RxTree.js → 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';
@@ -35,7 +35,7 @@ export var Priority;
     Priority[Priority["Background"] = 2] = "Background";
 })(Priority || (Priority = {}));
 export class RxNode {
-    static declare(driver, declaration, preset) {
+    static acquire(driver, declaration, preset) {
         var _a;
         let result;
         if (declaration)
@@ -89,8 +89,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 +209,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;
@@ -314,7 +315,7 @@ __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;
@@ -461,12 +462,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}`);
                 }

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.117",
+  "version": "0.24.119",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",

package/build/dist/source/tree/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/tree/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('.declare') >= 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]) || '',
-    };
-}