bookish-press 0.4.46 → 0.4.47

package/{models/chapter/ParagraphNode.js → src/lib/models/chapter/ParagraphNode.ts}

@@ -1,28 +1,41 @@
+import type Node from './Node';
 import BlockNode from './BlockNode';
 import FormatNode from './FormatNode';
 import TextNode from './TextNode';
+import type Caret from './Caret';
+import type { CaretRange } from './Caret';
 import AtomNode from './AtomNode';
 import MetadataNode from './MetadataNode';
+
 export default class ParagraphNode extends BlockNode {
-    #format;
-    #level;
-    constructor(level = 0, format) {
+    readonly #format: FormatNode;
+    readonly #level: number;
+
+    constructor(level: number = 0, format?: FormatNode) {
         super();
+
         // Always ensure the paragraphs have an empty space at the begining and end for insertion.
         let adjustedFormat = format ?? new FormatNode('', [new TextNode()]);
         if (adjustedFormat.getLength() > 0) {
             const first = adjustedFormat.getSegments()[0];
-            const last = adjustedFormat.getSegments()[adjustedFormat.getLength() - 1];
+            const last =
+                adjustedFormat.getSegments()[adjustedFormat.getLength() - 1];
             if (first instanceof AtomNode || first instanceof MetadataNode)
-                adjustedFormat = adjustedFormat.withSegmentPrepended(new TextNode());
+                adjustedFormat = adjustedFormat.withSegmentPrepended(
+                    new TextNode()
+                );
             if (last instanceof AtomNode || last instanceof MetadataNode)
-                adjustedFormat = adjustedFormat.withSegmentAppended(new TextNode());
+                adjustedFormat = adjustedFormat.withSegmentAppended(
+                    new TextNode()
+                );
         }
         // Always ensure a paragraph has at least an empty text node.
         adjustedFormat = adjustedFormat.withTextIfEmpty();
+
         this.#format = adjustedFormat;
         this.#level = level;
     }
+
     getType() {
         return 'paragraph';
     }
@@ -38,22 +51,24 @@ export default class ParagraphNode extends BlockNode {
     getChildren() {
         return [this.#format];
     }
-    getFirstTextNode() {
+    getFirstTextNode(): TextNode {
         return this.getFormat().getFirstTextNode();
     }
-    getLastTextNode() {
+    getLastTextNode(): TextNode {
         return this.getFormat().getLastTextNode();
     }
-    getTextNodes() {
-        return this.getNodes().filter((n) => n instanceof TextNode);
+    getTextNodes(): TextNode[] {
+        return this.getNodes().filter(
+            (n) => n instanceof TextNode
+        ) as TextNode[];
     }
-    getFirstCaret() {
+    getFirstCaret(): Caret | undefined {
         return this.#format.getFirstCaret();
     }
-    getLastCaret() {
+    getLastCaret(): Caret | undefined {
         return this.#format.getLastCaret();
     }
-    getSelection() {
+    getSelection(): CaretRange {
         const first = this.getFirstTextNode();
         const last = this.getLastTextNode();
         return {
@@ -61,88 +76,110 @@ export default class ParagraphNode extends BlockNode {
             end: { node: last, index: last.getLength() },
         };
     }
-    getParentOf(node) {
+    getParentOf(node: Node): Node | undefined {
         return node === this.#format ? this : this.#format.getParentOf(node);
     }
-    toText() {
+
+    toText(): string {
         return this.#format.toText();
     }
-    toBookdown() {
-        return ((this.#level === 1
-            ? '# '
-            : this.#level === 2
+
+    toBookdown(): string {
+        return (
+            (this.#level === 1
+                ? '# '
+                : this.#level === 2
                 ? '## '
                 : this.#level === 3
-                    ? '### '
-                    : '') + this.#format.toBookdown());
-    }
-    toHTML() {
-        const tag = this.#level === 1
-            ? 'h1'
-            : this.#level === 2
+                ? '### '
+                : '') + this.#format.toBookdown()
+        );
+    }
+
+    toHTML(): string {
+        const tag =
+            this.#level === 1
+                ? 'h1'
+                : this.#level === 2
                 ? 'h2'
                 : this.#level === 3
-                    ? 'h2'
-                    : 'p';
+                ? 'h2'
+                : 'p';
         return `<${tag}>${this.#format.toHTML()}</${tag}>`;
     }
-    withLevel(level) {
+
+    withLevel(level: number): ParagraphNode {
         return new ParagraphNode(level, this.#format);
     }
-    withContent(content) {
+
+    withContent(content: FormatNode): ParagraphNode {
         return new ParagraphNode(this.#level, content);
     }
-    withParagraphAppended(paragraph) {
-        return new ParagraphNode(this.#level, new FormatNode('', [
-            ...this.#format.getSegments(),
-            ...paragraph.#format.getSegments(),
-        ]));
-    }
-    withParagraphPrepended(paragraph) {
-        return new ParagraphNode(this.#level, new FormatNode('', [
-            ...paragraph.#format.getSegments(),
-            ...this.#format.getSegments(),
-        ]));
-    }
-    split(caret) {
+
+    withParagraphAppended(paragraph: ParagraphNode): ParagraphNode {
+        return new ParagraphNode(
+            this.#level,
+            new FormatNode('', [
+                ...this.#format.getSegments(),
+                ...paragraph.#format.getSegments(),
+            ])
+        );
+    }
+
+    withParagraphPrepended(paragraph: ParagraphNode): ParagraphNode {
+        return new ParagraphNode(
+            this.#level,
+            new FormatNode('', [
+                ...paragraph.#format.getSegments(),
+                ...this.#format.getSegments(),
+            ])
+        );
+    }
+
+    split(caret: Caret): [ParagraphNode, ParagraphNode] | undefined {
         // If we weren't given a text node, do nothing.
-        if (!(caret.node instanceof TextNode))
-            return;
+        if (!(caret.node instanceof TextNode)) return;
+
         // If this caret isn't in this paragraph, do nothing.
-        if (this.getParentOf(caret.node) === undefined)
-            return;
+        if (this.getParentOf(caret.node) === undefined) return;
+
         // If the caret is at the last position of the paragraph, insert a new empty paragraph.
         const lastTextNode = this.getLastTextNode();
-        if (caret.node === lastTextNode &&
-            caret.index === lastTextNode.getLength())
+        if (
+            caret.node === lastTextNode &&
+            caret.index === lastTextNode.getLength()
+        )
             return [this.copy(), new ParagraphNode()];
+
         // If the caret is in the first position of the paragraph, insert a new empty paragraph before.
         const firstTextNode = this.getFirstTextNode();
         if (caret.node === firstTextNode && caret.index === 0)
             return [new ParagraphNode(), this.copy()];
+
         // Otherwise, split the paragraph in two, with the caret at the beginning of the second.
         const before = this.#format.withoutContentAfter(caret);
         const after = this.#format.withoutContentBefore(caret);
-        if (after === undefined || before === undefined)
-            return;
+        if (after === undefined || before === undefined) return;
         return [
             new ParagraphNode(this.#level, before),
             new ParagraphNode(this.#level, after),
         ];
     }
+
     copy() {
-        return new ParagraphNode(this.#level, this.#format.copy());
+        return new ParagraphNode(this.#level, this.#format.copy()) as this;
     }
-    withChildReplaced(node, replacement) {
+
+    withChildReplaced(node: Node, replacement: Node | undefined) {
         return node === this.#format &&
             (replacement instanceof FormatNode || replacement === undefined)
-            ? new ParagraphNode(this.#level, replacement)
+            ? (new ParagraphNode(this.#level, replacement) as this)
             : undefined;
     }
-    withContentInRange(range) {
+
+    withContentInRange(range: CaretRange): this | undefined {
         const newFormat = this.#format.withContentInRange(range);
-        if (newFormat === undefined)
-            return;
-        return new ParagraphNode(this.#level, newFormat);
+        if (newFormat === undefined) return;
+        return new ParagraphNode(this.#level, newFormat) as this;
     }
 }

package/{models/chapter/Parser.test.js → src/lib/models/chapter/Parser.test.ts}

@@ -1,23 +1,30 @@
 import { test, expect } from 'vitest';
+
 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('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, '#');
     expect(p.more()).toBe(true);
+
     const p2 = new Parser(undefined, '');
     expect(p2.more()).toBe(false);
 });
+
 test('Whitespace', () => {
     const p = new Parser(undefined, '    Hi');
     p.readWhitespace();