@nerd-bible/wordgard 0.6.2-beta7 → 0.6.2-beta8

package/dist/doc.js

@@ -1392,6 +1392,8 @@ class Plot {
         constructor(type, param, marks) {
             super(param, marks);
             this.type = type;
+            if (this.type.isDoc && marks.length)
+                throw new Error("Document nodes cannot have marks");
         }
         static new(type, param, marks) {
             return new Tag(type, param, marks);

package/dist/editor.d.ts

@@ -8,6 +8,7 @@ import { PointSet, Set, RangeSet } from 'wordgard/set';
 
 type MakeSelectionStyle = (wg: Wordgard, event: MouseEvent) => Wordgard.MouseSelectionStyle | null;
 
+import Mark_ = Mark;
 /**
 A widget describes a piece of DOM content that can be used to
 render a node, a part of a node, or an extra element added via a
@@ -193,8 +194,8 @@ declare namespace Decoration {
         /**
         Override the shape used for a given mark inside the editor.
         */
-        function shape<V>(type: Mark.Type<V>, shape: Shape.Element<V> | Shape.Attribute<V> | Shape.Attributes<V>): GardState.Extension;
-        function shape(mark: Mark<null>, shape: Shape.Element<null> | Shape.Attribute<null> | Shape.Attributes<null>): GardState.Extension;
+        function shape<V>(type: Mark_.Type<V>, shape: Shape.Element<V> | Shape.Attribute<V> | Shape.Attributes<V>): GardState.Extension;
+        function shape(mark: Mark_<null>, shape: Shape.Element<null> | Shape.Attribute<null> | Shape.Attributes<null>): GardState.Extension;
     }
     /**
     A point decoration is a decoration that targets a given position

package/dist/editor.js

@@ -132,6 +132,7 @@ function joinRanges(ranges) {
     }
 }
 
+var Mark_ = Mark;
 class Widget {
     value;
     constructor(type, 
@@ -286,15 +287,15 @@ const Decoration = /*@__PURE__*/(function (Decoration) {
         }
         Tag.attribute = attribute;
     })(Decoration.Tag || (Decoration.Tag = {}));
