fix: use Queryable interface instead of Pool for pgsql-test compatibility

- ModuleConfigLoader accepts any object with query() method
- Works with both pg.Pool (production) and PgTestClient (testing)
- Fix seed adapters to use ctx.pg instead of ctx.pool
- Make pg an optional peer dependency

Author: pyramation

packages/module-loader/__tests__/module-loader.test.ts

@@ -14,7 +14,7 @@ import {
  */
 const metaSchemaSeed: SeedAdapter = {
   async seed(ctx) {
-    const { pool } = ctx;
+    const pool = ctx.pg;
 
     await pool.query(`
       CREATE SCHEMA IF NOT EXISTS metaschema_public;
@@ -111,7 +111,7 @@ const metaSchemaSeed: SeedAdapter = {
  */
 const testDataSeed: SeedAdapter = {
   async seed(ctx) {
-    const { pool } = ctx;
+    const pool = ctx.pg;
 
     // Create a test database entry
     await pool.query(`
@@ -198,7 +198,7 @@ describe('ModuleLoader', () => {
   let loader: ModuleLoader;
 
   beforeEach(() => {
-    loader = new ModuleLoader({ pool: pg.pool, ttlMs: 0 });
+    loader = new ModuleLoader({ pool: pg, ttlMs: 0 });
   });
 
   describe('function module', () => {
@@ -303,7 +303,7 @@ describe('ModuleLoader', () => {
 
   describe('caching', () => {
     it('caches results within TTL', async () => {
-      const loaderWithTtl = new ModuleLoader({ pool: pg.pool, ttlMs: 60_000 });
+      const loaderWithTtl = new ModuleLoader({ pool: pg, ttlMs: 60_000 });
 
       const first = await loaderWithTtl.function.loadAll(TEST_DB_ID);
       const second = await loaderWithTtl.function.loadAll(TEST_DB_ID);
@@ -317,7 +317,7 @@ describe('ModuleLoader', () => {
     });
 
     it('invalidate clears cache for specific database', async () => {
-      const loaderWithTtl = new ModuleLoader({ pool: pg.pool, ttlMs: 60_000 });
+      const loaderWithTtl = new ModuleLoader({ pool: pg, ttlMs: 60_000 });
 
       const first = await loaderWithTtl.function.loadAll(TEST_DB_ID);
       loaderWithTtl.function.invalidate(TEST_DB_ID);
@@ -326,7 +326,7 @@ describe('ModuleLoader', () => {
     });
 
     it('facade invalidate clears all sub-loader caches', async () => {
-      const loaderWithTtl = new ModuleLoader({ pool: pg.pool, ttlMs: 60_000 });
+      const loaderWithTtl = new ModuleLoader({ pool: pg, ttlMs: 60_000 });
 
       await loaderWithTtl.function.loadAll(TEST_DB_ID);
       await loaderWithTtl.namespace.loadAll(TEST_DB_ID);

packages/module-loader/package.json

@@ -20,8 +20,12 @@
     "lint": "eslint . --fix",
     "test": "jest"
   },
-  "dependencies": {
-    "pg": "^8.13.0"
+  "dependencies": {},
+  "peerDependencies": {
+    "pg": ">=8.0.0"
+  },
+  "peerDependenciesMeta": {
+    "pg": { "optional": true }
   },
   "devDependencies": {
     "@types/node": "^22.10.4",

packages/module-loader/src/generic-loader.ts

@@ -1,4 +1,7 @@
-import type { Pool } from 'pg';
+/** Minimal query interface compatible with both pg.Pool and pg.Client. */
+export interface Queryable {
+  query(text: string, values?: unknown[]): Promise<{ rows: Record<string, unknown>[] }>;
+}
 
 export interface ScopedModuleConfig {
   scope: string;
@@ -37,20 +40,20 @@ interface CacheEntry<T> {
  */
 export class ModuleConfigLoader<T extends ScopedModuleConfig> {
   private cache = new Map<string, CacheEntry<T>>();
-  private pool: Pool;
+  private queryable: Queryable;
   private sql: string;
   private moduleName: string;
   private mapper: (row: Record<string, unknown>) => T;
   private ttlMs: number;
 
   constructor(opts: {
-    pool: Pool;
+    pool: Queryable;
     sql: string;
     moduleName: string;
     mapper: (row: Record<string, unknown>) => T;
     ttlMs?: number;
   }) {
-    this.pool = opts.pool;
+    this.queryable = opts.pool;
     this.sql = opts.sql;
     this.moduleName = opts.moduleName;
     this.mapper = opts.mapper;
@@ -66,7 +69,7 @@ export class ModuleConfigLoader<T extends ScopedModuleConfig> {
       return cached.data;
     }
 
-    const { rows } = await this.pool.query(this.sql, [databaseId]);
+    const { rows } = await this.queryable.query(this.sql, [databaseId]);
     const configs = rows.map(this.mapper);
     this.cache.set(databaseId, { data: configs, expiresAt: Date.now() + this.ttlMs });
     return configs;

packages/module-loader/src/index.ts

@@ -1,5 +1,5 @@
-export type { ScopedModuleConfig } from './generic-loader';
-export { AmbiguousScopeError,ModuleConfigLoader, ModuleNotProvisionedError } from './generic-loader';
+export type { Queryable, ScopedModuleConfig } from './generic-loader';
+export { AmbiguousScopeError, ModuleConfigLoader, ModuleNotProvisionedError } from './generic-loader';
 export type {
   FunctionModuleConfig,
   InvocationModuleConfig,

packages/module-loader/src/loaders.ts

@@ -1,5 +1,4 @@
-import type { Pool } from 'pg';
-
+import type { Queryable } from './generic-loader';
 import { ModuleConfigLoader } from './generic-loader';
 
 // ─── Config Types ────────────────────────────────────────────────────────────
@@ -108,7 +107,7 @@ const INVOCATION_MODULE_SQL = `
 
 // ─── Loader Factories ────────────────────────────────────────────────────────
 
-export function createFunctionLoader(pool: Pool, ttlMs?: number) {
+export function createFunctionLoader(pool: Queryable, ttlMs?: number) {
   return new ModuleConfigLoader<FunctionModuleConfig>({
     pool,
     sql: FUNCTION_MODULE_SQL,
@@ -124,7 +123,7 @@ export function createFunctionLoader(pool: Pool, ttlMs?: number) {
   });
 }
 
-export function createNamespaceLoader(pool: Pool, ttlMs?: number) {
+export function createNamespaceLoader(pool: Queryable, ttlMs?: number) {
   return new ModuleConfigLoader<NamespaceModuleConfig>({
     pool,
     sql: NAMESPACE_MODULE_SQL,
@@ -140,7 +139,7 @@ export function createNamespaceLoader(pool: Pool, ttlMs?: number) {
   });
 }
 
-export function createSecretsLoader(pool: Pool, ttlMs?: number) {
+export function createSecretsLoader(pool: Queryable, ttlMs?: number) {
   return new ModuleConfigLoader<SecretsModuleConfig>({
     pool,
     sql: SECRETS_MODULE_SQL,
@@ -155,7 +154,7 @@ export function createSecretsLoader(pool: Pool, ttlMs?: number) {
   });
 }
 
-export function createStorageLoader(pool: Pool, ttlMs?: number) {
+export function createStorageLoader(pool: Queryable, ttlMs?: number) {
   return new ModuleConfigLoader<StorageModuleConfig>({
     pool,
     sql: STORAGE_MODULE_SQL,
@@ -171,7 +170,7 @@ export function createStorageLoader(pool: Pool, ttlMs?: number) {
   });
 }
 
-export function createInvocationLoader(pool: Pool, ttlMs?: number) {
+export function createInvocationLoader(pool: Queryable, ttlMs?: number) {
   return new ModuleConfigLoader<InvocationModuleConfig>({
     pool,
     sql: INVOCATION_MODULE_SQL,

packages/module-loader/src/module-loader.ts

@@ -1,6 +1,4 @@
-import type { Pool } from 'pg';
-
-import type { ModuleConfigLoader } from './generic-loader';
+import type { ModuleConfigLoader, Queryable } from './generic-loader';
 import type {
   FunctionModuleConfig,
   InvocationModuleConfig,
@@ -17,7 +15,7 @@ import {
 } from './loaders';
 
 export interface ModuleLoaderOptions {
-  pool: Pool;
+  pool: Queryable;
   ttlMs?: number;
 }