@geekmidas/testkit 0.0.12 → 0.0.13

package/dist/{helpers-BEmjyUVE.mjs → helpers-B4TXg3Wp.mjs}

@@ -24,23 +24,6 @@ function createKnexDb() {
 	});
 }
 /**
-* Test setup helper for Knex/Objection that creates tables within a transaction
-*/
-async function setupKnexTest() {
-	const db = createKnexDb();
-	const trx = await db.transaction();
-	await createTestTablesKnex(trx);
-	const cleanup = async () => {
-		await trx.rollback();
-		await db.destroy();
-	};
-	return {
-		db,
-		trx,
-		cleanup
-	};
-}
-/**
 * Creates test tables using Kysely
 */
 async function createTestTables(db) {
@@ -52,29 +35,21 @@ async function createTestTables(db) {
 * Creates test tables using Knex
 */
 async function createTestTablesKnex(trx) {
-	await trx.schema.createTable("users", (table) => {
-		table.bigIncrements("id").primary();
+	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();
 	});
-	await trx.schema.createTable("posts", (table) => {
-		table.bigIncrements("id").primary();
+	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").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();
+		table.uuid("user_id").notNullable().references("id").inTable("users").onDelete("cascade");
 	});
-	await trx.schema.createTable("comments", (table) => {
-		table.bigIncrements("id").primary();
+	await trx.schema.createTableIfNotExists("comments", (table) => {
+		table.uuid("id").primary().defaultTo(trx.raw("uuid_generate_v4()"));
 		table.text("content").notNullable();
-		table.bigInteger("post_id").notNullable().references("id").inTable("posts").onDelete("cascade");
-		table.bigInteger("user_id").notNullable().references("id").inTable("users").onDelete("cascade");
-		table.timestamp("created_at").defaultTo(trx.fn.now()).notNullable();
+		table.uuid("post_id").notNullable().references("id").inTable("posts").onDelete("cascade");
+		table.uuid("user_id").notNullable().references("id").inTable("users").onDelete("cascade");
 	});
 }
 /**
@@ -108,4 +83,4 @@ async function createTestDatabase(dbName) {
 }
 
 //#endregion
-export { TEST_DATABASE_CONFIG, createKnexDb, createTestDatabase, createTestTables, createTestTablesKnex, setupKnexTest };
+export { TEST_DATABASE_CONFIG, createKnexDb, createTestDatabase, createTestTables, createTestTablesKnex };

package/dist/{helpers-CNMBePuj.cjs → helpers-Bf0nXhbu.cjs}

@@ -25,23 +25,6 @@ function createKnexDb() {
 	});
 }
 /**
-* Test setup helper for Knex/Objection that creates tables within a transaction
-*/
-async function setupKnexTest() {
-	const db = createKnexDb();
-	const trx = await db.transaction();
-	await createTestTablesKnex(trx);
-	const cleanup = async () => {
-		await trx.rollback();
-		await db.destroy();
-	};
-	return {
-		db,
-		trx,
-		cleanup
-	};
-}
-/**
 * Creates test tables using Kysely
 */
 async function createTestTables(db) {
@@ -53,29 +36,21 @@ async function createTestTables(db) {
 * Creates test tables using Knex
 */
 async function createTestTablesKnex(trx) {
-	await trx.schema.createTable("users", (table) => {
-		table.bigIncrements("id").primary();
+	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();
 	});
-	await trx.schema.createTable("posts", (table) => {
-		table.bigIncrements("id").primary();
+	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").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();
+		table.uuid("user_id").notNullable().references("id").inTable("users").onDelete("cascade");
 	});
-	await trx.schema.createTable("comments", (table) => {
-		table.bigIncrements("id").primary();
+	await trx.schema.createTableIfNotExists("comments", (table) => {
+		table.uuid("id").primary().defaultTo(trx.raw("uuid_generate_v4()"));
 		table.text("content").notNullable();
-		table.bigInteger("post_id").notNullable().references("id").inTable("posts").onDelete("cascade");
-		table.bigInteger("user_id").notNullable().references("id").inTable("users").onDelete("cascade");
-		table.timestamp("created_at").defaultTo(trx.fn.now()).notNullable();
+		table.uuid("post_id").notNullable().references("id").inTable("posts").onDelete("cascade");
+		table.uuid("user_id").notNullable().references("id").inTable("users").onDelete("cascade");
 	});
 }
 /**
@@ -138,10 +113,4 @@ Object.defineProperty(exports, 'createTestTablesKnex', {
   get: function () {
     return createTestTablesKnex;
   }
-});
-Object.defineProperty(exports, 'setupKnexTest', {
-  enumerable: true,
-  get: function () {
-    return setupKnexTest;
-  }
 });

package/dist/kysely.cjs

@@ -1,6 +1,6 @@
 require('./Factory-WMhTNZ9S.cjs');
 require('./faker-B14IEMIN.cjs');
-const require_KyselyFactory = require('./KyselyFactory-CXtfmMfK.cjs');
+const require_KyselyFactory = require('./KyselyFactory-Cf0o2YxO.cjs');
 require('./PostgresMigrator-DFcNdCvD.cjs');
 const require_PostgresKyselyMigrator = require('./PostgresKyselyMigrator-CfytARcA.cjs');
 const require_VitestTransactionIsolator = require('./VitestTransactionIsolator-CruLTRRi.cjs');

package/dist/kysely.d.cts

@@ -1,6 +1,6 @@
-import "./faker-km9UhOS6.cjs";
-import "./Factory-Bm44VKa-.cjs";
-import { KyselyFactory } from "./KyselyFactory-BoPDDitt.cjs";
+import "./faker-BSH1EMtg.cjs";
+import "./Factory-pNV7ZQ7-.cjs";
+import { KyselyFactory } from "./KyselyFactory-DM2dnUXU.cjs";
 import "./PostgresMigrator-D5UkK1_K.cjs";
 import { PostgresKyselyMigrator } from "./PostgresKyselyMigrator-CQ3aUoy_.cjs";
 import { IsolationLevel } from "./VitestTransactionIsolator-DHf2MxmC.cjs";

package/dist/kysely.d.mts

@@ -1,6 +1,6 @@
-import "./faker-ChuHaYMR.mjs";
-import "./Factory-tjCDNgUK.mjs";
-import { KyselyFactory } from "./KyselyFactory-D82j74t9.mjs";
+import "./faker-C-Iuk_R1.mjs";
+import "./Factory-D7P3bKKb.mjs";
+import { KyselyFactory } from "./KyselyFactory-BrWADI77.mjs";
 import "./PostgresMigrator-BlvuQl7d.mjs";
 import { PostgresKyselyMigrator } from "./PostgresKyselyMigrator-_6yHZigp.mjs";
 import { IsolationLevel } from "./VitestTransactionIsolator-Xqyjlmw6.mjs";

package/dist/kysely.mjs

@@ -1,6 +1,6 @@
 import "./Factory-z2m01hMj.mjs";
 import "./faker-BGKYFoCT.mjs";
-import { KyselyFactory } from "./KyselyFactory-C3Bc3p4L.mjs";
+import { KyselyFactory } from "./KyselyFactory-BcYkC0t2.mjs";
 import "./PostgresMigrator-DxPC_gGu.mjs";
 import { PostgresKyselyMigrator } from "./PostgresKyselyMigrator-Bdhl251C.mjs";
 import { IsolationLevel } from "./VitestTransactionIsolator-BWwK-ca6.mjs";

package/dist/objection.cjs

@@ -1,6 +1,6 @@
 require('./Factory-WMhTNZ9S.cjs');
 require('./faker-B14IEMIN.cjs');
-const require_ObjectionFactory = require('./ObjectionFactory-DxIxJagq.cjs');
+const require_ObjectionFactory = require('./ObjectionFactory-CDriunkS.cjs');
 require('./PostgresMigrator-DFcNdCvD.cjs');
 const require_PostgresObjectionMigrator = require('./PostgresObjectionMigrator-BG6ymgnt.cjs');
 const require_VitestTransactionIsolator = require('./VitestTransactionIsolator-CruLTRRi.cjs');

package/dist/objection.d.cts

@@ -1,6 +1,6 @@
-import "./faker-km9UhOS6.cjs";
-import "./Factory-Bm44VKa-.cjs";
-import { ObjectionFactory } from "./ObjectionFactory-BWMTXsxH.cjs";
+import "./faker-BSH1EMtg.cjs";
+import "./Factory-pNV7ZQ7-.cjs";
+import { ObjectionFactory } from "./ObjectionFactory-D3l1VuyX.cjs";
 import "./PostgresMigrator-D5UkK1_K.cjs";
 import { PostgresObjectionMigrator } from "./PostgresObjectionMigrator-CZHHcCOv.cjs";
 import { IsolationLevel } from "./VitestTransactionIsolator-DHf2MxmC.cjs";

package/dist/objection.d.mts

@@ -1,6 +1,6 @@
-import "./faker-ChuHaYMR.mjs";
-import "./Factory-tjCDNgUK.mjs";
-import { ObjectionFactory } from "./ObjectionFactory-CEG5qUrm.mjs";
+import "./faker-C-Iuk_R1.mjs";
+import "./Factory-D7P3bKKb.mjs";
+import { ObjectionFactory } from "./ObjectionFactory-B40NQWSe.mjs";
 import "./PostgresMigrator-BlvuQl7d.mjs";
 import { PostgresObjectionMigrator } from "./PostgresObjectionMigrator-C69n7vzr.mjs";
 import { IsolationLevel } from "./VitestTransactionIsolator-Xqyjlmw6.mjs";

package/dist/objection.mjs

@@ -1,6 +1,6 @@
 import "./Factory-z2m01hMj.mjs";
 import "./faker-BGKYFoCT.mjs";
-import { ObjectionFactory } from "./ObjectionFactory-qIICOph3.mjs";
+import { ObjectionFactory } from "./ObjectionFactory-8hebmnai.mjs";
 import "./PostgresMigrator-DxPC_gGu.mjs";
 import { PostgresObjectionMigrator } from "./PostgresObjectionMigrator-G4h5FLvU.mjs";
 import { IsolationLevel } from "./VitestTransactionIsolator-BWwK-ca6.mjs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekmidas/testkit",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "private": false,
   "type": "module",
   "exports": {
@@ -37,6 +37,6 @@
     "objection": "~3.1.5",
     "db-errors": "~0.2.3",
     "vitest": "~3.2.4",
-    "@geekmidas/envkit": "0.0.5"
+    "@geekmidas/envkit": "0.0.6"
   }
 }

package/src/Factory.ts

@@ -71,7 +71,10 @@ export abstract class Factory<
     builderName: K,
     attrs?:
       | Parameters<Builders[K]>[0]
-      | ((idx: number, faker: FakerFactory) => Parameters<Builders[K]>[0]),
+      | ((
+          idx: number,
+          faker: FakerFactory,
+        ) => Promise<Parameters<Builders[K]>[0]>),
   ): Promise<Awaited<ReturnType<Builders[K]>>[]>;
 
   /**

package/src/KyselyFactory.ts

@@ -286,7 +286,10 @@ export class KyselyFactory<
   async insertMany<K extends keyof Builders>(
     count: number,
     builderName: K,
-    attrs: (idx: number, faker: FakerFactory) => Parameters<Builders[K]>[0],
+    attrs: (
+      idx: number,
+      faker: FakerFactory,
+    ) => Promise<Parameters<Builders[K]>[0]>,
   ): Promise<Awaited<ReturnType<Builders[K]>>[]>;
   async insertMany<K extends keyof Builders>(
     count: number,
@@ -304,7 +307,8 @@ export class KyselyFactory<
     const promises: Promise<any>[] = [];
 
     for (let i = 0; i < count; i++) {
-      const newAttrs = typeof attrs === 'function' ? attrs(i, faker) : attrs;
+      const newAttrs =
+        typeof attrs === 'function' ? await attrs(i, faker) : attrs;
       promises.push(this.insert(builderName, newAttrs));
     }
 

package/src/ObjectionFactory.ts

@@ -144,8 +144,17 @@ export class ObjectionFactory<
       // Handle insertion based on autoInsert flag
       if (autoInsert !== false) {
         // Auto insert is enabled by default
+        // Extract only defined values for insertion
+        const insertData = Object.entries(model).reduce((acc, [key, value]) => {
+          if (value !== undefined && key !== 'id') {
+            acc[key] = value;
+          }
+          return acc;
+        }, {} as any);
+        
+        // Use static query method to insert data directly
         // @ts-ignore
-        const result = await model.$query(db).insertGraph(model).execute();
+        const result = await ModelClass.query(db).insert(insertData);
         return result as Result;
       } else {
         // Return model for factory to handle insertion
@@ -221,7 +230,16 @@ export class ObjectionFactory<
 
     // If the builder returns a model instance, insert it
     if (result && typeof result.$query === 'function') {
-      return await result.$query(this.db).insertGraph(result).execute();
+      // Extract data from model, excluding undefined values and id
+      const insertData = Object.entries(result).reduce((acc, [key, value]) => {
+        if (value !== undefined && key !== 'id') {
+          acc[key] = value;
+        }
+        return acc;
+      }, {} as any);
+      
+      // Use the model's constructor to get the query builder
+      return await result.constructor.query(this.db).insert(insertData);
     }
 
     // Otherwise, assume the builder handled insertion itself
@@ -283,14 +301,23 @@ export class ObjectionFactory<
     const records: any[] = [];
     for (let i = 0; i < count; i++) {
       const newAttrs =
-        typeof attrs === 'function' ? (attrs as any)(i, faker) : attrs;
+        typeof attrs === 'function' ? await (attrs as any)(i, faker) : attrs;
 
       records.push(
         this.builders[builderName](newAttrs, this, this.db, faker).then(
           (record: any) => {
             // If the builder returns a model instance, insert it
             if (record && typeof record.$query === 'function') {
-              return record.$query(this.db).insertGraph(record).execute();
+              // Extract data from model, excluding undefined values and id
+              const insertData = Object.entries(record).reduce((acc, [key, value]) => {
+                if (value !== undefined && key !== 'id') {
+                  acc[key] = value;
+                }
+                return acc;
+              }, {} as any);
+              
+              // Use the model's constructor to get the query builder
+              return record.constructor.query(this.db).insert(insertData);
             }
             // Otherwise, assume the builder handled insertion itself
             return record;