reactronic 0.94.25032 → 0.94.25033

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

@@ -21,5 +21,5 @@ export { Journal } from "./core/Journal.js";
 export { runAtomically, runNonReactively, runSensitively, runContextually, manageReactiveOperation, configureCurrentReactiveOperation, disposeObservableObject } from "./System.js";
 export { ReactiveSystem, observable, atomic, reactive, cached, options } from "./System.js";
 export { ReactiveOperationEx } from "./OperationEx.js";
-export { launch, ReactiveTreeNode, BaseDriver, ReactiveTreeVariable } from "./core/TreeNode.js";
+export { declare, derived, launch, ReactiveTreeNode, BaseDriver, ReactiveTreeVariable } from "./core/TreeNode.js";
 export type { Script, ScriptAsync, Handler, ReactiveTreeNodeDecl, ReactiveTreeNodeDriver, ReactiveTreeNodeContext } from "./core/TreeNode.js";

package/build/dist/source/api.js

@@ -17,4 +17,4 @@ export { Journal } from "./core/Journal.js";
 export { runAtomically, runNonReactively, runSensitively, runContextually, manageReactiveOperation, configureCurrentReactiveOperation, disposeObservableObject } from "./System.js";
 export { ReactiveSystem, observable, atomic, reactive, cached, options } from "./System.js";
 export { ReactiveOperationEx } from "./OperationEx.js";
-export { launch, ReactiveTreeNode, BaseDriver, ReactiveTreeVariable } from "./core/TreeNode.js";
+export { declare, derived, launch, ReactiveTreeNode, BaseDriver, ReactiveTreeVariable } from "./core/TreeNode.js";

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

