reactronic 0.96.26016 → 0.96.26018

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

@@ -1,7 +1,8 @@
 export declare enum Mode {
     default = 0,
-    autonomous = 1,
-    external = 2
+    primitive = 1,
+    intermediate = 2,
+    external = 4
 }
 export declare enum Priority {
     realtime = 0,

package/build/dist/source/Enums.js

@@ -1,8 +1,9 @@
 export var Mode;
 (function (Mode) {
     Mode[Mode["default"] = 0] = "default";
-    Mode[Mode["autonomous"] = 1] = "autonomous";
-    Mode[Mode["external"] = 2] = "external";
+    Mode[Mode["primitive"] = 1] = "primitive";
+    Mode[Mode["intermediate"] = 2] = "intermediate";
+    Mode[Mode["external"] = 4] = "external";
 })(Mode || (Mode = {}));
 export var Priority;
 (function (Priority) {

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

@@ -6,9 +6,9 @@ import { RxObject } from "../core/Mvcc.js";
 export type Script<E> = (this: E, o: E, basis: () => void) => void;
 export type ScriptAsync<E> = (this: E, o: E, basis: () => Promise<void>) => Promise<void>;
 export type Handler<E = unknown, R = void> = (o: E) => R;
-export declare function declare<E = void>(driver: ReactiveTreeNodeDriver<E>, body?: Script<E>, bodyTask?: ScriptAsync<E>, key?: string, mode?: Mode, preparation?: Script<E>, preparationTask?: ScriptAsync<E>, finalization?: Script<E>, signalArgs?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
+export declare function declare<E = void>(driver: ReactiveTreeNodeDriver<E>, body?: Script<E>, bodyTask?: ScriptAsync<E>, key?: string, mode?: Mode, unmounted?: boolean, preparation?: Script<E>, preparationTask?: ScriptAsync<E>, mounting?: Script<E>, finalization?: Script<E>, signalArgs?: 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>, bodyOrDeclaration?: Script<E> | ReactiveTreeNodeDecl<E>, bodyTask?: ScriptAsync<E>, key?: string, mode?: Mode, preparation?: Script<E>, preparationTask?: ScriptAsync<E>, finalization?: Script<E>, signalArgs?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
+export declare function declare<E = void>(driver: ReactiveTreeNodeDriver<E>, bodyOrDeclaration?: Script<E> | ReactiveTreeNodeDecl<E>, bodyTask?: ScriptAsync<E>, key?: string, mode?: Mode, unmounted?: boolean, preparation?: Script<E>, preparationTask?: ScriptAsync<E>, mounting?: Script<E>, finalization?: Script<E>, signalArgs?: unknown, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNode<E>;
 export declare function derivative<E = void>(declaration?: ReactiveTreeNodeDecl<E>, basis?: ReactiveTreeNodeDecl<E>): ReactiveTreeNodeDecl<E>;
 export declare function launch<T>(func: (...args: any[]) => T, ...args: any[]): T;
 export declare abstract class ReactiveTreeNode<E = unknown> extends LinkedItem<ReactiveTreeNode<E>> {
@@ -32,6 +32,7 @@ export declare abstract class ReactiveTreeNode<E = unknown> extends LinkedItem<R
     abstract strictOrder: boolean;
     abstract getUri(relativeTo?: ReactiveTreeNode<any>): string;
     abstract has(mode: Mode): boolean;
+    abstract hasAny(mode: Mode): boolean;
     abstract configureReactivity(options: Partial<ReactivityOptions>): ReactivityOptions;
     static get current(): ReactiveTreeNode;
     static get isFirstBodyBuild(): boolean;
@@ -51,8 +52,10 @@ export type ReactiveTreeNodeDecl<E = unknown> = {
     bodyTask?: ScriptAsync<E>;
     key?: string;
     mode?: Mode;
+    unmounted?: boolean;
     preparation?: Script<E>;
     preparationTask?: ScriptAsync<E>;
+    mounting?: Script<E>;
     finalization?: Script<E>;
     signalArgs?: unknown;
     basis?: ReactiveTreeNodeDecl<E>;
@@ -126,6 +129,7 @@ declare class ReactiveTreeNode$<E = unknown> extends ReactiveTreeNode<E> {
     set strictOrder(value: boolean);
     get isMoved(): boolean;
     has(mode: Mode): boolean;
+    hasAny(mode: Mode): boolean;
     body(_signalArgs: unknown): void;
     configureReactivity(options: Partial<ReactivityOptions>): ReactivityOptions;
     static get node(): ReactiveTreeNode$;

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

@@ -16,12 +16,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { misuse } from "../util/Dbg.js";
 import { Uri } from "../util/Uri.js";
 import { LinkedList, LinkedItem, Mark, LinkedSubList } from "../util/LinkedList.js";
-import { emitLetters, flags, getCallerInfo, proceedSyncOrAsync } from "../util/Utils.js";
+import { emitLetters, flags, flagsAny, getCallerInfo, proceedSyncOrAsync } from "../util/Utils.js";
 import { Priority, Mode, Isolation, Reentrance } from "../Enums.js";
 import { RxObject } from "../core/Mvcc.js";
 import { Transaction } from "../core/Transaction.js";
 import { ReactiveSystem, options, signal, reaction, runTransactional, runNonReactive, manageReaction, disposeRxObject } from "../System.js";
-export function declare(driver, bodyOrDeclaration, bodyTask, key, mode, preparation, preparationTask, finalization, signalArgs, basis) {
+export function declare(driver, bodyOrDeclaration, bodyTask, key, mode, unmounted, preparation, preparationTask, mounting, finalization, signalArgs, basis) {
     let result;
     let declaration;
     if (bodyOrDeclaration instanceof Function) {
@@ -152,9 +152,10 @@ export class BaseDriver {
         return isLeader;
     }
     runMount(node) {
+        invokeMountingUsingBasisChain(node.element, node.declaration);
     }
     rebuildBody(node) {
-        return invokeScriptUsingBasisChain(node.element, node.declaration);
+        return invokeBodyUsingBasisChain(node.element, node.declaration);
     }
     declareChild(ownerNode, childDriver, childDeclaration, childBasis) {
         return undefined;
@@ -192,7 +193,7 @@ export 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 invokeBodyUsingBasisChain(element, declaration) {
     let result = undefined;
     const basis = declaration.basis;
     const body = declaration.body;
@@ -200,11 +201,11 @@ function invokeScriptUsingBasisChain(element, declaration) {
     if (body && bodyTask)
         throw misuse("'body' and 'bodyTask' cannot be defined together");
     if (body)
-        result = body.call(element, element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP);
+        result = body.call(element, element, basis ? () => invokeBodyUsingBasisChain(element, basis) : NOP);
     else if (bodyTask)
-        result = bodyTask.call(element, element, basis ? () => invokeScriptUsingBasisChain(element, basis) : NOP_ASYNC);
+        result = bodyTask.call(element, element, basis ? () => invokeBodyUsingBasisChain(element, basis) : NOP_ASYNC);
     else if (basis)
-        result = invokeScriptUsingBasisChain(element, basis);
+        result = invokeBodyUsingBasisChain(element, basis);
     return result;
 }
 function invokePreparationUsingBasisChain(element, declaration) {
@@ -222,6 +223,14 @@ function invokePreparationUsingBasisChain(element, declaration) {
         result = invokePreparationUsingBasisChain(element, basis);
     return result;
 }
+function invokeMountingUsingBasisChain(element, declaration) {
+    const basis = declaration.basis;
+    const mounting = declaration.mounting;
+    if (mounting)
+        mounting.call(element, element, basis ? () => invokeMountingUsingBasisChain(element, basis) : NOP);
+    else if (basis)
+        invokeMountingUsingBasisChain(element, basis);
+}
 function invokeFinalizationUsingBasisChain(element, declaration) {
     const basis = declaration.basis;
     const finalization = declaration.finalization;
@@ -271,7 +280,7 @@ class ReactiveTreeNode$ extends ReactiveTreeNode {
         this.priority = Priority.realtime;
         this.childrenShuffling = false;
         ReactiveTreeNode$.grandNodeCount++;
-        if (this.has(Mode.autonomous))
+        if (!this.has(Mode.primitive))
             ReactiveTreeNode$.disposableNodeCount++;
     }
     getUri(relativeTo) {
@@ -291,17 +300,20 @@ class ReactiveTreeNode$ extends ReactiveTreeNode {
         this.children.isStrictOrder = value;
     }
     get isMoved() {
-        return this.mark === Mark.modified;
+        return this.mark === Mark.moved;
     }
     has(mode) {
         return flags(getModeUsingBasisChain(this.declaration), mode);
     }
+    hasAny(mode) {
+        return flagsAny(getModeUsingBasisChain(this.declaration), mode);
+    }
     body(_signalArgs) {
         rebuildBodyNow(this);
     }
     configureReactivity(options) {
-        if (this.stamp < Number.MAX_SAFE_INTEGER - 1 || !this.has(Mode.autonomous))
-            throw misuse("reactronic can be configured only for elements with autonomous mode and only during preparation");
+        if (this.stamp < Number.MAX_SAFE_INTEGER - 1 || this.has(Mode.primitive))
+            throw misuse("reactivity can be configured only for elements with non-primitive mode and only during preparation");
         return manageReaction(this.body).configure(options);
     }
     static get node() {
@@ -395,8 +407,8 @@ function launchNestedNodesThenDoImpl(node, error, action) {
                         if (Transaction.isCanceled)
                             break;
                         const child = c;
-                        const isPart = child.driver.isPartition;
-                        const host = isPart ? owner : partition;
+                        const isPartition = child.driver.isPartition;
+                        const host = isPartition ? owner : partition;
                         mounting = markToMountIfNecessary(mounting, host, child, children, sequential);
                         const p = (_a = child.priority) !== null && _a !== void 0 ? _a : Priority.realtime;
                         if (p === Priority.realtime)
@@ -405,7 +417,7 @@ function launchNestedNodesThenDoImpl(node, error, action) {
                             p1 = push(child, p1);
                         else
                             p2 = push(child, p2);
-                        if (isPart)
+                        if (isPartition)
                             partition = child;
                     }
                     if (!Transaction.isCanceled && (p1 !== undefined || p2 !== undefined))
@@ -420,13 +432,15 @@ function launchNestedNodesThenDoImpl(node, error, action) {
     });
 }
 function markToMountIfNecessary(mounting, host, node, children, sequential) {
-    if (node.element.native && !node.has(Mode.external)) {
+    if (node.declaration.unmounted)
+        host = node;
+    if (!node.hasAny(Mode.intermediate | Mode.external)) {
         if (mounting || node.host !== host) {
-            LinkedItem.setStatus$(node, Mark.modified, node.rank);
+            LinkedItem.setStatus$(node, Mark.moved, node.rank);
             mounting = false;
         }
     }
-    else if (sequential && node.mark === Mark.modified)
+    else if (sequential && node.mark === Mark.moved)
         mounting = true;
     node.host = host;
     return mounting;
@@ -473,7 +487,7 @@ function runNestedScriptsIncrementally(owner, stamp, allChildren, items, priorit
 }
 function rebuildBodyImpl(node) {
     if (node.stamp >= 0) {
-        if (node.has(Mode.autonomous)) {
+        if (!node.has(Mode.primitive)) {
             if (node.stamp === Number.MAX_SAFE_INTEGER) {
                 Transaction.outside(() => {
                     if (ReactiveSystem.isLogging)
@@ -537,7 +551,7 @@ function launchFinalizationImpl(node, 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 = runNonReactive(() => driver.runFinalization(node, isLeader));
-        if (node.has(Mode.autonomous)) {
+        if (!node.has(Mode.primitive)) {
             LinkedItem.link$(gDisposeList, node, undefined);
             if (gDisposeList.first === node)
                 runTransactional({ isolation: Isolation.disjoinForInternalDisposal, hint: `runDisposalLoop(initiator=${node.key})` }, () => {

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

@@ -30,7 +30,7 @@ export declare class LinkedList<T extends LinkedItem<T>> {
 export declare enum Mark {
     reaffirmed = 0,
     added = 1,
-    modified = 2,
+    moved = 2,
     removed = 3
 }
 export declare class LinkedItem<T extends LinkedItem<T>> {

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

@@ -120,7 +120,7 @@ export var Mark;
 (function (Mark) {
     Mark[Mark["reaffirmed"] = 0] = "reaffirmed";
     Mark[Mark["added"] = 1] = "added";
-    Mark[Mark["modified"] = 2] = "modified";
+    Mark[Mark["moved"] = 2] = "moved";
     Mark[Mark["removed"] = 3] = "removed";
 })(Mark || (Mark = {}));
 const MARK_MOD = 4;
@@ -271,7 +271,7 @@ export class LinkedListRenovation {
                 const expected = (_a = grabExternalIfAny(result, x)) !== null && _a !== void 0 ? _a : x;
                 LinkedItem.link$(result, x, undefined);
                 if (list.isStrictOrder && expected !== this.expected) {
-                    LinkedItem.setStatus$(x, Mark.modified, result.count);
+                    LinkedItem.setStatus$(x, Mark.moved, result.count);
                     (_b = this.diff) === null || _b === void 0 ? void 0 : _b.push(x);
                 }
                 else
@@ -303,8 +303,8 @@ export class LinkedListRenovation {
             throw misuse("only reaffirmed items can be marked as modified");
         const m = item.mark;
         if (m === Mark.reaffirmed)
-            LinkedItem.setStatus$(item, Mark.modified, item.rank);
-        else if (m !== Mark.modified)
+            LinkedItem.setStatus$(item, Mark.moved, item.rank);
+        else if (m !== Mark.moved)
             throw misuse("item is renovated already and cannot be marked as modified");
     }
     thisIsMoved(item, before) {
@@ -312,7 +312,7 @@ export class LinkedListRenovation {
         if (item.list !== this.former)
             throw misuse("cannot move item which doesn't belong to former list");
         LinkedList.move$(this.list, item, before);
-        LinkedItem.setStatus$(item, Mark.modified, 0);
+        LinkedItem.setStatus$(item, Mark.moved, 0);
         (_a = this.diff) === null || _a === void 0 ? void 0 : _a.push(item);
     }
     thisIsRemoved(item) {

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

@@ -5,6 +5,7 @@ export declare class Utils {
     static copyAllMembers(source: any, target: any): any;
 }
 export declare function flags(value: number, flags: number): boolean;
+export declare function flagsAny(value: number, flags: number): boolean;
 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>;

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

@@ -40,6 +40,9 @@ export class Utils {
 export function flags(value, flags) {
     return (value & flags) === flags;
 }
+export function flagsAny(value, flags) {
+    return (value & flags) !== 0;
+}
 export function UNDEF(...args) {
     throw fatal(new Error("this method should never be called"));
 }

package/package.json

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