@voxpelli/pg-utils 1.2.0 → 2.1.0

package/lib/test-helpers.d.ts

@@ -4,12 +4,13 @@ export class PgTestHelpers {
     initTables(): Promise<void>;
     insertFixtures(): Promise<void>;
     removeTables(): Promise<void>;
+    end(): Promise<void>;
     #private;
 }
 export type PgTestHelpersOptions = {
     connectionString: string;
     fixtureFolder?: string | URL;
-    schema: string | URL | import("umzug").Umzug<import("umzeption").UmzeptionContext<"pg", import("umzeption").FastifyPostgresStyleDb>>;
+    schema: string | URL | (() => import("umzug").Umzug<import("umzeption").UmzeptionContext<"pg", import("umzeption").FastifyPostgresStyleDb>>);
     tablesWithDependencies?: Array<string[] | string>;
 };
 import type { Pool } from 'pg';

package/lib/test-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-helpers.d.ts","sourceRoot":"","sources":["test-helpers.js"],"names":[],"mappings":"AAoBA;IAaE,qBADY,oBAAoB,EAiC/B;IAnCD,cADW,IAAI,CAAC,OAAO,CAAC,CACX;IAoEb,cADc,OAAO,CAAC,IAAI,CAAC,CAiB1B;IAGD,kBADc,OAAO,CAAC,IAAI,CAAC,CAM1B;IAGD,gBADc,OAAO,CAAC,IAAI,CAAC,CAM1B;;CACF;;sBArHa,MAAM;oBACN,MAAM,GAAG,GAAG;YACZ,MAAM,GAAG,GAAG,GAAG,OAAO,OAAO,EAAE,KAAK,CAAC,OAAO,WAAW,EAAE,gBAAgB,CAAC,IAAI,EAAE,OAAO,WAAW,EAAE,sBAAsB,CAAC,CAAC;6BAC5H,KAAK,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC;;0BAPZ,IAAI"}
+{"version":3,"file":"test-helpers.d.ts","sourceRoot":"","sources":["test-helpers.js"],"names":[],"mappings":"AAoBA;IAaE,qBADY,oBAAoB,EAiC/B;IAnCD,cADW,IAAI,CAAC,OAAO,CAAC,CACX;IAoEb,cADc,OAAO,CAAC,IAAI,CAAC,CAiB1B;IAGD,kBADc,OAAO,CAAC,IAAI,CAAC,CAM1B;IAGD,gBADc,OAAO,CAAC,IAAI,CAAC,CAM1B;IAGD,OADc,OAAO,CAAC,IAAI,CAAC,CAG1B;;CACF;;sBA1Ha,MAAM;oBACN,MAAM,GAAG,GAAG;YACZ,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,OAAO,OAAO,EAAE,KAAK,CAAC,OAAO,WAAW,EAAE,gBAAgB,CAAC,IAAI,EAAE,OAAO,WAAW,EAAE,sBAAsB,CAAC,CAAC,CAAC;6BACpI,KAAK,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC;;0BAPZ,IAAI"}

package/lib/test-helpers.js

@@ -14,7 +14,7 @@ import { createPgPool, isStringArray, TypeNeverError } from './utils.js';
  * @typedef PgTestHelpersOptions
  * @property {string} connectionString
  * @property {string | URL} [fixtureFolder]
- * @property {string | URL | import('umzug').Umzug<import('umzeption').UmzeptionContext<'pg', import('umzeption').FastifyPostgresStyleDb>>} schema
+ * @property {string | URL | (() => import('umzug').Umzug<import('umzeption').UmzeptionContext<'pg', import('umzeption').FastifyPostgresStyleDb>>)} schema
  * @property {Array<string[] | string>} [tablesWithDependencies]
  */
 
@@ -49,8 +49,8 @@ export class PgTestHelpers {
     if (fixtureFolder && typeof fixtureFolder !== 'string' && !(fixtureFolder instanceof URL)) {
       throw new TypeNeverError(fixtureFolder, 'Invalid fixtureFolder, expected a string');
     }
-    if (typeof schema !== 'string' && typeof schema !== 'object') {
-      throw new TypeNeverError(schema, 'Invalid schema, expected a string or an object');
+    if (typeof schema !== 'string' && typeof schema !== 'object' && typeof schema !== 'function') {
+      throw new TypeNeverError(schema, 'Invalid schema, expected a string, object or function');
     }
     if (tablesWithDependencies && !Array.isArray(tablesWithDependencies)) {
       throw new TypeNeverError(tablesWithDependencies, 'Invalid tablesWithDependencies, expected an array');
@@ -88,8 +88,8 @@ export class PgTestHelpers {
           Array.isArray(name)
             ? this.#removeTablesByName(name)
             : this.queryPromise('DROP TABLE IF EXISTS ' + name + ' CASCADE').catch(cause => {
-              throw new Error(`Failed to drop table: ${name}`, { cause });
-            })
+                throw new Error(`Failed to drop table: ${name}`, { cause });
+              })
         );
       }
     }
@@ -98,8 +98,8 @@ export class PgTestHelpers {
   /** @returns {Promise<void>} */
   async initTables () {
     try {
-      if (typeof this.#schema === 'object' && 'up' in this.#schema) {
-        await this.#schema.up();
+      if (typeof this.#schema === 'function') {
+        await this.#schema().up();
         return;
       }
 
@@ -129,4 +129,9 @@ export class PgTestHelpers {
     }
     await this.#removeTablesByName(await this.#getTableNames());
   }
+
+  /** @returns {Promise<void>} */
+  async end () {
+    await this.#pool.end();
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxpelli/pg-utils",
-  "version": "1.2.0",
+  "version": "2.1.0",
   "description": " My personal database utils / helpers for Postgres",
   "homepage": "http://github.com/voxpelli/pg-utils",
   "repository": {
@@ -47,22 +47,22 @@
     "@types/chai": "^4.3.20",
     "@types/chai-as-promised": "^7.1.8",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^20.17.9",
+    "@types/node": "^20.17.17",
     "@types/pg-copy-streams": "^1.2.5",
     "@voxpelli/eslint-config": "^22.2.0",
-    "@voxpelli/tsconfig": "^15.1.0",
-    "c8": "^10.1.2",
+    "@voxpelli/tsconfig": "^15.1.1",
+    "c8": "^10.1.3",
     "chai": "^4.5.0",
     "chai-as-promised": "^7.1.2",
-    "dotenv": "^16.4.6",
-    "eslint": "^9.16.0",
+    "dotenv": "^16.4.7",
+    "eslint": "^9.19.0",
     "husky": "^9.1.7",
     "installed-check": "^9.3.0",
-    "knip": "^5.38.4",
-    "mocha": "^10.8.2",
-    "npm-run-all2": "^7.0.1",
+    "knip": "^5.43.6",
+    "mocha": "^11.1.0",
+    "npm-run-all2": "^7.0.2",
     "type-coverage": "^2.29.7",
-    "typescript": "~5.7.2",
+    "typescript": "~5.7.3",
     "validate-conventional-commit": "^1.0.4"
   },
   "dependencies": {