reactronic 0.24.306 → 0.24.308

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

@@ -36,7 +36,10 @@ 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>, basis?: RxNodeDecl<E>): RxNode<E>;
+    static declare<E = void>(driver: RxNodeDriver<E>, script?: Script<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, creation?: Script<E>, creationAsync?: ScriptAsync<E>, destruction?: Script<E>, triggers?: unknown, basis?: RxNodeDecl<E>): RxNode<E>;
+    static declare<E = void>(driver: RxNodeDriver<E>, declaration?: RxNodeDecl<E>): RxNode<E>;
+    static declare<E = void>(driver: RxNodeDriver<E>, scriptOrDeclaration?: Script<E> | RxNodeDecl<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, creation?: Script<E>, creationAsync?: ScriptAsync<E>, destruction?: Script<E>, triggers?: unknown, basis?: RxNodeDecl<E>): RxNode<E>;
+    static rebased<E = void>(declaration?: RxNodeDecl<E>, basis?: RxNodeDecl<E>): RxNodeDecl<E>;
     static get isFirstUpdate(): boolean;
     static get key(): string;
     static get stamp(): number;

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

@@ -36,18 +36,23 @@ export var Priority;
     Priority[Priority["background"] = 2] = "background";
 })(Priority || (Priority = {}));
 export class RxNode {
-    static declare(driver, declaration, basis) {
+    static declare(driver, scriptOrDeclaration, scriptAsync, key, mode, creation, creationAsync, destruction, triggers, basis) {
         let result;
-        if (declaration)
-            declaration.basis = basis;
+        let declaration;
+        if (scriptOrDeclaration instanceof Function) {
+            declaration = {
+                script: scriptOrDeclaration, scriptAsync, key, mode,
+                creation, creationAsync, destruction, triggers, basis,
+            };
+        }
         else
-            declaration = basis !== null && basis !== void 0 ? basis : {};
-        let key = declaration.key;
+            declaration = scriptOrDeclaration !== null && scriptOrDeclaration !== void 0 ? scriptOrDeclaration : {};
+        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, basis);
+            let existing = owner.driver.child(owner, driver, declaration, declaration.basis);
             const children = owner.children;
-            existing !== null && existing !== void 0 ? existing : (existing = children.tryMergeAsExisting(key = key || 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 update function only"));
             if (existing) {
                 result = existing.instance;
                 if (result.driver !== driver && driver !== undefined)
@@ -58,17 +63,24 @@ export class RxNode {
                 result.declaration = declaration;
             }
             else {
-                result = new RxNodeImpl(key || generateKey(owner), driver, declaration, owner);
+                result = new RxNodeImpl(effectiveKey || generateKey(owner), driver, declaration, owner);
                 result.seat = children.mergeAsAdded(result);
             }
         }
         else {
-            result = new RxNodeImpl(key || "", driver, declaration, owner);
+            result = new RxNodeImpl(effectiveKey || "", driver, declaration, owner);
             result.seat = MergeList.createItem(result);
             triggerUpdateViaSeat(result.seat);
         }
         return result;
     }
+    static rebased(declaration, basis) {
+        if (declaration)
+            declaration.basis = basis;
+        else
+            declaration = basis !== null && basis !== void 0 ? basis : {};
+        return declaration;
+    }
     static get isFirstUpdate() {
         return RxNodeImpl.ownSeat.instance.stamp === 1;
     }

package/package.json

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