joist-test-utils 2.0.3-next.9 → 2.1.0

package/build/seed.d.ts

@@ -1,9 +1,9 @@
 import "dotenv/config";
 import { Driver, EntityManager } from "joist-core";
-import { Knex } from "knex";
+import pg from "pg";
 export interface SeedConfig {
-    /** A factory function to create a Driver from a Knex instance. */
-    createDriver: (knex: Knex) => Driver;
+    /** A factory function to create a Driver from a pg Pool. */
+    createDriver: (pool: pg.Pool) => Driver;
 }
 /**
  * Allows easily seeding your local database with test data from the factories.
@@ -13,7 +13,6 @@ export interface SeedConfig {
  *
  * We currently make a lot of assumptions:
  *
- * - That the project is using knex (all Joist projects do atm)
  * - That the project is using postgres (all Joist projects do atm)
  * - That the project does not have a context, or at least does not require a context to seed
  *
@@ -24,7 +23,7 @@ export interface SeedConfig {
  * import { seed } from "joist-test-utils";
  * import { PostgresDriver } from "joist-orm";
  *
- * seed({ createDriver: (knex) => new PostgresDriver(knex) }, async (em) => {
+ * seed({ createDriver: (pool) => new PostgresDriver(pool) }, async (em) => {
  *   // seed your data here
  * });
  * ```

package/build/seed.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../src/seed.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAyB,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAsB,IAAI,EAAE,MAAM,MAAM,CAAC;AAEhD,MAAM,WAAW,UAAU;IACzB,kEAAkE;IAClE,YAAY,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,MAAM,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CA6BpH"}
+{"version":3,"file":"seed.d.ts","sourceRoot":"","sources":["../src/seed.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AACvB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAyB,MAAM,YAAY,CAAC;AAC1E,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,MAAM,WAAW,UAAU;IACzB,4DAA4D;IAC5D,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,IAAI,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CA0BpH"}

package/build/seed.js

@@ -1,9 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.seed = seed;
 require("dotenv/config");
 const joist_core_1 = require("joist-core");
-const knex_1 = require("knex");
+const pg_1 = __importDefault(require("pg"));
 /**
  * Allows easily seeding your local database with test data from the factories.
  *
@@ -12,7 +15,6 @@ const knex_1 = require("knex");
  *
  * We currently make a lot of assumptions:
  *
- * - That the project is using knex (all Joist projects do atm)
  * - That the project is using postgres (all Joist projects do atm)
  * - That the project does not have a context, or at least does not require a context to seed
  *
@@ -23,7 +25,7 @@ const knex_1 = require("knex");
  * import { seed } from "joist-test-utils";
  * import { PostgresDriver } from "joist-orm";
  *
- * seed({ createDriver: (knex) => new PostgresDriver(knex) }, async (em) => {
+ * seed({ createDriver: (pool) => new PostgresDriver(pool) }, async (em) => {
  *   // seed your data here
  * });
  * ```
@@ -33,13 +35,10 @@ function seed(config, fn) {
     if (env !== "local" && env !== "test") {
         throw new Error("seed will only run with NODE_ENV=local or NODE_ENV=test because it resets the database");
     }
-    // We make a lot of assumptions about the project is surely using
-    // knex & postgres, but at some point these will be configurable...
-    // Maybe we can detect it in the `DATABASE_URL` or what not.
-    const knex = (0, knex_1.knex)({ client: "pg", connection: (0, joist_core_1.newPgConnectionConfig)() });
+    const pool = new pg_1.default.Pool((0, joist_core_1.newPgConnectionConfig)());
     async function seed() {
-        await knex.select(knex.raw("flush_database()"));
-        const driver = config.createDriver(knex);
+        await pool.query("SELECT flush_database()");
+        const driver = config.createDriver(pool);
         const em = new joist_core_1.EntityManager({}, { driver });
         await fn(em);
         await em.flush();
@@ -47,11 +46,11 @@ function seed(config, fn) {
     seed()
         .then(async () => {
         console.log("Seeded!");
-        await knex.destroy();
+        await pool.end();
     })
         .catch(async (err) => {
         console.error(err);
-        await knex.destroy();
+        await pool.end();
         process.exit(1);
     });
 }

package/build/seed.js.map

@@ -1 +1 @@
-{"version":3,"file":"seed.js","sourceRoot":"","sources":["../src/seed.ts"],"names":[],"mappings":";;AAiCA,oBA6BC;AA9DD,yBAAuB;AACvB,2CAA0E;AAC1E,+BAAgD;AAOhD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,SAAgB,IAAI,CAA0C,MAAkB,EAAE,EAA4B;IAC5G,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACjC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;IAC5G,CAAC;IAED,iEAAiE;IACjE,mEAAmE;IACnE,4DAA4D;IAC5D,MAAM,IAAI,GAAG,IAAA,WAAU,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,IAAA,kCAAqB,GAAE,EAAE,CAAC,CAAC;IAE/E,KAAK,UAAU,IAAI;QACjB,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,EAAE,GAAG,IAAI,0BAAa,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAM,CAAC;QAClD,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QACb,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,EAAE;SACH,IAAI,CAAC,KAAK,IAAI,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACrB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"seed.js","sourceRoot":"","sources":["../src/seed.ts"],"names":[],"mappings":";;;;;AAgCA,oBA0BC;AA1DD,yBAAuB;AACvB,2CAA0E;AAC1E,4CAAoB;AAOpB;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,SAAgB,IAAI,CAA0C,MAAkB,EAAE,EAA4B;IAC5G,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;IACjC,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QACtC,MAAM,IAAI,KAAK,CAAC,wFAAwF,CAAC,CAAC;IAC5G,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,YAAE,CAAC,IAAI,CAAC,IAAA,kCAAqB,GAAE,CAAC,CAAC;IAElD,KAAK,UAAU,IAAI;QACjB,MAAM,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACzC,MAAM,EAAE,GAAG,IAAI,0BAAa,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAM,CAAC;QAClD,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QACb,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;IACnB,CAAC;IAED,IAAI,EAAE;SACH,IAAI,CAAC,KAAK,IAAI,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACvB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;IACnB,CAAC,CAAC;SACD,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACnB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "joist-test-utils",
-  "version": "2.0.3-next.9",
+  "version": "2.1.0",
   "license": "MIT",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -11,9 +11,9 @@
     "build"
   ],
   "peerDependencies": {
-    "joist-core": "2.0.3-next.9",
-    "joist-utils": "2.0.3-next.9",
-    "knex": "^3.1.0"
+    "joist-core": "2.1.0",
+    "joist-utils": "2.1.0",
+    "pg": "^8.16.3"
   },
   "devDependencies": {
     "@swc/core": "^1.13.20",