bookish-press 0.4.1 → 0.4.3

package/models/chapter/Parser.test.js

@@ -1,25 +1,25 @@
 import { test, expect } from 'vitest';
-import Parser from "./Parser";
-test("Empty chapter", () => {
-    expect(Parser.parseChapter(undefined, "").toBookdown()).toBe("");
+import Parser from './Parser';
+test('Empty chapter', () => {
+    expect(Parser.parseChapter(undefined, '').toBookdown()).toBe('');
 });
-test("Single paragraph", () => {
-    expect(Parser.parseChapter(undefined, "hello").toBookdown()).toBe("hello");
+test('Single paragraph', () => {
+    expect(Parser.parseChapter(undefined, 'hello').toBookdown()).toBe('hello');
 });
-test("Peek", () => {
-    const p = new Parser(undefined, "# hello");
-    expect(p.peek()).toBe("#");
-    expect(p.read()).toBe("#");
-    expect(p.peek()).toBe(" ");
+test('Peek', () => {
+    const p = new Parser(undefined, '# hello');
+    expect(p.peek()).toBe('#');
+    expect(p.read()).toBe('#');
+    expect(p.peek()).toBe(' ');
 });
-test("More", () => {
-    const p = new Parser(undefined, "#");
+test('More', () => {
+    const p = new Parser(undefined, '#');
     expect(p.more()).toBe(true);
-    const p2 = new Parser(undefined, "");
+    const p2 = new Parser(undefined, '');
     expect(p2.more()).toBe(false);
 });
-test("Whitespace", () => {
-    const p = new Parser(undefined, "    Hi");
+test('Whitespace', () => {
+    const p = new Parser(undefined, '    Hi');
     p.readWhitespace();
-    expect(p.peek()).toBe("H");
+    expect(p.peek()).toBe('H');
 });

package/models/chapter/Position.d.ts

@@ -1,2 +1,2 @@
-declare type Position = "|" | "<" | ">";
+type Position = '|' | '<' | '>';
 export default Position;

package/models/chapter/QuoteNode.d.ts

@@ -1,9 +1,9 @@
-import type Node from "./Node";
-import BlockNode from "./BlockNode";
-import type Position from "./Position";
-import FormatNode from "./FormatNode";
-import BlocksNode from "./BlocksNode";
-import type { CaretRange } from "./Caret";
+import type Node from './Node';
+import BlockNode from './BlockNode';
+import type Position from './Position';
+import FormatNode from './FormatNode';
+import BlocksNode from './BlocksNode';
+import type { CaretRange } from './Caret';
 export default class QuoteNode extends BlocksNode {
     #private;
     constructor(elements: BlockNode[], credit?: FormatNode, position?: Position);

package/models/chapter/QuoteNode.js

@@ -1,27 +1,46 @@
-import BlockNode from "./BlockNode";
-import FormatNode from "./FormatNode";
-import BlocksNode from "./BlocksNode";
-import TextNode from "./TextNode";
+import BlockNode from './BlockNode';
+import FormatNode from './FormatNode';
+import BlocksNode from './BlocksNode';
+import TextNode from './TextNode';
 export default class QuoteNode extends BlocksNode {
     #credit;
     #position;
-    constructor(elements, credit, position = "|") {
+    constructor(elements, credit, position = '|') {
         super(elements);
         this.#position = position;
-        this.#credit = credit === undefined ? new FormatNode("", [new TextNode()]) : credit.withTextIfEmpty();
+        this.#credit =
+            credit === undefined
+                ? new FormatNode('', [new TextNode()])
+                : credit.withTextIfEmpty();
+    }
+    getType() {
+        return 'quote';
+    }
+    getCredit() {
+        return this.#credit;
+    }
+    getPosition() {
+        return this.#position;
+    }
+    getFormats() {
+        return [this.#credit];
     }
-    getType() { return "quote"; }
-    getCredit() { return this.#credit; }
-    getPosition() { return this.#position; }
-    getFormats() { return [this.#credit]; }
     toText() {
-        return this.getBlocks().map(element => element.toText()).join(" ") + (this.#credit ? " " + this.#credit.toText() : "");
+        return (this.getBlocks()
+            .map((element) => element.toText())
+            .join(' ') + (this.#credit ? ' ' + this.#credit.toText() : ''));
     }
     toBookdown() {
-        return `"\n${this.getBlocks().map(element => element.toBookdown()).join("\n\n")}\n"${this.#position === "|" ? "" : this.#position}${this.#credit ? this.#credit.toBookdown() : ""}`;
+        return `"\n${this.getBlocks()
+            .map((element) => element.toBookdown())
+            .join('\n\n')}\n"${this.#position === '|' ? '' : this.#position}${this.#credit ? this.#credit.toBookdown() : ''}`;
+    }
+    toHTML() {
+        return `"${super.toHTML()}"<center>${this.#credit.toHTML()}</center>`;
+    }
+    getChildren() {
+        return [...this.getBlocks(), this.#credit];
     }
-    toHTML() { return `"${super.toHTML()}"<center>${this.#credit.toHTML()}</center>`; }
-    getChildren() { return [...this.getBlocks(), this.#credit]; }
     getParentOf(node) {
         if (node === this.#credit)
             return this;
@@ -30,11 +49,16 @@ export default class QuoteNode extends BlocksNode {
             return creditParent;
         return super.getParentOf(node);
     }
-    copy() { return new QuoteNode(this.getBlocks().map(b => b.copy())); }
-    create(blocks) { return new QuoteNode(blocks, this.#credit, this.#position); }
+    copy() {
+        return new QuoteNode(this.getBlocks().map((b) => b.copy()));
+    }
+    create(blocks) {
+        return new QuoteNode(blocks, this.#credit, this.#position);
+    }
     withChildReplaced(node, replacement) {
         // Replace the credit.
-        if (this.#credit === node && (replacement instanceof FormatNode || replacement === undefined))
+        if (this.#credit === node &&
+            (replacement instanceof FormatNode || replacement === undefined))
             return new QuoteNode(this.getBlocks(), replacement, this.#position);
         // Replace a block.
         if (replacement !== undefined && !(replacement instanceof BlockNode))
@@ -43,19 +67,33 @@ export default class QuoteNode extends BlocksNode {
         if (index < 0)
             return;
         // Make a new blocks node, assigning and re-parenting the replacement.
-        const blocks = replacement === undefined ?
-            [...this.getBlocks().slice(0, index), ...this.getBlocks().slice(index + 1)] :
-            [...this.getBlocks().slice(0, index), replacement, ...this.getBlocks().slice(index + 1)];
+        const blocks = replacement === undefined
+            ? [
+                ...this.getBlocks().slice(0, index),
+                ...this.getBlocks().slice(index + 1),
+            ]
+            : [
+                ...this.getBlocks().slice(0, index),
+                replacement,
+                ...this.getBlocks().slice(index + 1),
+            ];
         return new QuoteNode(blocks, this.#credit, this.#position);
     }
-    withCredit(credit) { return new QuoteNode(this.getBlocks(), credit, this.#position); }
-    withPosition(position) { return new QuoteNode(this.getBlocks(), this.#credit, position); }
+    withCredit(credit) {
+        return new QuoteNode(this.getBlocks(), credit, this.#position);
+    }
+    withPosition(position) {
+        return new QuoteNode(this.getBlocks(), this.#credit, position);
+    }
     withContentInRange(range) {
         // First get the blocks in range.
         const newQuote = super.withContentInRange(range);
         if (newQuote === undefined)
             return;
-        const newCredit = this.getBlocks().find(b => b.contains(range.end.node)) !== undefined ? new FormatNode("", [new TextNode()]) : this.#credit.withContentInRange(range);
+        const newCredit = this.getBlocks().find((b) => b.contains(range.end.node)) !==
+            undefined
+            ? new FormatNode('', [new TextNode()])
+            : this.#credit.withContentInRange(range);
         return newQuote.withNodeReplaced(this.#credit, newCredit);
     }
 }

package/models/chapter/RootNode.d.ts

@@ -1,5 +1,5 @@
-import type ChapterNode from "./ChapterNode";
-import type EmbedNode from "./EmbedNode";
-import type FormatNode from "./FormatNode";
-declare type RootNode = ChapterNode | FormatNode | EmbedNode;
+import type ChapterNode from './ChapterNode';
+import type EmbedNode from './EmbedNode';
+import type FormatNode from './FormatNode';
+type RootNode = ChapterNode | FormatNode | EmbedNode;
 export default RootNode;

package/models/chapter/RuleNode.d.ts

@@ -1,5 +1,5 @@
-import type Node from "./Node";
-import BlockNode from "./BlockNode";
+import type Node from './Node';
+import BlockNode from './BlockNode';
 export default class RuleNode extends BlockNode {
     constructor();
     getType(): string;

package/models/chapter/RuleNode.js

@@ -1,16 +1,36 @@
-import BlockNode from "./BlockNode";
+import BlockNode from './BlockNode';
 export default class RuleNode extends BlockNode {
     constructor() {
         super();
     }
-    getType() { return "rule"; }
-    toText() { return ""; }
-    toBookdown() { return "-"; }
-    toHTML() { return `<hr/>`; }
-    getParentOf() { return undefined; }
-    getFormats() { return []; }
-    getChildren() { return []; }
-    copy() { return new RuleNode(); }
-    withChildReplaced() { return undefined; }
-    withContentInRange() { return this.copy(); }
+    getType() {
+        return 'rule';
+    }
+    toText() {
+        return '';
+    }
+    toBookdown() {
+        return '-';
+    }
+    toHTML() {
+        return `<hr/>`;
+    }
+    getParentOf() {
+        return undefined;
+    }
+    getFormats() {
+        return [];
+    }
+    getChildren() {
+        return [];
+    }
+    copy() {
+        return new RuleNode();
+    }
+    withChildReplaced() {
+        return undefined;
+    }
+    withContentInRange() {
+        return this.copy();
+    }
 }

package/models/chapter/TableNode.d.ts

@@ -1,9 +1,9 @@
-import type Node from "./Node";
-import type Position from "./Position";
-import FormatNode from "./FormatNode";
-import BlockNode from "./BlockNode";
-import type { CaretRange } from "./Caret";
-declare type Location = {
+import type Node from './Node';
+import type Position from './Position';
+import FormatNode from './FormatNode';
+import BlockNode from './BlockNode';
+import type { CaretRange } from './Caret';
+type Location = {
     row: number;
     column: number;
 };
@@ -17,6 +17,7 @@ export default class TableNode extends BlockNode {
     getPosition(): Position;
     getCaption(): FormatNode;
     getFormats(): FormatNode[];
+    getNextCell(format: FormatNode, direction?: -1 | 1): FormatNode | undefined;
     toText(): string;
     toBookdown(): string;
     toHTML(): string;
@@ -31,5 +32,6 @@ export default class TableNode extends BlockNode {
     withoutColumn(index: number): TableNode | undefined;
     withNewColumn(index: number): TableNode | undefined;
     withContentInRange(range: CaretRange): this | undefined;
+    withPosition(position: Position): TableNode;
 }
 export {};

package/models/chapter/TableNode.js

@@ -1,40 +1,83 @@
-import FormatNode from "./FormatNode";
-import TextNode from "./TextNode";
-import BlockNode from "./BlockNode";
+import FormatNode from './FormatNode';
+import TextNode from './TextNode';
+import BlockNode from './BlockNode';
 export default class TableNode extends BlockNode {
     #rows;
     #caption;
     #position;
     constructor(rows, position, caption) {
         super();
-        this.#rows = rows.map(r => r.map(c => c.withTextIfEmpty()));
-        this.#position = position ? position : "|";
-        this.#caption = caption === undefined ? new FormatNode("", [new TextNode()]) : caption.withTextIfEmpty();
-    }
-    getType() { return "table"; }
-    getRows() { return this.#rows; }
-    getRowCount() { return this.#rows.length; }
-    getColumnCount() { return this.#rows.length === 0 ? 0 : this.#rows[0].length; }
-    getPosition() { return this.#position; }
-    getCaption() { return this.#caption; }
+        this.#rows = rows.map((r) => r.map((c) => c.withTextIfEmpty()));
+        this.#position = position ? position : '|';
+        this.#caption =
+            caption === undefined
+                ? new FormatNode('', [new TextNode()])
+                : caption.withTextIfEmpty();
+    }
+    getType() {
+        return 'table';
+    }
+    getRows() {
+        return this.#rows;
+    }
+    getRowCount() {
+        return this.#rows.length;
+    }
+    getColumnCount() {
+        return this.#rows.length === 0 ? 0 : this.#rows[0].length;
+    }
+    getPosition() {
+        return this.#position;
+    }
+    getCaption() {
+        return this.#caption;
+    }
     getFormats() {
         const formats = [];
-        this.#rows.forEach(row => row.forEach(cell => { formats.push(cell); }));
+        this.#rows.forEach((row) => row.forEach((cell) => {
+            formats.push(cell);
+        }));
         return [...formats, this.#caption];
     }
+    getNextCell(format, direction = 1) {
+        let previous = undefined;
+        let found = false;
+        for (const row of this.#rows) {
+            for (const cell of row) {
+                if (found)
+                    return cell;
+                if (cell === format) {
+                    if (direction > 0)
+                        found = true;
+                    else
+                        return previous;
+                }
+                previous = cell;
+            }
+        }
+        return undefined;
+    }
     toText() {
-        return this.#rows.map(row => row.map(cell => cell.toText()).join(", ")).join(", ");
+        return this.#rows
+            .map((row) => row.map((cell) => cell.toText()).join(', '))
+            .join(', ');
     }
     toBookdown() {
-        return this.#rows.map(row => `,${row.map(cell => cell.toBookdown()).join("|")}`).join("\n") +
-            `\n${this.#position === "|" ? "" : this.#position}${this.#caption ? "" + this.#caption.toBookdown() : ""}`;
+        return (this.#rows
+            .map((row) => `,${row.map((cell) => cell.toBookdown()).join('|')}`)
+            .join('\n') +
+            `\n${this.#position === '|' ? '' : this.#position}${this.#caption ? '' + this.#caption.toBookdown() : ''}`);
     }
     toHTML() {
-        return `<table><tbody>${this.#rows.map(row => `<tr>${row.map(cell => `<td>${cell.toHTML()}</td>`).join("")}`).join("")}</tbody></table><center>${this.#caption.toHTML()}</center>`;
+        return `<table><tbody>${this.#rows
+            .map((row) => `<tr>${row
+            .map((cell) => `<td>${cell.toHTML()}</td>`)
+            .join('')}`)
+            .join('')}</tbody></table><center>${this.#caption.toHTML()}</center>`;
     }
     getChildren() {
         const children = [];
-        this.#rows.forEach(row => row.forEach(cell => children.push(cell)));
+        this.#rows.forEach((row) => row.forEach((cell) => children.push(cell)));
         children.push(this.#caption);
         return children;
     }
@@ -48,9 +91,13 @@ export default class TableNode extends BlockNode {
         }
     }
     getCell(row, col) {
-        return row >= 0 && row < this.#rows.length && this.#rows.length > 0 && col >= 0 && col < this.#rows[0].length ?
-            this.#rows[row][col] :
-            undefined;
+        return row >= 0 &&
+            row < this.#rows.length &&
+            this.#rows.length > 0 &&
+            col >= 0 &&
+            col < this.#rows[0].length
+            ? this.#rows[row][col]
+            : undefined;
     }
     getParentOf(node) {
         for (let r = 0; r < this.#rows.length; r++) {
@@ -67,16 +114,17 @@ export default class TableNode extends BlockNode {
     }
     copy() {
         const rows = [];
-        this.#rows.forEach(row => {
+        this.#rows.forEach((row) => {
             const cells = [];
-            row.forEach(cell => cells.push(cell.copy()));
+            row.forEach((cell) => cells.push(cell.copy()));
             rows.push(cells);
         });
         return new TableNode(rows, this.#position, this.#caption ? this.#caption.copy() : undefined);
     }
     withChildReplaced(node, replacement) {
         // If it's just the caption, make a new node with the new credit.
-        if (node === this.#caption && (replacement instanceof FormatNode || replacement === undefined))
+        if (node === this.#caption &&
+            (replacement instanceof FormatNode || replacement === undefined))
             return new TableNode(this.#rows, this.#position, replacement);
         // If it's a cell, update the cell.
         if (node instanceof FormatNode && replacement instanceof FormatNode) {
@@ -90,7 +138,7 @@ export default class TableNode extends BlockNode {
             }
             // Make new rows with the updated cell.
             if (updateRow < this.#rows.length && updateColumn >= 0) {
-                const newRows = this.#rows.map(row => [...row]);
+                const newRows = this.#rows.map((row) => [...row]);
                 newRows[updateRow][updateColumn] = replacement;
                 return new TableNode(newRows, this.#position, this.#caption);
             }
@@ -104,7 +152,7 @@ export default class TableNode extends BlockNode {
         const columnCount = this.#rows.length === 0 ? 0 : this.#rows[0].length;
         const column = [];
         for (let c = 0; c < columnCount; c++)
-            column.push(new FormatNode("", [new TextNode()]));
+            column.push(new FormatNode('', [new TextNode()]));
         const newRows = this.#rows.slice();
         newRows.splice(index, 0, column);
         return new TableNode(newRows, this.#position, this.#caption);
@@ -125,13 +173,14 @@ export default class TableNode extends BlockNode {
         return new TableNode(newRows, this.#position, this.#caption);
     }
     withNewColumn(index) {
-        if (this.#rows.length > 0 && (index < 0 || index > this.#rows[0].length))
+        if (this.#rows.length > 0 &&
+            (index < 0 || index > this.#rows[0].length))
             return;
-        // Figure out how many rows the table has and add a column 
+        // Figure out how many rows the table has and add a column
         const newRows = this.#rows.slice();
         for (let r = 0; r < this.#rows.length; r++) {
             newRows[r] = newRows[r].slice();
-            newRows[r].splice(index, 0, new FormatNode("", [new TextNode()]));
+            newRows[r].splice(index, 0, new FormatNode('', [new TextNode()]));
         }
         return new TableNode(newRows, this.#position, this.#caption);
     }
@@ -149,7 +198,9 @@ export default class TableNode extends BlockNode {
         for (; r < this.#rows.length; r++, c = 0) {
             const row = this.#rows[r];
             // Skip this row if this table contains the start node and we haven't found it and the row doesn't contain it
-            if (containsStart && !foundStart && row.find(r => r.contains(range.start.node)) === undefined)
+            if (containsStart &&
+                !foundStart &&
+                row.find((r) => r.contains(range.start.node)) === undefined)
                 continue;
             // Stop if we found the end row.
             if (containsEnd && foundEnd)
@@ -161,9 +212,10 @@ export default class TableNode extends BlockNode {
                 const newCell = row[c].withContentInRange(range);
                 if (newCell === undefined)
                     return;
-                newRows[newRows.length - 1].push((((containsStart && foundStart) || !containsStart) && ((containsEnd && !foundEnd) || !containsEnd)) ?
-                    newCell :
-                    new FormatNode("", [new TextNode()]));
+                newRows[newRows.length - 1].push(((containsStart && foundStart) || !containsStart) &&
+                    ((containsEnd && !foundEnd) || !containsEnd)
+                    ? newCell
+                    : new FormatNode('', [new TextNode()]));
                 if (row[c].contains(range.end.node))
                     foundEnd = true;
             }
@@ -173,4 +225,7 @@ export default class TableNode extends BlockNode {
             return;
         return new TableNode(newRows, this.#position, newCaption);
     }
+    withPosition(position) {
+        return new TableNode(this.#rows, position, this.#caption);
+    }
 }

package/models/chapter/TableNode.test.js

@@ -1,31 +1,29 @@
 import { test, expect } from 'vitest';
-import FormatNode from "./FormatNode";
-import TextNode from "./TextNode";
-import TableNode from "./TableNode";
-const tl = new FormatNode("", [new TextNode("tl")]);
-const tr = new FormatNode("", [new TextNode("tr")]);
-const bl = new FormatNode("", [new TextNode("bl")]);
-const br = new FormatNode("", [new TextNode("br")]);
-const caption = new FormatNode("", [new TextNode("hi")]);
+import FormatNode from './FormatNode';
+import TextNode from './TextNode';
+import TableNode from './TableNode';
+const tl = new FormatNode('', [new TextNode('tl')]);
+const tr = new FormatNode('', [new TextNode('tr')]);
+const bl = new FormatNode('', [new TextNode('bl')]);
+const br = new FormatNode('', [new TextNode('br')]);
+const caption = new FormatNode('', [new TextNode('hi')]);
 const table = new TableNode([
     [tl, tr],
     [bl, br],
-], "|", caption);
-test("Replace", () => {
-    expect(table.withChildReplaced(tl, new FormatNode("", [new TextNode("new")]))?.toBookdown())
-        .toBe(",new|tr\n,bl|br\nhi");
-    expect(table.withChildReplaced(caption, new FormatNode("", [new TextNode("bye")]))?.toBookdown())
-        .toBe(",tl|tr\n,bl|br\nbye");
+], '|', caption);
+test('Replace', () => {
+    expect(table
+        .withChildReplaced(tl, new FormatNode('', [new TextNode('new')]))
+        ?.toBookdown()).toBe(',new|tr\n,bl|br\nhi');
+    expect(table
+        .withChildReplaced(caption, new FormatNode('', [new TextNode('bye')]))
+        ?.toBookdown()).toBe(',tl|tr\n,bl|br\nbye');
 });
-test("Insert", () => {
-    expect(table.withNewRow(0)?.toBookdown())
-        .toBe(",|\n,tl|tr\n,bl|br\nhi");
-    expect(table.withNewColumn(0)?.toBookdown())
-        .toBe(",|tl|tr\n,|bl|br\nhi");
+test('Insert', () => {
+    expect(table.withNewRow(0)?.toBookdown()).toBe(',|\n,tl|tr\n,bl|br\nhi');
+    expect(table.withNewColumn(0)?.toBookdown()).toBe(',|tl|tr\n,|bl|br\nhi');
 });
-test("Delete", () => {
-    expect(table.withoutRow(0)?.toBookdown())
-        .toBe(",bl|br\nhi");
-    expect(table.withoutColumn(0)?.toBookdown())
-        .toBe(",tr\n,br\nhi");
+test('Delete', () => {
+    expect(table.withoutRow(0)?.toBookdown()).toBe(',bl|br\nhi');
+    expect(table.withoutColumn(0)?.toBookdown()).toBe(',tr\n,br\nhi');
 });

package/models/chapter/TextNode.d.ts

@@ -1,9 +1,9 @@
-import type Caret from "./Caret";
-import type { CaretRange } from "./Caret";
-import FormatNode from "./FormatNode";
-import Node from "./Node";
-import BlocksNode from "./BlocksNode";
-import type RootNode from "./RootNode";
+import type Caret from './Caret';
+import type { CaretRange } from './Caret';
+import FormatNode from './FormatNode';
+import Node from './Node';
+import BlocksNode from './BlocksNode';
+import type RootNode from './RootNode';
 export default class TextNode extends Node {
     #private;
     constructor(text?: string);