Normalize how modules import and name each other

Also add a `defaultInterceptors` variable in `src/hero.mjs` to avoid
needing to redefine it in every application.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/db.mjs b/src/db.mjs
index d32df54..6bb2634 100644
--- a/src/db.mjs
+++ b/src/db.mjs
@@ -5,15 +5,15 @@ import url    from "node:url";
 
 import sqlite from "./sqlite.cjs";
 
-import { promisify }     from "./utils.mjs";
-import { runMigrations } from "./accretion.mjs";
+import * as u         from "./utils.mjs";
+import * as accretion from "./accretion.mjs";
 
 
 export const promisifyDb = dbHandle => ({
 	ref:  dbHandle,
-	all:  promisify((...args) =>  dbHandle.all(...args)),
-	exec: promisify((...args) => dbHandle.exec(...args)),
-	run:  promisify((...args) =>  dbHandle.run(...args)),
+	all:  u.promisify((...args) =>  dbHandle.all(...args)),
+	exec: u.promisify((...args) => dbHandle.exec(...args)),
+	run:  u.promisify((...args) =>  dbHandle.run(...args)),
 	each: (...args) =>
 		new Promise((resolve, reject) => {
 			const cb = args[args.length - 1];
@@ -27,8 +27,8 @@ export const promisifyDb = dbHandle => ({
 		new Promise((resolve, reject) => {
 			const mkStmt = stmtRef => ({
 				ref:      stmtRef,
-				run:      promisify((...args) =>      stmtRef.run(...args)),
-				finalize: promisify((...args) => stmtRef.finalize(...args)),
+				run:      u.promisify((...args) =>      stmtRef.run(...args)),
+				finalize: u.promisify((...args) => stmtRef.finalize(...args)),
 			});
 			const ref = dbHandle.prepare(
 				...args,
@@ -47,9 +47,9 @@ export const open = (...args) =>
 		));
 	});
 
-export let db = null;
+export let handle = null;
 
 export const init = async (dbName = process.env.PAPO_DB_PATH || ":memory:") => {
-	db = await open(dbName);
-	await runMigrations(db);
+	handle = await open(dbName);
+	await accretion.runMigrations(handle);
 };