reactronic 0.24.309 → 0.24.400

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

@@ -1,12 +1,12 @@
 import { LoggingOptions } from "../Logging.js";
 import { MergeListReader, MergedItem } from "../util/MergeList.js";
 import { MemberOptions } from "../Options.js";
-export type Script<E> = (e: E, basis: () => void) => void;
-export type ScriptAsync<E> = (e: E, basis: () => Promise<void>) => Promise<void>;
-export type Handler<E = unknown, R = void> = (e: E) => R;
+export type Script<E> = (el: E, basis: () => void) => void;
+export type ScriptAsync<E> = (el: E, basis: () => Promise<void>) => Promise<void>;
+export type Handler<E = unknown, R = void> = (el: E) => R;
 export declare enum Mode {
     default = 0,
-    independentUpdate = 1,
+    autonomous = 1,
     manualMount = 2
 }
 export declare enum Priority {
@@ -36,9 +36,9 @@ export declare abstract class ReactiveNode<E = unknown> {
     static readonly longFrameDuration = 300;
     static currentUpdatePriority: Priority;
     static frameDuration: number;
-    static declare<E = void>(driver: ReactiveNodeDriver<E>, script?: Script<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, creation?: Script<E>, creationAsync?: ScriptAsync<E>, destruction?: Script<E>, triggers?: unknown, basis?: ReactiveNodeDecl<E>): ReactiveNode<E>;
+    static declare<E = void>(driver: ReactiveNodeDriver<E>, content?: Script<E>, contentAsync?: ScriptAsync<E>, key?: string, mode?: Mode, creation?: Script<E>, creationAsync?: ScriptAsync<E>, destruction?: Script<E>, triggers?: unknown, basis?: ReactiveNodeDecl<E>): ReactiveNode<E>;
     static declare<E = void>(driver: ReactiveNodeDriver<E>, declaration?: ReactiveNodeDecl<E>): ReactiveNode<E>;
-    static declare<E = void>(driver: ReactiveNodeDriver<E>, scriptOrDeclaration?: Script<E> | ReactiveNodeDecl<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, creation?: Script<E>, creationAsync?: ScriptAsync<E>, destruction?: Script<E>, triggers?: unknown, basis?: ReactiveNodeDecl<E>): ReactiveNode<E>;
+    static declare<E = void>(driver: ReactiveNodeDriver<E>, contentOrDeclaration?: Script<E> | ReactiveNodeDecl<E>, contentAsync?: ScriptAsync<E>, key?: string, mode?: Mode, creation?: Script<E>, creationAsync?: ScriptAsync<E>, destruction?: Script<E>, triggers?: unknown, basis?: ReactiveNodeDecl<E>): ReactiveNode<E>;
     static withBasis<E = void>(declaration?: ReactiveNodeDecl<E>, basis?: ReactiveNodeDecl<E>): ReactiveNodeDecl<E>;
     static get isFirstUpdate(): boolean;
     static get key(): string;
@@ -59,8 +59,8 @@ export declare abstract class ReactiveNode<E = unknown> {
     static setDefaultLoggingOptions(logging?: LoggingOptions): void;
 }
 export type ReactiveNodeDecl<E = unknown> = {
-    script?: Script<E>;
-    scriptAsync?: ScriptAsync<E>;
+    content?: Script<E>;
+    contentAsync?: ScriptAsync<E>;
     key?: string;
     mode?: Mode;
     creation?: Script<E>;

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

@@ -26,7 +26,7 @@ import { ReactiveSystem, options, raw, reactive, unobs } from "../ReactiveSystem
 export var Mode;
 (function (Mode) {
     Mode[Mode["default"] = 0] = "default";
-    Mode[Mode["independentUpdate"] = 1] = "independentUpdate";
+    Mode[Mode["autonomous"] = 1] = "autonomous";
     Mode[Mode["manualMount"] = 2] = "manualMount";
 })(Mode || (Mode = {}));
 export var Priority;
@@ -36,23 +36,23 @@ export var Priority;
     Priority[Priority["background"] = 2] = "background";
 })(Priority || (Priority = {}));
 export class ReactiveNode {
-    static declare(driver, scriptOrDeclaration, scriptAsync, key, mode, creation, creationAsync, destruction, triggers, basis) {
+    static declare(driver, contentOrDeclaration, contentAsync, key, mode, creation, creationAsync, destruction, triggers, basis) {
         let result;
         let declaration;
-        if (scriptOrDeclaration instanceof Function) {
+        if (contentOrDeclaration instanceof Function) {
             declaration = {
-                script: scriptOrDeclaration, scriptAsync, key, mode,
+                content: contentOrDeclaration, contentAsync, key, mode,
                 creation, creationAsync, destruction, triggers, basis,
             };
         }
         else
-            declaration = scriptOrDeclaration !== null && scriptOrDeclaration !== void 0 ? scriptOrDeclaration : {};
+            declaration = contentOrDeclaration !== null && contentOrDeclaration !== void 0 ? contentOrDeclaration : {};
         let effectiveKey = declaration.key;
         const owner = gOwnSeat === null || gOwnSeat === void 0 ? void 0 : gOwnSeat.instance;
         if (owner) {
             let existing = owner.driver.child(owner, driver, declaration, declaration.basis);
             const children = owner.children;
-            existing !== null && existing !== void 0 ? existing : (existing = children.tryMergeAsExisting(effectiveKey = effectiveKey || generateKey(owner), undefined, "nested elements can be declared inside update function only"));
+            existing !== null && existing !== void 0 ? existing : (existing = children.tryMergeAsExisting(effectiveKey = effectiveKey || generateKey(owner), undefined, "nested elements can be declared inside content script only"));
             if (existing) {
                 result = existing.instance;
                 if (result.driver !== driver && driver !== undefined)
@@ -174,7 +174,7 @@ export class BaseDriver {
     mount(node) {
     }
     update(node) {
-        return invokeScriptUsingBasisChain(node.element, node.declaration);
+        return invokeContentUsingBasisChain(node.element, node.declaration);
     }
     child(ownerNode, childDriver, childDeclaration, childBasis) {
         return undefined;
@@ -211,22 +211,19 @@ function getModeUsingBasisChain(declaration) {
     var _a;
     return (_a = declaration === null || declaration === void 0 ? void 0 : declaration.mode) !== null && _a !== void 0 ? _a : ((declaration === null || declaration === void 0 ? void 0 : declaration.basis) ? getModeUsingBasisChain(declaration === null || declaration === void 0 ? void 0 : declaration.basis) : Mode.default);
 }
-function invokeScriptUsingBasisChain(element, declaration) {
+function invokeContentUsingBasisChain(element, declaration) {
     let result = undefined;
     const basis = declaration.basis;
-    const script = declaration.script;
-    const scriptAsync = declaration.scriptAsync;
-    if (script && scriptAsync) {
-        throw misuse("'script' and 'scriptAsync' cannot be defined together");
-    }
-    if (script) {
-        result = script(element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP);
-    }
-    else if (scriptAsync) {
-        result = scriptAsync(element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP_ASYNC);
-    }
+    const content = declaration.content;
+    const contentAsync = declaration.contentAsync;
+    if (content && contentAsync)
+        throw misuse("'content' and 'contentAsync' cannot be defined together");
+    if (content)
+        result = content(element, basis ? () => invokeContentUsingBasisChain(element, basis) : NOP);
+    else if (contentAsync)
+        result = contentAsync(element, basis ? () => invokeContentUsingBasisChain(element, basis) : NOP_ASYNC);
     else if (basis)
-        result = invokeScriptUsingBasisChain(element, basis);
+        result = invokeContentUsingBasisChain(element, basis);
     return result;
 }
 function invokeCreationUsingBasisChain(element, declaration) {
@@ -234,15 +231,12 @@ function invokeCreationUsingBasisChain(element, declaration) {
     const basis = declaration.basis;
     const creation = declaration.creation;
     const creationAsync = declaration.creationAsync;
-    if (creation && creationAsync) {
+    if (creation && creationAsync)
         throw misuse("'creation' and 'creationAsync' cannot be defined together");
-    }
-    if (creation) {
+    if (creation)
         result = creation(element, basis ? () => invokeCreationUsingBasisChain(element, basis) : NOP);
-    }
-    else if (creationAsync) {
+    else if (creationAsync)
         result = creationAsync(element, basis ? () => invokeCreationUsingBasisChain(element, basis) : NOP_ASYNC);
-    }
     else if (basis)
         result = invokeCreationUsingBasisChain(element, basis);
     return result;
@@ -299,7 +293,7 @@ class ReactiveNodeImpl extends ReactiveNode {
         this.priority = Priority.realtime;
         this.childrenShuffling = false;
         ReactiveNodeImpl.grandNodeCount++;
-        if (this.has(Mode.independentUpdate))
+        if (this.has(Mode.autonomous))
             ReactiveNodeImpl.disposableNodeCount++;
     }
     get strictOrder() { return this.children.isStrict; }
@@ -312,8 +306,8 @@ class ReactiveNodeImpl extends ReactiveNode {
         updateNow(this.seat);
     }
     configureReactronic(options) {
-        if (this.stamp < Number.MAX_SAFE_INTEGER - 1 || !this.has(Mode.independentUpdate))
-            throw new Error("reactronic can be configured only for elements with independent update mode and only during activation");
+        if (this.stamp < Number.MAX_SAFE_INTEGER - 1 || !this.has(Mode.autonomous))
+            throw new Error("reactronic can be configured only for elements with autonomous mode and only during activation");
         return ReactiveSystem.getOperation(this.update).configure(options);
     }
     static get ownSeat() {
@@ -479,7 +473,7 @@ function updateIncrementally(owner, stamp, allChildren, items, priority) {
 function triggerUpdateViaSeat(seat) {
     const node = seat.instance;
     if (node.stamp >= 0) {
-        if (node.has(Mode.independentUpdate)) {
+        if (node.has(Mode.autonomous)) {
             if (node.stamp === Number.MAX_SAFE_INTEGER) {
                 Transaction.outside(() => {
                     if (ReactiveSystem.isLogging)
@@ -543,7 +537,7 @@ function triggerDeactivation(seat, isLeader, individual) {
             console.log(`WARNING: it is recommended to assign explicit key for conditional element in order to avoid unexpected side effects: ${node.key}`);
         node.stamp = ~node.stamp;
         const childrenAreLeaders = unobs(() => driver.destroy(node, isLeader));
-        if (node.has(Mode.independentUpdate)) {
+        if (node.has(Mode.autonomous)) {
             seat.aux = undefined;
             const last = gLastToDispose;
             if (last)

package/build/dist/source/util/Utils.js

@@ -101,7 +101,7 @@ export function getCallerInfo(prefix) {
     return result;
 }
 function extractFunctionAndLocation(s) {
-    const match = s.match(/(?:\s*at\s+)?(?:(\S+)\s\()?(?:.*?)([^\/\(\):]+)(?:(:|\d)*\)?)$/);
+    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.309",
+  "version": "0.24.400",
   "description": "Reactronic - Transactional Reactive State Management",
   "publisher": "Nezaboodka Software",
   "license": "Apache-2.0",
@@ -31,13 +31,13 @@
   },
   "homepage": "https://github.com/nezaboodka/reactronic/blob/master/README.md#readme",
   "devDependencies": {
-    "@types/node": "20.11.28",
-    "@types/react": "18.3.4",
-    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "7.2.0",
-    "ava": "6.1.2",
-    "c8": "9.1.0",
-    "eslint": "8.57.0",
+    "@types/node": "22.8.5",
+    "@types/react": "18.3.12",
+    "@typescript-eslint/eslint-plugin": "8.12.2",
+    "@typescript-eslint/parser": "8.12.2",
+    "ava": "6.2.0",
+    "c8": "10.1.2",
+    "eslint": "9.13.0",
     "react": "18.3.1",
     "ts-node": "10.9.2",
     "typescript": "5.5.4"