js-draw 0.25.1 → 1.0.1

package/dist/mjs/rendering/caching/RenderingCacheNode.mjs

@@ -1,13 +1,12 @@
 // A cache record with sub-nodes.
-import  Color4  from '../../Color4.mjs';
 import  { sortLeavesByZIndex }  from '../../EditorImage.mjs';
-import  Rect2  from '../../math/shapes/Rect2.mjs';
+import { Rect2, Color4 } from '@js-draw/math';
 // 3x3 divisions for each node.
-var cacheDivisionSize = 3;
+const cacheDivisionSize = 3;
 // True: Show rendering updates.
-var debugMode = false;
-var RenderingCacheNode = /** @class */ (function () {
-    function RenderingCacheNode(region, cacheState) {
+const debugMode = false;
+export default class RenderingCacheNode {
+    constructor(region, cacheState) {
         this.region = region;
         this.cacheState = cacheState;
         // invariant: instantiatedChildren.length === 9
@@ -21,16 +20,16 @@ var RenderingCacheNode = /** @class */ (function () {
     // Creates a previous layer of the cache tree and adds this as a child near the
     // center of the previous layer's children.
     // Returns this' parent if it already exists.
-    RenderingCacheNode.prototype.generateParent = function () {
+    generateParent() {
         if (this.parent) {
             return this.parent;
         }
-        var parentRegion = Rect2.fromCorners(this.region.topLeft.minus(this.region.size), this.region.bottomRight.plus(this.region.size));
-        var parent = new RenderingCacheNode(parentRegion, this.cacheState);
+        const parentRegion = Rect2.fromCorners(this.region.topLeft.minus(this.region.size), this.region.bottomRight.plus(this.region.size));
+        const parent = new RenderingCacheNode(parentRegion, this.cacheState);
         parent.generateChildren();
         // Ensure the new node is matches the middle child's region.
-        var checkTolerance = this.region.maxDimension / 100;
-        var middleChildIdx = (parent.instantiatedChildren.length - 1) / 2;
+        const checkTolerance = this.region.maxDimension / 100;
+        const middleChildIdx = (parent.instantiatedChildren.length - 1) / 2;
         if (!parent.instantiatedChildren[middleChildIdx].region.eq(this.region, checkTolerance)) {
             console.error(parent.instantiatedChildren[middleChildIdx].region, '≠', this.region);
             throw new Error('Logic error: [this] is not contained within its parent\'s center child');
@@ -39,62 +38,58 @@ var RenderingCacheNode = /** @class */ (function () {
         parent.instantiatedChildren[middleChildIdx] = this;
         this.parent = parent;
         return parent;
-    };
+    }
     // Generates children, if missing.
-    RenderingCacheNode.prototype.generateChildren = function () {
+    generateChildren() {
         if (this.instantiatedChildren.length === 0) {
-            var childRects = this.region.divideIntoGrid(cacheDivisionSize, cacheDivisionSize);
+            const childRects = this.region.divideIntoGrid(cacheDivisionSize, cacheDivisionSize);
             if (this.region.size.x === 0 || this.region.size.y === 0) {
                 console.warn('Cache element has zero size! Not generating children.');
                 return;
             }
-            for (var _i = 0, childRects_1 = childRects; _i < childRects_1.length; _i++) {
-                var rect = childRects_1[_i];
-                var child = new RenderingCacheNode(rect, this.cacheState);
+            for (const rect of childRects) {
+                const child = new RenderingCacheNode(rect, this.cacheState);
                 child.parent = this;
                 this.instantiatedChildren.push(child);
             }
         }
         this.checkRep();
-    };
+    }
     // Returns CacheNodes directly contained within this.
-    RenderingCacheNode.prototype.getChildren = function () {
+    getChildren() {
         this.checkRep();
         this.generateChildren();
         return this.instantiatedChildren;
-    };
-    RenderingCacheNode.prototype.smallestChildContaining = function (rect) {
-        var _a;
-        var largerThanChildren = rect.maxDimension > this.region.maxDimension / cacheDivisionSize;
+    }
+    smallestChildContaining(rect) {
+        const largerThanChildren = rect.maxDimension > this.region.maxDimension / cacheDivisionSize;
         if (!this.region.containsRect(rect) || largerThanChildren) {
             return null;
         }
-        for (var _i = 0, _b = this.getChildren(); _i < _b.length; _i++) {
-            var child = _b[_i];
+        for (const child of this.getChildren()) {
             if (child.region.containsRect(rect)) {
-                return (_a = child.smallestChildContaining(rect)) !== null && _a !== void 0 ? _a : child;
+                return child.smallestChildContaining(rect) ?? child;
             }
         }
         return null;
-    };
+    }
     // => [true] iff [this] can be rendered without too much scaling
-    RenderingCacheNode.prototype.renderingWouldBeHighEnoughResolution = function (viewport) {
+    renderingWouldBeHighEnoughResolution(viewport) {
         // Determine how 1px in this corresponds to 1px on the canvas.
         //  this.region.w is in canvas units. Thus,
-        var sizeOfThisPixelOnCanvas = this.region.w / this.cacheState.props.blockResolution.x;
-        var sizeOfThisPixelOnScreen = viewport.getScaleFactor() * sizeOfThisPixelOnCanvas;
+        const sizeOfThisPixelOnCanvas = this.region.w / this.cacheState.props.blockResolution.x;
+        const sizeOfThisPixelOnScreen = viewport.getScaleFactor() * sizeOfThisPixelOnCanvas;
         if (sizeOfThisPixelOnScreen > this.cacheState.props.maxScale) {
             return false;
         }
         return true;
-    };
+    }
     // => [true] if all children of this can be rendered from their caches.
-    RenderingCacheNode.prototype.allChildrenCanRender = function (viewport, leavesSortedById) {
+    allChildrenCanRender(viewport, leavesSortedById) {
         if (this.instantiatedChildren.length === 0) {
             return false;
         }
-        for (var _i = 0, _a = this.instantiatedChildren; _i < _a.length; _i++) {
-            var child = _a[_i];
+        for (const child of this.instantiatedChildren) {
             if (!child.region.intersects(viewport.visibleRect)) {
                 continue;
             }
@@ -103,61 +98,57 @@ var RenderingCacheNode = /** @class */ (function () {
             }
         }
         return true;
-    };
-    RenderingCacheNode.prototype.computeSortedByLeafIds = function (leaves) {
-        var ids = leaves.slice();
-        ids.sort(function (a, b) { return a.getId() - b.getId(); });
+    }
+    computeSortedByLeafIds(leaves) {
+        const ids = leaves.slice();
+        ids.sort((a, b) => a.getId() - b.getId());
         return ids;
-    };
+    }
     // Returns a list of the ids of the nodes intersecting this
-    RenderingCacheNode.prototype.idsOfIntersecting = function (nodes) {
-        var result = [];
-        for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
-            var node = nodes_1[_i];
+    idsOfIntersecting(nodes) {
+        const result = [];
+        for (const node of nodes) {
             if (node.getBBox().intersects(this.region)) {
                 result.push(node.getId());
             }
         }
         return result;
-    };
+    }
     // Returns true iff all elems of this.renderedIds are in sortedIds.
     // sortedIds should be sorted by z-index (or some other order, so long as they are
     // sorted by the same thing as this.renderedIds.)
-    RenderingCacheNode.prototype.allRenderedIdsIn = function (sortedIds) {
+    allRenderedIdsIn(sortedIds) {
         if (this.renderedIds.length > sortedIds.length) {
             return false;
         }
-        for (var i = 0; i < this.renderedIds.length; i++) {
+        for (let i = 0; i < this.renderedIds.length; i++) {
             if (sortedIds[i] !== this.renderedIds[i]) {
                 return false;
             }
         }
         return true;
-    };
-    RenderingCacheNode.prototype.renderingIsUpToDate = function (sortedIds) {
+    }
+    renderingIsUpToDate(sortedIds) {
         if (this.cachedRenderer === null || sortedIds.length !== this.renderedIds.length) {
             return false;
         }
         return this.allRenderedIdsIn(sortedIds);
-    };
+    }
     // Render all [items] within [viewport]
-    RenderingCacheNode.prototype.renderItems = function (screenRenderer, items, viewport) {
-        var _this = this;
-        var _a, _b;
+    renderItems(screenRenderer, items, viewport) {
         if (!viewport.visibleRect.intersects(this.region)
             || items.length === 0) {
             return;
         }
-        var newItems = [];
+        const newItems = [];
         // Divide [items] until nodes are leaves or smaller than this
-        for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-            var item = items_1[_i];
-            var bbox = item.getBBox();
+        for (const item of items) {
+            const bbox = item.getBBox();
             if (!bbox.intersects(this.region)) {
                 continue;
             }
             if (bbox.maxDimension >= this.region.maxDimension) {
-                newItems.push.apply(newItems, item.getChildrenOrSelfIntersectingRegion(this.region));
+                newItems.push(...item.getChildrenOrSelfIntersectingRegion(this.region));
             }
             else {
                 newItems.push(item);
@@ -166,69 +157,62 @@ var RenderingCacheNode = /** @class */ (function () {
         items = newItems;
         // Can we cache at all?
         if (!this.cacheState.props.isOfCorrectType(screenRenderer)) {
-            items.forEach(function (item) { return item.render(screenRenderer, viewport.visibleRect); });
+            items.forEach(item => item.render(screenRenderer, viewport.visibleRect));
             return;
         }
         if (debugMode) {
             screenRenderer.drawRect(this.region, 0.5 * viewport.getSizeOfPixelOnCanvas(), { fill: Color4.yellow });
         }
         // Could we render direclty from [this] or do we need to recurse?
-        var couldRender = this.renderingWouldBeHighEnoughResolution(viewport);
+        const couldRender = this.renderingWouldBeHighEnoughResolution(viewport);
         if (!couldRender) {
-            var _loop_1 = function (child) {
-                child.renderItems(screenRenderer, items.filter(function (item) {
+            for (const child of this.getChildren()) {
+                child.renderItems(screenRenderer, items.filter(item => {
                     return item.getBBox().intersects(child.region);
                 }), viewport);
-            };
-            for (var _c = 0, _d = this.getChildren(); _c < _d.length; _c++) {
-                var child = _d[_c];
-                _loop_1(child);
             }
         }
         else {
             // Determine whether we already have rendered the items
-            var tooSmallToRender = function (rect) { return rect.w / _this.region.w < 1 / _this.cacheState.props.blockResolution.x; };
-            var leaves = [];
-            for (var _e = 0, items_2 = items; _e < items_2.length; _e++) {
-                var item = items_2[_e];
-                leaves.push.apply(leaves, item.getLeavesIntersectingRegion(this.region, tooSmallToRender));
+            const tooSmallToRender = (rect) => rect.w / this.region.w < 1 / this.cacheState.props.blockResolution.x;
+            const leaves = [];
+            for (const item of items) {
+                leaves.push(...item.getLeavesIntersectingRegion(this.region, tooSmallToRender));
             }
             sortLeavesByZIndex(leaves);
-            var leavesByIds = this.computeSortedByLeafIds(leaves);
+            const leavesByIds = this.computeSortedByLeafIds(leaves);
             // No intersecting leaves? No need to render
             if (leavesByIds.length === 0) {
                 return;
             }
-            var leafIds = leavesByIds.map(function (leaf) { return leaf.getId(); });
-            var thisRenderer = void 0;
+            const leafIds = leavesByIds.map(leaf => leaf.getId());
+            let thisRenderer;
             if (!this.renderingIsUpToDate(leafIds)) {
                 if (this.allChildrenCanRender(viewport, leavesByIds)) {
-                    for (var _f = 0, _g = this.getChildren(); _f < _g.length; _f++) {
-                        var child = _g[_f];
+                    for (const child of this.getChildren()) {
                         child.renderItems(screenRenderer, items, viewport);
                     }
                     return;
                 }
-                var leafApproxRenderTime = 0;
-                for (var _h = 0, leavesByIds_1 = leavesByIds; _h < leavesByIds_1.length; _h++) {
-                    var leaf = leavesByIds_1[_h];
+                let leafApproxRenderTime = 0;
+                for (const leaf of leavesByIds) {
                     leafApproxRenderTime += leaf.getContent().getProportionalRenderingTime();
                 }
                 // Is it worth it to render the items?
                 if (leafApproxRenderTime > this.cacheState.props.minProportionalRenderTimePerCache) {
-                    var fullRerenderNeeded = true;
+                    let fullRerenderNeeded = true;
                     if (!this.cachedRenderer) {
-                        this.cachedRenderer = this.cacheState.recordManager.allocCanvas(this.region, function () { return _this.onRegionDealloc(); });
+                        this.cachedRenderer = this.cacheState.recordManager.allocCanvas(this.region, () => this.onRegionDealloc());
                     }
                     else if (leavesByIds.length > this.renderedIds.length && this.allRenderedIdsIn(leafIds) && this.renderedMaxZIndex !== null) {
                         // We often don't need to do a full re-render even if something's changed.
                         // Check whether we can just draw on top of the existing cache.
-                        var newLeaves = [];
-                        var minNewZIndex = null;
-                        for (var i = 0; i < leavesByIds.length; i++) {
-                            var leaf = leavesByIds[i];
-                            var content = leaf.getContent();
-                            var zIndex = content.getZIndex();
+                        const newLeaves = [];
+                        let minNewZIndex = null;
+                        for (let i = 0; i < leavesByIds.length; i++) {
+                            const leaf = leavesByIds[i];
+                            const content = leaf.getContent();
+                            const zIndex = content.getZIndex();
                             if (i >= this.renderedIds.length || leaf.getId() !== this.renderedIds[i]) {
                                 newLeaves.push(leaf);
                                 if (minNewZIndex === null || zIndex < minNewZIndex) {
@@ -240,9 +224,9 @@ var RenderingCacheNode = /** @class */ (function () {
                             fullRerenderNeeded = false;
                             thisRenderer = this.cachedRenderer.startRender();
                             // Looping is faster than re-sorting.
-                            for (var i = 0; i < leaves.length; i++) {
-                                var leaf = leaves[i];
-                                var zIndex = leaf.getContent().getZIndex();
+                            for (let i = 0; i < leaves.length; i++) {
+                                const leaf = leaves[i];
+                                const zIndex = leaf.getContent().getZIndex();
                                 if (zIndex > this.renderedMaxZIndex) {
                                     leaf.render(thisRenderer, this.region);
                                     this.renderedMaxZIndex = zIndex;
@@ -260,10 +244,9 @@ var RenderingCacheNode = /** @class */ (function () {
                         thisRenderer = this.cachedRenderer.startRender();
                         thisRenderer.clear();
                         this.renderedMaxZIndex = null;
-                        for (var _j = 0, leaves_1 = leaves; _j < leaves_1.length; _j++) {
-                            var leaf = leaves_1[_j];
-                            var content = leaf.getContent();
-                            (_a = this.renderedMaxZIndex) !== null && _a !== void 0 ? _a : (this.renderedMaxZIndex = content.getZIndex());
+                        for (const leaf of leaves) {
+                            const content = leaf.getContent();
+                            this.renderedMaxZIndex ??= content.getZIndex();
                             this.renderedMaxZIndex = Math.max(this.renderedMaxZIndex, content.getZIndex());
                             leaf.render(thisRenderer, this.region);
                         }
@@ -274,15 +257,14 @@ var RenderingCacheNode = /** @class */ (function () {
                     this.renderedIds = leafIds;
                 }
                 else {
-                    (_b = this.cachedRenderer) === null || _b === void 0 ? void 0 : _b.dealloc();
+                    this.cachedRenderer?.dealloc();
                     // Slightly increase the clip region to prevent seams.
                     // Divide by two because grownBy expands the rectangle on all sides.
-                    var pixelSize = viewport.getSizeOfPixelOnCanvas();
-                    var expandedRegion = new Rect2(this.region.x, this.region.y, this.region.w + pixelSize, this.region.h + pixelSize);
-                    var clip = true;
+                    const pixelSize = viewport.getSizeOfPixelOnCanvas();
+                    const expandedRegion = new Rect2(this.region.x, this.region.y, this.region.w + pixelSize, this.region.h + pixelSize);
+                    const clip = true;
                     screenRenderer.startObject(expandedRegion, clip);
-                    for (var _k = 0, leaves_2 = leaves; _k < leaves_2.length; _k++) {
-                        var leaf = leaves_2[_k];
+                    for (const leaf of leaves) {
                         leaf.render(screenRenderer, this.region.intersection(viewport.visibleRect));
                     }
                     screenRenderer.endObject();
@@ -292,39 +274,38 @@ var RenderingCacheNode = /** @class */ (function () {
                 thisRenderer = this.cachedRenderer.startRender();
             }
             if (thisRenderer) {
-                var transformMat = this.cachedRenderer.getTransform(this.region).inverse();
+                const transformMat = this.cachedRenderer.getTransform(this.region).inverse();
                 screenRenderer.renderFromOtherOfSameType(transformMat, thisRenderer);
             }
             // Can we clean up this' children? (Are they unused?)
-            if (this.instantiatedChildren.every(function (child) { return child.isEmpty(); })) {
+            if (this.instantiatedChildren.every(child => child.isEmpty())) {
                 this.instantiatedChildren = [];
             }
         }
         this.checkRep();
-    };
+    }
     // Returns true iff this/its children have no cached state.
-    RenderingCacheNode.prototype.isEmpty = function () {
+    isEmpty() {
         if (this.cachedRenderer !== null) {
             return false;
         }
-        return this.instantiatedChildren.every(function (child) { return child.isEmpty(); });
-    };
-    RenderingCacheNode.prototype.onRegionDealloc = function () {
+        return this.instantiatedChildren.every(child => child.isEmpty());
+    }
+    onRegionDealloc() {
         this.cachedRenderer = null;
         if (this.isEmpty()) {
             this.instantiatedChildren = [];
         }
-    };
-    RenderingCacheNode.prototype.checkRep = function () {
+    }
+    checkRep() {
         if (this.instantiatedChildren.length !== cacheDivisionSize * cacheDivisionSize && this.instantiatedChildren.length !== 0) {
-            throw new Error("Repcheck: Wrong number of children. Got ".concat(this.instantiatedChildren.length));
+            throw new Error(`Repcheck: Wrong number of children. Got ${this.instantiatedChildren.length}`);
         }
         if (this.renderedIds[1] !== undefined && this.renderedIds[0] >= this.renderedIds[1]) {
             console.error(this.renderedIds);
             throw new Error('Repcheck: First two ids are not in ascending order!');
         }
-        for (var _i = 0, _a = this.instantiatedChildren; _i < _a.length; _i++) {
-            var child = _a[_i];
+        for (const child of this.instantiatedChildren) {
             if (child.parent !== this) {
                 throw new Error('Children should be linked to their parents!');
             }
@@ -332,7 +313,5 @@ var RenderingCacheNode = /** @class */ (function () {
         if (this.cachedRenderer && !this.cachedRenderer.isAllocd()) {
             throw new Error('this\' cachedRenderer != null, but is dealloc\'d');
         }
-    };
-    return RenderingCacheNode;
-}());
-export default RenderingCacheNode;
+    }
+}

package/dist/mjs/rendering/caching/testUtils.mjs

@@ -1,30 +1,28 @@
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-import  { Vec2 }  from '../../math/Vec2.mjs';
+import { Vec2 } from '@js-draw/math';
 import  DummyRenderer  from '../renderers/DummyRenderer.mjs';
 import  createEditor  from '../../testing/createEditor.mjs';
 import  RenderingCache  from './RenderingCache.mjs';
 // Override any default test options with [cacheOptions]
-export var createCache = function (onRenderAlloc, cacheOptions) {
-    var editor = createEditor();
-    var cache = new RenderingCache(__assign({ createRenderer: function () {
-            var renderer = new DummyRenderer(editor.viewport);
-            onRenderAlloc === null || onRenderAlloc === void 0 ? void 0 : onRenderAlloc(renderer);
+export const createCache = (onRenderAlloc, cacheOptions) => {
+    const editor = createEditor();
+    const cache = new RenderingCache({
+        createRenderer() {
+            const renderer = new DummyRenderer(editor.viewport);
+            onRenderAlloc?.(renderer);
             return renderer;
-        }, isOfCorrectType: function (renderer) {
+        },
+        isOfCorrectType(renderer) {
             return renderer instanceof DummyRenderer;
-        }, blockResolution: Vec2.of(500, 500), cacheSize: 500 * 10 * 4, maxScale: 2, minProportionalRenderTimePerCache: 0, minProportionalRenderTimeToUseCache: 0 }, cacheOptions));
+        },
+        blockResolution: Vec2.of(500, 500),
+        cacheSize: 500 * 10 * 4,
+        maxScale: 2,
+        minProportionalRenderTimePerCache: 0,
+        minProportionalRenderTimeToUseCache: 0,
+        ...cacheOptions
+    });
     return {
-        cache: cache,
-        editor: editor
+        cache,
+        editor
     };
 };

package/dist/mjs/rendering/caching/types.d.ts

@@ -1,6 +1,6 @@
-import { Vec2 } from '../../math/Vec2';
-import AbstractRenderer from '../renderers/AbstractRenderer';
-import { CacheRecordManager } from './CacheRecordManager';
+import type { Vec2 } from '@js-draw/math';
+import type AbstractRenderer from '../renderers/AbstractRenderer';
+import type { CacheRecordManager } from './CacheRecordManager';
 export type CacheAddress = number;
 export type BeforeDeallocCallback = () => void;
 export interface CacheProps {

package/dist/mjs/rendering/localization.mjs

@@ -1,9 +1,9 @@
-export var defaultTextRendererLocalization = {
-    pathNodeCount: function (count) { return "There are ".concat(count, " visible path objects."); },
-    textNodeCount: function (count) { return "There are ".concat(count, " visible text nodes."); },
-    imageNodeCount: function (nodeCount) { return "There are ".concat(nodeCount, " visible image nodes."); },
-    textNode: function (content) { return "Text: ".concat(content); },
-    imageNode: function (label) { return "Image: ".concat(label); },
+export const defaultTextRendererLocalization = {
+    pathNodeCount: (count) => `There are ${count} visible path objects.`,
+    textNodeCount: (count) => `There are ${count} visible text nodes.`,
+    imageNodeCount: (nodeCount) => `There are ${nodeCount} visible image nodes.`,
+    textNode: (content) => `Text: ${content}`,
+    imageNode: (label) => `Image: ${label}`,
     unlabeledImageNode: 'Unlabeled image',
     rerenderAsText: 'Re-render as text',
 };

package/dist/mjs/rendering/renderers/AbstractRenderer.d.ts

@@ -1,18 +1,9 @@
-import Color4 from '../../Color4';
+import { Color4, Mat33, Point2, Vec2, Rect2 } from '@js-draw/math';
 import { LoadSaveDataTable } from '../../components/AbstractComponent';
-import Mat33 from '../../math/Mat33';
-import Path, { PathCommand } from '../../math/shapes/Path';
-import Rect2 from '../../math/shapes/Rect2';
-import { Point2, Vec2 } from '../../math/Vec2';
 import Viewport from '../../Viewport';
 import RenderingStyle from '../RenderingStyle';
 import TextRenderingStyle from '../TextRenderingStyle';
-export interface RenderablePathSpec {
-    startPoint: Point2;
-    commands: PathCommand[];
-    style: RenderingStyle;
-    path?: Path;
-}
+import RenderablePathSpec from '../RenderablePathSpec';
 export interface RenderableImage {
     transform: Mat33;
     image: HTMLImageElement | HTMLCanvasElement;