@@ -6,6 +6,10 @@ import { ObservableObject } from "../core/Mvcc.js";
 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 function declare<E = void>(driver: ReactiveTreeNodeDriver<E>, script?: Script<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, preparation?: Script<E>, preparationAsync?: ScriptAsync<E>, finalization?: Script<E>, triggers?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
+export declare function declare<E = void>(driver: ReactiveTreeNodeDriver<E>, declaration?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
+export declare function declare<E = void>(driver: ReactiveTreeNodeDriver<E>, scriptOrDeclaration?: Script<E> | ReactiveTreeNodeDecl<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, preparation?: Script<E>, preparationAsync?: ScriptAsync<E>, finalization?: Script<E>, triggers?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
+export declare function derived<E = void>(declaration?: ReactiveTreeNodeDecl<E>, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNodeDecl<E>;
 export declare function launch<T>(node: ReactiveTreeNode<T>, triggers?: unknown): ReactiveTreeNode<T>;
 export declare abstract class ReactiveTreeNode<E = unknown> {
     static readonly shortFrameDuration = 16;
@@ -32,13 +36,9 @@ export declare abstract class ReactiveTreeNode<E = unknown> {
     abstract configureReactivity(options: Partial<ReactivityOptions>): ReactivityOptions;
     static get current(): ReactiveTreeNode;
     static get isFirstScriptRun(): boolean;
-    static declare<E = void>(driver: ReactiveTreeNodeDriver<E>, script?: Script<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, preparation?: Script<E>, preparationAsync?: ScriptAsync<E>, finalization?: Script<E>, triggers?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
-    static declare<E = void>(driver: ReactiveTreeNodeDriver<E>, declaration?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
-    static declare<E = void>(driver: ReactiveTreeNodeDriver<E>, scriptOrDeclaration?: Script<E> | ReactiveTreeNodeDecl<E>, scriptAsync?: ScriptAsync<E>, key?: string, mode?: Mode, preparation?: Script<E>, preparationAsync?: ScriptAsync<E>, finalization?: Script<E>, triggers?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
-    static withBasis<E = void>(declaration?: ReactiveTreeNodeDecl<E>, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNodeDecl<E>;
     static launchScript(node: ReactiveTreeNode<any>, triggers: unknown): void;
     static launchFinalization(node: ReactiveTreeNode<any>): void;
-    static runNestedNodeScriptsThenDo(action: (error: unknown) => void): void;
+    static launchNestedNodesThenDo(action: (error: unknown) => void): void;
     static markAsMounted(node: ReactiveTreeNode<any>, yes: boolean): void;
     lookupTreeNodeByUri<E = unknown>(uri: string): ReactiveTreeNode<E> | undefined;
     static findMatchingHost<E = unknown, R = unknown>(node: ReactiveTreeNode<E>, match: Handler<ReactiveTreeNode<E>, boolean>): ReactiveTreeNode<R> | undefined;

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

@@ -24,6 +24,50 @@ import { Priority, Mode, Isolation, Reentrance } from "../Enums.js";
 import { ObservableObject } from "../core/Mvcc.js";
 import { Transaction } from "../core/Transaction.js";
 import { ReactiveSystem, options, observable, reactive, runAtomically, runNonReactively, manageReactiveOperation, disposeObservableObject } from "../System.js";
+export function declare(driver, scriptOrDeclaration, scriptAsync, key, mode, preparation, preparationAsync, finalization, triggers, basis) {
+    let result;
+    let declaration;
+    if (scriptOrDeclaration instanceof Function) {
+        declaration = {
+            script: scriptOrDeclaration, scriptAsync, key, mode,
+            preparation, preparationAsync, finalization, triggers, basis,
+        };
+    }
+    else
+        declaration = scriptOrDeclaration !== null && scriptOrDeclaration !== void 0 ? scriptOrDeclaration : {};
+    let effectiveKey = declaration.key;
+    const owner = gNodeSlot === null || gNodeSlot === void 0 ? void 0 : gNodeSlot.instance;
+    if (owner) {
+        let existing = owner.driver.declareChild(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 'script' only"));
+        if (existing) {
+            result = existing.instance;
+            if (result.driver !== driver && driver !== undefined)
+                throw misuse(`changing element driver is not yet supported: "${result.driver.name}" -> "${driver === null || driver === void 0 ? void 0 : driver.name}"`);
+            const exTriggers = result.declaration.triggers;
+            if (observablesAreEqual(declaration.triggers, exTriggers))
+                declaration.triggers = exTriggers;
+            result.declaration = declaration;
+        }
+        else {
+            result = new ReactiveTreeNodeImpl(effectiveKey || generateKey(owner), driver, declaration, owner);
+            result.slot = children.mergeAsAdded(result);
+        }
+    }
+    else {
+        result = new ReactiveTreeNodeImpl(effectiveKey || generateKey(owner), driver, declaration, owner);
+        result.slot = MergeList.createItem(result);
+    }
+    return result;
+}
+export function derived(declaration, basis) {
+    if (declaration)
+        declaration.basis = basis;
+    else
+        declaration = basis !== null && basis !== void 0 ? basis : {};
+    return declaration;
+}
 export function launch(node, triggers) {
     ReactiveTreeNode.launchScript(node, triggers);
     return node;
@@ -35,50 +79,6 @@ export class ReactiveTreeNode {
     static get isFirstScriptRun() {
         return ReactiveTreeNode.current.stamp === 1;
     }
-    static declare(driver, scriptOrDeclaration, scriptAsync, key, mode, preparation, preparationAsync, finalization, triggers, basis) {
-        let result;
-        let declaration;
-        if (scriptOrDeclaration instanceof Function) {
-            declaration = {
-                script: scriptOrDeclaration, scriptAsync, key, mode,
-                preparation, preparationAsync, finalization, triggers, basis,
-            };
-        }
-        else
-            declaration = scriptOrDeclaration !== null && scriptOrDeclaration !== void 0 ? scriptOrDeclaration : {};
-        let effectiveKey = declaration.key;
-        const owner = gNodeSlot === null || gNodeSlot === void 0 ? void 0 : gNodeSlot.instance;
-        if (owner) {
-            let existing = owner.driver.declareChild(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 'script' only"));
-            if (existing) {
-                result = existing.instance;
-                if (result.driver !== driver && driver !== undefined)
-                    throw misuse(`changing element driver is not yet supported: "${result.driver.name}" -> "${driver === null || driver === void 0 ? void 0 : driver.name}"`);
-                const exTriggers = result.declaration.triggers;
-                if (observablesAreEqual(declaration.triggers, exTriggers))
-                    declaration.triggers = exTriggers;
-                result.declaration = declaration;
-            }
-            else {
-                result = new ReactiveTreeNodeImpl(effectiveKey || generateKey(owner), driver, declaration, owner);
-                result.slot = children.mergeAsAdded(result);
-            }
-        }
-        else {
-            result = new ReactiveTreeNodeImpl(effectiveKey || generateKey(owner), driver, declaration, owner);
-            result.slot = MergeList.createItem(result);
-        }
-        return result;
-    }
-    static withBasis(declaration, basis) {
-        if (declaration)
-            declaration.basis = basis;
-        else
-            declaration = basis !== null && basis !== void 0 ? basis : {};
-        return declaration;
-    }
     static launchScript(node, triggers) {
         const impl = node;
         const declaration = impl.declaration;
@@ -91,8 +91,8 @@ export class ReactiveTreeNode {
         const impl = node;
         launchFinalization(impl.slot, true, true);
     }
-    static runNestedNodeScriptsThenDo(action) {
-        runNestedNodeScriptsThenDoImpl(ReactiveTreeNodeImpl.nodeSlot, undefined, action);
+    static launchNestedNodesThenDo(action) {
+        launchNestedNodesThenDoImpl(ReactiveTreeNodeImpl.nodeSlot, undefined, action);
     }
     static markAsMounted(node, yes) {
         const n = node;
@@ -383,7 +383,7 @@ function gatherAuthorityAndPath(node, path, relativeTo) {
 function getNodeKey(node) {
     return node.stamp >= 0 ? node.key : undefined;
 }
-function runNestedNodeScriptsThenDoImpl(nodeSlot, error, action) {
+function launchNestedNodesThenDoImpl(nodeSlot, error, action) {
     runInsideContextOfNode(nodeSlot, () => {
         var _a;
         const owner = nodeSlot.instance;
@@ -531,10 +531,10 @@ function runScriptNow(nodeSlot) {
                     node.children.beginMerge();
                     const driver = node.driver;
                     result = driver.runScript(node);
-                    result = proceedSyncOrAsync(result, v => { runNestedNodeScriptsThenDoImpl(nodeSlot, undefined, NOP); return v; }, e => { console.log(e); runNestedNodeScriptsThenDoImpl(nodeSlot, e !== null && e !== void 0 ? e : new Error("unknown error"), NOP); });
+                    result = proceedSyncOrAsync(result, v => { launchNestedNodesThenDoImpl(nodeSlot, undefined, NOP); return v; }, e => { console.log(e); launchNestedNodesThenDoImpl(nodeSlot, e !== null && e !== void 0 ? e : new Error("unknown error"), NOP); });
                 }
                 catch (e) {
-                    runNestedNodeScriptsThenDoImpl(nodeSlot, e, NOP);
+                    launchNestedNodesThenDoImpl(nodeSlot, e, NOP);
                     console.log(`Reactive node script failed: ${node.key}`);
                     console.log(`${e}`);
                 }

package/package.json

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