@lexho111/plainblog 0.4.3 → 0.5.0

package/.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

package/Blog.js

@@ -2,18 +2,15 @@ import http from "http";
 import crypto from "crypto";
 import fs from "fs";
 import { URLSearchParams } from "url";
-import { MapTransform } from "./streams.js";
 import Article from "./Article.js";
-import DatabaseModel from "./model/DatabaseModel.js";
+import DatabaseModel from "./model/DatabaseModel2.js";
 import { fetchData, postData } from "./model/APIModel.js";
-import { save as saveToFile, load as loadFromFile } from "./model/fileModel.js";
 import { formatHTML, header, formatMarkdown, validate } from "./Formatter.js";
 import pkg from "./package.json" with { type: "json" };
 import path from "path";
 import { fileURLToPath } from "url";
 import { exec } from "child_process";
 import { promisify } from "util";
-import { compileStyles, mergeStyles } from "./build-styles.js";
 
 const execPromise = promisify(exec);
 
@@ -31,11 +28,11 @@ export default class Blog {
     this.reloadStylesOnGET = false;
 
     this.database = {
-      type: "sqlite",
-      username: "user1",
-      password: "password1",
+      type: "file",
+      username: "user",
+      password: "password",
       host: "localhost",
-      dbname: "blog",
+      dbname: "blog.json",
     };
     this.sessions = new Set();
 
@@ -68,6 +65,10 @@ export default class Blog {
 
   set title(t) {
     this.#title = t;
+    this.#databaseModel = new DatabaseModel(this.database);
+    console.log(`connected to database`);
+    if(t != this.#title && t.length == 0)
+      this.#databaseModel.updateBlogTitle(t);
   }
 
   get title() {
@@ -180,7 +181,8 @@ export default class Blog {
 
       if (srcHash !== publicHash) {
         console.log("Styles have changed. Recompiling...");
-        const finalStyles = await mergeStyles(this.styles, srcStyles);
+        //const finalStyles = await mergeStyles(this.styles, srcStyles);
+        const finalStyles = this.styles + " " + srcStyles;
         try {
           await fs.promises.mkdir(path.dirname(publicStylePath), { recursive: true });
           await fs.promises.writeFile(publicStylePath, finalStyles + `\n/* source-hash: ${srcHash} */`);
@@ -289,7 +291,6 @@ export default class Blog {
           res.end("Forbidden");
           return;
         }
-        await this.#databaseModel.updateBlogTitle(this.title);
         await this.postArticle(req, res);
         // GET artciles
       } else if (req.method === "GET" && req.url === "/") {
@@ -387,7 +388,7 @@ export default class Blog {
   /** Populates the blog's title and articles from a data object. */
   #applyBlogData(data) {
     this.articles = []; // Clear existing articles before loading new ones
-    this.title = data.title;
+    this.#title = data.title;
     // Assuming the API returns an array of objects with title and content
     if (data.articles && Array.isArray(data.articles)) {
       for (const articleData of data.articles) {
@@ -398,23 +399,6 @@ export default class Blog {
     }
   }
 
-  async save(filename = this.filename) {
-    if (this.#databaseModel === undefined) this.init(); // init blog if it didn't already happen
-    //await this.#apiServer.initialize();
-    if (this.#isExternalAPI) await this.loadFromAPI();
-    const blogData = { title: this.title, articles: this.articles };
-    saveToFile(filename, blogData);
-  }
-
-  async load(filename) {
-    loadFromFile(filename, (title, articles) => {
-      this.title = title;
-      this.articles = articles.map(
-        (article) => new Article(article.title, article.content)
-      );
-    });
-  }
-
   async loadFromAPI() {
     const data = await fetchData(this.#apiUrl);
     if (data) {
@@ -556,7 +540,8 @@ export default class Blog {
         this.#stylesHash = currentHash;
         
         // Compile styles using the standalone script from build-styles.js
-        this.compiledStyles = await compileStyles(fileData);
+        //this.compiledStyles = await compileStyles(fileData);
+        this.compiledStyles = fileData; // TODO workaround
 
         // generate a file
         const __filename = fileURLToPath(import.meta.url);

package/Formatter.js

@@ -33,7 +33,10 @@ export function formatHTML(data) {
     <nav>
   ${data.login}
   </nav>
-    <h1>${data.title}</h1>
+  <div id="header">
+  <h1>${data.title}</h1>
+  <!--<img src="headerphoto.jpg"/>-->
+    </div>
     <div id="wrapper">
     ${form}
       <section id="articles" class="grid">

package/README.md

@@ -25,24 +25,6 @@ Now you can open your blog in your webbrowser on `http://localhost:8080`. Login
 
 ## More Features
 
-**SQLite** is the default database. But you can use **PostgreSQL** instead.
-
-### run api server with postgres database
-
-```
-import Blog from "@lexho111/plainblog";
-
-const blog = new Blog();
-blog.database.type = "postgres";
-blog.database.username = "user";
-blog.database.password = "password";
-blog.database.host = "localhost";
-blog.setStyle("body { font-family: Arial, sans-serif; } h1 { color: #333; }");
-await blog.init(); // load data from database
-
-blog.startServer(8080);
-```
-
 ### set an API to fetch data from an external database
 
 ```
@@ -56,36 +38,18 @@ await blog.init(); // load data from database
 blog.startServer(8080);
 ```
 
-### provide custom style sheets and scripts
+### provide custom style sheets
 
 ```
 const blog = new Blog();
 blog.title = "My Blog";
 blog.style = "body { font-family: Arial, sans-serif; } h1 { color: #333; }";
 blog.password = "mypassword";
-blog.stylesheetPath = "path/to/my/styles.scss";
+blog.stylesheetPath = "path/to/my/styles.css";
 
 blog.startServer(8080);
 ```
 
-save data to file
-
-```
-import Blog from "@lexho111/plainblog";
-import { Article } from "@lexho111/plainblog";
-
-const blog = new Blog();
-blog.setStyle("body { font-family: Arial, sans-serif; } h1 { color: #333; }");
-
-const article = new Article("hello", "hello world!");
-blog.addArticle(article);
-
-blog.save("myblog.json");
-
-// load data from 'myblog.json'
-await blog.load("myblog.json");
-```
-
 print your blog articles in markdown
 
 ```

package/blog.json

@@ -3,7 +3,93 @@
   "articles": [
     {
       "title": "hello",
-      "content": "hello world!"
+      "content": "hML`JfDS]ARPVAfsGdogseNVYPXTpZaJhKJkPoMTWA\\q[CkNsXYrUGyGHWTDZpByubZMf_Y\\bMELh[]afM^XMAFqvxuyWat^hqSBMIifvbTdHNOQP_rbwwlWnGvVbPi]jlTIixyAaaU_]ecJYTjr]FqLq`UY\\XoYqhmuY`rvWH]EZO`tBHZSan`mAuhnwpXgdRJtjtH[",
+      "createdAt": "2026-01-07T12:49:43.098Z"
+    },
+    {
+      "title": "hello",
+      "content": "HgcFKFWDMl]cxiCVVrgFddJaOQCSPF^KYkROxkLTmxSc^ZssZh`ENyOXZn_DtOQe^V_vbu^KRonZ]bGcqsP]FYMmY\\YLjWknhiUksXwIUsvtpfXqViiKJ`xcmScZRXfAdHshvFlEHvPXWOfZRRIDIOxAafPoMD[ZgVlFkl\\Uw]RfubZWQ]`IHIUOKea_RTO`KiZisSA[",
+      "createdAt": "2026-01-07T12:49:43.444Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T13:10:50.239Z"
+    },
+    {
+      "title": "hello",
+      "content": "_\\jAuGsYByS]q\\QsnlqT\\]]TEDDalywtlmwmBZRlL[vtFdGqB\\[dlVx]A^[IV`KjhWU`DW`oorGwUlBU_IMCYoymIFi[`FpXrJfUmLZTRhoisxhXIcWqmk\\SPMV^]dvCuL_Pu^EAcMvBfadWFbUuSxFkjh\\KQyLnNWWsP`agQQkmU\\TAaOvYZAO\\FGtstSbaCJPXRQTO",
+      "createdAt": "2026-01-07T13:10:57.249Z"
+    },
+    {
+      "title": "hello",
+      "content": "HRkfwNRL_r\\DF]tyVBM[AMIjfMoBbohiqUf_T^]LwiJo[duXB`mQiRmmTkbMSJxvvHccfbXsdmKMbuYmxo[JGkwfCpqXSbhKiZID[vouGhbnLZ[wjkFFgm]fOaZcxoWduI`TNvin]\\dXoGW]YtueqSYPRLmGJswvUnyPHhfLUtf`]QNfM]hcvqqZasrQZVcXYjAnJxRP",
+      "createdAt": "2026-01-07T13:10:57.357Z"
+    },
+    {
+      "title": "hello",
+      "content": "UI\\KBodT[CgUg]L^WJ`Tuafq`rS]n\\T_eMqmBQqJVQisfABj^msS]u\\OEoJ]D^CtwE`UY[UbOICHcYPjNqNQ[LlwlJGPOoppSrkaEmDh_tm]CrrPGbBSPxgQQIZ^efcmITQQaAgT_vx[GUepg]LDagmTmihHbOIqHAa_NmRsX_EjxeE]EKhnHwFm]vFUpJTPFiDNU^BE",
+      "createdAt": "2026-01-07T13:17:47.559Z"
+    },
+    {
+      "title": "hello",
+      "content": "aMDnSSZDIZjbfrMlOcjMB\\CPup[GfoqHkLWAi]V_Ctkt[ekYRqIaufps[]TOMcw\\ojbVpPNv`lTTH\\[jbOcJXU[_tBSCsZW\\akiWuRf^mZGGrFxAq^oAdZjHwmJBjt^_GUXnHdXfjSrifiqXdAAdo]EM`aBFpJvyVLnLOfqrqoPrAIhRwoPHRy^lRCLyaS^VXChowHCn",
+      "createdAt": "2026-01-07T13:17:47.681Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T13:18:50.764Z"
+    },
+    {
+      "title": "hello",
+      "content": "[vL^GSDHJjBq^qdTMyyMm`SGhZhvgXsyTp[kYNkiBDavKevpIkSlWQr`bJaWyH]Qa`LQMKisdHeRvTKm`dviPLkLcJCtWbGPaDnNhJtEcEQM^MmP[RYERk\\uYeXruvPmJMjdvsOxA`btQtTmtBlOvrHLANJhcYRTAXmwOjLhp_SgkhWsB_pcIUQbd^X`RIWAdqUBPVmk",
+      "createdAt": "2026-01-07T13:18:52.387Z"
+    },
+    {
+      "title": "hello",
+      "content": "jRaJYEUFnMoEcjrWFREUuIQEoCtLoEuJSxJapEGpdPvq[GyrOqdSLY`VDlqSMTh\\BgybfwxfQQ_QqKkh\\YcEHYpA^W[ttGyGjA[TdZHn]]yoPWnFyFHJfAUkxkSM[RkQVqxAg_AGoJahaoOsNnoSGx^uM\\smWlWVDGvRcWVW\\rI_[lKnZEifvdPwkCcBRLXKGw[aNedN",
+      "createdAt": "2026-01-07T13:18:52.971Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T13:22:54.227Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T13:23:08.140Z"
+    },
+    {
+      "title": "hello",
+      "content": "M_RFGy[auVjFYypv^FdPqesIlcBkg]uoeIwMNLM]TOcDWKw[CFpsPpQWxSAXAupUdVsaiGJgLgIeuJEwBMXk`VG\\OoXIxCERYs`hqGRYGTnP]ZIrOSoJk[MFAxfVjJNMyZycryoRWr\\bhCXlurxgKPFSsTYbhlqZmrqaiJyvXpFsbiLQx^LBcZi`VqZSbjc`TNF_\\Eex",
+      "createdAt": "2026-01-07T13:26:02.437Z"
+    },
+    {
+      "title": "hello",
+      "content": "\\uRyVjar]vDZKHqRqJbEJpZbdKCWmQOGToNFQAqWdJQxSwmKTAGXywMDF`D\\nBA_eJxmFV^XtTuSGNJZTFjYvYibQIlgZdV[YXZpujmuWBgKNNBjrGZLVC[QlRZOwBdY^QPom\\b^WIIkeawsGBaafELGmfmTaIikRhCnCV_SYKEwogtqdfhkMkJslllumPyeGKqe\\cca",
+      "createdAt": "2026-01-07T13:26:02.816Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T13:26:07.866Z"
+    },
+    {
+      "title": "hello",
+      "content": "UecpUr`PFkpfKJ^V^q[T_lTr\\uP\\WFwcFtZgrdoao[japNpDycoAgWyELuIZtQroKxXSYdI]LrDTQSGqegWjgArWk[[eYXpy_OchWDywkus`GLcdwwr[qHoLINIdUoB^C]JcLfacOEJtMZOeWjRNbGcv\\XCfSAXUKIVqkPwJbaRTjlpGBxCGXxnchUhRoePYoLE]fexb",
+      "createdAt": "2026-01-07T13:45:46.304Z"
+    },
+    {
+      "title": "hello",
+      "content": "ef[SK^DuSJrKOlieeJHPLLoGgS[ZO\\gk_dWggGZchFewEnwspxJlhCWQ\\aTEKlDj\\a\\xRj\\uJANSkNLwrnPoOxJ[h]CrLppVtoeCEWPXRpCcoNFU`YA\\RPK\\dk\\Jp^fbdmC`Hpuf[ZYExseoPRbAYAaIolQ_mkJKRfrKsthmsBtCZdeQiBhY\\XAodKo_rOeQvtfNtDQB",
+      "createdAt": "2026-01-07T13:45:46.469Z"
+    },
+    {
+      "title": "Test Title from Jest",
+      "content": "This is the content of the test article.",
+      "createdAt": "2026-01-07T13:45:47.311Z"
     }
   ]
 }

package/build-styles.js

@@ -3,7 +3,7 @@ import { pathToFileURL } from "url";
 import * as sass from "sass";
 import postcss from "postcss";
 import autoprefixer from "autoprefixer";
-import cssnano from "cssnano";
+//import cssnano from "cssnano";
 
 // array of files or a single file
 export async function compileStyles(fileData) {
@@ -39,7 +39,7 @@ export async function compileStyles(fileData) {
 
     // 2. PostCSS (Autoprefixer + CSSNano)
     if (combinedCss) {
-      const plugins = [autoprefixer(), cssnano()];
+      const plugins = [autoprefixer()];
       const result = await postcss(plugins).process(combinedCss, {
         from: undefined,
       });
@@ -57,7 +57,7 @@ export async function mergeStyles(...cssContents) {
     const combinedCss = cssContents.join("\n");
 
     if (combinedCss) {
-      const plugins = [autoprefixer(), cssnano()];
+      const plugins = [autoprefixer()];
       const result = await postcss(plugins).process(combinedCss, {
         from: undefined,
       });

package/model/DatabaseModel2.js

@@ -0,0 +1,86 @@
+import { save as saveToFile, load as loadFromFile } from "./fileModel.js";
+
+export default class DatabaseModel {
+  filename = "blog.json";
+
+  //new DatabaseModel(this.database);
+  constructor(options) {}
+
+  async initialize() {}
+
+  async getBlogTitle() {
+    let blogTitle = "";
+    try {
+      await loadFromFile(this.filename, (title) => {
+        blogTitle = title;
+      });
+    } catch (err) {
+      console.error(err);
+    }
+    return blogTitle;
+  }
+
+  //findAll();
+  //save(newArticleData);
+  async save(newArticle) {
+    if (!newArticle.createdAt) {
+      newArticle.createdAt = new Date().toISOString();
+    }
+
+    let blogTitle = "";
+    let articles = [];
+    try {
+      await loadFromFile(this.filename, (t, a) => {
+        blogTitle = t;
+        articles = a || [];
+      });
+    } catch (err) {
+      console.error(err);
+    }
+
+    articles.push(newArticle);
+    saveToFile(this.filename, { title: blogTitle, articles });
+  }
+
+  //updateBlogTitle(this.title);
+  async updateBlogTitle(newTitle) {
+    let articles = [];
+    try {
+      await loadFromFile(this.filename, (t, a) => {
+        //blogTitle = t;
+        articles = a || [];
+      });
+    } catch (err) {
+      console.error(err);
+    }
+    saveToFile(this.filename, { title: newTitle, articles });
+  }
+
+  //findAll(limit, 0, startID, endID);
+  async findAll(
+    limit = 4,
+    offset = 0,
+    startId = null,
+    endId = null,
+    order = "DESC"
+  ) {
+    let dbArticles = [];
+    try {
+      await loadFromFile(this.filename, (title, articles) => {
+        if (Array.isArray(articles)) {
+          // Sort by createdAt
+          articles.sort((a, b) => {
+            const dateA = new Date(a.createdAt || 0);
+            const dateB = new Date(b.createdAt || 0);
+            return order === "DESC" ? dateB - dateA : dateA - dateB;
+          });
+          // Apply pagination
+          dbArticles = articles.slice(offset, offset + limit);
+        }
+      });
+    } catch (err) {
+      console.error(err);
+    }
+    return dbArticles;
+  }
+}

package/model/fileModel.js

@@ -17,9 +17,19 @@ export async function save(filename, data) {
 
 /** load blog content from file */
 export async function load(filename, f) {
-  const data = await fs.readFile(filename, "utf8");
-  const jsonData = JSON.parse(data);
-  const title = jsonData.title;
-  const articles = jsonData.articles;
-  f(title, articles);
+  try {
+    const data = await fs.readFile(filename, "utf8");
+    const jsonData = JSON.parse(data);
+    const title = jsonData.title;
+    const articles = jsonData.articles;
+    f(title, articles);
+  } catch (err) {
+    if (err.code === "ENOENT") {
+      const defaultData = { title: "Blog", articles: [] };
+      await save(filename, defaultData);
+      f(defaultData.title, defaultData.articles);
+    } else {
+      throw err;
+    }
+  }
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",
   "scripts": {
+    "dev": "node index.js",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "lint": "eslint ."
   },
@@ -17,14 +18,15 @@
   "license": "ISC",
   "dependencies": {
     "autoprefixer": "^10.4.23",
-    "cssnano": "^7.1.2",
-    "node-fetch": "^3.3.2",
-    "pg": "^8.16.3",
-    "pg-hstore": "^2.3.4",
+    "child_process": "^1.0.2",
+    "crypto": "^1.0.1",
+    "fs": "^0.0.1-security",
+    "http": "^0.0.1-security",
+    "path": "^0.12.7",
     "postcss": "^8.4.35",
     "sass": "^1.97.1",
-    "sequelize": "^6.37.7",
-    "sqlite3": "^5.1.7"
+    "url": "^0.11.4",
+    "util": "^0.12.5"
   },
   "devDependencies": {
     "dom-parser": "^1.1.5",

package/public/styles.min.css

@@ -1,2 +1,68 @@
-body{font-family:Arial;font-family:Arial,sans-serif}h1{color:#333}.grid{border:0 solid #000;display:grid;gap:.25rem;grid-template-columns:1fr}.grid article{border:0 solid #ccc;border-radius:4px;min-width:0;overflow-wrap:break-word;padding:.25rem}.grid article h2{color:#353535;margin-bottom:5px}.grid article .datetime{color:#757575;margin:0}.grid article p{margin-bottom:0;margin-top:10px}article a,article a:visited,h1{color:#696969}nav a{color:#3b40c1;font-size:20px;text-decoration:underline}nav a:visited{color:#3b40c1;text-decoration-color:#3b40c1}@media screen and (max-width:1000px){*{font-size:4vw}#wrapper{box-sizing:border-box;max-width:100%;padding:0 10px;width:100%}}
-/* source-hash: 374cb67a628dde5695d1104c5f9037d737d17d6b6b9a791be81779d7dd91beac */
+body { font-family: Arial; } .grid {
+  border: 0 solid #000;
+  display: grid;
+  gap: 0.25rem;
+  grid-template-columns: 1fr;
+}
+.grid article {
+  border: 0 solid #ccc;
+  border-radius: 4px;
+  min-width: 0;
+  overflow-wrap: break-word;
+  padding: 0.25rem;
+}
+.grid article h2 {
+  color: rgb(53, 53, 53);
+  margin-bottom: 5px;
+}
+
+.grid article .datetime {
+  margin: 0;
+  color: rgb(117, 117, 117);
+}
+
+.grid article p {
+  margin-top: 10px;
+  margin-bottom: 0;
+}
+
+article a {
+  color: rgb(105, 105, 105);
+}
+
+article a:visited {
+  color: rgb(105, 105, 105);
+}
+
+h1 {
+  color: #696969;
+}
+nav a {
+  color: #3b40c1;
+  font-size: 20px;
+  text-decoration: underline;
+}
+nav a:visited {
+  color: #3b40c1;
+  text-decoration-color: #3b40c1;
+}
+
+#wrapper {
+  max-width: 500px;
+  width: 100%;
+}
+
+/* Mobile Layout (screens smaller than 1000px) */
+@media screen and (max-width: 1000px) {
+  * {
+    font-size: 4vw;
+  }
+  #wrapper {
+    max-width: 100%;
+    width: 100%;
+    padding: 0 10px; /* Prevents text from touching the edges */
+    box-sizing: border-box;
+  }
+}
+
+/* source-hash: bcb6644ec5b5c6f9685c9ad6c14ee551a6f908b8a2c372d3294e2d2e80d17fb7 */

package/src/styles.css

@@ -46,6 +46,12 @@ nav a:visited {
   color: #3b40c1;
   text-decoration-color: #3b40c1;
 }
+
+#wrapper {
+  max-width: 500px;
+  width: 100%;
+}
+
 /* Mobile Layout (screens smaller than 1000px) */
 @media screen and (max-width: 1000px) {
   * {

package/test/blog.test.js

@@ -58,13 +58,13 @@ describe("test blog", () => {
     const styles = [
       {
         style: "body { font-family: Courier; }",
-        expected: "font-family:Courier",
+        expected: "font-family: Courier",
       },
       {
-        style: "body{background-color:black;color:white;}",
-        expected: "background-color:#000;color:#fff",
+        style: "body{ background-color:black; color:white; }",
+        expected: "background-color:black; color:white",
       },
-      { style: "body{font-size: 1.2em;}", expected: "font-size:1.2em" },
+      { style: "body{ font-size: 1.2em; }", expected: "font-size: 1.2em" },
     ];
     for (const style of styles) {
       const cssPath = path.join(publicDir, "styles.min.css");

package/test/model.test.js

@@ -2,6 +2,7 @@ import Blog from "../Blog.js";
 import Article from "../Article.js";
 import { fetchData, postData } from "../model/APIModel.js";
 import { server } from "./simpleServer.js";
+import { load as loadFromFile } from "../model/fileModel.js";
 
 function generateRandomContent(length) {
   let str = "";
@@ -26,18 +27,19 @@ describe("File Model test", () => {
     const article = new Article("hello", content);
     blog.addArticle(article);
 
-    await blog.load("blog.json");
-
-    expect(await blog.toHTML()).toContain(content);
-    expect(blog).toBeDefined();
+    await loadFromFile("blog.json", async (title) => {
+      expect(await blog.toHTML()).toContain(content);
+      expect(blog).toBeDefined();
+    });
   });
 });
 
 describe("API Model test", () => {
-  beforeAll(() => {
+  beforeAll((done) => {
     const port = 8081;
     server.listen(port, () => {
       console.log(`Simple server running at http://localhost:${port}/`);
+      done();
     });
   });
   afterAll(() => {

package/test/server.test.js

@@ -104,7 +104,8 @@ describe("server test", () => {
 
     expect(response.status).toBe(201);
     const responseData = await response.json();
-    expect(responseData).toEqual(newArticle);
+    expect(responseData.title).toEqual(newArticle.title);
+    expect(responseData.content).toEqual(newArticle.content);
 
     expect(await blog.toHTML()).toContain(newArticle.content); // does blog contain my new article?
   });

package/test/styles.test.js

@@ -77,7 +77,7 @@ describe("Blog Stylesheet Test", () => {
     expect(publicCSS).toContain("body");
     expect(publicCSS).toContain("nav a");
     expect(publicCSS).toContain(".datetime");
-    expect(publicCSS).toContain("font-style:normal");
+    expect(publicCSS).toContain("font-style: normal");
     expect(publicCSS).toContain("color:");
   });
 
@@ -99,7 +99,7 @@ describe("Blog Stylesheet Test", () => {
     expect(publicCSS).toContain("body");
     expect(publicCSS).toContain("nav a");
     expect(publicCSS).toContain(".datetime");
-    expect(publicCSS).toContain("font-style:normal");
+    expect(publicCSS).toContain("font-style: normal");
     expect(publicCSS).toContain("color:");
   });
 });

package/model/DatabaseModel.js

@@ -1,139 +0,0 @@
-import { Sequelize, DataTypes, Op } from "sequelize";
-
-export default class DatabaseModel {
-  #username;
-  #password;
-  #host;
-  #dbport = 5432;
-  #dbname = "blog";
-
-  #sequelize;
-  #Article;
-  #BlogInfo;
-
-  constructor(options) {
-    const databasetype = options.type; // the database type defines
-    if (databasetype === "sqlite") {
-      // Use the full path for the database file from the options.
-      if (options.dbname) this.#dbname = options.dbname;
-      this.#sequelize = new Sequelize({
-        dialect: "sqlite",
-        storage: this.#dbname + ".db",
-        logging: false,
-      });
-    } else if (databasetype === "postgres") {
-      this.#username = options.username;
-      this.#password = options.password;
-      this.#host = options.host;
-      if (options.dbname) this.#dbname = options.dbname;
-      if (!this.#username || !this.#password || !this.#host) {
-        throw new Error(
-          "PostgreSQL credentials not set. Please provide 'username', 'password', and 'host' in the options."
-        );
-      }
-      console.log(
-        `postgres://${this.#username}:${this.#password}@${this.#host}:${
-          this.#dbport
-        }/${this.#dbname}`
-      );
-
-      this.#sequelize = new Sequelize(
-        `postgres://${this.#username}:${this.#password}@${this.#host}:${
-          this.#dbport
-        }/${this.#dbname}`,
-        { logging: false }
-      );
-    } else {
-      throw new Error(`Error! ${databasetype} is an unknown database type.`);
-    }
-
-    this.#Article = this.#sequelize.define(
-      "Article",
-      {
-        title: DataTypes.STRING,
-        content: DataTypes.TEXT,
-        createdAt: {
-          type: DataTypes.DATE,
-          defaultValue: DataTypes.NOW,
-        },
-        updatedAt: {
-          type: DataTypes.DATE,
-          defaultValue: DataTypes.NOW,
-        },
-      },
-      {
-        timestamps: true,
-      }
-    );
-
-    this.#BlogInfo = this.#sequelize.define(
-      "BlogInfo",
-      {
-        title: DataTypes.STRING,
-      },
-      {
-        timestamps: false,
-      }
-    );
-  }
-
-  async initialize() {
-    // This creates the tables if they don't exist.
-    await this.#sequelize.sync({ alter: true });
-    console.log("database tables synced and ready.");
-
-    // Check for and create the initial blog title right after syncing.
-    const blogInfoCount = await this.#BlogInfo.count();
-    if (blogInfoCount === 0) {
-      await this.#BlogInfo.create({ title: "My Default Blog Title" });
-      console.log("initialized blog title in database.");
-    }
-  }
-
-  // model
-  async findAll(
-    limit = 4,
-    offset = 0,
-    startId = null,
-    endId = null,
-    order = "DESC"
-  ) {
-    const where = {};
-    if (startId !== null && endId !== null) {
-      where.id = {
-        [Op.between]: [Math.min(startId, endId), Math.max(startId, endId)],
-      };
-    } else if (startId !== null) {
-      where.id = { [order === "DESC" ? Op.lte : Op.gte]: startId };
-    }
-    const options = {
-      where,
-      order: [
-        ["createdAt", order],
-        ["id", order],
-      ],
-      limit,
-      offset,
-    };
-    const articles = await this.#Article.findAll(options);
-    return articles.map((article) => article.get({ plain: true }));
-  }
-
-  async save(newArticle) {
-    await this.#Article.create(newArticle);
-    console.log("Added new article:", newArticle);
-  }
-
-  async getBlogTitle() {
-    // Find the first (and only) entry in the BlogInfo table.
-    const blogInfo = await this.#BlogInfo.findOne();
-
-    return blogInfo.title;
-  }
-
-  async updateBlogTitle(newTitle) {
-    // Find the first (and only) entry and update its title.
-    // Using where: {} will always find the first row.
-    await this.#BlogInfo.update({ title: newTitle }, { where: {} });
-  }
-}

package/streams.js

@@ -1,17 +0,0 @@
-import { Transform } from "stream";
-
-export class MapTransform extends Transform {
-  constructor(fn) {
-    super({
-      objectMode: true,
-      transform: (chunk, encoding, callback) => {
-        try {
-          // Call the mapping function with the chunk
-          callback(null, fn(chunk));
-        } catch (err) {
-          callback(err);
-        }
-      },
-    });
-  }
-}