bookish-press 0.4.45 → 0.4.47

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

@@ -1,31 +1,39 @@
 import MetadataNode from './MetadataNode';
 import TextNode from './TextNode';
-export default class InlineCodeNode extends MetadataNode {
-    constructor(code, language = 'plaintext') {
+
+export default class InlineCodeNode extends MetadataNode<string> {
+    constructor(code?: TextNode, language: string = 'plaintext') {
         super(code === undefined ? new TextNode() : code, language);
     }
+
     getType() {
         return 'inline-code';
     }
-    toText() {
+
+    toText(): string {
         return this.getText().getText();
     }
     toHTML() {
         return `<code>${this.getMeta()}</code>`;
     }
-    toBookdown() {
-        return ('`' +
+
+    toBookdown(): string {
+        return (
+            '`' +
             this.getText().toBookdown().replace(/`/g, '\\`') +
             '`' +
-            (this.getMeta() === 'plaintext' ? '' : this.getMeta()));
+            (this.getMeta() === 'plaintext' ? '' : this.getMeta())
+        );
     }
+
     copy() {
-        return new InlineCodeNode(this.getText(), this.getMeta());
+        return new InlineCodeNode(this.getText(), this.getMeta()) as this;
     }
-    withMeta(meta) {
+
+    withMeta(meta: string): MetadataNode<string> {
         return new InlineCodeNode(this.getText(), meta);
     }
-    withText(text) {
+    withText(text: TextNode): MetadataNode<string> {
         return new InlineCodeNode(text, this.getMeta());
     }
 }

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

@@ -1,40 +1,56 @@
 import AtomNode from './AtomNode';
+import type Caret from './Caret';
+import type FormatNode from './FormatNode';
+import type Node from './Node';
+
 const ERROR_PLACEHOLDER = 'LABELNOIDERROR';
-export default class LabelNode extends AtomNode {
-    constructor(newID) {
+
+export default class LabelNode extends AtomNode<string> {
+    constructor(newID: string) {
         super(newID === ERROR_PLACEHOLDER ? '' : newID);
     }
+
     getType() {
         return 'label';
     }
-    getDefaultCaret() {
+
+    getDefaultCaret(): Caret {
         return { node: this, index: 0 };
     }
-    toText() {
+
+    toText(): string {
         return '';
     }
     toHTML() {
         return '';
     }
-    toBookdown(format) {
+
+    toBookdown(format?: FormatNode): string {
         const id = this.getMeta();
         const nextText = format?.getNextTextOrAtom(this)?.toBookdown();
+
         // The trailing space after enables parsing. The error placeholder handles invalid empty label IDs.
-        return `:${id === '' ? ERROR_PLACEHOLDER : id}${nextText?.startsWith(' ') ? '' : ' '}`;
+        return `:${id === '' ? ERROR_PLACEHOLDER : id}${
+            nextText?.startsWith(' ') ? '' : ' '
+        }`;
     }
-    getParentOf() {
+
+    getParentOf(): Node | undefined {
         return undefined;
     }
+
     copy() {
-        return new LabelNode(this.getMeta());
+        return new LabelNode(this.getMeta()) as this;
     }
-    withMeta(newID) {
+
+    withMeta(newID: string) {
         return new LabelNode(newID);
     }
     withChildReplaced() {
         return undefined;
     }
-    withContentInRange() {
+
+    withContentInRange(): this | undefined {
         return this.copy();
     }
 }

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

@@ -1,28 +1,33 @@
 import MetadataNode from './MetadataNode';
 import TextNode from './TextNode';
-export default class LinkNode extends MetadataNode {
-    constructor(text, url = '') {
+
+export default class LinkNode extends MetadataNode<string> {
+    constructor(text?: TextNode, url: string = '') {
         super(text === undefined ? new TextNode() : text, url);
     }
+
     getType() {
         return 'link';
     }
-    toText() {
+
+    toText(): string {
         return this.getText().toText();
     }
     toHTML() {
         return `<a href="${this.getMeta()}">${this.getText().toHTML()}</a>`;
     }
-    toBookdown() {
+    toBookdown(): string {
         return `[${this.getText().toBookdown()}|${this.getMeta()}]`;
     }
+
     copy() {
-        return new LinkNode(this.getText(), this.getMeta());
+        return new LinkNode(this.getText(), this.getMeta()) as this;
     }
-    withMeta(meta) {
+
+    withMeta(meta: string): MetadataNode<string> {
         return new LinkNode(this.getText(), meta);
     }
-    withText(text) {
+    withText(text: TextNode): MetadataNode<string> {
         return new LinkNode(text, this.getMeta());
     }
 }

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

@@ -1,7 +1,9 @@
 import { test, expect } from 'vitest';
+
 import FormatNode from './FormatNode';
 import ListNode from './ListNode';
 import TextNode from './TextNode';
+
 const oneText = new TextNode('one');
 const oneFormat = new FormatNode('', [oneText]);
 const twoText = new TextNode('two');
@@ -13,42 +15,77 @@ const fourFormat = new FormatNode('', [fourText]);
 const fiveText = new TextNode('five');
 const fiveFormat = new FormatNode('', [fiveText]);
 const shortList = new ListNode([oneFormat, twoFormat, threeFormat], false);
-const list = new ListNode([
-    oneFormat,
-    new ListNode([twoFormat, threeFormat, fourFormat], false),
-    fiveFormat,
-], false);
+const list = new ListNode(
+    [
+        oneFormat,
+        new ListNode([twoFormat, threeFormat, fourFormat], false),
+        fiveFormat,
+    ],
+    false
+);
+
 test('Insert items', () => {
-    expect(shortList.withItemAppended(fourFormat)?.toBookdown()).toBe(`* one\n* two\n* three\n* four`);
-    expect(shortList.withItemPrepended(fourFormat)?.toBookdown()).toBe(`* four\n* one\n* two\n* three`);
+    expect(shortList.withItemAppended(fourFormat)?.toBookdown()).toBe(
+        `* one\n* two\n* three\n* four`
+    );
+    expect(shortList.withItemPrepended(fourFormat)?.toBookdown()).toBe(
+        `* four\n* one\n* two\n* three`
+    );
     expect(shortList.withItemAt(fourFormat, 9)).toBeUndefined();
-    expect(shortList.withItemAt(fourFormat, 1)?.toBookdown()).toBe(`* one\n* four\n* two\n* three`);
-    expect(shortList.withItemAfter(fourFormat, oneFormat)?.toBookdown()).toBe(`* one\n* four\n* two\n* three`);
-    expect(shortList.withItemBefore(fourFormat, twoFormat)?.toBookdown()).toBe(`* one\n* four\n* two\n* three`);
-    expect(shortList
-        .withListAppended(new ListNode([fourFormat, fiveFormat], true))
-        ?.toBookdown()).toBe(`* one\n* two\n* three\n* four\n* five`);
+    expect(shortList.withItemAt(fourFormat, 1)?.toBookdown()).toBe(
+        `* one\n* four\n* two\n* three`
+    );
+    expect(shortList.withItemAfter(fourFormat, oneFormat)?.toBookdown()).toBe(
+        `* one\n* four\n* two\n* three`
+    );
+    expect(shortList.withItemBefore(fourFormat, twoFormat)?.toBookdown()).toBe(
+        `* one\n* four\n* two\n* three`
+    );
+    expect(
+        shortList
+            .withListAppended(new ListNode([fourFormat, fiveFormat], true))
+            ?.toBookdown()
+    ).toBe(`* one\n* two\n* three\n* four\n* five`);
 });
+
 test('Remove items', () => {
-    expect(shortList.withItemReplaced(1, fourFormat)?.toBookdown()).toBe(`* one\n* four\n* three`);
+    expect(shortList.withItemReplaced(1, fourFormat)?.toBookdown()).toBe(
+        `* one\n* four\n* three`
+    );
     expect(shortList.withoutItemAt(0)?.toBookdown()).toBe(`* two\n* three`);
 });
+
 test('Split', () => {
-    expect(shortList.withItemSplit({ node: threeText, index: 2 })?.toBookdown()).toBe('* one\n* two\n* th\n* ree');
+    expect(
+        shortList.withItemSplit({ node: threeText, index: 2 })?.toBookdown()
+    ).toBe('* one\n* two\n* th\n* ree');
 });
+
 test('Merge', () => {
     const merged = shortList.withItemMergedBackwards(1);
     expect(merged).not.toBeUndefined();
     if (merged !== undefined)
         expect(merged[0].toBookdown()).toBe('* onetwo\n* three');
 });
+
 test('Indent', () => {
-    expect(list.withItemIndented(oneFormat)?.toBookdown()).toBe(`** one\n** two\n** three\n** four\n* five`);
-    expect(list.withItemIndented(twoFormat)?.toBookdown()).toBe(`* one\n*** two\n** three\n** four\n* five`);
-    expect(list.withItemIndented(fiveFormat)?.toBookdown()).toBe(`* one\n** two\n** three\n** four\n** five`);
+    expect(list.withItemIndented(oneFormat)?.toBookdown()).toBe(
+        `** one\n** two\n** three\n** four\n* five`
+    );
+    expect(list.withItemIndented(twoFormat)?.toBookdown()).toBe(
+        `* one\n*** two\n** three\n** four\n* five`
+    );
+    expect(list.withItemIndented(fiveFormat)?.toBookdown()).toBe(
+        `* one\n** two\n** three\n** four\n** five`
+    );
 });
+
 test('Unindent', () => {
-    expect(list.withItemUnindented(twoFormat)?.toBookdown()).toBe(`* one\n* two\n** three\n** four\n* five`);
+    expect(list.withItemUnindented(twoFormat)?.toBookdown()).toBe(
+        `* one\n* two\n** three\n** four\n* five`
+    );
     expect(list.withItemUnindented(oneFormat)?.toBookdown()).toBeUndefined();
-    expect(list.withItemUnindented(threeFormat)?.toBookdown()).toBe(`* one\n** two\n* three\n** four\n* five`);
+    expect(list.withItemUnindented(threeFormat)?.toBookdown()).toBe(
+        `* one\n** two\n* three\n** four\n* five`
+    );
 });