bookish-press 0.5.62 → 0.5.73

package/dist/models/chapter/ParagraphNode.js

@@ -68,22 +68,12 @@ export default class ParagraphNode extends BlockNode {
         return this.#format.toText();
     }
     toBookdown() {
-        return ((this.#level === 1
-            ? '# '
-            : this.#level === 2
-                ? '## '
-                : this.#level === 3
-                    ? '### '
-                    : '') + this.#format.toBookdown());
+        return this.#level === 0
+            ? this.#format.toBookdown()
+            : `${'#'.repeat(this.#level)} ${this.#format.toBookdown()}`;
     }
     toHTML() {
-        const tag = this.#level === 1
-            ? 'h1'
-            : this.#level === 2
-                ? 'h2'
-                : this.#level === 3
-                    ? 'h2'
-                    : 'p';
+        const tag = this.#level === 0 ? 'p' : `h${this.#level}`;
         return `<${tag}>${this.#format.toHTML()}</${tag}>`;
     }
     withLevel(level) {

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

@@ -22,6 +22,7 @@ import type Position from './Position';
 import type BlockNode from './BlockNode';
 import type Bookkeeping from './Bookkeeping';
 import LineBreakNode from './LineBreakNode';
+export declare const Reserved: RegExp;
 export default class Parser {
     book: Edition | undefined;
     text: string;

package/dist/models/chapter/Parser.js

@@ -46,6 +46,7 @@ const bulletRE = /^\*+\s+/;
 // LINK :: [CONTENT|TEXT]
 // FOOTNOTE :: {TEXT}
 // TEXT :: (.+)
+export const Reserved = /([_*`@~:^<>{}\[\]])/g;
 export default class Parser {
     book;
     text;
@@ -355,7 +356,7 @@ export default class Parser {
         // Read any whitespace after the hashes.
         this.readWhitespace();
         // Parse some content.
-        return new ParagraphNode(Math.min(3, count), this.parseFormat());
+        return new ParagraphNode(Math.min(4, count), this.parseFormat());
     }
     parseRule() {
         // Read until the end of the line. Ignore all text that follows.

package/dist/models/chapter/TableNode.js

@@ -168,8 +168,10 @@ export default class TableNode extends BlockNode {
         if (index < 0 || index >= this.getColumnCount())
             return;
         const newRows = this.#rows.slice();
-        for (let r = 0; r < this.#rows.length; r++)
+        for (let r = 0; r < this.#rows.length; r++) {
+            newRows[r] = newRows[r].slice();
             newRows[r].splice(index, 1);
+        }
         return new TableNode(newRows, this.#position, this.#caption);
     }
     withNewColumn(index) {

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.73",
     "type": "module",
     "description": "A platform for reading and writing readable, accessible, beautiful online books.",
     "license": "MIT",
@@ -20,45 +20,48 @@
         "//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 && firebase deploy",
+        "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 && firebase deploy",
+        "release": "firebase use prod && cp .env.bookish-prod .env && 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",
-        "@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"
         },