@geekmidas/testkit 0.0.12 → 0.0.14

package/src/__tests__/VitestObjectionTransactionIsolator.spec.ts

@@ -12,8 +12,6 @@ class User extends Model {
 
   id!: number;
   name!: string;
-  email!: string;
-  role?: string;
   createdAt!: Date;
   updatedAt?: Date;
 
@@ -108,13 +106,9 @@ class Comment extends Model {
 }
 
 // Create database connection
-const knex = createKnexDb();
-
-// Bind models to Knex instance
-Model.knex(knex);
 
 // Create wrapped test with transaction isolation
-const it = wrapVitestObjectionTransaction(base, knex, async (trx) => {
+const it = wrapVitestObjectionTransaction(base, createKnexDb, async (trx) => {
   // Create tables in the transaction
   await createTestTablesKnex(trx);
 });
@@ -125,8 +119,6 @@ describe('VitestObjectionTransactionIsolator', () => {
       // Create a user within the transaction
       const user = await User.query(trx).insert({
         name: 'Test User',
-        email: 'test@example.com',
-        role: 'user',
       });
 
       expect(user).toBeDefined();
@@ -136,7 +128,6 @@ describe('VitestObjectionTransactionIsolator', () => {
       // Verify user exists in transaction
       const foundUser = await User.query(trx).findById(user.id);
       expect(foundUser).toBeDefined();
-      expect(foundUser?.email).toBe(user.email);
 
       // Data will be rolled back after this test
     });

package/src/__tests__/integration.spec.ts

@@ -5,7 +5,7 @@ import { KyselyFactory } from '../KyselyFactory';
 import { createKyselyDb } from '../helpers';
 import { wrapVitestKyselyTransaction } from '../kysely';
 
-const db = createKyselyDb<TestDatabase>(TEST_DATABASE_CONFIG);
+const db = () => createKyselyDb<TestDatabase>(TEST_DATABASE_CONFIG);
 const it = wrapVitestKyselyTransaction<TestDatabase>(
   base,
   db,

package/src/kysely.ts

@@ -1,7 +1,10 @@
 import type { Kysely, Transaction } from 'kysely';
 import type { TestAPI } from 'vitest';
 import { VitestKyselyTransactionIsolator } from './VitestKyselyTransactionIsolator';
-import { IsolationLevel } from './VitestTransactionIsolator';
+import {
+  type DatabaseConnection,
+  IsolationLevel,
+} from './VitestTransactionIsolator';
 
 /**
  * Kysely-specific exports for test utilities.
@@ -71,11 +74,11 @@ export { IsolationLevel } from './VitestTransactionIsolator';
  */
 export function wrapVitestKyselyTransaction<Database>(
   api: TestAPI,
-  db: Kysely<Database>,
+  connection: DatabaseConnection<Kysely<Database>>,
   setup?: (trx: Transaction<Database>) => Promise<void>,
   level: IsolationLevel = IsolationLevel.REPEATABLE_READ,
 ) {
   const wrapper = new VitestKyselyTransactionIsolator<Database>(api);
 
-  return wrapper.wrapVitestWithTransaction(db, setup, level);
+  return wrapper.wrapVitestWithTransaction(connection, setup, level);
 }

package/src/objection.ts

@@ -1,7 +1,10 @@
 import type { Knex } from 'knex';
 import type { TestAPI } from 'vitest';
 import { VitestObjectionTransactionIsolator } from './VitestObjectionTransactionIsolator';
-import { IsolationLevel } from './VitestTransactionIsolator';
+import {
+  type DatabaseConnection,
+  IsolationLevel,
+} from './VitestTransactionIsolator';
 
 /**
  * Objection.js-specific exports for test utilities.
@@ -20,7 +23,7 @@ export { PostgresObjectionMigrator } from './PostgresObjectionMigrator';
  * This ensures tests don't affect each other's data and run faster than truncating tables.
  *
  * @param api - The Vitest test API (usually `test` from vitest)
- * @param knex - The Knex database connection instance
+ * @param conn - The Knex database connection instance
  * @param setup - Optional setup function to run before each test in the transaction
  * @param level - Transaction isolation level (defaults to REPEATABLE_READ)
  * @returns A wrapped test API that provides transaction isolation
@@ -87,11 +90,11 @@ export { PostgresObjectionMigrator } from './PostgresObjectionMigrator';
  */
 export function wrapVitestObjectionTransaction(
   api: TestAPI,
-  knex: Knex,
+  conn: DatabaseConnection<Knex>,
   setup?: (trx: Knex.Transaction) => Promise<void>,
   level: IsolationLevel = IsolationLevel.REPEATABLE_READ,
 ) {
   const wrapper = new VitestObjectionTransactionIsolator(api);
 
-  return wrapper.wrapVitestWithTransaction(knex, setup, level);
+  return wrapper.wrapVitestWithTransaction(conn, setup, level);
 }

package/test/helpers.ts

@@ -165,49 +165,41 @@ export async function createTestTables(
 export async function createTestTablesKnex(
   trx: Knex.Transaction,
 ): Promise<void> {
-  // Create users table
-  await trx.schema.createTable('users', (table) => {
-    table.bigIncrements('id').primary();
+  // Create simple users table for testing factory
+  await trx.raw(`CREATE EXTENSION IF NOT EXISTS "uuid-ossp"`);
+  await trx.schema.createTableIfNotExists('users', (table) => {
+    table.uuid('id').primary().defaultTo(trx.raw('uuid_generate_v4()'));
     table.string('name').notNullable();
-    table.string('email').notNullable().unique();
-    table.string('role').defaultTo('user');
-    table.timestamp('created_at').defaultTo(trx.fn.now()).notNullable();
-    table.timestamp('updated_at').defaultTo(trx.fn.now()).notNullable();
   });
 
-  // Create posts table
-  await trx.schema.createTable('posts', (table) => {
-    table.bigIncrements('id').primary();
+  // Create simple posts table for testing factory
+  await trx.schema.createTableIfNotExists('posts', (table) => {
+    table.uuid('id').primary().defaultTo(trx.raw('uuid_generate_v4()'));
     table.string('title').notNullable();
-    table.text('content').notNullable();
     table
-      .bigInteger('user_id')
+      .uuid('user_id')
       .notNullable()
       .references('id')
       .inTable('users')
       .onDelete('cascade');
-    table.boolean('published').defaultTo(false);
-    table.timestamp('created_at').defaultTo(trx.fn.now()).notNullable();
-    table.timestamp('updated_at').defaultTo(trx.fn.now()).notNullable();
   });
 
-  // Create comments table
-  await trx.schema.createTable('comments', (table) => {
-    table.bigIncrements('id').primary();
+  // Create simple comments table for testing factory
+  await trx.schema.createTableIfNotExists('comments', (table) => {
+    table.uuid('id').primary().defaultTo(trx.raw('uuid_generate_v4()'));
     table.text('content').notNullable();
     table
-      .bigInteger('post_id')
+      .uuid('post_id')
       .notNullable()
       .references('id')
       .inTable('posts')
       .onDelete('cascade');
     table
-      .bigInteger('user_id')
+      .uuid('user_id')
       .notNullable()
       .references('id')
       .inTable('users')
       .onDelete('cascade');
-    table.timestamp('created_at').defaultTo(trx.fn.now()).notNullable();
   });
 }
 

package/dist/example.cjs

@@ -1,22 +0,0 @@
-require('./Factory-WMhTNZ9S.cjs');
-require('./faker-B14IEMIN.cjs');
-const require_KyselyFactory = require('./KyselyFactory-CXtfmMfK.cjs');
-
-//#region src/example.ts
-const userBuilder = require_KyselyFactory.KyselyFactory.createBuilder({
-	table: "users",
-	defaults: async (attrs) => ({
-		name: "John Doe",
-		email: `user${Date.now()}@example.com`,
-		createdAt: /* @__PURE__ */ new Date()
-	})
-});
-const builders = { user: userBuilder };
-const factory = new require_KyselyFactory.KyselyFactory(builders, {}, {});
-factory.insert("user", {
-	name: "Jane Doe",
-	email: `user${Date.now()}@example.com`,
-	createdAt: /* @__PURE__ */ new Date()
-});
-
-//#endregion

package/dist/example.d.cts

@@ -1,26 +0,0 @@
-import { FakerFactory } from "./faker-km9UhOS6.cjs";
-import * as kysely0 from "kysely";
-
-//#region src/example.d.ts
-interface Database {
-  users: {
-    id: number;
-    name: string;
-    email: string;
-    createdAt: Date;
-  };
-  posts: {
-    id: number;
-    title: string;
-    content: string;
-    userId: number;
-    createdAt: Date;
-  };
-}
-declare const builders: {
-  user: (attrs: Partial<kysely0.Insertable<DB[TableName]>>, factory: any, db: kysely0.Kysely<Database>, faker: FakerFactory) => Promise<kysely0.Selectable<DB[TableName]>>;
-};
-type Builders = typeof builders;
-type Seeds = Record<string, any>;
-//#endregion
-export { Builders, Seeds };

package/dist/example.d.mts

@@ -1,26 +0,0 @@
-import { FakerFactory } from "./faker-ChuHaYMR.mjs";
-import * as kysely0 from "kysely";
-
-//#region src/example.d.ts
-interface Database {
-  users: {
-    id: number;
-    name: string;
-    email: string;
-    createdAt: Date;
-  };
-  posts: {
-    id: number;
-    title: string;
-    content: string;
-    userId: number;
-    createdAt: Date;
-  };
-}
-declare const builders: {
-  user: (attrs: Partial<kysely0.Insertable<DB[TableName]>>, factory: any, db: kysely0.Kysely<Database>, faker: FakerFactory) => Promise<kysely0.Selectable<DB[TableName]>>;
-};
-type Builders = typeof builders;
-type Seeds = Record<string, any>;
-//#endregion
-export { Builders, Seeds };

package/dist/example.mjs

@@ -1,22 +0,0 @@
-import "./Factory-z2m01hMj.mjs";
-import "./faker-BGKYFoCT.mjs";
-import { KyselyFactory } from "./KyselyFactory-C3Bc3p4L.mjs";
-
-//#region src/example.ts
-const userBuilder = KyselyFactory.createBuilder({
-	table: "users",
-	defaults: async (attrs) => ({
-		name: "John Doe",
-		email: `user${Date.now()}@example.com`,
-		createdAt: /* @__PURE__ */ new Date()
-	})
-});
-const builders = { user: userBuilder };
-const factory = new KyselyFactory(builders, {}, {});
-factory.insert("user", {
-	name: "Jane Doe",
-	email: `user${Date.now()}@example.com`,
-	createdAt: /* @__PURE__ */ new Date()
-});
-
-//#endregion

package/src/example.ts

@@ -1,45 +0,0 @@
-import { KyselyFactory } from './KyselyFactory';
-
-interface Database {
-  users: {
-    id: number;
-    name: string;
-    email: string;
-    createdAt: Date;
-  };
-  posts: {
-    id: number;
-    title: string;
-    content: string;
-    userId: number;
-    createdAt: Date;
-  };
-}
-
-const userBuilder = KyselyFactory.createBuilder<Database, 'users'>({
-  table: 'users',
-  defaults: async (attrs) => ({
-    name: 'John Doe',
-    email: `user${Date.now()}@example.com`,
-    createdAt: new Date(),
-  }),
-});
-
-const builders = {
-  user: userBuilder,
-};
-
-export type Builders = typeof builders;
-export type Seeds = Record<string, any>;
-
-const factory = new KyselyFactory<Database, Builders, Seeds>(
-  builders,
-  {},
-  {} as any,
-);
-
-factory.insert('user', {
-  name: 'Jane Doe',
-  email: `user${Date.now()}@example.com`,
-  createdAt: new Date(),
-});