bookish-press 0.4.232 → 0.5.0

package/{models → package/models}/book/Schema.js

@@ -1,4 +1,4 @@
-export const Schema = {
+const Schema = {
     $schema: 'http://json-schema.org/draft-07/schema#',
     title: 'Bookish book schema',
     type: 'object',
@@ -10,18 +10,24 @@ export const Schema = {
     },
     required: [
         'title',
+        'number',
+        'summary',
+        'published',
         'authors',
+        'images',
         'description',
-        'chapters',
-        'revisions',
         'license',
+        'acknowledgements',
         'sources',
         'references',
-        'images',
+        'chapters',
     ],
     additionalProperties: false,
     properties: {
         title: { type: 'string' },
+        number: { type: 'number' },
+        summary: { type: 'string' },
+        published: { type: ['number', 'null'] },
         authors: {
             type: 'array',
             items: { type: 'string' },
@@ -55,15 +61,6 @@ export const Schema = {
                 },
             },
         },
-        revisions: {
-            type: 'array',
-            items: {
-                type: 'array',
-                minItems: 2,
-                maxItems: 2,
-                items: { type: 'string' },
-            },
-        },
         tags: {
             type: 'array',
             items: { type: 'string' },
@@ -77,10 +74,10 @@ export const Schema = {
                     { type: 'string' },
                     {
                         type: 'array',
-                        maxItems: 6,
+                        minItems: 5,
                         items: [
                             { type: 'string' },
-                            { type: 'integer' },
+                            { type: ['integer', 'string'] },
                             { type: 'string' },
                             { type: 'string' },
                             { type: ['string', 'null'], format: 'uri' },
@@ -108,7 +105,11 @@ export const Schema = {
             },
         },
         theme: {
-            type: 'object',
+            type: ['object', 'null'],
+        },
+        base: {
+            type: ['string'],
         },
     },
 };
+export default Schema;

package/{models → package/models}/book/Theme.js

@@ -67,7 +67,7 @@ export const BookishTheme = {
     // Spacing
     spacing: {
         paragraphLineHeight: '1.8em',
-        paragraphLineHeightTight: '1.4em',
+        paragraphLineHeightTight: '1.6em',
         headerLineHeight: '1.4em',
         paragraphSpacing: '1.8rem',
         headerSpacing: '2rem',
@@ -146,7 +146,7 @@ export const SeriousTheme = {
     // Spacing
     spacing: {
         paragraphLineHeight: '2rem',
-        paragraphLineHeightTight: '1.4em',
+        paragraphLineHeightTight: '1.6em',
         headerLineHeight: '1.3em',
         paragraphSpacing: '1.8rem',
         headerSpacing: '2rem',
@@ -200,6 +200,7 @@ export const TechTheme = {
         paragraphFontFamily: '"Roboto", serif',
         headerFontFamily: '"Russo One", serif',
         bulletFontFamily: '"Roboto"',
+        codeFontFamily: '"Courier New", monospace',
     },
     // Font sizes
     sizes: {
@@ -224,10 +225,10 @@ export const TechTheme = {
     // Spacing
     spacing: {
         paragraphLineHeight: '2rem',
-        paragraphLineHeightTight: '1.4em',
+        paragraphLineHeightTight: '1.6em',
         headerLineHeight: '3em',
         paragraphSpacing: '1.8rem',
-        headerSpacing: '2rem',
+        headerSpacing: '1.4rem',
         indent: '10%',
         inlinePadding: '0.25rem',
         blockPadding: '1rem',
@@ -303,7 +304,7 @@ export const HumanTheme = {
     // Spacing
     spacing: {
         paragraphLineHeight: '2.2rem',
-        paragraphLineHeightTight: '1.1em',
+        paragraphLineHeightTight: '1.8em',
         headerLineHeight: '1.4em',
         paragraphSpacing: '1.8rem',
         headerSpacing: '2rem',
@@ -382,7 +383,7 @@ export const SketchyTheme = {
     // Spacing
     spacing: {
         paragraphLineHeight: '2.4em',
-        paragraphLineHeightTight: '1.4em',
+        paragraphLineHeightTight: '1.8em',
         headerLineHeight: '1.3em',
         paragraphSpacing: '1.8rem',
         headerSpacing: '2rem',

package/{models → package/models}/chapter/CommentNode.js

@@ -1,5 +1,6 @@
 import AtomNode from './AtomNode';
 import FormatNode from './FormatNode';
+import TextNode from './TextNode';
 export default class CommentNode extends AtomNode {
     constructor(comment) {
         super(comment.withTextIfEmpty());
@@ -17,9 +18,18 @@ export default class CommentNode extends AtomNode {
         return this.getMeta().getFirstCaret();
     }
     toBookdown(format) {
-        const previousText = format?.getPreviousTextOrAtom(this)?.toBookdown();
-        // Insert a space before the % if there isn't one before this.
-        return `${previousText?.endsWith(' ') ? '' : ' '}%${this.getMeta().toBookdown()}%`;
+        const text = format
+            ?.getTextAndAtomNodes()
+            .filter((child) => child === this || !this.contains(child));
+        let previousText;
+        if (text) {
+            const index = text.indexOf(this);
+            const previous = text[index - 1];
+            previousText = previous instanceof TextNode ? previous : undefined;
+        }
+        return `${previousText !== undefined && !previousText.getText().endsWith(' ')
+            ? ' '
+            : ''}%${this.getMeta().toBookdown()}%`;
     }
     copy() {
         return new CommentNode(this.getMeta().copy());

package/{models → package/models}/chapter/EmbedNode.d.ts

@@ -9,6 +9,7 @@ export default class EmbedNode extends BlockNode {
     #private;
     constructor(url: string, description: string, caption?: FormatNode, credit?: FormatNode, position?: Position);
     getType(): string;
+    isVideo(): boolean;
     getURL(): string;
     getSmallURL(): string;
     hasSmallURL(): boolean;

package/{models → package/models}/chapter/EmbedNode.js

@@ -30,6 +30,12 @@ export default class EmbedNode extends BlockNode {
     getType() {
         return 'embed';
     }
+    isVideo() {
+        return (this.#urls.includes('https://www.youtube.com') ||
+            this.#urls.includes('https://youtu.be') ||
+            this.#urls.includes('https://www.tiktok.com') ||
+            this.#urls.includes('vimeo.com'));
+    }
     getURL() {
         return this.#urls.split(URL_SEPARATOR)[0];
     }

package/{models → package/models}/chapter/FormatNode.js

@@ -92,12 +92,7 @@ export default class FormatNode extends Node {
     }
     getAdjacentTextOrAtom(node, next) {
         // Find all of the text and atom nodes not in atom nodes in this node.
-        const text = this.getTextAndAtomNodes().filter((n) => {
-            const atomAncestor = n.getClosestParentOfType(this, AtomNode);
-            return (atomAncestor === undefined ||
-                (atomAncestor instanceof AtomNode &&
-                    atomAncestor.getMeta() === this));
-        });
+        const text = this.getTextAndAtomNodes();
         const index = text.indexOf(node);
         return index === undefined
             ? undefined

package/{models → package/models}/chapter/Parser.d.ts

@@ -31,7 +31,7 @@ export default class Parser {
     static preprocessSymbols(book: Edition, text: string): string;
     static parseChapter(book: Edition | undefined, text: string): ChapterNode;
     static parseFormat(book: Edition | undefined, text: string): FormatNode;
-    static parseEmbed(book: Edition | undefined, text: string): EmbedNode | ErrorNode;
+    static parseEmbed(book: Edition | undefined, text: string): EmbedNode;
     peek(): string | null;
     more(): boolean;
     nextIsEmptyParagraph(): boolean;
@@ -62,7 +62,7 @@ export default class Parser {
     parseCallout(): CalloutNode;
     parseTable(): TableNode;
     parseFormat(awaiting?: string): FormatNode;
-    parseEmbed(): EmbedNode | ErrorNode;
+    parseEmbed(): EmbedNode;
     parseComment(): CommentNode;
     parseLabel(): LabelNode | ErrorNode;
     parseStyle(awaiting: string): FormatNode | ErrorNode;

package/{models → package/models}/chapter/Parser.js

@@ -639,32 +639,34 @@ export default class Parser {
         this.read();
         // Read the URL
         const url = this.readUntilNewlineOr('|');
-        if (this.peek() !== '|')
-            return new ErrorNode(this.readUntilNewLine(), "Missing '|' after URL in embed");
-        // Read a |
-        this.read();
-        // Read the description
-        const description = this.readUntilNewlineOr('|');
-        if (this.peek() !== '|')
-            return new ErrorNode(this.readUntilNewLine(), "Missing '|' after description in embed");
-        // Read a |
-        this.read();
-        // Parse the caption
-        const caption = this.parseFormat('|');
-        if (this.peek() !== '|')
-            return new ErrorNode(this.readUntilNewLine(), "Missing '|' after caption in embed");
-        // Read a |
-        this.read();
-        // Parse the credit
-        const credit = this.parseFormat('|');
-        // Check for the closing delimeter
-        if (this.peek() !== '|')
-            return new ErrorNode(this.readUntilNewLine(), "Missing '|' after credit in embed.");
-        // Read a |
-        this.read();
+        let description;
+        let caption;
+        let credit;
+        if (this.peek() === '|') {
+            // Read a |
+            this.read();
+            // Read the description
+            description = this.readUntilNewlineOr('|');
+            if (this.peek() === '|') {
+                // Read a |
+                this.read();
+                // Parse the caption
+                caption = this.parseFormat('|');
+                if (this.peek() === '|') {
+                    // Read a |
+                    this.read();
+                    // Parse the credit
+                    credit = this.parseFormat('|');
+                    // Check for the closing delimeter
+                    if (this.peek() === '|')
+                        // Read a |
+                        this.read();
+                }
+            }
+        }
         // Is there a position indicator?
         const position = this.parsePosition();
-        return new EmbedNode(url, description, caption, credit, position);
+        return new EmbedNode(url, description ?? '', caption, credit, position);
     }
     parseComment() {
         // Consume the opening %

package/package/util/dark.d.ts

@@ -0,0 +1,2 @@
+export declare function isDark(): boolean;
+export declare function setDark(dark: boolean): void;

package/package/util/dark.js

@@ -0,0 +1,16 @@
+export function isDark() {
+    return (typeof localStorage !== 'undefined' &&
+        localStorage.getItem('dark') !== 'false' &&
+        (localStorage.getItem('dark') === 'true' || // A previous setting
+            window.matchMedia('(prefers-color-scheme: dark)').matches)); // Operating system is set to dark
+}
+export function setDark(dark) {
+    if (typeof document !== 'undefined') {
+        if (dark)
+            document.body.classList.add('dark');
+        else
+            document.body.classList.remove('dark');
+        if (typeof localStorage !== 'undefined')
+            localStorage.setItem('dark', dark ? 'true' : 'false');
+    }
+}