-    (function (Mark$1) {
+    (function (Mark) {
         function shape(type, shape) {
-            if (type instanceof Mark)
+            if (type instanceof Mark_)
                 type = type.type;
             if (type.spanning && !("element" in shape))
                 throw new Error("Spanning marks must have an element shape");
-            return markShape.of({ type, modified: Mark.Type.define(type.name, { ...type.spec, shape }) });
+            return markShape.of({ type, modified: Mark_.Type.define(type.name, { ...type.spec, shape }) });
         }
-        Mark$1.shape = shape;
+        Mark.shape = shape;
     })(Decoration.Mark || (Decoration.Mark = {}));
     class Point {
         constructor() { }
@@ -763,15 +764,17 @@ class DecoIterator {
                         shape = applyDeco(shape, deco, node.tag);
                 let wrappers = this.nodeWrappers(node.tag, iter.active, !shape.hasContent);
                 let atom = !shape.hasContent;
-                if (atom)
+                if (atom) {
                     walker.node(node, shape, wrappers, pos + node.length > to ? to - pos : undefined);
-                else
+                }
+                else {
                     walker.enter(node, shape, wrappers);
-                this.widgets(node.tag, 2, walker);
+                    this.widgets(node.tag, 2, walker);
+                }
                 return !atom;
             },
             leavePlot: tag => {
-                if (started)
+                if (started && !atomParent)
                     this.widgets(tag, 3, walker);
                 else
                     started = true;
@@ -779,7 +782,7 @@ class DecoIterator {
                 this.widgets(tag, 1, walker);
             }
         };
-        if (inclusiveStart) {
+        if (inclusiveStart && !atomParent) {
             let before = pos.nodeBefore;
             if (before)
                 this.widgets(before.tag, 1, walker);
@@ -791,9 +794,10 @@ class DecoIterator {
                 let end = Math.min(to, atomParent.after), done = atomParent.after <= to;
                 walker.nodePart(atomParent.node, end - pos.pos, done);
                 pos = pos.advance(end - pos.pos);
-                if (done)
+                if (done) {
                     this.widgets(atomParent.node.tag, 1, walker);
-                atomParent = undefined;
+                    atomParent = undefined;
+                }
                 while (iter.point && iter.from < end)
                     iter.next();
             }
@@ -2082,6 +2086,9 @@ class ContentUpdate {
                             this.partialNode = null;
                             this.new.addChild(this.buildNodeShape(tag, length + (to - from), shape, reuse));
                         }
+                        else {
+                            this.partialNode.length += to - from;
+                        }
                     }
                 }
                 else if (this.new.lastChild instanceof TextTile && !this.new.lastChild.isComposition) {
@@ -2295,6 +2302,9 @@ class ContentUpdate {
                     for (let i = 0; i < wrappers; i++)
                         this.up();
                 }
+                else {
+                    this.partialNode.length += length;
+                }
             },
             widget: (widget, side) => {
                 let sideFlag = side < 0 ? 32 : side > 0 ? 64 : 0;

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export * as collab from "wordgard/collab"
 export * as command from "wordgard/command"
 export * as doc from "wordgard/doc"
 export * as editor from "wordgard/editor"
-export * as highlight-code from "wordgard/highlight-code"
+export * as highlightCode from "wordgard/highlight-code"
 export * as history from "wordgard/history"
 export * as phrases from "wordgard/phrases"
 export * as schema from "wordgard/schema"

package/dist/index.js

@@ -2,7 +2,7 @@ export * as collab from "wordgard/collab"
 export * as command from "wordgard/command"
 export * as doc from "wordgard/doc"
 export * as editor from "wordgard/editor"
-export * as highlight-code from "wordgard/highlight-code"
+export * as highlightCode from "wordgard/highlight-code"
 export * as history from "wordgard/history"
 export * as phrases from "wordgard/phrases"
 export * as schema from "wordgard/schema"

package/dist/table.d.ts

@@ -175,6 +175,116 @@ declare class CellSelection extends GardSelection {
     static extension: GardState.Extension;
 }
 
+/**
+A table map describes the structore of a given table.
+*/
+declare class TableMap {
+    /**
+    The start position of the table's content.
+    */
+    readonly start: number;
+    /**
+    Get a table map for the given table node. Will reuse known
+    structure of unchanged tables across document changes.
+    */
+    static get(table: Plot, start: number): TableMap;
+    private constructor();
+    /**
+    The number of columns in this table.
+    */
+    get width(): number;
+    /**
+    The number of rows in the table.
+    */
+    get height(): number;
+    /**
+    The table plot.
+    */
+    get table(): Plot;
+    /**
+    The document position before the table.
+    */
+    get tablePos(): number;
+    /**
+    Find the dimensions of the cell at the given position.
+    */
+    cellRect(pos: number): TableMap.Rect;
+    /**
+    Find the end position of the given cell.
+    */
+    cellEnd(pos: number): number;
+    /**
+    Get the rectangle spanning the two given cells.
+    */
+    rectBetween(a: number, b: number): TableMap.Rect;
+    /**
+    Return the position of all cells that have their top start
+    corner in the given rectangle.
+    */
+    cellsInRect(rect: TableMap.Rect): number[];
+    /**
+    Return the position of the cell that occupies the position at the
+    given row and column (which must be in bounds for the table).
+    */
+    cellAt(col: number, row: number): number | null;
+    /**
+    Get the position at the start of the given row (which may be
+    `width` to query the position after the last row).
+    */
+    rowPos(row: number): number;
+    /**
+    Get the position where a cell would have to be inserted to
+    appear at the given column and row.
+    */
+    cellInsertionPos(col: number, row: number): number;
+    /**
+    Get the node for the cell at the given position.
+    */
+    getCell(pos: number): Plot;
+}
+declare namespace TableMap {
+    /**
+    Data type used for a rectangular area in a table.
+    */
+    class Rect {
+        /**
+        Starting column of the rectangle.
+        */
+        readonly startCol: number;
+        /**
+        Starting row.
+        */
+        readonly startRow: number;
+        /**
+        The end column. Non-inclusive. Always higher than
+        `startCol`.
+        */
+        readonly endCol: number;
+        /**
+        The end row. Non-inclusive. Always higher than `startRow`.
+        */
+        readonly endRow: number;
+        constructor(
+        /**
+        Starting column of the rectangle.
+        */
+        startCol: number, 
+        /**
+        Starting row.
+        */
+        startRow: number, 
+        /**
+        The end column. Non-inclusive. Always higher than
+        `startCol`.
+        */
+        endCol: number, 
+        /**
+        The end row. Non-inclusive. Always higher than `startRow`.
+        */
+        endRow: number);
+    }
+}
+
 declare const toggleHeaderCell: Command.Pure;
 /**
 Add a column at the given side of the selection. The selection may
@@ -213,4 +323,4 @@ declare const splitCell: Command.Pure;
 */
 declare function handleTablePaste(state: GardState, slice: Slice, drop?: number): false | Transaction.Spec;
 
-export { CellSelection, addColumn, addRow, deleteColumn, deleteRow, handleTablePaste, mergeCells, splitCell, tableMenu, tables, toggleHeaderCell };
+export { CellSelection, TableMap, addColumn, addRow, deleteColumn, deleteRow, handleTablePaste, mergeCells, splitCell, tableMenu, tables, toggleHeaderCell };

package/dist/table.js

@@ -5,18 +5,6 @@ import { Node, Slice, ValidationError, Token, ChangeSet } from 'wordgard/doc';
 import { Command, moveByUnit, moveByWord, moveByLine, moveToLineSide, Menu } from 'wordgard/command';
 import { tablePhrases } from 'wordgard/phrases';
 
-class Rect {
-    startCol;
-    startRow;
-    endCol;
-    endRow;
-    constructor(startCol, startRow, endCol,    endRow) {
-        this.startCol = startCol;
-        this.startRow = startRow;
-        this.endCol = endCol;
-        this.endRow = endRow;
-    }
-}
 class MapData {
     table;
     width;
@@ -37,7 +25,15 @@ let cache = /*@__PURE__*/(() => new WeakMap())();
 class TableMap {
     start;
     data;
-    constructor(start, data) {
+    static get(table, start) {
+        let data = cache.get(table);
+        if (!data)
+            cache.set(table, data = computeMap(table));
+        return new TableMap(start, data);
+    }
+    constructor(
+    start, 
+    data) {
         this.start = start;
         this.data = data;
     }
@@ -55,7 +51,7 @@ class TableMap {
                     endCol++;
                 for (let j = 1; endRow < height && map[i + (width * j)] == localPos; j++)
                     endRow++;
-                return new Rect(startCol, startRow, endCol, endRow);
+                return new TableMap.Rect(startCol, startRow, endCol, endRow);
             }
         throw new RangeError(`No cell with offset ${pos} found`);
     }
@@ -87,7 +83,7 @@ class TableMap {
     rectBetween(a, b) {
         let { startCol: startColA, endCol: endColA, startRow: startRowA, endRow: endRowA } = this.cellRect(a);
         let { startCol: startColB, endCol: endColB, startRow: startRowB, endRow: endRowB } = this.cellRect(b);
-        return new Rect(Math.min(startColA, startColB), Math.min(startRowA, startRowB), Math.max(endColA, endColB), Math.max(endRowA, endRowB));
+        return new TableMap.Rect(Math.min(startColA, startColB), Math.min(startRowA, startRowB), Math.max(endColA, endColB), Math.max(endRowA, endRowB));
     }
     cellsInRect(rect) {
         let result = [], { map, width } = this.data;
@@ -148,13 +144,26 @@ class TableMap {
         }
         return false;
     }
-    static get(table, start) {
-        let data = cache.get(table);
-        if (!data)
-            cache.set(table, data = computeMap(table));
-        return new TableMap(start, data);
-    }
 }
+;TableMap = /*@__PURE__*/(function (TableMap) {
+    class Rect {
+        startCol;
+        startRow;
+        endCol;
+        endRow;
+        constructor(
+        startCol, 
+        startRow, 
+        endCol, 
+        endRow) {
+            this.startCol = startCol;
+            this.startRow = startRow;
+            this.endCol = endCol;
+            this.endRow = endRow;
+        }
+    }
+    TableMap.Rect = Rect;
+;return TableMap})(TableMap);
 function sameCell(a, b) {
     return a != 0 && a == b;
 }
@@ -1318,4 +1327,4 @@ function tables(config = {}) {
     tables.dropHandler = tableDropHandler;
 ;return tables})(tables);
 
-export { CellSelection, addColumn, addRow, deleteColumn, deleteRow, handleTablePaste, mergeCells, splitCell, tableMenu, tables, toggleHeaderCell };
+export { CellSelection, TableMap, addColumn, addRow, deleteColumn, deleteRow, handleTablePaste, mergeCells, splitCell, tableMenu, tables, toggleHeaderCell };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.6.2-beta7",
+  "version": "0.6.2-beta8",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",