bookish-press 0.4.1 → 0.4.3

package/models/chapter/TextNode.js

@@ -1,21 +1,37 @@
-import FormatNode from "./FormatNode";
-import Node from "./Node";
-import AtomNode from "./AtomNode";
-import BlocksNode from "./BlocksNode";
+import FormatNode from './FormatNode';
+import Node from './Node';
+import AtomNode from './AtomNode';
+import BlocksNode from './BlocksNode';
 export default class TextNode extends Node {
     #text;
-    constructor(text = "") {
+    constructor(text = '') {
         super();
         this.#text = text;
     }
-    getType() { return "text"; }
-    getText() { return this.#text; }
-    getLength() { return this.#text.length; }
-    getCaretPositionCount() { return this.#text.length; }
-    getParentOf() { return undefined; }
-    getFirstCaret() { return { node: this, index: 0 }; }
-    getLastCaret() { return { node: this, index: this.#text.length }; }
-    toText() { return this.#text; }
+    getType() {
+        return 'text';
+    }
+    getText() {
+        return this.#text;
+    }
+    getLength() {
+        return this.#text.length;
+    }
+    getCaretPositionCount() {
+        return this.#text.length;
+    }
+    getParentOf() {
+        return undefined;
+    }
+    getFirstCaret() {
+        return { node: this, index: 0 };
+    }
+    getLastCaret() {
+        return { node: this, index: this.#text.length };
+    }
+    toText() {
+        return this.#text;
+    }
     toBookdown() {
         // Escape all characters with special meaning inside content nodes: _*`<^{~\[@% and :'s with no space after
         return this.#text
@@ -34,17 +50,27 @@ export default class TextNode extends Node {
     }
     toHTML() {
         return this.#text
-            .replace("<", "&lt;")
-            .replace(">", "&gt;")
-            .replace("&", "&amp;")
-            .replace('"', "&quot;")
-            .replace("'", "&#39;");
-    }
-    getChildren() { return []; }
-    copy() { return new TextNode(this.#text); }
-    isItalic(root) { return this.getAncestors(root).filter(p => p instanceof FormatNode && p.getFormat() === "_").length > 0; }
-    isBold(root) { return this.getAncestors(root).filter(p => p instanceof FormatNode && p.getFormat() === "*").length > 0; }
-    isEmpty() { return this.getLength() === 0; }
+            .replace('<', '&lt;')
+            .replace('>', '&gt;')
+            .replace('&', '&amp;')
+            .replace('"', '&quot;')
+            .replace("'", '&#39;');
+    }
+    getChildren() {
+        return [];
+    }
+    copy() {
+        return new TextNode(this.#text);
+    }
+    isItalic(root) {
+        return (this.getAncestors(root).filter((p) => p instanceof FormatNode && p.getFormat() === '_').length > 0);
+    }
+    isBold(root) {
+        return (this.getAncestors(root).filter((p) => p instanceof FormatNode && p.getFormat() === '*').length > 0);
+    }
+    isEmpty() {
+        return this.getLength() === 0;
+    }
     getFormat(root) {
         return this.getClosestParentOfType(root, FormatNode);
     }
@@ -52,17 +78,19 @@ export default class TextNode extends Node {
         // The format root is the highest format in the tree that contains this text.
         // There is one exception to this, however: formats inside atom nodes shouldn't traverse
         // past the atom node, since should be isolated from edits outside the atom.
-        const atom = this.getClosestParentMatching(root, p => p instanceof AtomNode);
+        const atom = this.getClosestParentMatching(root, (p) => p instanceof AtomNode);
         if (atom && atom.getMeta() instanceof FormatNode)
             return atom.getMeta();
         // If this isn't in an atom, just return the highest format this is in.
-        return this.getFarthestParentMatching(root, p => p instanceof FormatNode);
+        return this.getFarthestParentMatching(root, (p) => p instanceof FormatNode);
     }
     getBlocks(root) {
         return this.getClosestParentOfType(root, BlocksNode);
     }
     getNextCaret(index) {
-        return index < this.#text.length ? { node: this, index: index + 1 } : undefined;
+        return index < this.#text.length
+            ? { node: this, index: index + 1 }
+            : undefined;
     }
     getPreviousCaret(index) {
         return index > 0 ? { node: this, index: index - 1 } : undefined;
@@ -77,7 +105,8 @@ export default class TextNode extends Node {
         while (i < this.getLength() && this.#text.charAt(i).match(/\w/))
             i++;
         // If we found one in this node, return it.
-        if (i < this.getLength() || (i === this.getLength() && this.#text.charAt(i - 1).match(/\w/)))
+        if (i < this.getLength() ||
+            (i === this.getLength() && this.#text.charAt(i - 1).match(/\w/)))
             return { node: this, index: i };
         // Otherwise, find the next text node's next word boundary.
         const format = this.getFormatRoot(root);
@@ -85,7 +114,9 @@ export default class TextNode extends Node {
         const nextNode = root.getNextTextOrAtom(this);
         const nextWord = nextNode?.nextWord(root);
         // If there isn't one, just go to the end of this.
-        if (formatTextNodes && nextNode && this === formatTextNodes[formatTextNodes.length - 1])
+        if (formatTextNodes &&
+            nextNode &&
+            this === formatTextNodes[formatTextNodes.length - 1])
             return { node: nextNode, index: 0 };
         else if (nextWord === undefined)
             return { node: this, index: this.#text.length };
@@ -111,13 +142,20 @@ export default class TextNode extends Node {
         const previousWord = previousNode?.previousWord(root);
         // If there isn't one, just go to the end of this.
         if (formatTextNodes && previousNode && this === formatTextNodes[0])
-            return { node: previousNode, index: previousNode instanceof TextNode ? previousNode.getLength() : 0 };
+            return {
+                node: previousNode,
+                index: previousNode instanceof TextNode
+                    ? previousNode.getLength()
+                    : 0,
+            };
         else if (previousWord === undefined)
             return { node: this, index: 0 };
         else
             return previousWord;
     }
-    withChildReplaced() { return undefined; }
+    withChildReplaced() {
+        return undefined;
+    }
     withCharacterAt(char, index) {
         if (index < 0 || index > this.#text.length)
             return undefined;
@@ -126,7 +164,9 @@ export default class TextNode extends Node {
     withoutRange(range) {
         if (range.start.node !== this && range.end.node !== this)
             return;
-        return new TextNode(this.#text.substring(0, range.start.index) + this.#text.substring(range.end.index));
+        const min = Math.max(0, Math.min(range.start.index, range.end.index));
+        const max = Math.min(this.#text.length, Math.max(range.start.index, range.end.index));
+        return new TextNode(this.#text.substring(0, min) + this.#text.substring(max));
     }
     withContentInRange(range) {
         const includesStart = range.start.node === this;

package/models/chapter/TextNode.test.js

@@ -1,6 +1,6 @@
 import { test, expect } from 'vitest';
-import TextNode from "./TextNode";
-test("Insert character", () => {
-    const text = new TextNode("Hello");
-    expect(text.withCharacterAt("!", 5)?.toBookdown()).toBe("Hello!");
+import TextNode from './TextNode';
+test('Insert character', () => {
+    const text = new TextNode('Hello');
+    expect(text.withCharacterAt('!', 5)?.toBookdown()).toBe('Hello!');
 });

package/package.json

@@ -1,35 +1,38 @@
 {
   "name": "bookish-press",
   "private": false,
-  "version": "0.4.001",
+  "version": "0.4.3",
   "type": "module",
   "description": "A platform for reading and writing readable, accessible, beautiful online books.",
   "license": "MIT",
   "repository": "https://github.com/amyjko/bookish.git",
   "devDependencies": {
-    "@sveltejs/adapter-auto": "next",
-    "@sveltejs/kit": "next",
-    "@sveltejs/adapter-static": "^1.0.0-next.48",
-    "@sveltejs/package": "^1.0.0-next.5",
+    "@sveltejs/adapter-static": "^1.0.5",
+    "@sveltejs/kit": "^1.3.2",
+    "@sveltejs/package": "^1.0.2",
+    "@types/prismjs": "^1.26.0",
     "@types/smoothscroll-polyfill": "^0.3.1",
-    "@types/uuid": "^8.3.4",
-    "svelte": "^3.44.0",
-    "svelte-check": "^2.7.1",
-    "svelte-preprocess": "^4.10.6",
-    "tslib": "^2.3.1",
-    "typescript": "^4.7.4",
-    "vite": "^3.1.0",
-    "vitest": "^0.23.4"
+    "@types/uuid": "^9.0.0",
+    "prettier": "^2.8.3",
+    "prettier-plugin-svelte": "^2.9.0",
+    "svelte-check": "^3.0.3",
+    "svelte-preprocess": "^5.0.1",
+    "tslib": "^2.5.0",
+    "typescript": "^4.9.4",
+    "vite": "^4.0.4",
+    "vitest": "^0.28.3"
   },
   "dependencies": {
-    "ajv": "^8.8.2",
+    "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
-    "firebase": "^9.9.4",
-    "firebase-functions": "^3.24.1",
-    "highlight.js": "11.1.0",
+    "firebase": "latest",
+    "firebase-functions": "^4.2.0",
+    "prismjs": "^1.29.0",
     "smoothscroll-polyfill": "^0.4.4",
+    "svelte": "^3.55.1",
     "uuid": "^9.0.0"
   },
+  "types": "./src/lib/index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     "./components/Auth.svelte": "./components/Auth.svelte",
@@ -37,6 +40,18 @@
     "./components/BookPreview.svelte": "./components/BookPreview.svelte",
     "./components/External.svelte": "./components/External.svelte",
     "./components/Link.svelte": "./components/Link.svelte",
+    "./components/app/BookList.svelte": "./components/app/BookList.svelte",
+    "./components/app/Button.svelte": "./components/app/Button.svelte",
+    "./components/app/Feedback.svelte": "./components/app/Feedback.svelte",
+    "./components/app/Head.svelte": "./components/app/Head.svelte",
+    "./components/app/Large.svelte": "./components/app/Large.svelte",
+    "./components/app/Lead.svelte": "./components/app/Lead.svelte",
+    "./components/app/Link.svelte": "./components/app/Link.svelte",
+    "./components/app/Options.svelte": "./components/app/Options.svelte",
+    "./components/app/Paragraph.svelte": "./components/app/Paragraph.svelte",
+    "./components/app/Section.svelte": "./components/app/Section.svelte",
+    "./components/app/Table.svelte": "./components/app/Table.svelte",
+    "./components/app/TextInput.svelte": "./components/app/TextInput.svelte",
     "./components/chapter/Atom.svelte": "./components/chapter/Atom.svelte",
     "./components/chapter/Block.svelte": "./components/chapter/Block.svelte",
     "./components/chapter/Callout.svelte": "./components/chapter/Callout.svelte",
@@ -48,6 +63,8 @@
     "./components/chapter/Definition.svelte": "./components/chapter/Definition.svelte",
     "./components/chapter/Embed.svelte": "./components/chapter/Embed.svelte",
     "./components/chapter/ErrorMessage.svelte": "./components/chapter/ErrorMessage.svelte",
+    "./components/chapter/ExtendedPrism": "./components/chapter/ExtendedPrism.js",
+    "./components/chapter/Figure.svelte": "./components/chapter/Figure.svelte",
     "./components/chapter/Footnote.svelte": "./components/chapter/Footnote.svelte",
     "./components/chapter/Format.svelte": "./components/chapter/Format.svelte",
     "./components/chapter/InlineCode.svelte": "./components/chapter/InlineCode.svelte",
@@ -56,18 +73,21 @@
     "./components/chapter/List.svelte": "./components/chapter/List.svelte",
     "./components/chapter/Marginal.svelte": "./components/chapter/Marginal.svelte",
     "./components/chapter/Paragraph.svelte": "./components/chapter/Paragraph.svelte",
+    "./components/chapter/Positioned.svelte": "./components/chapter/Positioned.svelte",
+    "./components/chapter/Problem.svelte": "./components/chapter/Problem.svelte",
     "./components/chapter/Python.svelte": "./components/chapter/Python.svelte",
     "./components/chapter/Quote.svelte": "./components/chapter/Quote.svelte",
     "./components/chapter/Rule.svelte": "./components/chapter/Rule.svelte",
     "./components/chapter/Table.svelte": "./components/chapter/Table.svelte",
     "./components/chapter/Text.svelte": "./components/chapter/Text.svelte",
-    "./components/chapter/renderPosition": "./components/chapter/renderPosition.js",
+    "./components/editor/.DS_Store": "./components/editor/.DS_Store",
     "./components/editor/BookishEditor.svelte": "./components/editor/BookishEditor.svelte",
     "./components/editor/CalloutEditor.svelte": "./components/editor/CalloutEditor.svelte",
     "./components/editor/CaptionedCodeEditor.svelte": "./components/editor/CaptionedCodeEditor.svelte",
     "./components/editor/CaretContext": "./components/editor/CaretContext.js",
     "./components/editor/CaretState": "./components/editor/CaretState.js",
     "./components/editor/CaretUtilities": "./components/editor/CaretUtilities.js",
+    "./components/editor/CaretView.svelte": "./components/editor/CaretView.svelte",
     "./components/editor/CitationsEditor.svelte": "./components/editor/CitationsEditor.svelte",
     "./components/editor/Clipboard": "./components/editor/Clipboard.js",
     "./components/editor/Command": "./components/editor/Command.js",
@@ -75,33 +95,87 @@
     "./components/editor/ConfirmButton.svelte": "./components/editor/ConfirmButton.svelte",
     "./components/editor/DefinitionEditor.svelte": "./components/editor/DefinitionEditor.svelte",
     "./components/editor/EmbedEditor.svelte": "./components/editor/EmbedEditor.svelte",
+    "./components/editor/Icon.svelte": "./components/editor/Icon.svelte",
     "./components/editor/ImageChooser.svelte": "./components/editor/ImageChooser.svelte",
     "./components/editor/InlineCodeEditor.svelte": "./components/editor/InlineCodeEditor.svelte",
     "./components/editor/LabelEditor.svelte": "./components/editor/LabelEditor.svelte",
     "./components/editor/LanguageEditor.svelte": "./components/editor/LanguageEditor.svelte",
     "./components/editor/LinkEditor.svelte": "./components/editor/LinkEditor.svelte",
     "./components/editor/Note.svelte": "./components/editor/Note.svelte",
+    "./components/editor/Permissions.svelte": "./components/editor/Permissions.svelte",
     "./components/editor/PositionEditor.svelte": "./components/editor/PositionEditor.svelte",
     "./components/editor/QuoteEditor.svelte": "./components/editor/QuoteEditor.svelte",
     "./components/editor/Switch.svelte": "./components/editor/Switch.svelte",
+    "./components/editor/TableEditor.svelte": "./components/editor/TableEditor.svelte",
     "./components/editor/TextEditor.svelte": "./components/editor/TextEditor.svelte",
     "./components/editor/Toggle.svelte": "./components/editor/Toggle.svelte",
     "./components/editor/Toolbar.svelte": "./components/editor/Toolbar.svelte",
     "./components/editor/ToolbarGroup.svelte": "./components/editor/ToolbarGroup.svelte",
-    "./components/editor/ToolbarIcon.svelte": "./components/editor/ToolbarIcon.svelte",
     "./components/editor/ToolbarSpacer.svelte": "./components/editor/ToolbarSpacer.svelte",
     "./components/editor/URLEditor.svelte": "./components/editor/URLEditor.svelte",
     "./components/editor/UndoState": "./components/editor/UndoState.js",
+    "./components/editor/icons/annotate.svg": "./components/editor/icons/annotate.svg",
+    "./components/editor/icons/block.svg": "./components/editor/icons/block.svg",
+    "./components/editor/icons/bold.svg": "./components/editor/icons/bold.svg",
+    "./components/editor/icons/bullets.svg": "./components/editor/icons/bullets.svg",
+    "./components/editor/icons/callout.svg": "./components/editor/icons/callout.svg",
+    "./components/editor/icons/citation.svg": "./components/editor/icons/citation.svg",
+    "./components/editor/icons/clear.svg": "./components/editor/icons/clear.svg",
+    "./components/editor/icons/clipboard.svg": "./components/editor/icons/clipboard.svg",
+    "./components/editor/icons/code.svg": "./components/editor/icons/code.svg",
+    "./components/editor/icons/columnafter.svg": "./components/editor/icons/columnafter.svg",
+    "./components/editor/icons/columnbefore.svg": "./components/editor/icons/columnbefore.svg",
+    "./components/editor/icons/comment.svg": "./components/editor/icons/comment.svg",
+    "./components/editor/icons/copy.svg": "./components/editor/icons/copy.svg",
+    "./components/editor/icons/cut.svg": "./components/editor/icons/cut.svg",
+    "./components/editor/icons/define.svg": "./components/editor/icons/define.svg",
+    "./components/editor/icons/deletecolumn.svg": "./components/editor/icons/deletecolumn.svg",
+    "./components/editor/icons/deleterow.svg": "./components/editor/icons/deleterow.svg",
+    "./components/editor/icons/footnote.svg": "./components/editor/icons/footnote.svg",
+    "./components/editor/icons/header1.svg": "./components/editor/icons/header1.svg",
+    "./components/editor/icons/header2.svg": "./components/editor/icons/header2.svg",
+    "./components/editor/icons/header3.svg": "./components/editor/icons/header3.svg",
+    "./components/editor/icons/home.svg": "./components/editor/icons/home.svg",
+    "./components/editor/icons/indent.svg": "./components/editor/icons/indent.svg",
+    "./components/editor/icons/italic.svg": "./components/editor/icons/italic.svg",
+    "./components/editor/icons/label.svg": "./components/editor/icons/label.svg",
+    "./components/editor/icons/left.svg": "./components/editor/icons/left.svg",
+    "./components/editor/icons/level.svg": "./components/editor/icons/level.svg",
+    "./components/editor/icons/link.svg": "./components/editor/icons/link.svg",
+    "./components/editor/icons/list.svg": "./components/editor/icons/list.svg",
+    "./components/editor/icons/media.svg": "./components/editor/icons/media.svg",
+    "./components/editor/icons/middle.svg": "./components/editor/icons/middle.svg",
+    "./components/editor/icons/numbers.svg": "./components/editor/icons/numbers.svg",
+    "./components/editor/icons/paragraph.svg": "./components/editor/icons/paragraph.svg",
+    "./components/editor/icons/paste.svg": "./components/editor/icons/paste.svg",
+    "./components/editor/icons/quote.svg": "./components/editor/icons/quote.svg",
+    "./components/editor/icons/redo.svg": "./components/editor/icons/redo.svg",
+    "./components/editor/icons/right.svg": "./components/editor/icons/right.svg",
+    "./components/editor/icons/rowabove.svg": "./components/editor/icons/rowabove.svg",
+    "./components/editor/icons/rowbelow.svg": "./components/editor/icons/rowbelow.svg",
+    "./components/editor/icons/rule.svg": "./components/editor/icons/rule.svg",
+    "./components/editor/icons/sub.svg": "./components/editor/icons/sub.svg",
+    "./components/editor/icons/super.svg": "./components/editor/icons/super.svg",
+    "./components/editor/icons/table.svg": "./components/editor/icons/table.svg",
+    "./components/editor/icons/text.svg": "./components/editor/icons/text.svg",
+    "./components/editor/icons/time.svg": "./components/editor/icons/time.svg",
+    "./components/editor/icons/undo.svg": "./components/editor/icons/undo.svg",
+    "./components/editor/icons/unindent.svg": "./components/editor/icons/unindent.svg",
+    "./components/editor/icons/unlink.svg": "./components/editor/icons/unlink.svg",
     "./components/page/Acknowledgements.svelte": "./components/page/Acknowledgements.svelte",
-    "./components/page/Alert.svelte": "./components/page/Alert.svelte",
     "./components/page/Authors.svelte": "./components/page/Authors.svelte",
+    "./components/page/BookLoader.svelte": "./components/page/BookLoader.svelte",
     "./components/page/BulkReferenceEditor.svelte": "./components/page/BulkReferenceEditor.svelte",
     "./components/page/Chapter.svelte": "./components/page/Chapter.svelte",
     "./components/page/ChapterContext": "./components/page/ChapterContext.js",
+    "./components/page/ChapterNumber.svelte": "./components/page/ChapterNumber.svelte",
+    "./components/page/ChapterTitle.svelte": "./components/page/ChapterTitle.svelte",
     "./components/page/Contexts": "./components/page/Contexts.js",
     "./components/page/DefinitionView.svelte": "./components/page/DefinitionView.svelte",
     "./components/page/Description.svelte": "./components/page/Description.svelte",
     "./components/page/Edition.svelte": "./components/page/Edition.svelte",
+    "./components/page/EditionLoader.svelte": "./components/page/EditionLoader.svelte",
+    "./components/page/Editions.svelte": "./components/page/Editions.svelte",
     "./components/page/Glossary.svelte": "./components/page/Glossary.svelte",
     "./components/page/Header.svelte": "./components/page/Header.svelte",
     "./components/page/Index.svelte": "./components/page/Index.svelte",
@@ -110,14 +184,18 @@
     "./components/page/Loading.svelte": "./components/page/Loading.svelte",
     "./components/page/Media.svelte": "./components/page/Media.svelte",
     "./components/page/MediaPreview.svelte": "./components/page/MediaPreview.svelte",
+    "./components/page/Muted.svelte": "./components/page/Muted.svelte",
     "./components/page/Outline.svelte": "./components/page/Outline.svelte",
     "./components/page/Page.svelte": "./components/page/Page.svelte",
+    "./components/page/PageHeader.svelte": "./components/page/PageHeader.svelte",
+    "./components/page/PageParagraph.svelte": "./components/page/PageParagraph.svelte",
     "./components/page/PossibleChapter.svelte": "./components/page/PossibleChapter.svelte",
     "./components/page/PossibleReference.svelte": "./components/page/PossibleReference.svelte",
     "./components/page/Print.svelte": "./components/page/Print.svelte",
+    "./components/page/Publish.svelte": "./components/page/Publish.svelte",
     "./components/page/Reference.svelte": "./components/page/Reference.svelte",
     "./components/page/References.svelte": "./components/page/References.svelte",
-    "./components/page/Revisions.svelte": "./components/page/Revisions.svelte",
+    "./components/page/Rows.svelte": "./components/page/Rows.svelte",
     "./components/page/Search.svelte": "./components/page/Search.svelte",
     "./components/page/Status.svelte": "./components/page/Status.svelte",
     "./components/page/SubdomainEditor.svelte": "./components/page/SubdomainEditor.svelte",
@@ -128,19 +206,24 @@
     "./components/page/ThemeEditorPreview.svelte": "./components/page/ThemeEditorPreview.svelte",
     "./components/page/ThemeSetEditor.svelte": "./components/page/ThemeSetEditor.svelte",
     "./components/page/ThemeVariableEditor.svelte": "./components/page/ThemeVariableEditor.svelte",
+    "./components/page/Title.svelte": "./components/page/Title.svelte",
     "./components/page/Unknown.svelte": "./components/page/Unknown.svelte",
     "./components/page/margins": "./components/page/margins.js",
-    "./models/BookLoader": "./models/BookLoader.js",
+    ".": "./index.js",
+    "./models/CRUD": "./models/CRUD.js",
     "./models/Firebase": "./models/Firebase.js",
-    "./models/Firestore": "./models/Firestore.js",
     "./models/book/Book": "./models/book/Book.js",
     "./models/book/BookMedia": "./models/book/BookMedia.js",
+    "./models/book/BookSaveStatus": "./models/book/BookSaveStatus.js",
     "./models/book/Chapter": "./models/book/Chapter.js",
     "./models/book/ChapterID": "./models/book/ChapterID.js",
     "./models/book/Definition": "./models/book/Definition.js",
     "./models/book/Edition": "./models/book/Edition.js",
+    "./models/book/Reference": "./models/book/Reference.js",
+    "./models/book/Schema": "./models/book/Schema.js",
     "./models/book/Theme": "./models/book/Theme.js",
     "./models/book/ThemeColors": "./models/book/ThemeColors.js",
+    "./models/book/Words": "./models/book/Words.js",
     "./models/chapter/AtomNode": "./models/chapter/AtomNode.js",
     "./models/chapter/BlockNode": "./models/chapter/BlockNode.js",
     "./models/chapter/BlocksNode.test": "./models/chapter/BlocksNode.test.js",
@@ -173,17 +256,16 @@
     "./models/chapter/Parser": "./models/chapter/Parser.js",
     "./models/chapter/Position": "./models/chapter/Position.js",
     "./models/chapter/QuoteNode": "./models/chapter/QuoteNode.js",
-    "./models/chapter/ReferenceNode": "./models/chapter/ReferenceNode.js",
     "./models/chapter/RootNode": "./models/chapter/RootNode.js",
     "./models/chapter/RuleNode": "./models/chapter/RuleNode.js",
     "./models/chapter/TableNode.test": "./models/chapter/TableNode.test.js",
     "./models/chapter/TableNode": "./models/chapter/TableNode.js",
     "./models/chapter/TextNode.test": "./models/chapter/TextNode.test.js",
     "./models/chapter/TextNode": "./models/chapter/TextNode.js",
-    "./models/loadEdition": "./models/loadEdition.js",
     "./util/getSubdomain": "./util/getSubdomain.js",
     "./util/isMobile": "./util/isMobile.js",
     "./util/mineReference": "./util/mineReference.js",
     "./util/scrollToEyeLevel": "./util/scrollToEyeLevel.js"
-  }
+  },
+  "svelte": "./index.js"
 }

package/util/getSubdomain.js

@@ -1,11 +1,13 @@
 export function getSubdomain() {
-    if (typeof window === "undefined")
+    if (typeof window === 'undefined')
         return undefined;
     // Determine if there's a subdomain.
-    const hostParts = window.location.hostname.split(".");
+    const hostParts = window.location.hostname.split('.');
     const firstPart = hostParts[0];
     const secondPart = hostParts[1];
-    return secondPart === undefined || /^(localhost|bookish)$/.test(firstPart) ? undefined : firstPart;
+    return secondPart === undefined || /^(localhost|bookish)$/.test(firstPart)
+        ? undefined
+        : firstPart;
 }
 export function pathWithoutSubdomain(path) {
     // If there's no subdomain, just return the path.
@@ -13,10 +15,10 @@ export function pathWithoutSubdomain(path) {
     if (subdomain === undefined)
         return path;
     // Otherwise, return a full URL without the subdomain
-    return `${window.location.protocol}//${window.location.host.replace(subdomain + ".", "")}${path}${window.location.search}`;
+    return `${window.location.protocol}//${window.location.host.replace(subdomain + '.', '')}${path}${window.location.search}`;
 }
 export function getSubdomainURL(subdomain) {
-    const parts = window.location.host.split(".");
+    const parts = window.location.host.split('.');
     // Construct a URL from the subdomain and the last one or two parts of the host (accounting for localhost and normal domains and top level domains.)
-    return `${window.location.protocol}//${subdomain}.${parts.length > 1 ? `${parts[parts.length - 2]}.` : ""}${parts[parts.length - 1]}`;
+    return `${window.location.protocol}//${subdomain}.${parts.length > 1 ? `${parts[parts.length - 2]}.` : ''}${parts[parts.length - 1]}`;
 }

package/util/isMobile.js

@@ -2,5 +2,5 @@ export function isMobile() {
     return watchMobile().matches;
 }
 export function watchMobile() {
-    return window.matchMedia("screen and (max-width: 1200px)");
+    return window.matchMedia('screen and (max-width: 1200px)');
 }

package/util/mineReference.d.ts

@@ -1,3 +1,4 @@
-import ReferenceNode from "../models/chapter/ReferenceNode";
-export declare function mineReference(ids: string[], text: string): ReferenceNode;
+import Reference from '../models/book/Reference';
+export declare function mineReference(ids: string[], text: string): Reference;
+export declare function splitIntoSentences(text: string): string[];
 export declare function getUniqueReferenceID(ids: string[], authors?: string, year?: string): string;

package/util/mineReference.js

@@ -1,60 +1,98 @@
-import ReferenceNode from "../models/chapter/ReferenceNode";
+import Reference from '../models/book/Reference';
 export function mineReference(ids, text) {
     // First find the year, since it's the most easily detected. Optional parens.
     let yearMatches = text.match(/(\(?[0-9]{4}\)?)/);
-    let year = yearMatches !== null && yearMatches.length > 0 ? yearMatches[1].replace("(", "").replace(")", "") : undefined;
+    let year = yearMatches !== null && yearMatches.length > 0
+        ? yearMatches[1].replace('(', '').replace(')', '')
+        : undefined;
     if (year && yearMatches)
-        text = text.replace(yearMatches[1], "");
-    // Split the remaining text by period-space sequences, assuming chunks of information are segmented by sentences.
-    // let chunks = text.split(/(?<![A-Z])[?.]\s/);
-    // Grrr, Safari doesn't support negative lookbehind. I'm going to break this until I have time for a fix.
-    let chunks = text.split(/[?.]\s/);
-    // First find the URL. If we find it, remove it from the chunks.
-    let url = chunks.find(t => t.indexOf("http") >= 0);
-    if (url) {
-        chunks = chunks.filter(t => t !== url);
-        url = url.trim();
+        text = text.replace(yearMatches[1], '');
+    // Next, find the URL
+    let url = null;
+    let urlMatches = text.match(/https?:\/\/(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/);
+    if (urlMatches !== null && urlMatches.length > 0) {
+        url = urlMatches[0];
+        const index = text.indexOf(url);
+        text = text.substring(0, index) + text.substring(index + url.length);
     }
+    // Split the remaining portion into sentences.
+    let chunks = splitIntoSentences(text);
     // Authors are usually lists of roman characters and periods optionally followed by commas or semicolons
-    let authors = chunks.find(t => /[a-zA-Z\.]+[,;]?/.test(t));
+    let authors = chunks.find((t) => /[a-zA-Z\.]+[,;]?/.test(t));
     if (authors) {
-        chunks = chunks.filter(t => t !== authors);
+        chunks = chunks.filter((t) => t !== authors);
         authors = authors.trim();
     }
     // Titles are usually lists of roman characters and spaces and maybe a colon.
-    let title = chunks.find(t => /[a-zA-Z0-9:!#?]+/.test(t));
+    let title = chunks.find((t) => /[a-zA-Z0-9:!#?]+/.test(t));
     if (title) {
-        chunks = chunks.filter(t => t !== title);
-        if (text.charAt(text.indexOf(title) + title.length) === "?")
-            title = title + "?";
+        chunks = chunks.filter((t) => t !== title);
+        if (text.charAt(text.indexOf(title) + title.length) === '?')
+            title = title + '?';
+        title = title.trim();
     }
     // Source is whatever is left.
     let source = chunks.length > 0 ? chunks[0] : undefined;
     if (source) {
-        chunks = chunks.filter(t => t !== source);
+        chunks = chunks.filter((t) => t !== source);
+        source = source.trim();
     }
     // If there's anything left, fall back to just a string.
-    return chunks.length > 0 ?
-        new ReferenceNode(getUniqueReferenceID(ids), text) :
-        new ReferenceNode(getUniqueReferenceID(ids, authors, year), authors || "", year || "", title || "", source || "", url || "", "", false);
+    return chunks.length > 0
+        ? new Reference(getUniqueReferenceID(ids), text)
+        : new Reference(getUniqueReferenceID(ids, authors, year), authors || '', year || '', title || '', source || '', url || '', '', false);
+}
+export function splitIntoSentences(text) {
+    // Split the remaining text by period-space sequences, assuming chunks of information are segmented by sentences
+    // unless they are single initials followed by a period.
+    let sentences = [];
+    let priorLetterSequence = '';
+    let accumulator = '';
+    for (let i = 0; i < text.length; i++) {
+        let char = text.charAt(i);
+        if (/[a-zA-Z]/.test(char)) {
+            priorLetterSequence += char;
+            accumulator += char;
+        }
+        else {
+            if (char === '.' && priorLetterSequence.length !== 1) {
+                sentences.push(accumulator);
+                accumulator = '';
+                priorLetterSequence = '';
+            }
+            else {
+                priorLetterSequence = '';
+                accumulator += char;
+            }
+        }
+    }
+    if (accumulator.length > 0)
+        sentences.push(accumulator);
+    return sentences;
 }
 export function getUniqueReferenceID(ids, authors, year) {
     if (authors && year) {
         // Split the authors, combine the first initials of each, then append the year.
-        const semicolons = authors.includes(";");
-        const authorList = authors.split(semicolons ? /;\s+/ : /,\s+/).map(t => t.trim());
-        const initials = authorList.map(a => a.charAt(0).toLocaleLowerCase());
-        const id = initials.join("") + year;
+        const semicolons = authors.includes(';');
+        const authorList = authors
+            .split(semicolons ? /;\s+/ : /,\s+/)
+            .map((t) => t.trim());
+        const initials = authorList.map((a) => a.charAt(0).toLocaleLowerCase());
+        const id = initials.join('') + year;
         let revisedID = id;
-        let letters = "abcdefghijklmnopqrstuv".split("");
+        let letters = 'abcdefghijklmnopqrstuv'.split('');
         while (ids.includes(revisedID) || revisedID.length === 0) {
             const letter = letters.shift();
-            revisedID = id + (letter !== undefined ? letter : Math.floor(Math.random() * 10));
+            revisedID =
+                id +
+                    (letter !== undefined
+                        ? letter
+                        : Math.floor(Math.random() * 10));
         }
         return revisedID;
     }
     else {
-        let id = "ref";
+        let id = 'ref';
         for (let i = 0; i < 4; i++)
             id = id + Math.round(Math.random() * 9);
         return id;