@lexho111/plainblog 0.5.20 → 0.5.22

package/build-styles.js

@@ -1,4 +1,5 @@
 import path from "path";
+import { execSync } from "child_process";
 
 /**
  * Compiles CSS styles from file content objects.
@@ -6,9 +7,8 @@ import path from "path";
  * @returns {Promise<string>} The compiled and minified CSS.
  */
 export async function compileStyles(fileData) {
+  let combinedCss = "";
   try {
-    let combinedCss = "";
-
     // 1. filter out css files
     if (fileData) {
       const scssFiles = fileData.filter(
@@ -26,16 +26,18 @@ export async function compileStyles(fileData) {
 
     // 2. minify and uglify with PostCSS
     if (combinedCss) {
-      return postcss2(combinedCss);
+      return await runPostcss(combinedCss);
     }
     return "";
   } catch (error) {
-    console.error("Build failed:", error);
-    return "";
+    if (error.message !== "Missing optional dependencies") {
+      console.error("Build failed:", error);
+    }
+    return combinedCss;
   }
 }
 
-async function postcss2(css) {
+async function runPostcss(css) {
   let postcss, autoprefixer, cssnano;
 
   try {
@@ -43,12 +45,23 @@ async function postcss2(css) {
     autoprefixer = (await import("autoprefixer")).default;
     cssnano = (await import("cssnano")).default;
   } catch (error) {
-    console.error("Missing CSS processing dependencies.");
-    console.error(
-      "To use this feature, please install the following packages manually:"
-    );
-    console.error("\n    npm install postcss autoprefixer cssnano\n");
-    throw new Error("Missing optional dependencies");
+    if (
+      error.code === "ERR_MODULE_NOT_FOUND" ||
+      error.code === "MODULE_NOT_FOUND"
+    ) {
+      try {
+        const packageName = "postcss autoprefixer cssnano";
+        console.log(`Installing ${packageName}...`);
+        execSync(`npm install ${packageName} --no-save`, { stdio: "inherit" });
+        postcss = (await import("postcss")).default;
+        autoprefixer = (await import("autoprefixer")).default;
+        cssnano = (await import("cssnano")).default;
+      } catch (e) {
+        throw new Error("Missing optional dependencies");
+      }
+    } else {
+      throw new Error("Missing optional dependencies");
+    }
   }
 
   const plugins = [autoprefixer(), cssnano()];
@@ -68,11 +81,13 @@ export async function mergeStyles(...cssContents) {
     const combinedCss = cssContents.join("\n");
 
     if (combinedCss) {
-      return postcss2(combinedCss);
+      return await runPostcss(combinedCss);
     }
     return "";
   } catch (error) {
-    console.error("Merge failed:", error);
-    return "";
+    if (error.message !== "Missing optional dependencies") {
+      console.error("Merge failed:", error);
+    }
+    return cssContents.join("\n"); // fallback: return unminified css
   }
 }

package/model/PostgresAdapter.js

@@ -1,4 +1,5 @@
 import SequelizeAdapter from "./SequelizeAdapter.js";
+import { execSync } from "child_process";
 
 export default class PostgresAdapter extends SequelizeAdapter {
   dbtype = "postgres";
@@ -21,6 +22,28 @@ export default class PostgresAdapter extends SequelizeAdapter {
 
   async initialize() {
     console.log("initialize database");
+    let pgPkg;
+    try {
+      await import("sequelize");
+      pgPkg = await import("pg");
+      await import("pg-hstore");
+    } catch (error) {
+      if (
+        error.code === "ERR_MODULE_NOT_FOUND" ||
+        error.code === "MODULE_NOT_FOUND"
+      ) {
+        try {
+          const packageName = "sequelize pg pg-hstore";
+          console.log(`Installing ${packageName}...`);
+          execSync(`npm install ${packageName} --no-save`, {
+            stdio: "inherit",
+          });
+          pgPkg = await import("pg");
+        } catch (e) {
+          throw new Error("Missing optional dependencies");
+        }
+      }
+    }
     await this.loadSequelize();
     const maxRetries = 10;
     const retryDelay = 3000;
@@ -33,7 +56,10 @@ export default class PostgresAdapter extends SequelizeAdapter {
 
         this.sequelize = new this.Sequelize(
           `postgres://${this.username}:${this.password}@${this.host}:${this.dbport}/${this.dbname}`,
-          { logging: false }
+          {
+            logging: false,
+            dialectModule: pgPkg.default || pgPkg,
+          }
         );
         await this.sequelize.authenticate();
         await this.initializeModels();

package/model/SequelizeAdapter.js

@@ -1,3 +1,5 @@
+import { execSync } from "child_process";
+
 export default class SequelizeAdapter {
   username;
   password;
@@ -20,17 +22,31 @@ export default class SequelizeAdapter {
 
   async loadSequelize() {
     if (this.Sequelize) return;
+    let sequelizePkg;
     try {
-      const sequelizePkg = await import("sequelize");
-      this.Sequelize = sequelizePkg.Sequelize;
-      this.DataTypes = sequelizePkg.DataTypes;
-      this.Op = sequelizePkg.Op;
-    } catch (err) {
-      console.error(err);
-      throw new Error(
-        "Sequelize is not installed. Please install it to use PostgresAdapter: npm install sequelize"
-      );
+      sequelizePkg = await import("sequelize");
+    } catch (error) {
+      if (
+        error.code === "ERR_MODULE_NOT_FOUND" ||
+        error.code === "MODULE_NOT_FOUND"
+      ) {
+        try {
+          const packageName = "sequelize";
+          console.log(`Installing ${packageName}...`);
+          execSync(`npm install ${packageName} --no-save`, {
+            stdio: "inherit",
+          });
+          sequelizePkg = await import("sequelize");
+        } catch (e) {
+          throw new Error("Missing optional dependencies");
+        }
+      } else {
+        throw new Error("Missing optional dependencies");
+      }
     }
+    this.Sequelize = sequelizePkg.Sequelize;
+    this.DataTypes = sequelizePkg.DataTypes;
+    this.Op = sequelizePkg.Op;
   }
 
   async initializeModels() {

package/model/SqliteAdapter.js

@@ -1,4 +1,5 @@
 import SequelizeAdapter from "./SequelizeAdapter.js";
+import { execSync } from "child_process";
 
 export default class SqliteAdapter extends SequelizeAdapter {
   constructor(options = {}) {
@@ -10,12 +11,34 @@ export default class SqliteAdapter extends SequelizeAdapter {
   }
 
   async initialize() {
+    let sqlite3Pkg;
+    try {
+      await import("sequelize");
+      sqlite3Pkg = await import("sqlite3");
+    } catch (error) {
+      if (
+        error.code === "ERR_MODULE_NOT_FOUND" ||
+        error.code === "MODULE_NOT_FOUND"
+      ) {
+        try {
+          const packageName = "sequelize sqlite3";
+          console.log(`Installing ${packageName}...`);
+          execSync(`npm install ${packageName} --no-save`, {
+            stdio: "inherit",
+          });
+          sqlite3Pkg = await import("sqlite3");
+        } catch (e) {
+          throw new Error("Missing optional dependencies");
+        }
+      }
+    }
     await this.loadSequelize();
     try {
       this.sequelize = new this.Sequelize({
         dialect: "sqlite",
         storage: this.dbname + ".db",
         logging: false,
+        dialectModule: sqlite3Pkg.default || sqlite3Pkg,
       });
       await this.initializeModels();
     } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lexho111/plainblog",
-  "version": "0.5.20",
+  "version": "0.5.22",
   "description": "A tool for creating and serving a minimalist, single-page blog.",
   "main": "index.js",
   "type": "module",

package/knip.json

@@ -1,10 +0,0 @@
-{
-  "$schema": "https://unpkg.com/knip@5/schema.json",
-  "ignoreExportsUsedInFile": {
-    "interface": true,
-    "type": true
-  },
-  "tags": [
-    "-lintignore"
-  ]
-}