bookish-press 0.7.1 → 0.7.4

package/dist/components/editor/Permissions.svelte

@@ -60,23 +60,25 @@ function hasEditor(email) {
             </form>
         {/if}
 
-        {#each uids as uid, index (uid)}
-            {@const email = $emails.get(uid)}
-            <p>
-                {#if email}{email}{:else}<em>missing email</em>{/if}
-                {#if writable}
-                    <Button
-                        tooltip="remove {email} editing rights"
-                        command={() =>
-                            change([
-                                ...uids.slice(0, index),
-                                ...uids.slice(index + 1),
-                            ])}
-                        disabled={atleastone && uids.length <= 1}>⨉</Button
-                    >
-                {/if}
-            </p>
-        {/each}
+        {#key $emails}
+            {#each uids as uid, index (uid)}
+                {@const email = $emails.get(uid)}
+                <p>
+                    {#if email}{email}{:else}<em>loading...</em>{/if}
+                    {#if writable}
+                        <Button
+                            tooltip="remove {email} editing rights"
+                            command={() =>
+                                change([
+                                    ...uids.slice(0, index),
+                                    ...uids.slice(index + 1),
+                                ])}
+                            disabled={atleastone && uids.length <= 1}>⨉</Button
+                        >
+                    {/if}
+                </p>
+            {/each}
+        {/key}
         {#each inheriteduids as uid}
             <p><em>{$emails.get(uid)}</em> <Note>book editor</Note></p>
         {/each}

package/dist/components/page/Chapter.svelte

@@ -183,21 +183,22 @@ $: chapterStore.set({
     marginal,
     layoutMarginals,
 });
-let editable = isBookEditable() ||
-    isEditionEditable() ||
-    isChapterEditable() ||
-    ($auth !== undefined &&
-        $auth.user !== null &&
-        chapter.isEditor($auth.user.uid));
+let editable = !print &&
+    (isBookEditable() ||
+        isEditionEditable() ||
+        isChapterEditable() ||
+        ($auth !== undefined &&
+            $auth.user !== null &&
+            chapter.isEditor($auth.user.uid)));
 </script>
 
 {#if $edition}
     <Page
         afterLoaded={scrollToLastLocation}
-        title={`${$edition.getTitle()} - ${chapter.getTitle()}`}
+        title={print ? undefined : `${$edition.getTitle()} - ${chapter.getTitle()}`}
     >
         <Header
-            editable={isChapterEditable()}
+            {editable}
             id={chapter.id}
             header={chapter.getTitle()}
             label="Chapter title"

package/dist/components/page/Editions.svelte

@@ -13,20 +13,47 @@ let editable = isBookEditable();
 let user = getUser();
 $: editions = $book?.getEditions();
 $: latestPublishedID = $book?.getLatestPublishedEditionID();
-async function handleDraftEdition() {
+let publisher = false;
+$: {
+    if ($user && $user.user)
+        updateUserClaims();
+}
+async function updateUserClaims() {
+    if ($user === undefined || $user.user === null)
+        return;
+    const token = await $user.user.getIdTokenResult();
+    publisher =
+        'publisher' in token.claims && token.claims.publisher === true;
+}
+async function createEdition() {
     if ($book === undefined)
         return;
-    book.set(await createNewEdition($book));
+    try {
+        const revisedBook = await createNewEdition($book);
+        book.set(revisedBook);
+    }
+    catch (err) {
+        console.error('Error creating new edition:', err);
+    }
 }
 </script>
 
 {#if $book && editions}
     {#if editable}
         <p>
-            <Button tooltip="create new edition" command={handleDraftEdition}
-                >+ edition</Button
+            <Button
+                tooltip="create new edition"
+                command={createEdition}
+                disabled={!publisher}>+ edition</Button
             >
         </p>
+        {#if !publisher || !$book.hasPublishedEdition()}
+            <Note
+                >You must have publisher privileges to create new editions of a
+                published book. If you believe this is an error, please contact
+                support.</Note
+            >
+        {/if}
     {/if}
     <Instructions {editable}>
         Each book has one or more editions, allowing you to track revisions and
@@ -36,18 +63,17 @@ async function handleDraftEdition() {
         and then publish. By default, readers will see the latest published
         edition, but they can access older editions here.
     </Instructions>
-    {#each editions as edition, index (edition.ref)}
-        {@const editionNumber =
-            editions === undefined ? -1 : editions.length - index}
+    {#each editions.toReversed() as edition (edition.ref)}
+        {@const editionNumber = edition.number}
         {@const editionLabel =
             editionNumber +
             (editionNumber === 1
                 ? 'st'
                 : editionNumber === 2
-                ? 'nd'
-                : editionNumber === 3
-                ? 'rd'
-                : 'th')}
+                  ? 'nd'
+                  : editionNumber === 3
+                    ? 'rd'
+                    : 'th')}
 
         {#if $book && (editable || edition.published || ($user?.user?.uid && edition.editionuids.includes($user.user.uid)))}
             <section class="edition">
@@ -55,38 +81,37 @@ async function handleDraftEdition() {
                     >{editionLabel}
                     <Note
                         >{#if edition.published}{new Date(
-                                edition.published
+                                edition.published,
                             ).toLocaleDateString(
-                                'en-us'
+                                'en-us',
                             )}{:else}unpublished{/if}
                         {#if edition.published}&nbsp;
                             <Link
                                 to={latestPublishedID === edition.ref.id &&
                                 $book.getSubdomain() !== undefined
                                     ? `/${$book.getSubdomain()}`
-                                    : `/${$book.getID()}/${
-                                          editions.length - index
-                                      }`}
+                                    : `/${$book.getID()}/${editionNumber}`}
                                 external>read</Link
                             >{/if}
                         {#if editable || ($user?.user?.uid && edition.editionuids.includes($user?.user.uid))}
                             &nbsp;
                             <Link
-                                to={`/write/${$book.getID()}/${
-                                    editions.length - index
-                                }`}>edit</Link
+                                to={`/write/${$book.getID()}/${editionNumber}`}
+                                >edit</Link
                             >
                         {/if}
                     </Note>
                 </h3>
-                <p
-                    >{#if edition.summary !== ''}<Format
-                            node={Parser.parseFormat(
-                                undefined,
-                                edition.summary
-                            )}
-                        />{:else}&mdash;{/if}</p
-                >
+                {#if edition.summary !== ''}<p
+                        ><em
+                            ><Format
+                                node={Parser.parseFormat(
+                                    undefined,
+                                    edition.summary,
+                                )}
+                            /></em
+                        ></p
+                    >{/if}
             </section>
         {/if}
     {/each}

package/dist/components/page/Outline.svelte

@@ -324,6 +324,7 @@ let expandLabel = '\u2630';
     /* Desktop */
     @media screen and (min-width: 1200px) {
         .outline {
+            --outline-width: min(12em, calc((100vw - 740px) / 2 - 3 * var(--outline-padding)));
             width: var(--outline-width);
             z-index: 0; /* Put it below everything when it's in the margin. */
             border-right: 1px solid var(--bookish-border-color-light);

package/dist/components/page/Page.svelte

@@ -1,6 +1,6 @@
 <script>import { onMount } from 'svelte';
 import Loading from './Loading.svelte';
-export let title;
+export let title = undefined;
 export let afterLoaded = undefined;
 let fontsLoaded = false;
 let imagesLoaded = false;
@@ -44,8 +44,10 @@ function imagesAreLoaded() {
 </script>
 
 <svelte:head>
-    <title>{title}</title>
-    <meta name="description" content={title} />
+    {#if title !== undefined}
+        <title>{title}</title>
+        <meta name="description" content={title} />
+    {/if}
 </svelte:head>
 
 <section class={'bookish-page' + (imagesLoaded ? ' loaded' : '')}>

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

@@ -1,7 +1,7 @@
 import { SvelteComponent } from "svelte";
 declare const __propDef: {
     props: {
-        title: string;
+        title?: string | undefined;
         afterLoaded?: Function | undefined;
     };
     events: {

package/dist/components/page/Print.svelte

@@ -1,8 +1,22 @@
 <script>import Chapter from './Chapter.svelte';
 import { getEdition } from './Contexts';
+import Parser from '../../models/chapter/Parser';
 let edition = getEdition();
+$: title = $edition
+    ? [
+        $edition.getTitle(),
+        `${$edition.getEditionLabel()} Edition`,
+        Parser.parseFormat($edition, $edition.getAuthors().at(0) ?? '').toText() + ($edition.getAuthors().length > 1 ? ' et al.' : ''),
+    ]
+        .filter(Boolean)
+        .join(' - ')
+    : undefined;
 </script>
 
+<svelte:head>
+    {#if title}<title>{title}</title>{/if}
+</svelte:head>
+
 {#if $edition}
     {#each $edition
         .getChapters()
@@ -16,6 +30,9 @@ let edition = getEdition();
         :global(.bookish-chapter-header) {
             break-before: page;
         }
+        :global(.bookish-page:first-of-type .bookish-chapter-header) {
+            break-before: auto;
+        }
 
         :global(body) {
             font-size: 16pt;

package/dist/models/CRUD.js

@@ -132,7 +132,7 @@ export async function createBook(userID) {
 }
 export async function createNewEdition(book) {
     if (!db)
-        throw Error("Can't publish draft, no Firebase connection.");
+        throw Error("Can't create new edition, no Firebase connection.");
     // Get the latest draft.
     const latestEditionID = book.getLatestEditionID();
     if (latestEditionID === undefined)
@@ -141,6 +141,7 @@ export async function createNewEdition(book) {
     const latestDraftData = latestDraftDoc.exists()
         ? latestDraftDoc.data()
         : undefined;
+    // No latest draft? Return the book as is.
     if (latestDraftData === undefined)
         return book;
     const latestDraft = Edition.fromJSON(latestDraftDoc.ref, latestDraftData);
@@ -149,18 +150,36 @@ export async function createNewEdition(book) {
     let newEdition = latestDraft.withoutRefs();
     // Create a copy of the existing draft as a new edition.
     const newEditionRef = await addDoc(collection(db, 'books', book.id, 'editions'), newEdition.toObject());
+    // Create a new edition that has the new ref and an updated edition number.
     newEdition = newEdition
         .withRef(newEditionRef)
         .withIncrementedEditionNumber();
-    // Create the edition, creating chapter text as necessary, using the edition sync function.
-    updateEdition(book, undefined, newEdition);
+    // Add the chapter text of the existing edition into the new edition's chapters, so it gets copied over. We have to do this because the chapter text is stored in the chapter documents, not the edition document.
+    const textByID = new Map();
+    for (const chapter of latestDraft.chapters) {
+        if (chapter.ref === undefined)
+            continue;
+        const chapterDoc = await getDoc(chapter.ref);
+        if (!chapterDoc.exists())
+            continue;
+        const chapterData = chapterDoc.data();
+        if (!chapterData || typeof chapterData.text !== 'string')
+            continue;
+        textByID.set(chapter.id, chapterData.text);
+    }
+    newEdition = newEdition.withChapters(newEdition.chapters.map((c) => {
+        const text = textByID.get(c.id) ?? '';
+        return c.withText(text);
+    }));
+    // Save the edition, creating chapter text as necessary, using the edition sync function.
+    await updateEdition(book, undefined, newEdition);
     // Put the new edition in the book.
     book = book.withEditions([
         newEdition.getInfo(),
         ...book.getEditions(),
     ]);
     // Update the book.
-    updateBook(book);
+    await updateBook(book);
     return book;
 }
 export async function updateLock(edition, uid, content, lock) {

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

@@ -49,7 +49,7 @@ export default class Book {
     withAuthors(authors: string[]): Book;
     getID(): string;
     getEditionNumberID(number: number): string | undefined;
-    getLatestPublishedEditionID(): string;
+    getLatestPublishedEditionID(): string | undefined;
     getLatestEditionID(): string | undefined;
     getEditions(): EditionInfo[];
     getPublishedEditionCount(): number;

package/dist/models/book/Book.js

@@ -18,7 +18,7 @@ export default class Book {
         this.cover = cover;
         // The published state is always true if some edition's published flag isn't null.
         this.published = editions.some((edition) => edition.published !== null);
-        // We always keep editions in reversed edition number for easy reference.
+        // We always keep editions in ascending edition number for easy reference.
         this.editions = editions.sort((a, b) => a.number - b.number);
         this.domain = domain;
         this.uids = uids;
@@ -91,10 +91,10 @@ export default class Book {
         return edition ? edition.ref.id : undefined;
     }
     getLatestPublishedEditionID() {
-        return this.editions.filter((ed) => ed.published !== null)[0]?.ref.id;
+        return this.editions.filter((ed) => ed.published !== null).at(-1)?.ref.id;
     }
     getLatestEditionID() {
-        return this.editions[0]?.ref.id;
+        return this.editions.toSorted((a, b) => b.number - a.number)[0]?.ref.id;
     }
     getEditions() {
         return this.editions.slice();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "bookish-press",
     "private": false,
-    "version": "0.7.1",
+    "version": "0.7.4",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -27,8 +27,7 @@
         "merge": "git checkout main && git merge dev && git push origin main && git checkout dev"
     },
     "devDependencies": {
-        "@sveltejs/adapter-auto": "^3",
-        "@sveltejs/adapter-static": "^3",
+        "@sveltejs/adapter-node": "^5",
         "@sveltejs/kit": "^2",
         "@sveltejs/package": "^2",
         "@sveltejs/vite-plugin-svelte": "^3",
@@ -59,7 +58,7 @@
         "uuid": "^11"
     },
     "engines": {
-        "node": "20"
+        "node": "22"
     },
     "types": "./dist/index.d.ts",
     "main": "./dist/index.js",