bookish-press 0.5.62 → 0.5.71

package/README.md

@@ -4,4 +4,33 @@ Bookish is a framework and platform for writing and publishing web-based books.
 
 ## Status
 
-I'm working on a beta launch of the platform at [bookish.press](https://bookish.press) and expect to maintain the platform for the foreseeable future. Let me know if you'd like to help!
+I'm working on a 1.0 of the platform at [bookish.press](https://bookish.press) and expect to maintain the platform for the foreseeable future. Let me know if you'd like to help!
+
+## Deployment notes
+
+There are two major components to Bookish: the authoring platform and the reading front end. Changes to the authoring platform that do not affect reading can be verified and deployed to Firebase without any other coordination. However, changes to the reading experience have downstream dependencies that need to be managed. Here's the general deployment workflow, which I'm currently using as reminders for myself:
+
+0. Ensure you're working in the `dev` branch
+1. Fix bugs, add features
+2. Ensure there are no type errors (`npm run check`) or failed tests (`npm run test`).
+2. Test with emulator (`npm run emu`), if possible. (Some features aren't possible to perfectly emulate, such as authentication, hosting configurations, permissions.)
+3. Test on the [staging server](https://bookish-dev-21ac3.web.app/`) (`npm run stage`).
+4. Bump the version in `package.json`
+5. Describe the changes in `CHANGELOG.md`, linking to any issues closed
+6. Commit changes to `dev`, referring to any issues addressed
+7. Release to production (`npm run release`)
+8. Verify the change in production on [bookish.press](https://bookish.press)
+9. Merge dev to main (`npm run merge`)
+10. If any of the changes affected the reading experience (essentially if any `.svelte` file or its dependencies in `/src/lib/components` changed), then we need to update the reader package for authors who pre-build their books manually:
+    1. Update the bookish package with the Sveltekit package tooling (`npm run package`)
+    2. Publish the package to npm (`npm publish`)
+    3. Open the `bookish-reader` repository
+    4. Pull the revisions (`npm update`), ensuring you update the repository's `package.json` dependencies, in case there was a major version change
+    5. Update reader's `CHANGELOG.md` to describe any changes.
+    6. Bump the reader's version in `package.json`
+    7. Commit the changes directly to `main`, and sync them
+    8. For any of these changes to make it to pre-built books, authors need ot use the updated `bookish-reader` repo to rebuild their books. That generally involves:
+        1. Cloning the reader repo: `git clone https://github.com/amyjko/bookish-reader`
+        2. Entering the repo directory: `cd bookish-reader`
+        3. Binding the book: `bind.sh`
+        4. Deploying the bound book in the newly created `build` folder to wherever it's hosted.

package/dist/components/app/Options.svelte

@@ -20,5 +20,6 @@ export let label;
         padding: var(--app-chrome-padding);
         font-family: var(--app-font);
         font-size: var(--app-chrome-font-size);
+        max-width: 10em;
     }
 </style>

package/dist/components/app/Table.svelte

@@ -9,7 +9,6 @@
         width: 100%;
         overflow-x: auto;
         margin-top: var(--app-text-spacing);
-        margin-bottom: var(--app-text-spacing);
         border-top: var(--app-chrome-border-size) solid var(--app-border-color);
         border-bottom: var(--app-chrome-border-size) solid
             var(--app-border-color);

package/dist/components/chapter/CaptionedCode.svelte

@@ -5,35 +5,22 @@ import Python from './Python.svelte';
 import Text from './Text.svelte';
 import { isChapterEditable } from '../page/Contexts';
 import Figure from './Figure.svelte';
-import { getCaret } from '../page/Contexts';
+import Button from '../app/Button.svelte';
 export let node;
 $: language = node.getLanguage();
 let editable = isChapterEditable();
 // const languages = [ "C", "C++", "CSS", "Go", "HTML", "Java", "JavaScript", "Markdown", "Plaintext", "Python", "TypeScript" ];
-let caret = getCaret();
-$: inside =
-    $caret?.range?.start.node === node.getCodeNode() ||
-        $caret?.range?.end.node === node.getCodeNode();
+let editing = true;
 </script>
 
-<Figure {node} caption={node.getCaption()}>
-    {#if editable}
-        <div class="container">
+<Figure {node} caption={node.getCaption()} focusable={false}>
+    {#if editable && editing}
+        <div class="container" class:editing>
             <code
-                class={`bookish-code bookish-code-block language-${language} ${
-                    !inside ? 'hidden' : ''
-                }`}
+                class={`bookish-code bookish-code-block language-${language}`}
             >
                 <Text node={node.getCodeNode()} />
             </code>
-            <div class="code" class:inside>
-                <Code
-                    editable={false}
-                    inline={false}
-                    language={node.getLanguage()}
-                    nodeID={node.getCodeNode().nodeID}>{node.getCode()}</Code
-                >
-            </div>
         </div>
     {:else if node.getLanguage() === 'python' && node.isExecutable()}
         <Python {node} startCode={node.getCode()} />
@@ -45,6 +32,15 @@ $: inside =
             nodeID={node.getCodeNode().nodeID}>{node.getCode()}</Code
         >
     {/if}
+    {#if editable}
+        <Button
+            tooltip={editing ? 'stop editing' : 'start editing'}
+            command={() => {
+                editing = !editing;
+            }}
+            >{#if editing}done{:else}edit{/if}</Button
+        >
+    {/if}
     {#if node.getLanguage() !== 'plaintext'}<aside class="language"
             >{node.getLanguage()}</aside
         >{/if}
@@ -66,6 +62,12 @@ $: inside =
     .container {
         position: relative;
     }
+
+    .container.editing {
+        border: 1px solid var(--app-interactive-color);
+        border-radius: var(--app-chrome-roundedness);
+    }
+
     .code {
         position: absolute;
         top: 0;

package/dist/components/chapter/Figure.svelte

@@ -6,6 +6,7 @@ import { getCaret, isChapterEditable } from '../page/Contexts';
 export let node;
 export let caption;
 export let credit = undefined;
+export let focusable = true;
 let editable = isChapterEditable();
 let caret = getCaret();
 $: selected = $caret?.range?.start.node === node;
@@ -30,11 +31,12 @@ function focusFigure() {
 
 <Positioned position={node.getPosition()}>
     <figure class="bookish-figure" data-nodeid={node.nodeID}>
+        <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
         <div
             class:selected
-            role="button"
-            tabindex="0"
-            on:mousedown={focusFigure}
+            role={focusable ? 'button' : undefined}
+            tabindex={focusable ? 0 : undefined}
+            on:mousedown={focusable ? focusFigure : null}
             on:keydown={(event) =>
                 event.key === ' ' || event.key === 'Enter'
                     ? focusFigure()

package/dist/components/chapter/Figure.svelte.d.ts

@@ -8,6 +8,7 @@ declare const __propDef: {
         node: TableNode | EmbedNode | CodeNode;
         caption: FormatNode | undefined;
         credit?: FormatNode | undefined;
+        focusable?: boolean | undefined;
     };
     events: {
         [evt: string]: CustomEvent<any>;

package/dist/components/editor/BookishEditor.svelte

@@ -18,6 +18,7 @@ import commands from './Commands';
 import { afterUpdate, onMount, setContext } from 'svelte';
 import { getCaret } from '../page/Contexts';
 import CaretView from './CaretView.svelte';
+import Parser from '../../models/chapter/Parser';
 const IDLE_TIME = 500;
 export let text;
 export let parser;
@@ -698,14 +699,16 @@ function handleCopy(node) {
         window.alert("Your browser doesn't support copying to the clipboard :(");
 }
 function handlePaste(context, text, save) {
+    // If we're pasting a node, see what will accept it.
     if (text instanceof BookishNode)
         return handlePasteNode(context, text, save);
-    const plain = text.plain === undefined ? undefined : new TextNode(text.plain);
-    if (plain) {
-        const edit = handlePasteNode(context, plain, save);
-        if (edit)
-            return edit;
-    }
+    if (text.plain === undefined)
+        return undefined;
+    // If we're pasting text, then we parse it as a series of paragraphs.
+    const chapter = Parser.parseChapter(undefined, text.plain);
+    const edit = handlePasteNode(context, chapter, save);
+    if (edit)
+        return edit;
     return undefined;
 }
 function handlePasteNode(context, node, save) {

package/dist/components/editor/CaretView.svelte

@@ -1,4 +1,4 @@
-<script>import { afterUpdate } from 'svelte';
+<script>import { afterUpdate, tick } from 'svelte';
 export let left;
 export let top;
 export let height;
@@ -11,9 +11,14 @@ export let blink;
 export let locked;
 let element;
 let headerHeight = 0;
-// When the caret updates, make sure it's in view.
+// When the caret updates position, scroll the element into view after the render is complete.
+$: {
+    left;
+    top;
+    tick().then(() => element ? element.scrollIntoView({ block: 'nearest' }) : undefined);
+}
+/** Keep track of the header height, so we can snap to the caret position. */
 afterUpdate(() => {
-    element?.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
     headerHeight =
         document.querySelector('.bookish-app > .header')
             ?.offsetHeight ?? 0;

package/dist/components/editor/Commands.js

@@ -1471,7 +1471,7 @@ const commands = [
                                         const text = await blob.text();
                                         contents.plain = text;
                                     }
-                                    context.handlePaste(context, contents, true);
+                                    return context.handlePaste(context, contents, true);
                                 }
                                 catch (err) { }
                             }

package/dist/components/page/BulkReferenceEditor.svelte

@@ -39,7 +39,7 @@ function handleEmptyAdd() {
     command={handleBulkAdd}>+ bulk references</Button
 >
 <Button tooltip="add empty reference" command={handleEmptyAdd}
-    >+ reference</Button
+    >+ empty reference</Button
 >
 
 <style>

package/dist/components/page/Chapter.svelte

@@ -213,8 +213,8 @@ let editable = isBookEditable() ||
             <Outline
                 slot="outline"
                 collapse={$marginal !== undefined}
-                previous={$edition.getPreviousChapterID(chapterID)}
-                next={$edition.getNextChapterID(chapterID)}
+                previous={$edition.getPreviousChapterID(chapterID, editable)}
+                next={$edition.getNextChapterID(chapterID, editable)}
                 listener={(expanded) => {
                     // If the outline is being expanded, hide the marginal, otherwise leave it alone.
                     if (expanded) marginal.set(undefined);
@@ -331,9 +331,8 @@ let editable = isBookEditable() ||
                 {:else}
                     <ChapterBody node={chapterAST} />
                 {/if}
-            {:else}
-                <span>Loading...</span>
-            {/if}
+            {:else if $edition === undefined}Loading...{:else}Unable to load
+                chapter text{/if}
         </section>
 
         {#if citations && citations.size > 0}

package/dist/components/page/EditionLoader.svelte

@@ -4,12 +4,13 @@ import Feedback from '../app/Feedback.svelte';
 import { getBook, getEdition, getUser, getChapterText, } from './Contexts';
 import { onDestroy } from 'svelte';
 import { page } from '$app/stores';
-import { deleteChapterText, listenToChapters, listenToEdition, } from '../../models/CRUD';
+import { listenToChapters, listenToEdition } from '../../models/CRUD';
 export let write;
 let auth = getUser();
 let book = getBook();
 let edition = getEdition();
-let chapterText = getChapterText();
+/** Mapping from Firestore docuemnt IDs to chapter text */
+let chapterText = new Map();
 let editionUnsub = undefined;
 let chaptersUnsub = undefined;
 let error = undefined;
@@ -54,9 +55,7 @@ function listen() {
             editionUnsub = listenToEdition($book.getID(), editionID, (ed) => {
                 if (ed) {
                     // Before setting the new edition, augmented it with the chapter text.
-                    edition.set($chapterText
-                        ? ed.withChapterText($chapterText)
-                        : ed);
+                    edition.set(ed.withChapterText(chapterText));
                 }
                 else {
                     edition.set(undefined);
@@ -64,20 +63,12 @@ function listen() {
                 }
             });
             chaptersUnsub = listenToChapters($book.getID(), editionID, (chapters) => {
-                // Update the chapter text store.
-                chapterText.set(chapters);
+                // Update the text of the chapters we received.
+                for (const [ref, text] of chapters)
+                    chapterText.set(ref.id, text);
                 // Update the chapter text in the current edition.
-                if ($edition) {
-                    const newEdition = $edition.withChapterText(chapters);
-                    if (newEdition !== $edition)
-                        edition.set(newEdition);
-                    // Get all the chapters in the updated chapter list and
-                    // delete the ones not referenced by the edition.
-                    chapters
-                        .filter(([ref]) => $edition &&
-                        !$edition.hasChapterRefID(ref.id))
-                        .forEach(([ref]) => deleteChapterText(ref));
-                }
+                if ($edition)
+                    edition.set($edition.withChapterText(chapterText));
             });
         }
     }

package/dist/components/page/Editions.svelte

@@ -1,7 +1,7 @@
 <script>import { createNewEdition } from '../../models/CRUD';
 import Instructions from './Instructions.svelte';
 import Note from '../editor/Note.svelte';
-import { getBook, isBookEditable } from './Contexts';
+import { getBook, getUser, isBookEditable } from './Contexts';
 import Button from '../app/Button.svelte';
 import Link from '../app/Link.svelte';
 import Format from '../chapter/Format.svelte';
@@ -10,6 +10,7 @@ import Permissions from '../editor/Permissions.svelte';
 export let editors = true;
 let book = getBook();
 let editable = isBookEditable();
+let user = getUser();
 $: editions = $book?.getEditions();
 $: latestPublishedID = $book?.getLatestPublishedEditionID();
 async function handleDraftEdition() {
@@ -48,7 +49,7 @@ async function handleDraftEdition() {
                 ? 'rd'
                 : 'th')}
 
-        {#if $book && (editable || edition.published)}
+        {#if $book && (editable || edition.published || ($user?.user?.uid && edition.editionuids.includes($user.user.uid)))}
             <section class="edition">
                 <h3
                     >{editionLabel}
@@ -68,7 +69,7 @@ async function handleDraftEdition() {
                                       }`}
                                 external>read</Link
                             >{/if}
-                        {#if editable}
+                        {#if editable || ($user?.user?.uid && edition.editionuids.includes($user?.user.uid))}
                             &nbsp;
                             <Link
                                 to={`/write/${$book.getID()}/${

package/dist/components/page/Glossary.svelte

@@ -50,8 +50,14 @@ function addEmptyDefinition() {
         >
             <Outline
                 slot="outline"
-                previous={$edition.getPreviousChapterID(ChapterIDs.GlossaryID)}
-                next={$edition.getNextChapterID(ChapterIDs.GlossaryID)}
+                previous={$edition.getPreviousChapterID(
+                    ChapterIDs.GlossaryID,
+                    editable
+                )}
+                next={$edition.getNextChapterID(
+                    ChapterIDs.GlossaryID,
+                    editable
+                )}
             />
         </Header>
         {#if editable}

package/dist/components/page/Index.svelte

@@ -57,8 +57,11 @@ $: {
         >
             <Outline
                 slot="outline"
-                previous={$edition.getPreviousChapterID(ChapterIDs.IndexID)}
-                next={$edition.getNextChapterID(ChapterIDs.IndexID)}
+                previous={$edition.getPreviousChapterID(
+                    ChapterIDs.IndexID,
+                    editable
+                )}
+                next={$edition.getNextChapterID(ChapterIDs.IndexID, editable)}
             />
         </Header>
 

package/dist/components/page/Media.svelte

@@ -43,8 +43,11 @@ $: unused = images?.filter((image) => !embeds.some((embed) => image.url.includes
         >
             <Outline
                 slot="outline"
-                previous={$edition.getPreviousChapterID(ChapterIDs.MediaID)}
-                next={$edition.getNextChapterID(ChapterIDs.MediaID)}
+                previous={$edition.getPreviousChapterID(
+                    ChapterIDs.MediaID,
+                    editable
+                )}
+                next={$edition.getNextChapterID(ChapterIDs.MediaID, editable)}
             />
         </Header>
         <Instructions {editable}>

package/dist/components/page/Reference.svelte

@@ -231,7 +231,7 @@ function move(field, direction) {
         </tr>
     </Table>
 {:else}
-    <!-- If not editable, just render the reference. -->
+    <!-- Otherwise, just render the reference. -->
     <p class="reference">
         {#if reference.authors}{reference.authors}{:else}<em>Authors</em>{/if}
         {#if reference.year}({reference.year}){:else}<em>Year</em>{/if}. {#if reference.url === null || reference.url.length === 0}{#if reference.title}{reference.title}{:else}<em
@@ -247,26 +247,31 @@ function move(field, direction) {
     </p>
 {/if}
 {#if edit && editable && !reference.short}
-    <ConfirmButton
-        tooltip="delete reference {reference.title}"
-        confirm="delete reference"
-        command={() =>
-            $edition
-                ? edition.set($edition.withoutReference(reference.citationID))
-                : undefined}>⨉</ConfirmButton
-    >
-    <Button
-        tooltip="stop editing reference"
-        command={() => (editing ? stopEditing() : startEditing())}
-        >{editing ? 'done' : 'edit'}</Button
-    >
+    <div class="controls">
+        {#if editable}<Note>{reference.citationID}</Note>{/if}
+        <ConfirmButton
+            tooltip="delete reference {reference.title}"
+            confirm="delete reference"
+            command={() =>
+                $edition
+                    ? edition.set(
+                          $edition.withoutReference(reference.citationID)
+                      )
+                    : undefined}>⨉</ConfirmButton
+        >
+        <Button
+            tooltip="stop editing reference"
+            command={() => (editing ? stopEditing() : startEditing())}
+            >{editing ? 'done' : 'edit'}</Button
+        >
+    </div>
 {/if}
 
 <style>
     .reference {
         line-height: var(--bookish-paragraph-line-height-tight);
         margin-top: 0;
-        margin-bottom: var(--bookish-block-padding);
+        margin-top: var(--bookish-block-padding);
     }
 
     p {
@@ -289,4 +294,8 @@ function move(field, direction) {
     td {
         line-height: 1;
     }
+
+    .controls {
+        margin-top: calc(var(--bookish-block-padding) / 2);
+    }
 </style>

package/dist/components/page/References.svelte

@@ -36,9 +36,13 @@ if (references !== null) {
             <Outline
                 slot="outline"
                 previous={$edition.getPreviousChapterID(
-                    ChapterIDs.ReferencesID
+                    ChapterIDs.ReferencesID,
+                    editable
+                )}
+                next={$edition.getNextChapterID(
+                    ChapterIDs.ReferencesID,
+                    editable
                 )}
-                next={$edition.getNextChapterID(ChapterIDs.ReferencesID)}
             />
         </Header>
         {#if editable}<BulkReferenceEditor />{/if}

package/dist/components/page/Search.svelte

@@ -5,7 +5,6 @@ import Link from '../Link.svelte';
 import Chapter from '../../models/book/Chapter';
 import ChapterIDs from '../../models/book/ChapterID';
 import { getBase, getEdition, isEditionEditable } from './Contexts';
-import TextInput from '../app/TextInput.svelte';
 import ChapterTitle from './ChapterTitle.svelte';
 import ChapterNumber from './ChapterNumber.svelte';
 import PageHeader from './PageHeader.svelte';
@@ -76,8 +75,11 @@ $: {
         >
             <Outline
                 slot="outline"
-                previous={$edition.getPreviousChapterID(ChapterIDs.SearchID)}
-                next={$edition.getNextChapterID(ChapterIDs.SearchID)}
+                previous={$edition.getPreviousChapterID(
+                    ChapterIDs.SearchID,
+                    false
+                )}
+                next={$edition.getNextChapterID(ChapterIDs.SearchID, false)}
             />
         </Header>
 

package/dist/components/page/SubdomainEditor.svelte

@@ -1,6 +1,6 @@
 <script>import TextEditor from '../editor/TextEditor.svelte';
 import { isSubdomainAvailable } from '../../models/CRUD';
-import Note from '../editor/Note.svelte';
+import { getSubdomain } from '../../util/getSubdomain';
 import { getBook } from './Contexts';
 import Muted from './Muted.svelte';
 let book = getBook();
@@ -22,9 +22,10 @@ const invalidNames = [
             save={// Save the new domain
             async (domain) => {
                 if ($book) {
-                    const available = await isSubdomainAvailable(domain, $book);
+                    const available = await isSubdomainAvailable(domain);
                     if (available) book.set($book.withSubdomain(domain));
-                    else throw Error("Domain isn't available");
+                    else if ($book.getSubdomain() !== domain)
+                        throw Error("Domain isn't available");
                 }
             }}
             placeholder="book name"

package/dist/components/page/TableOfContents.svelte

@@ -95,7 +95,7 @@ onMount(() => {
             <Outline
                 slot="outline"
                 previous={null}
-                next={$edition.getNextChapterID('')}
+                next={$edition.getNextChapterID('', editable)}
             />
             <div slot="after">
                 <Authors
@@ -126,7 +126,7 @@ onMount(() => {
         <Description />
 
         <Instructions {editable}>
-            This will appear on the <Link to="{$base}/read">book browsing</Link>
+            This will appear on the <Link to="/read">book browsing</Link>
             page and in your table of contents. Write an informative description
             of what your book is about.
         </Instructions>
@@ -192,7 +192,7 @@ onMount(() => {
                             You can edit this chapter.
                         {/if}
                     </span>
-                    <span slot="etc">
+                    <span class="etc" slot="etc">
                         <Muted>
                             {#if editable}
                                 <Toggle
@@ -310,3 +310,9 @@ onMount(() => {
         {/if}
     </Page>
 {/if}
+
+<style>
+    .etc {
+        white-space: nowrap;
+    }
+</style>

package/dist/components/page/TableOfContentsRow.svelte

@@ -82,7 +82,7 @@ $: chapterURL =
                             ? edition.set(
                                   $edition.withoutChapter(chapter.getID())
                               )
-                            : undefined}>- chapter</ConfirmButton
+                            : undefined}>⨉</ConfirmButton
                 >
             {/if}
         </td>
@@ -102,6 +102,8 @@ $: chapterURL =
         display: flex;
         flex-direction: row;
         flex-wrap: nowrap;
+        justify-content: end;
+        margin-inline-end: var(--app-chrome-padding);
         gap: var(--app-chrome-padding);
     }
 

package/dist/models/CRUD.d.ts

@@ -20,9 +20,8 @@ export declare function updateLock(edition: Edition, uid: string, content: strin
  * returns a map of DocumentReferences for new chapters so they can be persisted client side.
  */
 export declare function updateEdition(book: Book, previousEdition: Edition | undefined, newEdition: Edition): Promise<Map<string, DocumentReference>>;
-export declare function deleteChapterText(ref: DocumentReference): Promise<void>;
 export declare function updateBook(book: Book): Promise<void>;
-export declare function isSubdomainAvailable(subdomain: string, book: Book): Promise<boolean>;
+export declare function isSubdomainAvailable(subdomain: string): Promise<boolean>;
 export declare function getBookIDWithSubdomain(subdomain: string): Promise<string | null>;
 export declare function publish(edition: Edition): Promise<string | {
     url: string;

package/dist/models/CRUD.js

@@ -62,7 +62,8 @@ export function listenToChapters(bookID, editionID, react) {
         const chapters = [];
         // For each chapter in the book, if the doc exists and it's not a pending local write, send updated chapters to the front end.
         docs.forEach((doc) => {
-            if (doc.exists() && !doc.metadata.hasPendingWrites)
+            // We propagate pending writes to cycle back local edits to the client.
+            if (doc.exists())
                 // If the chapter text is somehow null, set it to an empty string.
                 // This accounts for previous defects that could lead to null.
                 chapters.push([doc.ref, doc.data().text ?? '']);
@@ -235,15 +236,12 @@ export async function updateEdition(book, previousEdition, newEdition) {
     await setDoc(doc(db, editionPath(newEdition.bookRef.id, editionRef.id)), newEdition.toObject());
     return newChapterRefs;
 }
-export async function deleteChapterText(ref) {
-    deleteDoc(ref);
-}
 export async function updateBook(book) {
     if (!db)
         throw Error("Can't update book, not connected to Firebase.");
     await setDoc(doc(db, 'books', book.getID()), book.toJSON());
 }
-export async function isSubdomainAvailable(subdomain, book) {
+export async function isSubdomainAvailable(subdomain) {
     if (!db)
         throw Error('Not connected to Firebase.');
     return (await getBookIDWithSubdomain(subdomain)) === null;

package/dist/models/book/BookMedia.js

@@ -85,17 +85,22 @@ export default class BookMedia {
         // The canonical path format for Bookish images in the store is image/{bookid}/{imageid}
         // where {bookid} is the Firestore document ID of the book being edited and {imageid} is just a random id.
         const imageRef = ref(storage, `${this.getImagePath()}/${imageName}`);
-        const thumbnailRef = ref(storage, `${this.getImagePath()}/thumbnails/${imageName}`);
         uploadBytes(imageRef, file)
             .then((snapshot) => {
             getDownloadURL(snapshot.ref)
                 // After we get the download URL for the uploaded image,
                 // try to get the thumbnail URL for the resized image on the server.
                 .then((url) => finishedHandler(this.stripTokenFromURL(url), this.makeThumbnailURL(this.stripTokenFromURL(url))))
-                .catch(() => errorHandler('Unable to get image URL.'));
+                .catch((error) => {
+                console.error(error);
+                errorHandler('Unable to get image URL.');
+            });
         })
             .then(() => this.cacheImages())
-            .catch(() => errorHandler('Unable to upload image.'));
+            .catch((error) => {
+            console.error(error);
+            errorHandler('Unable to upload image.');
+        });
         // This seems to be broken in Firebase right now. Switched above to a no-feedback approach.
         // const uploadTask = uploadBytesResumable(imageRef, file);
         // uploadTask.on("state_changed",

package/dist/models/book/Chapter.js

@@ -156,9 +156,8 @@ export default class Chapter {
     }
     getWordCount(edition) {
         if (this._wordCount === undefined)
-            this._wordCount = this.getAST(edition)
-                ?.toText()
-                .split(/\s+/).length;
+            this._wordCount = this.getAST(edition)?.toText().split(/\s+/)
+                .length;
         return this._wordCount;
     }
     // Utility function

package/dist/models/book/Edition.d.ts

@@ -27,7 +27,9 @@ export type EditionSpecification = {
     glossary: Record<string, Definition>;
     theme: Theme | null;
     base: string | null;
+    /** People who have edit access to this edition */
     uids: string[];
+    /** All uids who have edit access to at least one chapter. Used in firestore rules to give permission to update book. */
     chapteruids: string[];
     active: Record<string, string>;
 };
@@ -78,7 +80,7 @@ export default class Edition {
     getChapterPosition(chapterID: string): number | undefined;
     getChapterCount(): number;
     withChapters(chapters: Chapter[]): Edition;
-    withChapterText(text: [DocumentReference, string][]): Edition;
+    withChapterText(textByID: Map<string, string>): Edition;
     withRevisedChapter(previous: Chapter, edited: Chapter): Edition;
     withoutRefs(): Edition;
     withIncrementedEditionNumber(): Edition;
@@ -130,8 +132,8 @@ export default class Edition {
     getChapterSection(chapterID: string): string | undefined;
     getFootnoteSymbol(number: number): string;
     getBookIndex(): Record<string, Set<string>>;
-    getNextChapterID(chapterID: string): string | null;
-    getPreviousChapterID(chapterID: string): string | null;
+    getNextChapterID(chapterID: string, editable: boolean): string | null;
+    getPreviousChapterID(chapterID: string, editable: boolean): string | null;
     getEmbeds(): {
         embed: EmbedNode;
         chapterID: string | undefined;

package/dist/models/book/Edition.js

@@ -174,20 +174,15 @@ export default class Edition {
     withChapters(chapters) {
         return new Edition(this.bookRef, this.editionRef, this.uids, this.title, this.authors, this.number, this.summary, this.published, this.images, this.description, chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
     }
-    withChapterText(text) {
-        // No need to make a new edition if no chapter was changed.
-        let modified = false;
+    withChapterText(textByID) {
         const newChapters = this.chapters.map((chapter) => {
-            if (chapter.ref === undefined)
+            if (chapter.ref === undefined) {
                 return chapter;
-            const match = text.find(([ref, text]) => chapter.ref !== undefined &&
-                chapter.ref.id === ref.id &&
-                chapter.text !== text);
-            if (match)
-                modified = true;
-            return match ? chapter.withText(match[1]) : chapter;
+            }
+            const text = textByID.get(chapter.ref.id);
+            return text === undefined ? chapter : chapter.withText(text);
         });
-        return modified ? this.withChapters(newChapters) : this;
+        return this.withChapters(newChapters);
     }
     withRevisedChapter(previous, edited) {
         const index = this.chapters.indexOf(previous);
@@ -482,7 +477,7 @@ export default class Edition {
         return bookIndex;
     }
     // Given the current chapter, find the available chapter after it.
-    getNextChapterID(chapterID) {
+    getNextChapterID(chapterID, editable) {
         // Handle back matter chapters.
         switch (chapterID) {
             case ChapterIDs.ReferencesID:
@@ -508,7 +503,7 @@ export default class Edition {
                     if (chapter.getID() === chapterID)
                         after = true;
                     // If we're after the given chapter and it's not forthcoming.
-                    else if (after && !chapter.isForthcoming())
+                    else if (after && (!chapter.isForthcoming() || editable))
                         return chapter.getID();
                 }
                 // If the given ID was the last chapter, go to the next back matter chapter.
@@ -524,7 +519,7 @@ export default class Edition {
         }
     }
     // Given a chapter id, find the available chapter before it.
-    getPreviousChapterID(chapterID) {
+    getPreviousChapterID(chapterID, editable) {
         switch (chapterID) {
             // Handle back matter chapters.
             case ChapterIDs.ReferencesID:
@@ -556,7 +551,7 @@ export default class Edition {
                     if (chapter.getID() === chapterID)
                         before = true;
                     // If we're before the given chapter and it's not forthcoming.
-                    else if (before && !chapter.isForthcoming())
+                    else if (before && (!chapter.isForthcoming() || editable))
                         return chapter.getID();
                 }
                 // If the given ID was the last chapter, go to the next back matter chapter.

package/dist/util/mineReference.js

@@ -1,12 +1,16 @@
 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 yearMatches = text.match(/(\(?[0-9]{4}(,[a-zA-Z ]+)?\)?)/);
     let year = yearMatches !== null && yearMatches.length > 0
         ? yearMatches[1].replace('(', '').replace(')', '')
         : undefined;
-    if (year && yearMatches)
+    if (year && yearMatches) {
+        const digits = year.match(/([0-9]{4})/);
+        if (digits !== null)
+            year = digits[1];
         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()!@:%_\+.~#?&\/\/=]*)/);
@@ -38,9 +42,7 @@ export function mineReference(ids, text) {
         source = source.trim();
     }
     // If there's anything left, fall back to just a string.
-    return chunks.length > 0
-        ? new Reference(getUniqueReferenceID(ids), text)
-        : new Reference(getUniqueReferenceID(ids, authors, year), authors || '', year || '', title || '', source || '', url || '', '', false);
+    return 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
@@ -92,7 +94,7 @@ export function getUniqueReferenceID(ids, authors, year) {
         return revisedID;
     }
     else {
-        let id = 'ref';
+        let id = '00';
         for (let i = 0; i < 4; i++)
             id = id + Math.round(Math.random() * 9);
         return id;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.5.62",
+    "version": "0.5.71",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -27,38 +27,41 @@
         "merge": "git checkout main && git merge dev && git push origin main && git checkout dev"
     },
     "devDependencies": {
-        "@sveltejs/adapter-static": "^2",
-        "@sveltejs/kit": "^1.22",
-        "@sveltejs/package": "^2",
+        "@sveltejs/adapter-static": "^2.0",
+        "@sveltejs/adapter-auto": "^2.1.1",
+        "@sveltejs/kit": "^1.27",
+        "@sveltejs/package": "^2.2",
         "@types/prismjs": "^1.26",
         "@types/smoothscroll-polyfill": "^0",
         "@types/uuid": "^9.0",
         "prettier": "^3",
         "prettier-plugin-svelte": "^3",
         "svelte-adapter-firebase": "^0.15.0",
-        "svelte-check": "^3",
-        "svelte-preprocess": "^5",
+        "svelte-check": "^3.6",
+        "svelte-preprocess": "^5.1",
         "tslib": "^2",
         "typescript": "^5",
         "vite": "^4",
         "vitest": "^0"
     },
     "dependencies": {
+        "@sveltejs/kit": "^1.27",
         "ajv": "^8",
         "ajv-formats": "^2",
         "firebase": "latest",
         "firebase-functions": "latest",
         "prismjs": "^1.29",
         "smoothscroll-polyfill": "^0.4",
-        "svelte": "^4.0",
-        "@sveltejs/kit": "^1.22",
+        "svelte": "^4.2",
         "uuid": "^9.0"
     },
     "types": "./dist/index.d.ts",
+    "main": "./dist/index.js",
     "exports": {
         "./package.json": "./package.json",
         ".": {
             "types": "./dist/index.d.ts",
+            "main": "./dist/index.js",
             "svelte": "./dist/index.js",
             "default": "./dist/index.js"
         },