bookish-press 0.5.2 → 0.5.4

package/dist/components/page/ThemeEditor.svelte

@@ -87,7 +87,7 @@ function getEmptyGroup(group) {
         {:else}
             <ConfirmButton
                 tooltip="change theme to the default"
-                confirm="delete your theme?"
+                confirm="delete theme"
                 command={() =>
                     $edition
                         ? edition.set($edition.withTheme(null))

package/dist/models/CRUD.d.ts

@@ -1,4 +1,4 @@
-import { DocumentReference } from 'firebase/firestore';
+import { type DocumentReference } from 'firebase/firestore';
 import Edition from './book/Edition';
 import Book from './book/Book';
 import type { Unsubscribe } from 'firebase/auth';
@@ -20,6 +20,7 @@ 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 getBookIDWithSubdomain(subdomain: string): Promise<string | null>;

package/dist/models/CRUD.js

@@ -1,5 +1,5 @@
 import { db, functions } from './Firebase';
-import { collection, getDocs, getDoc, setDoc, doc, addDoc, query, where, deleteDoc, DocumentReference, onSnapshot, QueryFieldFilterConstraint, } from 'firebase/firestore';
+import { collection, getDocs, getDoc, setDoc, doc, addDoc, query, where, deleteDoc, onSnapshot, } from 'firebase/firestore';
 import { httpsCallable } from 'firebase/functions';
 import Edition from './book/Edition';
 import Book, {} from './book/Book';
@@ -60,8 +60,12 @@ export function listenToChapters(bookID, editionID, react) {
         throw NO_DATABASE_CONNECTION;
     return onSnapshot(collection(db, 'books', bookID, 'editions', editionID, 'chapters'), (docs) => {
         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) => {
-            chapters.push([doc.ref, doc.data().text]);
+            if (doc.exists() && !doc.metadata.hasPendingWrites)
+                // 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 ?? '']);
         });
         react(chapters);
     });
@@ -182,7 +186,9 @@ export async function updateEdition(book, previousEdition, newEdition) {
     for (const newChapter of newEdition.chapters) {
         if (newChapter.ref === undefined) {
             // Make the new chapter's text.
-            const newChapterRef = await addDoc(collection(db, editionPath(newEdition.bookRef.id, editionRef.id), 'chapters'), { text: newChapter.text });
+            const newChapterRef = await addDoc(collection(db, editionPath(newEdition.bookRef.id, editionRef.id), 'chapters'), 
+            // If the new chapter has null text, set it to empty string
+            { text: newChapter.text ?? '' });
             // Add the ref of the new chapter to the revised chapter.
             newEdition = newEdition.withRevisedChapter(newChapter, newChapter.withRef(newChapterRef));
             // Map the chapter ref to it's id.
@@ -193,8 +199,12 @@ export async function updateEdition(book, previousEdition, newEdition) {
             const previousChapter = previousEdition === undefined
                 ? undefined
                 : previousEdition.getChapterByRef(newChapter.ref);
-            if (previousChapter === undefined ||
-                newChapter.text !== previousChapter.text) {
+            if (
+            // A null chapter text means that we haven't loaded it yet from the database, so we
+            // only set it if it's not null.
+            newChapter.text !== null &&
+                (previousChapter === undefined ||
+                    newChapter.text !== previousChapter.text)) {
                 await setDoc(doc(db, editionPath(newEdition.bookRef.id, editionRef.id), 'chapters', newChapter.ref.id), { text: newChapter.text });
             }
         }
@@ -225,6 +235,9 @@ 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.");

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

@@ -2,6 +2,7 @@ import type { StorageReference } from 'firebase/storage';
 import type Book from './Book';
 export type Image = {
     url: string;
+    thumb: string;
     ref: StorageReference;
 };
 export default class BookMedia {
@@ -17,6 +18,8 @@ export default class BookMedia {
     /** Get a listing of all of the images for the book. */
     cacheImages(): Promise<Image[]>;
     retrieveImages(): Promise<(Image | undefined)[]>;
+    stripTokenFromURL(url: string): string;
+    makeThumbnailURL(url: string): string;
     getThumbnailURL(url: string, thumbnailRef: StorageReference, error: (message: string) => void, finished: (url: string, thumbnailURL: string) => void, attempt?: number): void;
     upload(file: File, _: (progress: number) => void, errorHandler: (message: string) => void, finishedHandler: (url: string, thumbnailURL: string) => void): void;
     remove(image: Image): Promise<Image[] | undefined>;

package/dist/models/book/BookMedia.js

@@ -1,5 +1,4 @@
 import { deleteObject, getDownloadURL, listAll, ref, uploadBytes, } from 'firebase/storage';
-import { v4 as uuidv4 } from 'uuid';
 import { storage } from '../Firebase';
 export default class BookMedia {
     book;
@@ -43,7 +42,8 @@ export default class BookMedia {
         // Find all the prefixes and items.
         return listAll(listRef).then((res) => Promise.all(res.items.map((itemRef) => getDownloadURL(itemRef).then((url) => {
             const image = {
-                url: url,
+                url,
+                thumb: this.makeThumbnailURL(url),
                 description: '',
                 ref: itemRef,
             };
@@ -53,6 +53,22 @@ export default class BookMedia {
             return image;
         }))));
     }
+    stripTokenFromURL(url) {
+        const tokenIndex = url.indexOf('&token=');
+        return tokenIndex >= 0 ? (url = url.substring(0, tokenIndex)) : url;
+    }
+    // Construct a thumbnail URL from the base URL.
+    makeThumbnailURL(url) {
+        // The structure of the URL is
+        // https://[firebase-domain]/v0/b/[projectid].appspot.com/o/images%2F[bookID]%2F[imagename]?alt=media
+        // And we want
+        // https://[firebase-domain]/v0/b/[projectid].appspot.com/o/images%2F[bookID]%2Fthumbnails%2F[imagename]?alt=media
+        const bookID = this.book.getID();
+        const bookIDIndex = url.indexOf(bookID);
+        return bookIDIndex >= 0
+            ? `${url.substring(0, bookIDIndex)}${bookID}%2Fthumbnails${url.substring(bookIDIndex + bookID.length)}`
+            : url;
+    }
     getThumbnailURL(url, thumbnailRef, error, finished, attempt = 0) {
         getDownloadURL(thumbnailRef)
             .then((thumbnail) => finished(url, thumbnail))
@@ -64,9 +80,10 @@ export default class BookMedia {
     upload(file, _, errorHandler, finishedHandler) {
         if (storage === undefined)
             return;
+        // We use the file name given, but append a unique string to avoid collisions.
+        const imageName = file.name;
         // The canonical path format for Bookish images in the store is image/{bookid}/{imageid}
-        // where {bookid} is the Firestore ID of the book being edited and {imageid} is just a random id.
-        const imageName = `image-${uuidv4()}`;
+        // 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)
@@ -74,7 +91,7 @@ export default class BookMedia {
             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) => this.getThumbnailURL(url, thumbnailRef, errorHandler, finishedHandler))
+                .then((url) => finishedHandler(this.stripTokenFromURL(url), this.makeThumbnailURL(this.stripTokenFromURL(url))))
                 .catch(() => errorHandler('Unable to get image URL.'));
         })
             .then(() => this.cacheImages())

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

@@ -10,7 +10,8 @@ export type ChapterSpecification = {
     numbered: boolean;
     forthcoming: boolean;
     section?: string;
-    text?: string;
+    /** A string means that we know the chapter's text; null means we haven't loaded it yet from the database and should not be editing or saving it. */
+    text?: string | null;
     uids: string[];
 };
 export type ChapterContent = {
@@ -30,7 +31,7 @@ export default class Chapter {
     readonly numbered: boolean;
     readonly forthcoming: boolean;
     readonly section: string | undefined;
-    readonly text: string;
+    readonly text: string | null;
     readonly uids: string[];
     _ast: ChapterNode | undefined;
     _index: Record<string, Array<Match>> | undefined;
@@ -41,15 +42,16 @@ export default class Chapter {
     }[];
     lastEdit: number;
     listeners: Set<(text: string) => void>;
-    constructor(ref: DocumentReference | undefined, id: string, title: string, authors: string[], image: string | null, numbered: boolean, forthcoming: boolean, section: string | undefined, text: string, uids: string[]);
+    constructor(ref: DocumentReference | undefined, id: string, title: string, authors: string[], image: string | null, numbered: boolean, forthcoming: boolean, section: string | undefined, text: string | null, uids: string[]);
     /**
      * Convert a chapter spec and it's text into a chapter object.
      * The spec may contain the text itself, but it may not, so we require it to be
      * repeated here to guarantee its provided.
      */
-    static fromJSON(spec: ChapterSpecification, text: string): Chapter;
+    static fromJSON(spec: ChapterSpecification): Chapter;
     toJSON(): ChapterSpecification;
     getRef(): DocumentReference<import("@firebase/firestore").DocumentData> | undefined;
+    hasRefID(id: string): boolean;
     withEditors(uids: string[]): Chapter;
     withRef(ref: DocumentReference): Chapter;
     withoutRef(): Chapter;
@@ -62,7 +64,7 @@ export default class Chapter {
     isNumbered(): boolean;
     asNumbered(numbered: boolean): Chapter;
     isEditor(uid: string): boolean;
-    getText(): string;
+    getText(): string | null;
     withText(text: string): Chapter;
     withAST(ast: ChapterNode): Chapter;
     getAuthors(): string[];
@@ -73,8 +75,8 @@ export default class Chapter {
     withTitle(title: string): Chapter;
     getImage(): string | null;
     withImage(image: string | null): Chapter;
-    getAST(edition: Edition): ChapterNode;
-    getWordCount(edition: Edition): number;
+    getAST(edition: Edition): ChapterNode | undefined;
+    getWordCount(edition: Edition): number | undefined;
     getReadingTime(edition: Edition): number | undefined;
     getIndex(edition: Edition): Record<string, Match[]>;
     toString(): string;

package/dist/models/book/Chapter.js

@@ -39,9 +39,9 @@ export default class Chapter {
      * The spec may contain the text itself, but it may not, so we require it to be
      * repeated here to guarantee its provided.
      */
-    static fromJSON(spec, text) {
+    static fromJSON(spec) {
         // Copy the spec, filling in defaults as necessary.
-        return new Chapter(spec.ref, spec.id, spec.title, spec.authors ?? [], spec.image ?? null, spec.numbered === true || spec.numbered === undefined, spec.forthcoming === true, spec.section, spec.text ?? text, spec.uids);
+        return new Chapter(spec.ref, spec.id, spec.title, spec.authors ?? [], spec.image ?? null, spec.numbered === true || spec.numbered === undefined, spec.forthcoming === true, spec.section, spec.text ?? null, spec.uids);
     }
     toJSON() {
         // Note that we don't include the chapter text in the payload; that's stored in the chapters subcollection.
@@ -64,6 +64,9 @@ export default class Chapter {
     getRef() {
         return this.ref;
     }
+    hasRefID(id) {
+        return this.ref !== undefined && this.ref.id === id;
+    }
     withEditors(uids) {
         return new Chapter(this.ref, this.id, this.title, this.authors, this.image, this.numbered, this.forthcoming, this.section, this.text, uids);
     }
@@ -144,6 +147,8 @@ export default class Chapter {
         return new Chapter(this.ref, this.id, this.title, this.authors, image, this.numbered, this.forthcoming, this.section, this.text, this.uids);
     }
     getAST(edition) {
+        if (this.text === null)
+            return undefined;
         // Compute the cache if necessary
         if (this._ast === undefined)
             this._ast = Parser.parseChapter(edition, this.text);
@@ -151,18 +156,23 @@ 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
     getReadingTime(edition) {
-        return this.isForthcoming()
+        const wordCount = this.getWordCount(edition);
+        return wordCount === undefined || this.isForthcoming()
             ? undefined
-            : Math.max(1, Math.round(this.getWordCount(edition) / 150));
+            : Math.max(1, Math.round(wordCount / 150));
     }
     getIndex(edition) {
         if (this._index === undefined) {
             const ast = this.getAST(edition);
+            if (ast === undefined)
+                return {};
             // Build a list of common words
             let commonWords = new Set();
             CommonWords.forEach((word) => commonWords.add(word));
@@ -207,6 +217,6 @@ export default class Chapter {
         return this._index;
     }
     toString() {
-        return `${this.title} by ${this.authors.join(', ')}: ${this.text.substring(0, 32)}}`;
+        return `${this.title} by ${this.authors.join(', ')}: ${this.text?.substring(0, 32)}}`;
     }
 }

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

@@ -83,6 +83,7 @@ export default class Edition {
     withoutRefs(): Edition;
     withIncrementedEditionNumber(): Edition;
     withNewChapter(): Edition;
+    hasChapterRefID(id: string): boolean;
     withoutChapter(chapterID: string): Edition;
     withMovedChapter(chapterID: string, increment: number): Edition;
     getSymbols(): Record<string, string>;
@@ -107,6 +108,7 @@ export default class Edition {
     withTheme(theme: Theme | null): Edition;
     withThemeValue(group: string, name: string, value: string): Edition;
     getAuthors(): string[];
+    getAuthorsText(): string;
     withAuthors(authors: string[]): Edition;
     withAuthor(name: string): Edition;
     withAuthorName(index: number, name: string): Edition;
@@ -130,7 +132,10 @@ export default class Edition {
     getBookIndex(): Record<string, Set<string>>;
     getNextChapterID(chapterID: string): string | null;
     getPreviousChapterID(chapterID: string): string | null;
-    getEmbeds(): EmbedNode[];
+    getEmbeds(): {
+        embed: EmbedNode;
+        chapterID: string | undefined;
+    }[];
     isLatestEdition(book: Book): boolean;
     isLatestPublishedEdition(book: Book): boolean;
     getEditionNumber(): number;

package/dist/models/book/Edition.js

@@ -59,7 +59,7 @@ export default class Edition {
     static fromJSON(editionRef, spec) {
         // Copy all of the specification metadata to fields.
         // Choose suitable defaults if the spec is lacking a field.
-        return new Edition(spec.bookRef, editionRef, spec.uids, spec.title, spec.authors, spec.number, spec.summary, spec.published, spec.images, spec.description, spec.chapters.map((chap) => Chapter.fromJSON(chap, '')), spec.license, spec.acknowledgements, spec.tags ?? [], spec.sources ?? {}, spec.references ?? {}, spec.symbols ?? {}, spec.glossary ?? {}, spec.theme, spec.base ?? '', spec.active);
+        return new Edition(spec.bookRef, editionRef, spec.uids, spec.title, spec.authors, spec.number, spec.summary, spec.published, spec.images, spec.description, spec.chapters.map((chap) => Chapter.fromJSON(chap)), spec.license, spec.acknowledgements, spec.tags ?? [], spec.sources ?? {}, spec.references ?? {}, spec.symbols ?? {}, spec.glossary ?? {}, spec.theme, spec.base, spec.active);
     }
     static parseReference(citationID, ref, edition, short = false) {
         if (typeof ref === 'string')
@@ -99,7 +99,7 @@ export default class Edition {
             symbols: Object.assign({}, this.symbols),
             glossary: Object.assign({}, this.glossary),
             theme: this.theme,
-            base: this.base,
+            base: this.base && this.base.length > 0 ? this.base : null,
             uids: this.uids.slice(),
             chapteruids: this.getChapterUIDS(),
             active: this.active,
@@ -175,15 +175,19 @@ export default class Edition {
         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) {
-        return this.withChapters(this.chapters.map((chapter) => {
+        // No need to make a new edition if no chapter was changed.
+        let modified = false;
+        const newChapters = this.chapters.map((chapter) => {
             if (chapter.ref === undefined)
                 return chapter;
             const match = text.find(([ref, text]) => chapter.ref !== undefined &&
                 chapter.ref.id === ref.id &&
-                chapter.text !== text &&
-                text !== undefined);
+                chapter.text !== text);
+            if (match)
+                modified = true;
             return match ? chapter.withText(match[1]) : chapter;
-        }));
+        });
+        return modified ? this.withChapters(newChapters) : this;
     }
     withRevisedChapter(previous, edited) {
         const index = this.chapters.indexOf(previous);
@@ -210,6 +214,9 @@ export default class Edition {
         const newChapter = new Chapter(undefined, `chapter${number}`, 'Untitled Chapter', [], null, true, false, undefined, '', []);
         return this.withChapters([...this.chapters, newChapter]);
     }
+    hasChapterRefID(id) {
+        return this.chapters.some((chapter) => chapter.hasRefID(id));
+    }
     withoutChapter(chapterID) {
         let index = this.chapters.findIndex((chapter) => chapter.getID() === chapterID);
         if (index < 0)
@@ -340,6 +347,11 @@ export default class Edition {
     getAuthors() {
         return [...this.authors];
     }
+    getAuthorsText() {
+        return this.getAuthors()
+            .map((author) => Parser.parseFormat(this, author).toText())
+            .join(', ');
+    }
     withAuthors(authors) {
         return new Edition(this.bookRef, this.editionRef, this.uids, this.title, authors, this.number, this.summary, this.published, this.images, this.description, this.chapters, this.license, this.acknowledgements, this.tags, this.sources, this.references, this.symbols, this.glossary, this.theme, this.base, this.active);
     }
@@ -563,18 +575,18 @@ export default class Edition {
         if (cover) {
             let coverNode = Parser.parseEmbed(this, cover);
             if (coverNode instanceof EmbedNode)
-                embeds.push(coverNode);
+                embeds.push({ embed: coverNode, chapterID: undefined });
         }
         // Add the cover and images from each chapter.
         this.getChapters().forEach((c) => {
             const image = c.getImage();
             let cover = image === null ? undefined : Parser.parseEmbed(this, image);
             if (cover && cover instanceof EmbedNode)
-                embeds.push(cover);
+                embeds.push({ embed: cover, chapterID: c.id });
             // Get the chapter body's embeds
             let bodyEmbeds = c?.getAST(this)?.getEmbeds();
             if (bodyEmbeds)
-                bodyEmbeds.forEach((embed) => embeds.push(embed));
+                bodyEmbeds.forEach((embed) => embeds.push({ embed, chapterID: c.id }));
         });
         // Add the back matter covers
         let backmatter = ['references', 'glossary', 'index', 'search', 'media'];
@@ -583,7 +595,7 @@ export default class Edition {
             if (img) {
                 let image = Parser.parseEmbed(this, img);
                 if (image instanceof EmbedNode)
-                    embeds.push(image);
+                    embeds.push({ embed: image, chapterID: id });
             }
         });
         return embeds;

package/dist/models/book/Words.js

@@ -62,7 +62,6 @@ const CommonWords = [
     'other',
     'our',
     'out',
-    'people',
     'say',
     'see',
     'she',

package/dist/models/chapter/ChapterNode.d.ts

@@ -22,6 +22,7 @@ export default class ChapterNode extends BlocksNode {
     getEmbeds(): EmbedNode[];
     getComments(): CommentNode[];
     getLabels(): LabelNode[];
+    getFirstParagraph(): ParagraphNode | undefined;
     hasLabel(labelID: string): boolean;
     getCitationNumber(citationID: string): number | null;
     toText(): string;

package/dist/models/chapter/ChapterNode.js

@@ -45,6 +45,9 @@ export default class ChapterNode extends BlocksNode {
     getLabels() {
         return this.getNodes().filter((n) => n instanceof LabelNode);
     }
+    getFirstParagraph() {
+        return this.getBlocks().find((b) => b instanceof ParagraphNode);
+    }
     hasLabel(labelID) {
         return (this.getLabels().find((label) => label.getMeta() === labelID) !==
             undefined);

package/dist/models/chapter/DefinitionNode.js

@@ -14,7 +14,7 @@ export default class DefinitionNode extends MetadataNode {
         return `${this.getText().toHTML()}`;
     }
     toBookdown() {
-        return `~${this.getText().toBookdown()}~${this.getMeta()}`;
+        return `~${this.getText().getText()}~${this.getMeta()}`;
     }
     copy() {
         return new DefinitionNode(this.getText(), this.getMeta());

package/dist/models/chapter/FormatNode.js

@@ -18,6 +18,9 @@ export default class FormatNode extends Node {
             const previous = list[position - 1];
             return !(previous instanceof TextNode && previous.getLength() === 0);
         });
+        // Always ensure an empty text node.
+        if (this.#segments.length === 0)
+            this.#segments.push(new TextNode());
     }
     getType() {
         return 'formatted';
@@ -149,7 +152,7 @@ export default class FormatNode extends Node {
         const text = this.getTextNodes();
         if (text.length === 0)
             return undefined;
-        return { node: this.getTextNodes()[0], index: 0 };
+        return { node: this.getFirstTextNode(), index: 0 };
     }
     getLastCaret() {
         const text = this.getTextNodes();

package/dist/models/chapter/InlineCodeNode.js

@@ -15,7 +15,7 @@ export default class InlineCodeNode extends MetadataNode {
     }
     toBookdown() {
         return ('`' +
-            this.getText().toBookdown().replace(/`/g, '\\`') +
+            this.getText().getText().replace(/`/g, '\\`') +
             '`' +
             (this.getMeta() === 'plaintext' ? '' : this.getMeta()));
     }

package/dist/models/chapter/LinkNode.js

@@ -14,7 +14,7 @@ export default class LinkNode extends MetadataNode {
         return `<a href="${this.getMeta()}">${this.getText().toHTML()}</a>`;
     }
     toBookdown() {
-        return `[${this.getText().toBookdown()}|${this.getMeta()}]`;
+        return `[${this.getText().getText()}|${this.getMeta()}]`;
     }
     copy() {
         return new LinkNode(this.getText(), this.getMeta());

package/dist/models/chapter/ListNode.js

@@ -101,7 +101,7 @@ export default class ListNode extends BlockNode {
         return (format !== undefined &&
             caret.node.hasAncestor(root, this) &&
             caret.index === 0 &&
-            format.getTextNodes()[0] === caret.node);
+            format.getFirstTextNode() === caret.node);
     }
     getItemContaining(caret) {
         const match = this.#items.find((n) => n.getParentOf(caret.node) !== undefined);

package/dist/models/chapter/Parser.js

@@ -739,12 +739,9 @@ export default class Parser {
         let code = '';
         while (this.more() && !this.nextIs('`')) {
             let next = this.read(false);
-            if (next === '\\') {
-                if (this.nextIs('`')) {
-                    this.read();
-                    next = '`';
-                }
-            }
+            // Skip backslash of escaped characters.
+            if (next === '\\')
+                next = this.read();
             code = code + next;
         }
         // Read the backtick.

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.5.2",
+    "version": "0.5.4",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -22,35 +22,37 @@
         "//stage": "echo 'switch to the dev project, deploy, relying on Firebase's predeploy hook to run the build script above before release'",
         "stage": "firebase use dev && firebase deploy",
         "//release": "echo 'switch to the prod project, deploy, relying on Firebase's predeploy hook to run the build script above before release'",
-        "release": "firebase use prod && firebase deploy"
+        "release": "firebase use prod && firebase deploy",
+        "//merge": "merge dev into main, push to remote",
+        "merge": "git checkout main && git merge dev && git push origin main && git checkout dev"
     },
     "devDependencies": {
-        "@sveltejs/adapter-static": "^2.0.1",
-        "@sveltejs/kit": "^1.7.2",
-        "@sveltejs/package": "^2.0.0",
-        "@types/prismjs": "^1.26.0",
+        "@sveltejs/adapter-static": "^2.0",
+        "@sveltejs/kit": "^1.2",
+        "@sveltejs/package": "^2.0",
+        "@types/prismjs": "^1.26",
         "@types/smoothscroll-polyfill": "^0.3.1",
-        "@types/uuid": "^9.0.0",
-        "prettier": "^2.8.4",
-        "prettier-plugin-svelte": "^2.9.0",
+        "@types/uuid": "^9.0",
+        "prettier": "^2.8",
+        "prettier-plugin-svelte": "^2.10",
         "svelte-adapter-firebase": "^0.15.0",
-        "svelte-check": "^3.0.3",
-        "svelte-preprocess": "^5.0.1",
-        "tslib": "^2.5.0",
-        "typescript": "^4.9.5",
-        "vite": "^4.1.2",
-        "vitest": "^0.28.5"
+        "svelte-check": "^3.4",
+        "svelte-preprocess": "^5.0",
+        "tslib": "^2.5",
+        "typescript": "^5",
+        "vite": "^4.3",
+        "vitest": "^0.32"
     },
     "dependencies": {
-        "ajv": "^8.12.0",
-        "ajv-formats": "^2.1.1",
+        "ajv": "^8.12",
+        "ajv-formats": "^2.1",
         "firebase": "latest",
-        "firebase-functions": "^4.2.1",
-        "prismjs": "^1.29.0",
-        "smoothscroll-polyfill": "^0.4.4",
-        "svelte": "^3.55.1",
-        "@sveltejs/kit": "^1.7.2",
-        "uuid": "^9.0.0"
+        "firebase-functions": "latest",
+        "prismjs": "^1.29",
+        "smoothscroll-polyfill": "^0.4",
+        "svelte": "^4.0",
+        "@sveltejs/kit": "^1.20",
+        "uuid": "^9.0"
     },
     "types": "./dist/index.d.ts",
     "exports": {