verstak 0.23.108 → 0.23.109

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

@@ -20,13 +20,13 @@ import { reactive, nonreactive, Transaction, options, Reentrance, Rx, Collection
 import { BlockKind, Priority, Mode, Align } from "./Interfaces";
 import { emitLetters, equalBlockCoords, parseBlockCoords, getCallerInfo } from "./Utils";
 export class Verstak {
-    static claim(driver, builder, original) {
+    static claim(driver, builder, base) {
         var _a;
         let result;
         if (builder)
-            builder.original = original;
+            builder.base = base;
         else
-            builder = original !== null && original !== void 0 ? original : {};
+            builder = base !== null && base !== void 0 ? base : {};
         let key = builder.key;
         const owner = gCurrent === null || gCurrent === void 0 ? void 0 : gCurrent.instance;
         if (owner) {
@@ -49,12 +49,12 @@ export class Verstak {
                 d.builder = builder;
             }
             else {
-                result = new XBlock(key || generateKey(owner), driver, owner, builder);
+                result = new BlockImpl(key || generateKey(owner), driver, owner, builder);
                 result.descriptor.item = children.add(result);
             }
         }
         else {
-            result = new XBlock(key || "", driver, owner, builder);
+            result = new BlockImpl(key || "", driver, owner, builder);
             result.descriptor.item = Collection.createItem(result);
             triggerRendering(result.descriptor.item);
         }
@@ -69,10 +69,10 @@ export class Verstak {
         runRenderNestedTreesThenDo(undefined, action);
     }
     static getDefaultLoggingOptions() {
-        return XBlock.logging;
+        return BlockImpl.logging;
     }
     static setDefaultLoggingOptions(logging) {
-        XBlock.logging = logging;
+        BlockImpl.logging = logging;
     }
 }
 Verstak.shortFrameDuration = 16;
@@ -108,32 +108,19 @@ export class BaseDriver {
         chainedFinalize(b, b.descriptor.builder);
         return isLeader;
     }
-    applyKind(block, value) {
-    }
-    applyCoords(block, value) {
-    }
-    applyWidthGrowth(block, value) {
-    }
-    applyMinWidth(block, value) {
-    }
-    applyMaxWidth(block, value) {
-    }
-    applyHeightGrowth(block, value) {
-    }
-    applyMinHeight(block, value) {
-    }
-    applyMaxHeight(block, value) {
-    }
-    applyContentAlignment(block, value) {
-    }
-    applyBlockAlignment(block, value) {
-    }
-    applyContentWrapping(block, value) {
-    }
-    applyOverlayVisible(block, value) {
-    }
-    applyStyle(block, secondary, styleName, enabled) {
-    }
+    applyKind(block, value) { }
+    applyCoords(block, value) { }
+    applyWidthGrowth(block, value) { }
+    applyMinWidth(block, value) { }
+    applyMaxWidth(block, value) { }
+    applyHeightGrowth(block, value) { }
+    applyMinHeight(block, value) { }
+    applyMaxHeight(block, value) { }
+    applyContentAlignment(block, value) { }
+    applyBlockAlignment(block, value) { }
+    applyContentWrapping(block, value) { }
+    applyOverlayVisible(block, value) { }
+    applyStyle(block, secondary, styleName, enabled) { }
 }
 BaseDriver.fragment = new BaseDriver("fragment", false, b => b.kind = BlockKind.Group);
 function generateKey(owner) {
@@ -146,49 +133,49 @@ function generateKey(owner) {
         result = `·${lettered}`;
     return result;
 }
-function chainedMode(builder) {
+function chainedMode(bb) {
     var _a;
-    return (_a = builder === null || builder === void 0 ? void 0 : builder.modes) !== null && _a !== void 0 ? _a : ((builder === null || builder === void 0 ? void 0 : builder.original) ? chainedMode(builder === null || builder === void 0 ? void 0 : builder.original) : Mode.Default);
+    return (_a = bb === null || bb === void 0 ? void 0 : bb.mode) !== null && _a !== void 0 ? _a : ((bb === null || bb === void 0 ? void 0 : bb.base) ? chainedMode(bb === null || bb === void 0 ? void 0 : bb.base) : Mode.Default);
 }
-function chainedClaim(block, builder) {
-    const claim = builder.claim;
-    const original = builder.original;
+function chainedClaim(block, bb) {
+    const claim = bb.claim;
+    const base = bb.base;
     if (claim)
-        claim(block, original ? () => chainedClaim(block, original) : NOP);
-    else if (original)
-        chainedClaim(block, original);
+        claim(block, base ? () => chainedClaim(block, base) : NOP);
+    else if (base)
+        chainedClaim(block, base);
 }
-function chainedCreate(block, builder) {
-    const create = builder.create;
-    const original = builder.original;
+function chainedCreate(block, bb) {
+    const create = bb.create;
+    const base = bb.base;
     if (create)
-        create(block, original ? () => chainedCreate(block, original) : NOP);
-    else if (original)
-        chainedCreate(block, original);
+        create(block, base ? () => chainedCreate(block, base) : NOP);
+    else if (base)
+        chainedCreate(block, base);
 }
-function chainedInitialize(block, builder) {
-    const initialize = builder.initialize;
-    const original = builder.original;
+function chainedInitialize(block, bb) {
+    const initialize = bb.initialize;
+    const base = bb.base;
     if (initialize)
-        initialize(block, original ? () => chainedInitialize(block, original) : NOP);
-    else if (original)
-        chainedInitialize(block, original);
+        initialize(block, base ? () => chainedInitialize(block, base) : NOP);
+    else if (base)
+        chainedInitialize(block, base);
 }
-function chainedRender(block, builder) {
-    const render = builder.render;
-    const original = builder.original;
+function chainedRender(block, bb) {
+    const render = bb.render;
+    const base = bb.base;
     if (render)
-        render(block, original ? () => chainedRender(block, original) : NOP);
-    else if (original)
-        chainedRender(block, original);
+        render(block, base ? () => chainedRender(block, base) : NOP);
+    else if (base)
+        chainedRender(block, base);
 }
-function chainedFinalize(block, builder) {
-    const finalize = builder.finalize;
-    const original = builder.original;
+function chainedFinalize(block, bb) {
+    const finalize = bb.finalize;
+    const base = bb.base;
     if (finalize)
-        finalize(block, original ? () => chainedFinalize(block, original) : NOP);
-    else if (original)
-        chainedFinalize(block, original);
+        finalize(block, base ? () => chainedFinalize(block, base) : NOP);
+    else if (base)
+        chainedFinalize(block, base);
 }
 export class StaticDriver extends BaseDriver {
     constructor(element, name, isRow, preset) {
@@ -215,13 +202,13 @@ export class ContextVariable {
         this.defaultValue = defaultValue;
     }
     set value(value) {
-        XBlock.setContextVariableValue(this, value);
+        BlockImpl.setContextVariableValue(this, value);
     }
     get value() {
-        return XBlock.useContextVariableValue(this);
+        return BlockImpl.useContextVariableValue(this);
     }
     get valueOrUndefined() {
-        return XBlock.tryUseContextVariable(this);
+        return BlockImpl.tryUseContextVariable(this);
     }
 }
 class CursorPosition {
@@ -242,7 +229,7 @@ var CursorFlags;
 })(CursorFlags || (CursorFlags = {}));
 const UndefinedBlockCoords = Object.freeze({ x1: 0, y1: 0, x2: 0, y2: 0 });
 const InitialCursorPosition = Object.freeze(new CursorPosition({ x: 1, y: 1, runningMaxX: 0, runningMaxY: 0, flags: CursorFlags.None }));
-class XBlockCtx extends ObservableObject {
+class BlockCtxImpl extends ObservableObject {
     constructor(variable, value) {
         super();
         this.next = undefined;
@@ -253,12 +240,12 @@ class XBlockCtx extends ObservableObject {
 __decorate([
     raw,
     __metadata("design:type", Object)
-], XBlockCtx.prototype, "next", void 0);
+], BlockCtxImpl.prototype, "next", void 0);
 __decorate([
     raw,
     __metadata("design:type", ContextVariable)
-], XBlockCtx.prototype, "variable", void 0);
-class XBlockDescriptor {
+], BlockCtxImpl.prototype, "variable", void 0);
+class BlockDescriptorImpl {
     constructor(key, driver, builder, self, owner) {
         this.maxColumnCount = 0;
         this.maxRowCount = 0;
@@ -287,9 +274,9 @@ class XBlockDescriptor {
         this.cursorPosition = undefined;
     }
 }
-class XBlock {
+class BlockImpl {
     constructor(key, driver, owner, builder) {
-        this.descriptor = new XBlockDescriptor(key, driver, builder, this, owner);
+        this.descriptor = new BlockDescriptorImpl(key, driver, builder, this, owner);
         this.native = undefined;
         this.model = undefined;
         this.controller = undefined;
@@ -306,24 +293,30 @@ class XBlock {
         this._blockAlignment = Align.Default;
         this._contentWrapping = false;
         this._overlayVisible = undefined;
-        this.hasStyles = false;
+        this._hasStyles = false;
         this.childrenShuffling = false;
         this.renderingPriority = Priority.Realtime;
-        XBlock.grandCount++;
-        if (this.has(Mode.SeparateReaction))
-            XBlock.disposableCount++;
+        BlockImpl.grandCount++;
+        if (this.isOn(Mode.PinpointRefresh))
+            BlockImpl.disposableCount++;
     }
     render(_triggers) {
         renderNow(this.descriptor.item);
     }
-    has(mode) { return (chainedMode(this.descriptor.builder) & mode) === mode; }
+    prepareForRender() {
+        this._area = undefined;
+        this._hasStyles = false;
+    }
+    isOn(mode) {
+        return (chainedMode(this.descriptor.builder) & mode) === mode;
+    }
     get isInitialRendering() { return this.descriptor.stamp === 2; }
     get isSequential() { return this.descriptor.children.isStrict; }
     set isSequential(value) { this.descriptor.children.isStrict = value; }
     get isAuxiliary() { return this.kind > BlockKind.Note; }
     get isBand() { return this.kind === BlockKind.Band; }
     get isTable() { return this.kind === BlockKind.Table; }
-    get isAutoMountEnabled() { return !this.has(Mode.ManualMount) && this.descriptor.host !== this; }
+    get isAutoMountingEnabled() { return !this.isOn(Mode.ManualMounting) && this.descriptor.host !== this; }
     get isMoved() { return this.descriptor.owner.descriptor.children.isMoved(this.descriptor.item); }
     get kind() { return this._kind; }
     set kind(value) {
@@ -342,7 +335,7 @@ class XBlock {
             const cursorPosition = (_b = (_a = d.item.prev) === null || _a === void 0 ? void 0 : _a.instance.descriptor.cursorPosition) !== null && _b !== void 0 ? _b : InitialCursorPosition;
             const newCursorPosition = d.cursorPosition = owner.children.isStrict ? new CursorPosition(cursorPosition) : undefined;
             const isCursorBlock = driver instanceof CursorCommandDriver;
-            const coords = areaToCoords(!isCursorBlock, value, owner.maxColumnCount, owner.maxRowCount, cursorPosition, newCursorPosition);
+            const coords = getEffectiveBlockCoords(!isCursorBlock, value, owner.maxColumnCount, owner.maxRowCount, cursorPosition, newCursorPosition);
             if (!equalBlockCoords(coords, this._coords)) {
                 driver.applyCoords(this, coords);
                 this._coords = coords;
@@ -422,12 +415,12 @@ class XBlock {
             this._overlayVisible = value;
         }
     }
-    style(styleName, enabled) {
-        this.descriptor.driver.applyStyle(this, this.hasStyles, styleName, enabled);
-        this.hasStyles = true;
+    useStyle(styleName, enabled) {
+        this.descriptor.driver.applyStyle(this, this._hasStyles, styleName, enabled);
+        this._hasStyles = true;
     }
     configureReactronic(options) {
-        if (this.descriptor.stamp !== 1 || !this.has(Mode.SeparateReaction))
+        if (this.descriptor.stamp !== 1 || !this.isOn(Mode.PinpointRefresh))
             throw new Error("reactronic can be configured only for blocks with separate reaction mode and only inside initialize");
         return Rx.getController(this.render).configure(options);
     }
@@ -438,20 +431,20 @@ class XBlock {
     }
     static tryUseContextVariable(variable) {
         var _a, _b;
-        let b = XBlock.curr.instance;
+        let b = BlockImpl.curr.instance;
         while (((_a = b.descriptor.context) === null || _a === void 0 ? void 0 : _a.variable) !== variable && b.descriptor.owner !== b)
             b = b.descriptor.outer;
         return (_b = b.descriptor.context) === null || _b === void 0 ? void 0 : _b.value;
     }
     static useContextVariableValue(variable) {
         var _a;
-        const result = (_a = XBlock.tryUseContextVariable(variable)) !== null && _a !== void 0 ? _a : variable.defaultValue;
+        const result = (_a = BlockImpl.tryUseContextVariable(variable)) !== null && _a !== void 0 ? _a : variable.defaultValue;
         if (!result)
             throw new Error("context doesn't exist");
         return result;
     }
     static setContextVariableValue(variable, value) {
-        const b = XBlock.curr.instance;
+        const b = BlockImpl.curr.instance;
         const d = b.descriptor;
         const owner = d.owner;
         const hostCtx = nonreactive(() => { var _a; return (_a = owner.descriptor.context) === null || _a === void 0 ? void 0 : _a.value; });
@@ -467,7 +460,7 @@ class XBlock {
                     ctx.value = value;
                 }
                 else
-                    d.context = new XBlockCtx(variable, value);
+                    d.context = new BlockCtxImpl(variable, value);
             });
         }
         else if (hostCtx)
@@ -484,9 +477,9 @@ class XBlock {
         newCursorPosition.y = newCursorPosition.runningMaxY + 1;
     }
 }
-XBlock.grandCount = 0;
-XBlock.disposableCount = 0;
-XBlock.logging = undefined;
+BlockImpl.grandCount = 0;
+BlockImpl.disposableCount = 0;
+BlockImpl.logging = undefined;
 __decorate([
     reactive,
     options({
@@ -497,12 +490,12 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object]),
     __metadata("design:returntype", void 0)
-], XBlock.prototype, "render", null);
+], BlockImpl.prototype, "render", null);
 function getBlockKey(block) {
     const d = block.descriptor;
     return d.stamp >= 0 ? d.key : undefined;
 }
-function areaToCoords(isRegularBlock, area, maxX, maxY, cursorPosition, newCursorPosition) {
+function getEffectiveBlockCoords(isRegularBlock, area, maxX, maxY, cursorPosition, newCursorPosition) {
     var _a, _b;
     let result;
     if (typeof (area) === "string") {
@@ -581,7 +574,7 @@ function areaToCoords(isRegularBlock, area, maxX, maxY, cursorPosition, newCurso
 }
 function runRenderNestedTreesThenDo(error, action) {
     var _a;
-    const curr = XBlock.curr;
+    const curr = BlockImpl.curr;
     const owner = curr.instance;
     const children = owner.descriptor.children;
     if (children.isMergeInProgress) {
@@ -627,7 +620,7 @@ function runRenderNestedTreesThenDo(error, action) {
 function markToMountIfNecessary(mounting, host, item, children, sequential) {
     const b = item.instance;
     const d = b.descriptor;
-    if (b.native && !b.has(Mode.ManualMount)) {
+    if (b.native && !b.isOn(Mode.ManualMounting)) {
         if (mounting || d.host !== host) {
             children.markAsMoved(item);
             mounting = false;
@@ -682,7 +675,7 @@ function triggerRendering(item) {
     const b = item.instance;
     const d = b.descriptor;
     if (d.stamp >= 0) {
-        if (b.has(Mode.SeparateReaction)) {
+        if (b.isOn(Mode.PinpointRefresh)) {
             if (d.stamp === 0) {
                 Transaction.outside(() => {
                     if (Rx.isLogging)
@@ -706,11 +699,11 @@ function mountIfNecessary(block) {
         nonreactive(() => {
             driver.create(block, block);
             driver.initialize(block);
-            if (block.isAutoMountEnabled)
+            if (block.isAutoMountingEnabled)
                 driver.mount(block);
         });
     }
-    else if (block.isMoved && block.isAutoMountEnabled)
+    else if (block.isMoved && block.isAutoMountingEnabled)
         nonreactive(() => driver.mount(block));
 }
 function renderNow(item) {
@@ -723,12 +716,11 @@ function renderNow(item) {
                 mountIfNecessary(b);
                 d.stamp++;
                 d.numerator = 0;
-                b._area = undefined;
-                b.hasStyles = false;
+                b.prepareForRender();
                 d.children.beginMerge();
                 const driver = d.driver;
                 result = driver.render(b);
-                if (b._area === undefined && d.owner.isTable)
+                if (b.area === undefined && d.owner.isTable)
                     b.area = undefined;
                 if (result instanceof Promise)
                     result.then(v => { runRenderNestedTreesThenDo(undefined, NOP); return v; }, e => { console.log(e); runRenderNestedTreesThenDo(e !== null && e !== void 0 ? e : new Error("unknown error"), NOP); });
@@ -754,7 +746,7 @@ function triggerFinalization(item, isLeader, individual) {
         const childrenAreLeaders = nonreactive(() => driver.finalize(b, isLeader));
         b.native = null;
         b.controller = null;
-        if (b.has(Mode.SeparateReaction)) {
+        if (b.isOn(Mode.PinpointRefresh)) {
             item.aux = undefined;
             const last = gLastToDispose;
             if (last)
@@ -768,7 +760,7 @@ function triggerFinalization(item, isLeader, individual) {
         }
         for (const item of d.children.items())
             triggerFinalization(item, childrenAreLeaders, false);
-        XBlock.grandCount--;
+        BlockImpl.grandCount--;
     }
 }
 function runDisposalLoop() {
@@ -780,7 +772,7 @@ function runDisposalLoop() {
                 yield Transaction.requestNextFrame();
             Rx.dispose(item.instance);
             item = item.aux;
-            XBlock.disposableCount--;
+            BlockImpl.disposableCount--;
         }
         gFirstToDispose = gLastToDispose = undefined;
     });

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

@@ -1,27 +1,27 @@
-import { VBlock, BlockKind, BlockBuilder, Align, BlockCoords, BlockArea } from "../core/api";
+import { Block, BlockKind, BlockBuilder, Align, BlockCoords, BlockArea } from "../core/api";
 import { HtmlDriver } from "./HtmlDriver";
-export declare function Band<M = unknown, R = void>(builder?: BlockBuilder<HTMLElement, M, R>, base?: BlockBuilder<HTMLElement, M, R>): VBlock<HTMLElement, M, R>;
-export declare function Table<M = unknown, R = void>(builder?: BlockBuilder<HTMLElement, M, R>, base?: BlockBuilder<HTMLElement, M, R>): VBlock<HTMLElement, M, R>;
+export declare function Band<M = unknown, R = void>(builder?: BlockBuilder<HTMLElement, M, R>, base?: BlockBuilder<HTMLElement, M, R>): Block<HTMLElement, M, R>;
+export declare function Table<M = unknown, R = void>(builder?: BlockBuilder<HTMLElement, M, R>, base?: BlockBuilder<HTMLElement, M, R>): Block<HTMLElement, M, R>;
 export declare function row<T = void>(builder?: (block: void) => T, shiftCursorDown?: number): void;
 export declare function fromNewRow(shiftCursorDown?: number): void;
 export declare function cursor(areaParams: BlockArea): void;
-export declare function Note(content: string, builder?: BlockBuilder<HTMLElement, void, void>): VBlock<HTMLElement, void, void>;
-export declare function HtmlNote(content: string, builder?: BlockBuilder<HTMLElement, void, void>): VBlock<HTMLElement, void, void>;
-export declare function Group<M = unknown, R = void>(builder?: BlockBuilder<HTMLElement, M, R>, base?: BlockBuilder<HTMLElement, M, R>): VBlock<HTMLElement, M, R>;
-export declare function Fragment<M = unknown, R = void>(builder?: BlockBuilder<void, M, R>, base?: BlockBuilder<void, M, R>): VBlock<void, M, R>;
+export declare function Note(content: string, builder?: BlockBuilder<HTMLElement, void, void>): Block<HTMLElement, void, void>;
+export declare function HtmlNote(content: string, builder?: BlockBuilder<HTMLElement, void, void>): Block<HTMLElement, void, void>;
+export declare function Group<M = unknown, R = void>(builder?: BlockBuilder<HTMLElement, M, R>, base?: BlockBuilder<HTMLElement, M, R>): Block<HTMLElement, M, R>;
+export declare function Fragment<M = unknown, R = void>(builder?: BlockBuilder<void, M, R>, base?: BlockBuilder<void, M, R>): Block<void, M, R>;
 export declare class VerstakHtmlDriver<T extends HTMLElement> extends HtmlDriver<T> {
-    applyKind(block: VBlock<T, any, any>, value: BlockKind): void;
-    applyCoords(block: VBlock<T>, value: BlockCoords | undefined): void;
-    applyWidthGrowth(block: VBlock<T>, value: number): void;
-    applyMinWidth(block: VBlock<T>, value: string): void;
-    applyMaxWidth(block: VBlock<T>, value: string): void;
-    applyHeightGrowth(block: VBlock<T>, value: number): void;
-    applyMinHeight(block: VBlock<T>, value: string): void;
-    applyMaxHeight(block: VBlock<T>, value: string): void;
-    applyContentAlignment(block: VBlock<T>, value: Align): void;
-    applyBlockAlignment(block: VBlock<T>, value: Align): void;
-    applyContentWrapping(block: VBlock<T>, value: boolean): void;
-    applyOverlayVisible(block: VBlock<T>, value: boolean | undefined): void;
-    applyStyle(block: VBlock<T, any, any>, secondary: boolean, styleName: string, enabled?: boolean): void;
-    render(block: VBlock<T>): void | Promise<void>;
+    applyKind(block: Block<T, any, any>, value: BlockKind): void;
+    applyCoords(block: Block<T>, value: BlockCoords | undefined): void;
+    applyWidthGrowth(block: Block<T>, value: number): void;
+    applyMinWidth(block: Block<T>, value: string): void;
+    applyMaxWidth(block: Block<T>, value: string): void;
+    applyHeightGrowth(block: Block<T>, value: number): void;
+    applyMinHeight(block: Block<T>, value: string): void;
+    applyMaxHeight(block: Block<T>, value: string): void;
+    applyContentAlignment(block: Block<T>, value: Align): void;
+    applyBlockAlignment(block: Block<T>, value: Align): void;
+    applyContentWrapping(block: Block<T>, value: boolean): void;
+    applyOverlayVisible(block: Block<T>, value: boolean | undefined): void;
+    applyStyle(block: Block<T, any, any>, secondary: boolean, styleName: string, enabled?: boolean): void;
+    render(block: Block<T>): void | Promise<void>;
 }