verstak 0.22.516 → 0.23.100

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

@@ -22,27 +22,14 @@ import { emitLetters, equalCellRanges } from "./CellRange";
 import { Cursor, Align } from "./Cursor";
 export var Priority;
 (function (Priority) {
-    Priority[Priority["SyncP0"] = 0] = "SyncP0";
-    Priority[Priority["AsyncP1"] = 1] = "AsyncP1";
-    Priority[Priority["AsyncP2"] = 2] = "AsyncP2";
+    Priority[Priority["Realtime"] = 0] = "Realtime";
+    Priority[Priority["Normal"] = 1] = "Normal";
+    Priority[Priority["Background"] = 2] = "Background";
 })(Priority || (Priority = {}));
-export function asBaseFor(outer, base) {
-    if (outer instanceof Function)
-        outer = { render: outer };
-    if (base instanceof Function)
-        base = { render: base };
-    const result = Object.assign(Object.assign(Object.assign({}, base), outer), { initialize: via(outer === null || outer === void 0 ? void 0 : outer.initialize, base.initialize), render: via(outer === null || outer === void 0 ? void 0 : outer.render, base.render), finalize: via(outer === null || outer === void 0 ? void 0 : outer.finalize, base.finalize) });
-    return result;
-}
-function via(outer, base) {
-    const inherited = base !== null && base !== void 0 ? base : NOP;
-    return outer ? b => outer(b, () => inherited(b)) : inherited;
-}
-export function nestedContext(type, context) {
-    return VBlockImpl.setContext(type, context);
-}
-export function useContext(type) {
-    return VBlockImpl.use(type);
+export function vmt(body) {
+    if (body instanceof Function)
+        body = { render: body };
+    return body;
 }
 export class VBlock {
     get isInitialRendering() {
@@ -50,7 +37,7 @@ export class VBlock {
     }
     static root(render) {
         gSysRoot.instance.body.render = render;
-        prepareAndRunRender(gSysRoot, false, false);
+        triggerRendering(gSysRoot);
     }
     static get current() {
         return gCurrent.instance;
@@ -62,7 +49,7 @@ export class VBlock {
         forEachChildRecursively(gSysRoot, action);
     }
     static claim(driver, body) {
-        var _a, _b;
+        var _a;
         let result;
         const owner = gCurrent.instance;
         const children = owner.children;
@@ -81,7 +68,7 @@ export class VBlock {
             result = ex.instance;
             if (result.driver !== driver && driver !== undefined)
                 throw new Error(`changing block driver is not yet supported: "${result.driver.name}" -> "${driver === null || driver === void 0 ? void 0 : driver.name}"`);
-            const exTriggers = (_b = result.body) === null || _b === void 0 ? void 0 : _b.triggers;
+            const exTriggers = result.body.triggers;
             if (triggersAreEqual(body.triggers, exTriggers))
                 body.triggers = exTriggers;
             result.body = body;
@@ -90,7 +77,7 @@ export class VBlock {
             result = new VBlockImpl(key || VBlock.generateKey(owner), driver, owner, body);
             result.item = children.add(result);
             VBlockImpl.grandCount++;
-            if (body.reacting)
+            if (body.autonomous)
                 VBlockImpl.disposableCount++;
         }
         return result;
@@ -100,9 +87,9 @@ export class VBlock {
         const lettered = emitLetters(n);
         let result;
         if (Rx.isLogging)
-            result = `[${getCallerInfo(lettered)}]`;
+            result = `${getCallerInfo(lettered)}!`;
         else
-            result = `[${lettered}]`;
+            result = `${lettered}!`;
         return result;
     }
     static getDefaultLoggingOptions() {
@@ -114,7 +101,7 @@ export class VBlock {
 }
 VBlock.shortFrameDuration = 16;
 VBlock.longFrameDuration = 300;
-VBlock.currentRenderingPriority = Priority.SyncP0;
+VBlock.currentRenderingPriority = Priority.Realtime;
 VBlock.frameDuration = VBlock.longFrameDuration;
 export var LayoutKind;
 (function (LayoutKind) {
@@ -126,31 +113,32 @@ export var LayoutKind;
 })(LayoutKind || (LayoutKind = {}));
 const createDefaultCursor = () => new Cursor();
 export class AbstractDriver {
-    constructor(name, layout, createCursor) {
-        this.name = name;
-        this.layout = layout;
-        this.createCursor = createCursor !== null && createCursor !== void 0 ? createCursor : createDefaultCursor;
-    }
     get isSequential() { return (this.layout & 1) === 0; }
     get isAuxiliary() { return (this.layout & 2) === 2; }
     get isBlock() { return this.layout === LayoutKind.Block; }
     get isGrid() { return this.layout === LayoutKind.Grid; }
     get isLine() { return this.layout === LayoutKind.Line; }
+    constructor(name, layout, createCursor) {
+        this.name = name;
+        this.layout = layout;
+        this.createCursor = createCursor !== null && createCursor !== void 0 ? createCursor : createDefaultCursor;
+    }
     initialize(block, native) {
-        var _a, _b;
         const b = block;
         b.native = native;
-        (_b = (_a = block.body).initialize) === null || _b === void 0 ? void 0 : _b.call(_a, block, NOP);
+        invokeInitializeChain(b, b.body);
+    }
+    deploy(block) {
+    }
+    render(block) {
+        invokeRenderChain(block, block.body);
     }
     finalize(block, isLeader) {
-        var _a, _b;
         const b = block;
-        (_b = (_a = block.body).finalize) === null || _b === void 0 ? void 0 : _b.call(_a, block, NOP);
+        invokeFinalizeChain(b, b.body);
         b.native = null;
         return isLeader;
     }
-    deploy(block, sequential) {
-    }
     applyCellRange(block, cellRange) {
     }
     applyWidthGrowth(block, widthGrowth) {
@@ -171,24 +159,47 @@ export class AbstractDriver {
     }
     applyContentWrapping(block, contentWrapping) {
     }
-    applyFloating(block, floating) {
+    applyOverlayVisible(block, overlayVisible) {
     }
-    render(block) {
-        var _a;
-        let result;
-        const override = (_a = block.body) === null || _a === void 0 ? void 0 : _a.override;
-        if (override)
-            result = override(block, NOP);
-        else
-            result = invokeRenderFunction(block);
-        return result;
+    applyStyling(block, secondary, styleName, enabled) {
     }
 }
 AbstractDriver.group = new AbstractDriver("group", LayoutKind.Group);
-function invokeRenderFunction(block) {
+function invokeInitializeChain(block, vmt) {
+    var _a;
+    const redefined = vmt.redefinedInitialize;
+    const base = vmt.base;
+    if (!redefined) {
+        (_a = vmt.initialize) === null || _a === void 0 ? void 0 : _a.call(vmt, block);
+        if (base)
+            invokeInitializeChain(block, base);
+    }
+    else
+        redefined(block, base ? () => invokeInitializeChain(block, base) : NOP);
+}
+function invokeRenderChain(block, vmt) {
+    var _a;
+    const redefined = vmt.redefinedRender;
+    const base = vmt.base;
+    if (!redefined) {
+        if (base)
+            invokeRenderChain(block, base);
+        (_a = vmt.render) === null || _a === void 0 ? void 0 : _a.call(vmt, block);
+    }
+    else
+        redefined(block, base ? () => invokeRenderChain(block, base) : NOP);
+}
+function invokeFinalizeChain(block, vmt) {
     var _a;
-    const r = (_a = block.body.render) !== null && _a !== void 0 ? _a : NOP;
-    return r(block, NOP);
+    const redefined = vmt.redefinedFinalize;
+    const base = vmt.base;
+    if (!redefined) {
+        (_a = vmt.finalize) === null || _a === void 0 ? void 0 : _a.call(vmt, block);
+        if (base)
+            invokeFinalizeChain(block, base);
+    }
+    else
+        redefined(block, base ? () => invokeFinalizeChain(block, base) : NOP);
 }
 export class StaticDriver extends AbstractDriver {
     constructor(element, name, layout, createCursor) {
@@ -199,20 +210,39 @@ export class StaticDriver extends AbstractDriver {
         super.initialize(block, this.element);
     }
 }
+export class ContextVariable {
+    constructor(defaultValue) {
+        this.defaultValue = defaultValue;
+    }
+    set value(value) {
+        VBlockImpl.setContextVariableValue(this, value);
+    }
+    get value() {
+        return VBlockImpl.useContextVariableValue(this);
+    }
+    get valueOrUndefined() {
+        return VBlockImpl.tryUseContextVariable(this);
+    }
+}
 function getBlockKey(block) {
     return block.stamp >= 0 ? block.key : undefined;
 }
 class VBlockContext extends ObservableObject {
-    constructor(type, instance) {
+    constructor(variable, value) {
         super();
-        this.type = type;
-        this.instance = instance;
+        this.next = undefined;
+        this.variable = variable;
+        this.value = value;
     }
 }
 __decorate([
     raw,
     __metadata("design:type", Object)
-], VBlockContext.prototype, "type", void 0);
+], VBlockContext.prototype, "next", void 0);
+__decorate([
+    raw,
+    __metadata("design:type", ContextVariable)
+], VBlockContext.prototype, "variable", void 0);
 class VBlockImpl extends VBlock {
     constructor(key, driver, owner, body) {
         super();
@@ -221,6 +251,7 @@ class VBlockImpl extends VBlock {
         this.body = body;
         this.model = undefined;
         this.assignedCells = undefined;
+        this.assignedStyle = false;
         this.appliedCellRange = Cursor.UndefinedCellRange;
         this.appliedWidthGrowth = 0;
         this.appliedMinWidth = "";
@@ -231,9 +262,9 @@ class VBlockImpl extends VBlock {
         this.appliedContentAlignment = Align.Default;
         this.appliedFrameAlignment = Align.Default;
         this.appliedContentWrapping = false;
-        this.appliedFloating = false;
+        this.appliedOverlayVisible = undefined;
         this.childrenShuffling = false;
-        this.renderingPriority = Priority.SyncP0;
+        this.renderingPriority = Priority.Realtime;
         this.level = owner.level + 1;
         this.host = owner;
         this.children = new Collection(driver.isSequential, getBlockKey);
@@ -242,11 +273,17 @@ class VBlockImpl extends VBlock {
         this.stamp = 0;
         this.native = undefined;
         this.cursor = driver.createCursor();
-        this.senior = owner.context ? owner : owner.senior;
+        this.outer = owner.context ? owner : owner.outer;
         this.context = undefined;
     }
-    rerender(_triggers) {
-        runRender(this.item);
+    get isMoved() {
+        let owner = this.host;
+        if (owner.driver.isLine)
+            owner = owner.host;
+        return owner.children.isMoved(this.item);
+    }
+    render(_triggers) {
+        renderNow(this.item);
     }
     get cells() { return this.assignedCells; }
     set cells(value) {
@@ -322,50 +359,59 @@ class VBlockImpl extends VBlock {
             this.appliedContentWrapping = value;
         }
     }
-    get floating() { return this.appliedFloating; }
-    set floating(value) {
-        if (value !== this.appliedFloating) {
-            this.driver.applyFloating(this, value);
-            this.appliedFloating = value;
+    get overlayVisible() { return this.appliedOverlayVisible; }
+    set overlayVisible(value) {
+        if (value !== this.appliedOverlayVisible) {
+            this.driver.applyOverlayVisible(this, value);
+            this.appliedOverlayVisible = value;
         }
     }
+    style(styleName, enabled) {
+        this.driver.applyStyling(this, this.assignedStyle, styleName, enabled);
+        this.assignedStyle = true;
+    }
     configureReactronic(options) {
-        if (this.stamp !== 1 || !this.body.reacting)
+        if (this.stamp !== 1 || !this.body.autonomous)
             throw new Error("reactronic can be configured only for reacting blocks and only inside initialize");
-        return Rx.getController(this.rerender).configure(options);
+        return Rx.getController(this.render).configure(options);
     }
-    static use(type) {
+    static tryUseContextVariable(variable) {
         var _a, _b;
         let b = gCurrent.instance;
-        while (((_a = b.context) === null || _a === void 0 ? void 0 : _a.type) !== type && b.host !== b)
-            b = b.senior;
-        if (b.host === b)
-            throw new Error(`${type.name} context doesn't exist`);
-        return (_b = b.context) === null || _b === void 0 ? void 0 : _b.instance;
+        while (((_a = b.context) === null || _a === void 0 ? void 0 : _a.variable) !== variable && b.host !== b)
+            b = b.outer;
+        return (_b = b.context) === null || _b === void 0 ? void 0 : _b.value;
+    }
+    static useContextVariableValue(variable) {
+        var _a;
+        const result = (_a = VBlockImpl.tryUseContextVariable(variable)) !== null && _a !== void 0 ? _a : variable.defaultValue;
+        if (!result)
+            throw new Error("context doesn't exist");
+        return result;
     }
-    static setContext(type, context) {
+    static setContextVariableValue(variable, value) {
         const block = gCurrent.instance;
         const host = block.host;
-        const hostCtx = nonreactive(() => { var _a; return (_a = host.context) === null || _a === void 0 ? void 0 : _a.instance; });
-        if (context && context !== hostCtx) {
+        const hostCtx = nonreactive(() => { var _a; return (_a = host.context) === null || _a === void 0 ? void 0 : _a.value; });
+        if (value && value !== hostCtx) {
             if (hostCtx)
-                block.senior = host;
+                block.outer = host;
             else
-                block.senior = host.senior;
+                block.outer = host.outer;
             Transaction.run({ separation: true }, () => {
                 const ctx = block.context;
                 if (ctx) {
-                    ctx.type = type;
-                    ctx.instance = context;
+                    ctx.variable = variable;
+                    ctx.value = value;
                 }
                 else
-                    block.context = new VBlockContext(type, context);
+                    block.context = new VBlockContext(variable, value);
             });
         }
         else if (hostCtx)
-            block.senior = host;
+            block.outer = host;
         else
-            block.senior = host.senior;
+            block.outer = host.outer;
     }
 }
 VBlockImpl.grandCount = 0;
@@ -381,7 +427,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], VBlockImpl.prototype, "rerender", null);
+], VBlockImpl.prototype, "render", null);
 function runRenderNestedTreesThenDo(error, action) {
     var _a;
     const current = gCurrent;
@@ -392,7 +438,7 @@ function runRenderNestedTreesThenDo(error, action) {
         try {
             children.endMerge(error);
             for (const item of children.removedItems(true)) {
-                runFinalize(item, true, true);
+                triggerFinalization(item, true, true);
             }
             if (!error) {
                 const ownerIsBlock = owner.driver.isBlock;
@@ -409,11 +455,11 @@ function runRenderNestedTreesThenDo(error, action) {
                     const block = item.instance;
                     const driver = block.driver;
                     const host = driver.isLine ? owner : partHost;
-                    const p = (_a = block.renderingPriority) !== null && _a !== void 0 ? _a : Priority.SyncP0;
+                    const p = (_a = block.renderingPriority) !== null && _a !== void 0 ? _a : Priority.Realtime;
                     redeploy = markToRedeployIfNecessary(redeploy, host, item, children, sequential);
-                    if (p === Priority.SyncP0)
-                        prepareAndRunRender(item, children.isMoved(item), sequential);
-                    else if (p === Priority.AsyncP1)
+                    if (p === Priority.Realtime)
+                        triggerRendering(item);
+                    else if (p === Priority.Normal)
                         p1 = push(item, p1);
                     else
                         p2 = push(item, p2);
@@ -447,9 +493,9 @@ function startIncrementalRendering(owner, allChildren, priority1, priority2) {
     return __awaiter(this, void 0, void 0, function* () {
         const stamp = owner.instance.stamp;
         if (priority1)
-            yield renderIncrementally(owner, stamp, allChildren, priority1, Priority.AsyncP1);
+            yield renderIncrementally(owner, stamp, allChildren, priority1, Priority.Normal);
         if (priority2)
-            yield renderIncrementally(owner, stamp, allChildren, priority2, Priority.AsyncP2);
+            yield renderIncrementally(owner, stamp, allChildren, priority2, Priority.Background);
     });
 }
 function renderIncrementally(owner, stamp, allChildren, items, priority) {
@@ -460,13 +506,12 @@ function renderIncrementally(owner, stamp, allChildren, items, priority) {
             let outerPriority = VBlock.currentRenderingPriority;
             VBlock.currentRenderingPriority = priority;
             try {
-                const sequential = block.children.strict;
                 if (block.childrenShuffling)
                     shuffle(items);
-                const frameDurationLimit = priority === Priority.AsyncP2 ? VBlock.shortFrameDuration : Infinity;
+                const frameDurationLimit = priority === Priority.Background ? VBlock.shortFrameDuration : Infinity;
                 let frameDuration = Math.min(frameDurationLimit, Math.max(VBlock.frameDuration / 4, VBlock.shortFrameDuration));
                 for (const child of items) {
-                    prepareAndRunRender(child, allChildren.isMoved(child), sequential);
+                    triggerRendering(child);
                     if (Transaction.isFrameOver(1, frameDuration)) {
                         VBlock.currentRenderingPriority = outerPriority;
                         yield Transaction.requestNextFrame(0);
@@ -484,51 +529,46 @@ function renderIncrementally(owner, stamp, allChildren, items, priority) {
         }
     });
 }
-function prepareAndRunRender(item, redeploy, sequential) {
-    var _a, _b;
+function triggerRendering(item) {
     const block = item.instance;
     if (block.stamp >= 0) {
-        prepareRender(item, redeploy, sequential);
-        if ((_a = block.body) === null || _a === void 0 ? void 0 : _a.reacting)
-            nonreactive(block.rerender, (_b = block.body) === null || _b === void 0 ? void 0 : _b.triggers);
-        else
-            runRender(item);
-    }
-}
-function prepareRender(item, redeploy, sequential) {
-    const block = item.instance;
-    const driver = block.driver;
-    if (block.stamp === 0) {
-        block.stamp = 1;
-        runUnder(item, () => {
-            var _a;
-            if ((_a = block.body) === null || _a === void 0 ? void 0 : _a.reacting) {
+        if (block.body.autonomous) {
+            if (block.stamp === 0) {
                 Transaction.outside(() => {
                     if (Rx.isLogging)
                         Rx.setLoggingHint(block, block.key);
-                    Rx.getController(block.rerender).configure({
+                    Rx.getController(block.render).configure({
                         order: block.level,
                     });
                 });
             }
-            driver.initialize(block, undefined);
-            driver.deploy(block, sequential);
-        });
+            nonreactive(block.render, block.body.triggers);
+        }
+        else
+            renderNow(item);
     }
-    else if (redeploy)
-        runUnder(item, () => {
-            driver.deploy(block, sequential);
-        });
 }
-function runRender(item) {
+function redeployIfNecessary(block) {
+    const driver = block.driver;
+    if (block.stamp === 0) {
+        block.stamp = 1;
+        driver.initialize(block, undefined);
+        driver.deploy(block);
+    }
+    else if (block.isMoved)
+        driver.deploy(block);
+}
+function renderNow(item) {
     const block = item.instance;
     if (block.stamp >= 0) {
         let result = undefined;
         runUnder(item, () => {
             try {
+                redeployIfNecessary(block);
                 block.stamp++;
                 block.numerator = 0;
                 block.assignedCells = undefined;
+                block.assignedStyle = false;
                 block.children.beginMerge();
                 result = block.driver.render(block);
                 if (block.driver.isLine)
@@ -548,15 +588,14 @@ function runRender(item) {
         });
     }
 }
-function runFinalize(item, isLeader, individual) {
-    var _a;
+function triggerFinalization(item, isLeader, individual) {
     const block = item.instance;
     if (block.stamp >= 0) {
         if (individual && block.key !== block.body.key && !block.driver.isLine)
             console.log(`WARNING: it is recommended to assign explicit key for conditionally rendered block in order to avoid unexpected side effects: ${block.key}`);
         block.stamp = ~block.stamp;
         const childrenAreLeaders = block.driver.finalize(block, isLeader);
-        if ((_a = block.body) === null || _a === void 0 ? void 0 : _a.reacting) {
+        if (block.body.autonomous) {
             item.aux = undefined;
             const last = gLastToDispose;
             if (last)
@@ -569,7 +608,7 @@ function runFinalize(item, isLeader, individual) {
                 });
         }
         for (const item of block.children.items())
-            runFinalize(item, childrenAreLeaders, false);
+            triggerFinalization(item, childrenAreLeaders, false);
         VBlockImpl.grandCount--;
     }
 }
@@ -662,7 +701,7 @@ function defaultReject(error) {
 Promise.prototype.then = reactronicDomHookedThen;
 const NOP = (...args) => { };
 const gSysDriver = new StaticDriver(null, "SYSTEM", LayoutKind.Group);
-const gSysRoot = Collection.createItem(new VBlockImpl(gSysDriver.name, gSysDriver, { level: 0 }, { reacting: true, render: NOP }));
+const gSysRoot = Collection.createItem(new VBlockImpl(gSysDriver.name, gSysDriver, { level: 0 }, { autonomous: true, render: NOP }));
 gSysRoot.instance.item = gSysRoot;
 Object.defineProperty(gSysRoot.instance, "host", {
     value: gSysRoot.instance,

package/build/dist/source/html/Blocks.d.ts

@@ -18,6 +18,7 @@ export declare class VerstakDriver<T extends HTMLElement> extends HtmlDriver<T>
     applyContentAlignment(block: VBlock<T>, contentAlign: Align): void;
     applyFrameAlignment(block: VBlock<T>, frameAlign: Align): void;
     applyContentWrapping(block: VBlock<T>, contentWrapping: boolean): void;
-    applyFloating(block: VBlock<T>, floating: boolean): void;
+    applyOverlayVisible(block: VBlock<T>, overlayVisible: boolean | undefined): void;
+    applyStyling(block: VBlock<T, any, any>, secondary: boolean, styleName: string, enabled?: boolean): void;
     render(block: VBlock<T>): void | Promise<void>;
 }

package/build/dist/source/html/Blocks.js

@@ -1,21 +1,21 @@
-import { VBlock, LayoutKind, Align, GridCursor, asBaseFor } from "../core/api";
+import { VBlock, LayoutKind, Align, GridCursor, vmt } from "../core/api";
 import { HtmlDriver } from "./HtmlDriver";
 export function Block(body) {
     return VBlock.claim(VerstakTags.block, body);
 }
 export function PlainText(content, body) {
-    return VBlock.claim(VerstakTags.text, asBaseFor(body, {
-        render(b) {
-            b.native.innerText = content;
-        },
-    }));
+    return VBlock.claim(VerstakTags.text, Object.assign(Object.assign({}, vmt(body)), { base: {
+            render(b) {
+                b.native.innerText = content;
+            }
+        } }));
 }
 export function HtmlText(content, body) {
-    return VBlock.claim(VerstakTags.text, asBaseFor(body, {
-        render(b) {
-            b.native.innerHTML = content;
-        },
-    }));
+    return VBlock.claim(VerstakTags.text, Object.assign(Object.assign({}, vmt(body)), { base: {
+            render(b) {
+                b.native.innerHTML = content;
+            }
+        } }));
 }
 export function Grid(body) {
     return VBlock.claim(VerstakTags.grid, body);
@@ -110,11 +110,32 @@ export class VerstakDriver extends HtmlDriver {
         else
             block.native.removeAttribute("wrapping");
     }
-    applyFloating(block, floating) {
-        if (floating)
-            block.native.setAttribute("floating", "true");
+    applyOverlayVisible(block, overlayVisible) {
+        const e = block.native;
+        const parent = HtmlDriver.findNearestParentHtmlBlock(block).native;
+        if (overlayVisible === true) {
+            const doc = document.body;
+            const rect = parent.getBoundingClientRect();
+            const h = doc.offsetWidth - rect.left > rect.right ? "rightward" : "leftward";
+            const v = doc.clientHeight - rect.top > rect.bottom ? "downward" : "upward";
+            e.setAttribute("overlay", `${h}-${v}`);
+            parent.setAttribute("stacking", "true");
+        }
+        else {
+            parent.removeAttribute("stacking");
+            if (overlayVisible === false)
+                e.setAttribute("overlay", "hidden");
+            else
+                e.removeAttribute("overlay");
+        }
+    }
+    applyStyling(block, secondary, styleName, enabled) {
+        const e = block.native;
+        enabled !== null && enabled !== void 0 ? enabled : (enabled = true);
+        if (secondary)
+            e.classList.toggle(styleName, enabled);
         else
-            block.native.removeAttribute("floating");
+            e.className = enabled ? styleName : "";
     }
     render(block) {
         if (block.driver.layout < LayoutKind.Line)