bookish-press 0.7.4 → 0.8.2

package/dist/components/page/ThemeEditorPreview.svelte.d.ts

@@ -1,19 +1,7 @@
-import { SvelteComponent } from "svelte";
 import type Theme from '../../models/book/Theme';
-declare const __propDef: {
-    props: {
-        theme: Theme | null;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type ThemeEditorPreviewProps = typeof __propDef.props;
-export type ThemeEditorPreviewEvents = typeof __propDef.events;
-export type ThemeEditorPreviewSlots = typeof __propDef.slots;
-export default class ThemeEditorPreview extends SvelteComponent<ThemeEditorPreviewProps, ThemeEditorPreviewEvents, ThemeEditorPreviewSlots> {
+interface Props {
+    theme: Theme | null;
 }
-export {};
+declare const ThemeEditorPreview: import("svelte").Component<Props, {}, "">;
+type ThemeEditorPreview = ReturnType<typeof ThemeEditorPreview>;
+export default ThemeEditorPreview;

package/dist/components/page/ThemeSetEditor.svelte

@@ -1,9 +1,7 @@
-<script>import PageHeader from './PageHeader.svelte';
-import Rows from './Rows.svelte';
-import ThemeVariableEditor from './ThemeVariableEditor.svelte';
-export let header;
-export let group;
-export let properties;
+<script lang="ts">import PageHeader from "./PageHeader.svelte";
+import Rows from "./Rows.svelte";
+import ThemeVariableEditor from "./ThemeVariableEditor.svelte";
+let { header, group, properties } = $props();
 </script>
 
 <PageHeader>{header}</PageHeader>

package/dist/components/page/ThemeSetEditor.svelte.d.ts

@@ -1,20 +1,8 @@
-import { SvelteComponent } from "svelte";
-declare const __propDef: {
-    props: {
-        header: string;
-        group: string;
-        properties: Record<string, string>;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type ThemeSetEditorProps = typeof __propDef.props;
-export type ThemeSetEditorEvents = typeof __propDef.events;
-export type ThemeSetEditorSlots = typeof __propDef.slots;
-export default class ThemeSetEditor extends SvelteComponent<ThemeSetEditorProps, ThemeSetEditorEvents, ThemeSetEditorSlots> {
+interface Props {
+    header: string;
+    group: string;
+    properties: Record<string, string>;
 }
-export {};
+declare const ThemeSetEditor: import("svelte").Component<Props, {}, "">;
+type ThemeSetEditor = ReturnType<typeof ThemeSetEditor>;
+export default ThemeSetEditor;

package/dist/components/page/ThemeVariableEditor.svelte

@@ -1,16 +1,14 @@
-<script>import TextEditor from '../editor/TextEditor.svelte';
-import { getEdition } from './Contexts';
+<script lang="ts">import TextEditor from "../editor/TextEditor.svelte";
+import { getEdition } from "./Contexts";
 const placeholders = {
-    light: 'CSS color',
-    dark: 'CSS color',
-    fonts: 'CSS font name',
-    sizes: 'CSS font size',
-    weights: 'CSS font weights',
-    spacing: 'CSS length',
+  light: "CSS color",
+  dark: "CSS color",
+  fonts: "CSS font name",
+  sizes: "CSS font size",
+  weights: "CSS font weights",
+  spacing: "CSS length"
 };
-export let group;
-export let name;
-export let value;
+let { group, name, value } = $props();
 let edition = getEdition();
 </script>
 

package/dist/components/page/ThemeVariableEditor.svelte.d.ts

@@ -1,20 +1,8 @@
-import { SvelteComponent } from "svelte";
-declare const __propDef: {
-    props: {
-        group: string;
-        name: string;
-        value: string;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {};
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type ThemeVariableEditorProps = typeof __propDef.props;
-export type ThemeVariableEditorEvents = typeof __propDef.events;
-export type ThemeVariableEditorSlots = typeof __propDef.slots;
-export default class ThemeVariableEditor extends SvelteComponent<ThemeVariableEditorProps, ThemeVariableEditorEvents, ThemeVariableEditorSlots> {
+interface Props {
+    group: string;
+    name: string;
+    value: string;
 }
-export {};
+declare const ThemeVariableEditor: import("svelte").Component<Props, {}, "">;
+type ThemeVariableEditor = ReturnType<typeof ThemeVariableEditor>;
+export default ThemeVariableEditor;

package/dist/components/page/Title.svelte

@@ -1,4 +1,7 @@
-<h1><slot /></h1>
+<script lang="ts">let { children } = $props();
+</script>
+
+<h1>{@render children?.()}</h1>
 
 <style>
     h1 {

package/dist/components/page/Title.svelte.d.ts

@@ -1,29 +1,6 @@
-/** @typedef {typeof __propDef.props}  TitleProps */
-/** @typedef {typeof __propDef.events}  TitleEvents */
-/** @typedef {typeof __propDef.slots}  TitleSlots */
-export default class Title extends SvelteComponent<{
-    [x: string]: never;
-}, {
-    [evt: string]: CustomEvent<any>;
-}, {
-    default: {};
-}> {
+interface Props {
+    children?: import('svelte').Snippet;
 }
-export type TitleProps = typeof __propDef.props;
-export type TitleEvents = typeof __propDef.events;
-export type TitleSlots = typeof __propDef.slots;
-import { SvelteComponent } from "svelte";
-declare const __propDef: {
-    props: {
-        [x: string]: never;
-    };
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {
-        default: {};
-    };
-    exports?: undefined;
-    bindings?: undefined;
-};
-export {};
+declare const Title: import("svelte").Component<Props, {}, "">;
+type Title = ReturnType<typeof Title>;
+export default Title;

package/dist/components/page/Unknown.svelte

@@ -1,9 +1,10 @@
-<script>import Header from './Header.svelte';
-import Outline from './Outline.svelte';
-import Page from './Page.svelte';
-import Instructions from './Instructions.svelte';
-import ChapterIDs from '../../models/book/ChapterID';
-import { getEdition, isEditionEditable } from './Contexts';
+<script lang="ts">import Header from "./Header.svelte";
+import Outline from "./Outline.svelte";
+import Page from "./Page.svelte";
+import Instructions from "./Instructions.svelte";
+import ChapterIDs from "../../models/book/ChapterID";
+import { getEdition, isEditionEditable } from "./Contexts";
+let { children } = $props();
 let editable = isEditionEditable();
 let edition = getEdition();
 </script>
@@ -23,7 +24,9 @@ let edition = getEdition();
                     : undefined}
             header={$edition.getHeader(ChapterIDs.UnknownID)}
         >
-            <Outline slot="outline" previous={null} next={null} />
+            {#snippet outline()}
+                        <Outline  previous={null} next={null} />
+                    {/snippet}
         </Header>
 
         <Instructions {editable}>
@@ -31,6 +34,6 @@ let edition = getEdition();
             doesn't exist. You can customize the image shown.
         </Instructions>
 
-        <slot />
+        {@render children?.()}
     </Page>
 {/if}

package/dist/components/page/Unknown.svelte.d.ts

@@ -1,18 +1,6 @@
-import { SvelteComponent } from "svelte";
-declare const __propDef: {
-    props: Record<string, never>;
-    events: {
-        [evt: string]: CustomEvent<any>;
-    };
-    slots: {
-        default: {};
-    };
-    exports?: {} | undefined;
-    bindings?: string | undefined;
-};
-export type UnknownProps = typeof __propDef.props;
-export type UnknownEvents = typeof __propDef.events;
-export type UnknownSlots = typeof __propDef.slots;
-export default class Unknown extends SvelteComponent<UnknownProps, UnknownEvents, UnknownSlots> {
+interface Props {
+    children?: import('svelte').Snippet;
 }
-export {};
+declare const Unknown: import("svelte").Component<Props, {}, "">;
+type Unknown = ReturnType<typeof Unknown>;
+export default Unknown;

package/dist/models/Firebase.js

@@ -4,6 +4,7 @@ import { connectFirestoreEmulator, getFirestore } from 'firebase/firestore';
 import { connectFunctionsEmulator, getFunctions } from 'firebase/functions';
 import { connectStorageEmulator, getStorage } from 'firebase/storage';
 import { PUBLIC_READER, PUBLIC_CONTEXT, PUBLIC_FIREBASE_API_KEY, PUBLIC_FIREBASE_AUTH_DOMAIN, PUBLIC_FIREBASE_PROJECT_ID, PUBLIC_FIREBASE_STORAGE_BUCKET, PUBLIC_FIREBASE_MESSAGING_SENDER_ID, PUBLIC_FIREBASE_APP_ID, } from '$env/static/public';
+import { env } from '$env/dynamic/public';
 const isReader = PUBLIC_READER === 'true';
 // Some feedback about context
 if (!isReader && PUBLIC_CONTEXT !== 'prod')
@@ -24,13 +25,26 @@ export const auth = isReader ? undefined : getAuth(app);
 export const db = isReader ? undefined : getFirestore();
 export const storage = isReader ? undefined : getStorage(app);
 export const functions = isReader ? undefined : getFunctions(app);
+/** Emulator ports default to the firebase.json values but can be overridden
+ *  by env vars so test runs (see firebase.test.json) can use dedicated ports
+ *  that don't collide with other running emulator suites. Dynamic env isn't
+ *  available in every context (e.g. unit tests), hence the guard. */
+function emulatorPort(name, fallback) {
+    try {
+        return (env?.[name] ??
+            fallback);
+    }
+    catch {
+        return fallback;
+    }
+}
 if (!isReader && PUBLIC_CONTEXT === 'local') {
     if (db)
-        connectFirestoreEmulator(db, 'localhost', 8080);
+        connectFirestoreEmulator(db, 'localhost', parseInt(emulatorPort('PUBLIC_EMULATOR_FIRESTORE', '8080')));
     if (auth)
-        connectAuthEmulator(auth, 'http://localhost:9099');
+        connectAuthEmulator(auth, `http://localhost:${emulatorPort('PUBLIC_EMULATOR_AUTH', '9099')}`);
     if (storage)
-        connectStorageEmulator(storage, 'localhost', 9199);
+        connectStorageEmulator(storage, 'localhost', parseInt(emulatorPort('PUBLIC_EMULATOR_STORAGE', '9199')));
     if (functions)
-        connectFunctionsEmulator(functions, 'localhost', 5001);
+        connectFunctionsEmulator(functions, 'localhost', parseInt(emulatorPort('PUBLIC_EMULATOR_FUNCTIONS', '5001')));
 }

package/dist/models/book/Book.js

@@ -91,7 +91,8 @@ export default class Book {
         return edition ? edition.ref.id : undefined;
     }
     getLatestPublishedEditionID() {
-        return this.editions.filter((ed) => ed.published !== null).at(-1)?.ref.id;
+        return this.editions.filter((ed) => ed.published !== null).at(-1)?.ref
+            .id;
     }
     getLatestEditionID() {
         return this.editions.toSorted((a, b) => b.number - a.number)[0]?.ref.id;

package/dist/models/book/BookMedia.js

@@ -1,6 +1,5 @@
 import { deleteObject, getDownloadURL, listAll, ref, uploadBytes, } from 'firebase/storage';
 import { storage } from '../Firebase';
-import { v4 as uuidv4 } from 'uuid';
 export default class BookMedia {
     book;
     _images;
@@ -84,7 +83,7 @@ export default class BookMedia {
         // Get the extension if there is one.
         const [name, extension] = file.name.split('.');
         // We use the file name given, but append a unique string to avoid collisions.
-        const imageName = `${name}-${uuidv4()}.${extension ?? ''}`;
+        const imageName = `${name}-${crypto.randomUUID()}.${extension ?? ''}`;
         // 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}`);

package/dist/models/book/Chapter.js

@@ -161,8 +161,9 @@ 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;
     }
     /** Either a number of minutes, or undefined if there's no text yet, or null if forthcoming. */

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

@@ -7,7 +7,7 @@ import type Definition from './Definition.js';
 import { type ChapterIDKey, type TOCHeaderKey } from './ChapterID.js';
 import type { DocumentReference } from 'firebase/firestore';
 import type Book from './Book';
-import type FormatNode from '../chapter/FormatNode';
+import FormatNode from '../chapter/FormatNode';
 import type { EditionInfo } from './Book';
 export type EditionSpecification = {
     bookRef: DocumentReference;

package/dist/models/book/Edition.js

@@ -3,6 +3,7 @@ import Parser from '../chapter/Parser';
 import EmbedNode from '../chapter/EmbedNode';
 import Reference from './Reference';
 import ChapterIDs, {} from './ChapterID.js';
+import FormatNode from '../chapter/FormatNode';
 export default class Edition {
     bookRef;
     editionRef;
@@ -48,8 +49,11 @@ export default class Edition {
         this.sources = Object.assign({}, sources);
         this.references = {};
         for (const [citationID, ref] of Object.entries(references)) {
+            // Pass through already-parsed references: strings parse to
+            // FormatNodes, and every copy-on-write constructor call re-runs
+            // this normalization, so FormatNodes must survive it too.
             this.references[citationID] =
-                ref instanceof Reference
+                ref instanceof Reference || ref instanceof FormatNode
                     ? ref
                     : Edition.parseReference(citationID, ref, this);
         }

package/dist/models/chapter/BlocksNode.js

@@ -474,7 +474,9 @@ export default class BlocksNode extends BlockNode {
             if (first instanceof ParagraphNode &&
                 last instanceof ParagraphNode) {
                 // Replace the first paragraph with the second merged.
-                newBlocks = newBlocks.withNodeReplaced(first, first.withContent(first.getFormat().withSegmentsAppended(last.getFormat())));
+                newBlocks = newBlocks.withNodeReplaced(first, first.withContent(first
+                    .getFormat()
+                    .withSegmentsAppended(last.getFormat())));
                 if (newBlocks === undefined)
                     return;
                 // Remove the last paragraph.

package/dist/models/chapter/BlocksNode.test.js

@@ -29,7 +29,11 @@ const beforeBold = new TextNode('I am a ');
 const bold = new TextNode('bold');
 const afterBold = new TextNode(' word.');
 const boldChapter = new ChapterNode([
-    new ParagraphNode(0, new FormatNode('', [beforeBold, new FormatNode('*', [bold]), afterBold])),
+    new ParagraphNode(0, new FormatNode('', [
+        beforeBold,
+        new FormatNode('*', [bold]),
+        afterBold,
+    ])),
 ]);
 const itemOneTextNode = new TextNode('one');
 const itemOneFormat = new FormatNode('', [itemOneTextNode]);

package/dist/models/chapter/Node.test.js

@@ -13,11 +13,11 @@ const format = new FormatNode('', [textOne, textTwo, bold, textFive]);
 
 test('Replace descendants', () => {
     expect(
-        format.withNodeReplaced(textThree, new TextNode('hi'))?.toBookdown()
+        format.withNodeReplaced(textThree, new TextNode('hi'))?.toBookdown(),
     ).toBe('onetwo*hifour*five');
 
     expect(
-        format.withNodeReplaced(textFive, new TextNode('yo'))?.toBookdown()
+        format.withNodeReplaced(textFive, new TextNode('yo'))?.toBookdown(),
     ).toBe('onetwo*threefour*yo');
 });
 

package/package.json

@@ -1,11 +1,14 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.7.4",
+    "version": "0.8.2",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
-    "repository": "https://github.com/amyjko/bookish.git",
+    "repository": {
+        "type": "git",
+        "url": "git+https://github.com/amyjko/bookish.git"
+    },
     "scripts": {
         "prepare": "svelte-kit sync",
         "//dev": "echo 'Run the Svelte/Vite local server to test locally. Use in combination with run emu to run locally.'",
@@ -15,47 +18,56 @@
         "//emu": "echo 'This copies the local .env file and starts the emulator'",
         "emu": "firebase use dev && npm run env && firebase emulators:start",
         "package": "svelte-package --watch",
+        "package:build": "svelte-package",
         "test": "vitest",
+        "test:ci": "vitest run",
+        "//test:e2e": "echo 'Build the app and run the Playwright smoke tests against a preview server.'",
+        "test:e2e": "npm run build && playwright test",
+        "//test:e2e:emu": "echo 'Build the app and run the Playwright suite that signs in and edits against dedicated Firebase emulators (see firebase.test.json).'",
+        "test:e2e:emu": "PUBLIC_FIREBASE_PROJECT_ID=demo-bookish PUBLIC_FIREBASE_STORAGE_BUCKET=demo-bookish.appspot.com npm run build && bash scripts/test-emulators.sh 'npx playwright test --config playwright.emulator.config.ts'",
         "check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
+        "check:ci": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
         "//env": "echo 'This copies the .env file corresponding to the current Firebase project specified with firebase use, defaulting to local'",
         "env": "cp .env.${GCLOUD_PROJECT:-example} .env",
-        "//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 && cp .env.bookish-dev-21ac3 .env && 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 && cp .env.bookish-prod .env && firebase deploy",
+        "//deploy:ssr": "echo 'Build the app with the current .env, then deploy the SSR server in build/ to Cloud Run for the given project. Used by stage and release.'",
+        "deploy:ssr": "vite build && gcloud run deploy bookish-ssr --source . --region us-central1 --allow-unauthenticated --quiet --project",
+        "//stage": "echo 'Switch to the dev project, build with the dev .env, deploy the SSR server to Cloud Run, then deploy hosting, rules, and functions.'",
+        "stage": "firebase use dev && cp .env.bookish-dev-21ac3 .env && npm run deploy:ssr -- bookish-dev-21ac3 && firebase deploy",
+        "//release": "echo 'Switch to the prod project, build with the prod .env, deploy the SSR server to Cloud Run, then deploy hosting, rules, and functions.'",
+        "release": "firebase use prod && cp .env.bookish-prod .env && npm run deploy:ssr -- bookish-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": {
+        "@playwright/test": "^1",
         "@sveltejs/adapter-node": "^5",
-        "@sveltejs/kit": "^2",
         "@sveltejs/package": "^2",
-        "@sveltejs/vite-plugin-svelte": "^3",
+        "@sveltejs/vite-plugin-svelte": "^6",
+        "@testing-library/svelte": "^5",
         "@types/prismjs": "^1.26",
         "@types/smoothscroll-polyfill": "^0",
-        "chalk": "^5.3.0",
-        "globals": "^16",
+        "firebase-tools": "^15.28.2",
+        "jsdom": "^29",
         "prettier": "^3",
-        "prettier-plugin-svelte": "^3",
-        "svelte-check": "^3",
-        "svelte-preprocess": "^5",
+        "prettier-plugin-svelte": "^4",
+        "svelte": "^5.57",
+        "svelte-check": "^4.7",
         "tslib": "^2",
         "typescript": "^5",
-        "uuid": "^11.1.0",
-        "vite": "^5",
-        "vitest": "^3"
+        "vite": "^7",
+        "vitest": "^4"
     },
     "dependencies": {
         "@sveltejs/kit": "^2",
         "ajv": "^8",
         "ajv-formats": "^3",
-        "firebase": "^11",
-        "firebase-admin": "^12.7.0",
-        "firebase-functions": "^6",
+        "firebase": "^12",
+        "firebase-admin": "^14",
         "prismjs": "^1.29",
-        "smoothscroll-polyfill": "^0.4",
-        "svelte": "^4",
-        "uuid": "^11"
+        "smoothscroll-polyfill": "^0.4"
+    },
+    "peerDependencies": {
+        "svelte": "^5.0.0"
     },
     "engines": {
         "node": "22"