okay, deno, no more "unstable sloppy imports"

Ariel-Mutebi · Dec 20, 2024 · 1947264 · 1947264 · deno-deploy · Dec 20, 2024
1 parent b73f4f9
commit 1947264
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ In regards to the design, I wanted it to be reminiscent of an early 2000s websit
 
 ### Model
 
-**directory**: `/model (db)`
+**directory**: `/database`
 
 Originally, I used a JavaScript object for data storage. But because my code was SOLID (that's a pun hinting at the design principles acronym 🙂), I easily migrated to a **PostgreSQL** database with the help of the **pg** (node-postgres) library.
 

diff --git a/controllers/getControllers.ts b/controllers/getControllers.ts
@@ -1,6 +1,6 @@
 import { RequestHandler } from "express";
 import { format as dateFormatter } from "date-fns";
-import { getMessages, getMessage } from "../model (db)/query.ts";
+import { getMessages, getMessage } from "../database/query.ts";
 
 const index: RequestHandler = async(req, res) => {
   const messages = await getMessages();

diff --git a/controllers/postControllers.ts b/controllers/postControllers.ts
@@ -1,6 +1,6 @@
 import { RequestHandler } from "express";
 import { validationResult } from "express-validator";
-import { addMessage } from "../model (db)/query.ts";
+import { addMessage } from "../database/query.ts";
 import { postMessageValidator } from "../middlewares/validators.ts";
 
 const postMessage: RequestHandler[] = [

diff --git a/model (db)/pool.ts → database/pool.ts b/model (db)/pool.ts → database/pool.ts
@@ -1,8 +1,9 @@
 import dotenv from "dotenv";
-import { Pool } from "pg";
+import pg from "pg";
 
 dotenv.config();
 
+const { Pool } = pg;
 const pool = new Pool({ connectionString: process.env.DATABASE_URL });
 
 export default pool;
diff --git a/model (db)/populate.sql → database/populate.sql b/model (db)/populate.sql → database/populate.sql
diff --git a/model (db)/populate.ts → database/populate.ts b/model (db)/populate.ts → database/populate.ts
diff --git a/model (db)/query.ts → database/query.ts b/model (db)/query.ts → database/query.ts
@@ -1,4 +1,4 @@
-import Message from "../types/MessageInterface";
+import Message from "../types/MessageInterface.ts";
 import pool from "./pool.ts";
 
 async function getMessages(): Promise<Message[]> {

diff --git a/index.ts b/index.ts
@@ -8,7 +8,7 @@ dotenv.config();
 const app = express();
 const PORT = process.env.PORT;
 
-app.set("views", path.join(__dirname, "views"));
+app.set("views", path.join(import.meta.dirname, "views"));
 app.set("view engine", "ejs");
 app.use(express.static("public"));
 app.use(express.urlencoded({ extended: false }));

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "populate": "deno './model (db)/populate.ts'"
+    "populate": "deno './database/populate.ts'"
   },
   "keywords": [],
   "author": "Ariel Robert Mutebi",