bookish-press 0.4.0 → 0.4.16

package/models/chapter/CommentNode.js

@@ -1,28 +1,44 @@
-import AtomNode from "./AtomNode";
-import FormatNode from "./FormatNode";
+import AtomNode from './AtomNode';
+import FormatNode from './FormatNode';
 export default class CommentNode extends AtomNode {
     constructor(comment) {
         super(comment.withTextIfEmpty());
     }
-    getType() { return "comment"; }
-    toText() { return ""; }
-    toHTML() { return `(${this.getMeta().toHTML()})`; }
-    getDefaultCaret() { return this.getMeta().getFirstCaret(); }
+    getType() {
+        return 'comment';
+    }
+    toText() {
+        return '';
+    }
+    toHTML() {
+        return `(${this.getMeta().toHTML()})`;
+    }
+    getDefaultCaret() {
+        return this.getMeta().getFirstCaret();
+    }
     toBookdown(format) {
         const previousText = format?.getPreviousTextOrAtom(this)?.toBookdown();
         // Insert a space before the % if there isn't one before this.
-        return `${previousText?.endsWith(" ") ? "" : " "}%${this.getMeta().toBookdown()}%`;
+        return `${previousText?.endsWith(' ') ? '' : ' '}%${this.getMeta().toBookdown()}%`;
+    }
+    copy() {
+        return new CommentNode(this.getMeta().copy());
     }
-    copy() { return new CommentNode(this.getMeta().copy()); }
     withChildReplaced(node, replacement) {
-        return node instanceof FormatNode && replacement instanceof FormatNode && node === this.getMeta() ?
-            new CommentNode(replacement) :
-            undefined;
+        return node instanceof FormatNode &&
+            replacement instanceof FormatNode &&
+            node === this.getMeta()
+            ? new CommentNode(replacement)
+            : undefined;
     }
     getParentOf(node) {
-        return node === this.getMeta() ? this : this.getMeta().getParentOf(node);
+        return node === this.getMeta()
+            ? this
+            : this.getMeta().getParentOf(node);
+    }
+    withMeta(comment) {
+        return new CommentNode(comment);
     }
-    withMeta(comment) { return new CommentNode(comment); }
     withContentInRange(range) {
         const newFormat = this.getMeta().withContentInRange(range);
         if (newFormat === undefined)

package/models/chapter/DefinitionNode.d.ts

@@ -1,5 +1,5 @@
-import MetadataNode from "./MetadataNode";
-import TextNode from "./TextNode";
+import MetadataNode from './MetadataNode';
+import TextNode from './TextNode';
 export default class DefinitionNode extends MetadataNode<string> {
     constructor(phrase?: TextNode, glossaryID?: string);
     getType(): string;

package/models/chapter/DefinitionNode.js

@@ -1,20 +1,28 @@
-import MetadataNode from "./MetadataNode";
-import TextNode from "./TextNode";
+import MetadataNode from './MetadataNode';
+import TextNode from './TextNode';
 export default class DefinitionNode extends MetadataNode {
-    constructor(phrase, glossaryID = "") {
+    constructor(phrase, glossaryID = '') {
         super(phrase === undefined ? new TextNode() : phrase, glossaryID);
     }
-    getType() { return "definition"; }
+    getType() {
+        return 'definition';
+    }
     toText() {
         return this.getText().toText();
     }
-    toHTML() { return `${this.getText().toHTML()}`; }
+    toHTML() {
+        return `${this.getText().toHTML()}`;
+    }
     toBookdown() {
         return `~${this.getText().toBookdown()}~${this.getMeta()}`;
     }
     copy() {
         return new DefinitionNode(this.getText(), this.getMeta());
     }
-    withMeta(meta) { return new DefinitionNode(this.getText(), meta); }
-    withText(text) { return new DefinitionNode(text, this.getMeta()); }
+    withMeta(meta) {
+        return new DefinitionNode(this.getText(), meta);
+    }
+    withText(text) {
+        return new DefinitionNode(text, this.getMeta());
+    }
 }

package/models/chapter/Edit.d.ts

@@ -1,6 +1,6 @@
-import type { CaretRange } from "./Caret";
-import type Node from "./Node";
-declare type Edit = undefined | {
+import type { CaretRange } from './Caret';
+import type Node from './Node';
+type Edit = undefined | {
     root: Node;
     range: CaretRange;
 };

package/models/chapter/EmbedNode.d.ts

@@ -1,8 +1,10 @@
-import type Node from "./Node";
-import type Position from "./Position";
-import FormatNode from "./FormatNode";
-import BlockNode from "./BlockNode";
-import type { CaretRange } from "./Caret";
+import type Node from './Node';
+import type Position from './Position';
+import FormatNode from './FormatNode';
+import BlockNode from './BlockNode';
+import type { CaretRange } from './Caret';
+import type RootNode from './RootNode';
+import type Caret from './Caret';
 export default class EmbedNode extends BlockNode {
     #private;
     constructor(url: string, description: string, caption?: FormatNode, credit?: FormatNode, position?: Position);
@@ -37,4 +39,6 @@ export default class EmbedNode extends BlockNode {
     withCredit(credit: FormatNode): EmbedNode;
     withPosition(position: Position): EmbedNode;
     withContentInRange(range: CaretRange): this | undefined;
+    nextWord(): Caret;
+    previousWord(root: RootNode): Caret;
 }

package/models/chapter/EmbedNode.js

@@ -1,8 +1,8 @@
-import FormatNode from "./FormatNode";
-import TextNode from "./TextNode";
-import BlockNode from "./BlockNode";
+import FormatNode from './FormatNode';
+import TextNode from './TextNode';
+import BlockNode from './BlockNode';
 // This is what we use to encode URLs in the URL field of the embed node.
-const URL_SEPARATOR = "*";
+const URL_SEPARATOR = '*';
 export default class EmbedNode extends BlockNode {
     /**
      * The URL is actually a list of up to two URLs. The first is a full-size image URL, the second is a smaller image.
@@ -13,26 +13,61 @@ export default class EmbedNode extends BlockNode {
     #caption;
     #credit;
     #position;
-    constructor(url, description, caption, credit, position = "|") {
+    constructor(url, description, caption, credit, position = '|') {
         super();
         this.#urls = url;
         this.#description = description;
-        this.#caption = caption === undefined ? new FormatNode("", [new TextNode()]) : caption.withTextIfEmpty();
-        this.#credit = credit == undefined ? new FormatNode("", [new TextNode()]) : credit.withTextIfEmpty();
+        this.#caption =
+            caption === undefined
+                ? new FormatNode('', [new TextNode()])
+                : caption.withTextIfEmpty();
+        this.#credit =
+            credit == undefined
+                ? new FormatNode('', [new TextNode()])
+                : credit.withTextIfEmpty();
         this.#position = position;
     }
-    getType() { return "embed"; }
-    getURL() { return this.#urls.split(URL_SEPARATOR)[0]; }
-    getSmallURL() { return this.isLocal() ? "images/small/" + this.getURL() : this.hasSmallURL() ? this.#urls.split(URL_SEPARATOR)[1] : this.getURL(); }
-    hasSmallURL() { return this.#urls.split(URL_SEPARATOR).length > 1 && this.#urls.split(URL_SEPARATOR)[1].trim().length > 0; }
-    isHosted() { return this.#urls.includes("bookish"); }
-    isLocal() { return !this.#urls.startsWith("http"); }
-    getDescription() { return this.#description; }
-    getCaption() { return this.#caption; }
-    getCredit() { return this.#credit; }
-    getPosition() { return this.#position; }
-    getFormats() { return [this.#credit, this.#caption]; }
-    getChildren() { return [this.#credit, this.#caption]; }
+    getType() {
+        return 'embed';
+    }
+    getURL() {
+        return this.#urls.split(URL_SEPARATOR)[0];
+    }
+    getSmallURL() {
+        return this.isLocal()
+            ? 'images/small/' + this.getURL()
+            : this.hasSmallURL()
+                ? this.#urls.split(URL_SEPARATOR)[1]
+                : this.getURL();
+    }
+    hasSmallURL() {
+        return (this.#urls.split(URL_SEPARATOR).length > 1 &&
+            this.#urls.split(URL_SEPARATOR)[1].trim().length > 0);
+    }
+    isHosted() {
+        return this.#urls.includes('bookish');
+    }
+    isLocal() {
+        return this.#urls.length > 0 && !this.#urls.startsWith('http');
+    }
+    getDescription() {
+        return this.#description;
+    }
+    getCaption() {
+        return this.#caption;
+    }
+    getCredit() {
+        return this.#credit;
+    }
+    getPosition() {
+        return this.#position;
+    }
+    getFormats() {
+        return [this.#caption, this.#credit];
+    }
+    getChildren() {
+        return [this.#caption, this.#credit];
+    }
     getParentOf(node) {
         if (node === this.#caption || node === this.#credit)
             return this;
@@ -43,8 +78,12 @@ export default class EmbedNode extends BlockNode {
         if (creditParent)
             return creditParent;
     }
-    toText() { return this.#caption.toText(); }
-    toHTML() { return `<img src="${this.getURL()}" alt="${this.getDescription()}" />`; }
+    toText() {
+        return this.#caption.toText();
+    }
+    toHTML() {
+        return `<img src="${this.getURL()}" alt="${this.getDescription()}" />`;
+    }
     toBookdown() {
         return `|${this.#urls}|${this.#description}|${this.#caption.toBookdown()}|${this.#credit.toBookdown()}|`;
     }
@@ -53,37 +92,71 @@ export default class EmbedNode extends BlockNode {
             url: this.#urls,
             alt: this.#description,
             caption: this.#caption.toText(),
-            credit: this.#credit.toText()
+            credit: this.#credit.toText(),
         };
     }
     copy() {
         return new EmbedNode(this.#urls, this.#description, this.#caption.copy(), this.#credit.copy(), this.#position);
     }
     withChildReplaced(node, replacement) {
-        const newCaption = (node === this.#caption && (replacement === undefined || replacement instanceof FormatNode)) ? replacement : this.#caption;
-        const newCredit = (node === this.#credit && (replacement === undefined || replacement instanceof FormatNode)) ? replacement : this.#credit;
-        return newCaption || newCredit ?
-            new EmbedNode(this.#urls, this.#description, newCaption, newCredit, this.#position) :
-            undefined;
+        const newCaption = node === this.#caption &&
+            (replacement === undefined || replacement instanceof FormatNode)
+            ? replacement
+            : this.#caption;
+        const newCredit = node === this.#credit &&
+            (replacement === undefined || replacement instanceof FormatNode)
+            ? replacement
+            : this.#credit;
+        return newCaption || newCredit
+            ? new EmbedNode(this.#urls, this.#description, newCaption, newCredit, this.#position)
+            : undefined;
     }
     withURL(url) {
         // If the URL is a YouTube URL, convert to an embed URL, since a raw YouTube URL is never valid for embedding.
-        if (url.includes("www.youtube.com/watch?v="))
+        if (url.includes('www.youtube.com/watch?v='))
             url = url.replace('/watch?v=', '/embed/');
         return new EmbedNode(url, this.#description, this.#caption, this.#credit, this.#position);
     }
-    withURLs(url, thumbnail) { return new EmbedNode(url + URL_SEPARATOR + thumbnail, this.#description, this.#caption, this.#credit, this.#position); }
-    withDescription(description) { return new EmbedNode(this.#urls, description, this.#caption, this.#credit, this.#position); }
-    withCaption(caption) { return new EmbedNode(this.#urls, this.#description, caption, this.#credit, this.#position); }
-    withCredit(credit) { return new EmbedNode(this.#urls, this.#description, this.#caption, credit, this.#position); }
-    withPosition(position) { return new EmbedNode(this.#urls, this.#description, this.#caption, this.#credit, position); }
+    withURLs(url, thumbnail) {
+        return new EmbedNode(url + URL_SEPARATOR + thumbnail, this.#description, this.#caption, this.#credit, this.#position);
+    }
+    withDescription(description) {
+        return new EmbedNode(this.#urls, description, this.#caption, this.#credit, this.#position);
+    }
+    withCaption(caption) {
+        return new EmbedNode(this.#urls, this.#description, caption, this.#credit, this.#position);
+    }
+    withCredit(credit) {
+        return new EmbedNode(this.#urls, this.#description, this.#caption, credit, this.#position);
+    }
+    withPosition(position) {
+        return new EmbedNode(this.#urls, this.#description, this.#caption, this.#credit, position);
+    }
     withContentInRange(range) {
         if (!this.contains(range.start.node) && !this.contains(range.end.node))
             return this.copy();
-        const newCredit = this.#caption.contains(range.start.node) ? new FormatNode("", [new TextNode()]) : this.#credit.withContentInRange(range);
-        const newCaption = this.#credit.contains(range.end.node) ? new FormatNode("", [new TextNode()]) : this.#caption.withContentInRange(range);
+        const newCredit = this.#credit.contains(range.end.node) ||
+            this.#credit.contains(range.start.node)
+            ? this.#credit.withContentInRange(range)
+            : new FormatNode('', [new TextNode()]);
+        const newCaption = this.#caption.contains(range.start.node) ||
+            this.#caption.contains(range.end.node)
+            ? this.#caption.withContentInRange(range)
+            : new FormatNode('', [new TextNode()]);
         if (newCaption === undefined || newCredit === undefined)
             return;
         return new EmbedNode(this.#urls, this.#description, newCaption, newCredit, this.#position);
     }
+    nextWord() {
+        return this.#caption.getFirstCaret();
+    }
+    previousWord(root) {
+        const previous = root.getPreviousTextOrAtom(this.#caption.getFirstTextNode());
+        return previous
+            ? {
+                node: previous,
+                index: previous instanceof TextNode ? previous.getLength() : 0,
+            }
+            : { node: this, index: 0 };
+    }
 }

package/models/chapter/ErrorNode.d.ts

@@ -1,5 +1,5 @@
-import BlockNode from "./BlockNode";
-import type Node from "./Node";
+import BlockNode from './BlockNode';
+import type Node from './Node';
 export default class ErrorNode extends BlockNode {
     #private;
     constructor(text: string | undefined, error: string);

package/models/chapter/ErrorNode.js

@@ -1,4 +1,4 @@
-import BlockNode from "./BlockNode";
+import BlockNode from './BlockNode';
 export default class ErrorNode extends BlockNode {
     #text;
     #error;
@@ -7,15 +7,37 @@ export default class ErrorNode extends BlockNode {
         this.#text = text;
         this.#error = error;
     }
-    getType() { return "error"; }
-    getError() { return this.#error; }
-    getFormats() { return []; }
-    toText() { return ""; }
-    toBookdown() { return this.#text ?? ""; }
-    toHTML() { return this.#text ?? ""; }
-    getChildren() { return []; }
-    getParentOf() { return undefined; }
-    copy() { return new ErrorNode(this.#text, this.#error); }
-    withChildReplaced() { return undefined; }
-    withContentInRange() { return this.copy(); }
+    getType() {
+        return 'error';
+    }
+    getError() {
+        return this.#error;
+    }
+    getFormats() {
+        return [];
+    }
+    toText() {
+        return '';
+    }
+    toBookdown() {
+        return this.#text ?? '';
+    }
+    toHTML() {
+        return this.#text ?? '';
+    }
+    getChildren() {
+        return [];
+    }
+    getParentOf() {
+        return undefined;
+    }
+    copy() {
+        return new ErrorNode(this.#text, this.#error);
+    }
+    withChildReplaced() {
+        return undefined;
+    }
+    withContentInRange() {
+        return this.copy();
+    }
 }

package/models/chapter/FootnoteNode.d.ts

@@ -1,8 +1,8 @@
-import FormatNode from "./FormatNode";
-import AtomNode from "./AtomNode";
-import type Node from "./Node";
-import type Caret from "./Caret";
-import type { CaretRange } from "./Caret";
+import FormatNode from './FormatNode';
+import AtomNode from './AtomNode';
+import type Node from './Node';
+import type Caret from './Caret';
+import type { CaretRange } from './Caret';
 export default class FootnoteNode extends AtomNode<FormatNode> {
     constructor(content?: FormatNode);
     getType(): string;

package/models/chapter/FootnoteNode.js

@@ -1,25 +1,43 @@
-import FormatNode from "./FormatNode";
-import AtomNode from "./AtomNode";
-import TextNode from "./TextNode";
+import FormatNode from './FormatNode';
+import AtomNode from './AtomNode';
+import TextNode from './TextNode';
 export default class FootnoteNode extends AtomNode {
     constructor(content) {
-        super(content === undefined ? new FormatNode("", [new TextNode()]) : content.withTextIfEmpty());
-    }
-    getType() { return "footnote"; }
-    getDefaultCaret() { return this.getMeta().getFirstCaret(); }
-    toText() { return this.getMeta().toText(); }
-    toBookdown() { return `{${this.getMeta().toBookdown()}}`; }
-    toHTML() { return `(${this.getMeta().toHTML()})`; }
-    copy() { return new FootnoteNode(this.getMeta().copy()); }
+        super(content === undefined
+            ? new FormatNode('', [new TextNode()])
+            : content.withTextIfEmpty());
+    }
+    getType() {
+        return 'footnote';
+    }
+    getDefaultCaret() {
+        return this.getMeta().getFirstCaret();
+    }
+    toText() {
+        return this.getMeta().toText();
+    }
+    toBookdown() {
+        return `{${this.getMeta().toBookdown()}}`;
+    }
+    toHTML() {
+        return `(${this.getMeta().toHTML()})`;
+    }
+    copy() {
+        return new FootnoteNode(this.getMeta().copy());
+    }
     getParentOf(node) {
-        return node === this.getMeta() ? this : this.getMeta().getParentOf(node);
+        return node === this.getMeta()
+            ? this
+            : this.getMeta().getParentOf(node);
     }
     withChildReplaced(node, replacement) {
-        return node === this.getMeta() && replacement !== undefined ?
-            new FootnoteNode(replacement) :
-            undefined;
+        return node === this.getMeta() && replacement !== undefined
+            ? new FootnoteNode(replacement)
+            : undefined;
+    }
+    withMeta(footnote) {
+        return new FootnoteNode(footnote);
     }
-    withMeta(footnote) { return new FootnoteNode(footnote); }
     withContentInRange(range) {
         const newFormat = this.getMeta().withContentInRange(range);
         if (newFormat === undefined)

package/models/chapter/FormatNode.d.ts

@@ -1,13 +1,13 @@
-import Node from "./Node";
-import type ErrorNode from "./ErrorNode";
-import TextNode from "./TextNode";
-import type Caret from "./Caret";
-import { type CaretRange } from "./Caret";
-import MetadataNode from "./MetadataNode";
-import AtomNode from "./AtomNode";
-import type Edit from "./Edit";
-export declare type Format = "" | "*" | "_" | "^" | "v";
-export declare type FormatNodeSegmentType = FormatNode | TextNode | ErrorNode | MetadataNode<any> | AtomNode<any>;
+import Node from './Node';
+import type ErrorNode from './ErrorNode';
+import TextNode from './TextNode';
+import type Caret from './Caret';
+import { type CaretRange } from './Caret';
+import MetadataNode from './MetadataNode';
+import AtomNode from './AtomNode';
+import type Edit from './Edit';
+export type Format = '' | '*' | '_' | '^' | 'v';
+export type FormatNodeSegmentType = FormatNode | TextNode | ErrorNode | MetadataNode<any> | AtomNode<any>;
 export default class FormatNode extends Node {
     #private;
     constructor(format: Format, segments: FormatNodeSegmentType[]);