chore: update module references, fix SQL client release, and improve code formatting

kingRayhan · kingRayhan · commit f675eef17998 · 2025-04-17T08:07:28.000+06:00
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.npmrc b/.npmrc
@@ -0,0 +1 @@
+provenance=false
diff --git a/__tests__/repository/paginate.test.ts b/__tests__/repository/paginate.test.ts
@@ -60,7 +60,7 @@ describe("Repository Pagination", () => {
     expect(page.nodes).toHaveLength(5);
     for (let i = 1; i < page.nodes.length; i++) {
       expect(page.nodes[i].age).toBeGreaterThanOrEqual(
-        page?.nodes?.[i - 1].age ?? 0
+        page?.nodes?.[i - 1].age ?? 0,
       );
     }
   });
@@ -75,7 +75,7 @@ describe("Repository Pagination", () => {
     expect(page.nodes).toHaveLength(5);
     for (let i = 1; i < page.nodes.length; i++) {
       expect(page.nodes[i].age ?? 0).toBeLessThanOrEqual(
-        page.nodes[i - 1].age ?? 0
+        page.nodes[i - 1].age ?? 0,
       );
     }
   });
diff --git a/examples/index.ts b/examples/index.ts
@@ -0,0 +1 @@
+
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sqlkit",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A lightweight SQL builder for TypeScript",
   "license": "MIT",
   "author": {
@@ -12,17 +12,15 @@
     "url": "https://github.com/sqlkit-dev/sqlkit"
   },
   "type": "module",
-  "main": "dist/index.js",
+  "main": "dist/index.cjs",
   "types": "dist/index.d.ts",
   "module": "dist/index.mjs",
   "scripts": {
-    "build": "tsup src/index.ts --minify --sourcemap",
-    "dev": "tsup --watch",
+    "build": "pkgroll",
+    "tinker": "npx tsx watch src/tinker.ts",
     "test": "jest --runInBand",
-    "lint": "eslint src --ext .ts",
     "format": "prettier --write \"src/**/*.ts\"",
-    "docs": "npx typedoc src/index.ts",
-    "prepublishOnly": "npm run build"
+    "docs": "npx typedoc src/index.ts"
   },
   "keywords": [
     "sql",
@@ -37,8 +35,8 @@
     "@types/pg": "^8.11.12",
     "jest": "^29.7.0",
     "pg": "^8.14.1",
+    "pkgroll": "^2.12.1",
     "prettier": "^3.5.3",
-    "ts-jest": "^29.3.2",
-    "tsup": "^8.4.0"
+    "ts-jest": "^29.3.2"
   }
 }
diff --git a/src/dialects/postgres.ts b/src/dialects/postgres.ts
@@ -6,9 +6,15 @@ export class PostgresAdapter implements SqlExecutor {
   async executeSQL<T>(sql: string, values: any[]): Promise<QueryResult> {
     try {
       const result = await this.client.query(sql, values);
+      this.client.release();
       return { rows: result.rows as T[] };
     } catch (error) {
       throw new Error(`PostgreSQL error: ${(error as Error).message}`);
+    } finally {
+      // Ensure the client is released back to the pool
+      if (this.client.release) {
+        this.client.release();
+      }
     }
   }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -1,5 +1,7 @@
-export * from "./query-builder";
 export * from "./dialects";
-export * from "./types";
 export * from "./operators";
+export * from "./query-builder";
+export * from "./repository";
 export * from "./schema";
+export * from "./types";
+export * from "./utils";
diff --git a/src/operators/comparison.ts b/src/operators/comparison.ts
@@ -120,7 +120,7 @@ export function ilike<T>(key: keyof T, pattern: string): SimpleWhere<T> {
  */
 export function inArray<T, K extends keyof T>(
   key: K,
-  values: T[K][]
+  values: T[K][],
 ): SimpleWhere<T> {
   return {
     key,
@@ -137,7 +137,7 @@ export function inArray<T, K extends keyof T>(
  */
 export function notInArray<T, K extends keyof T>(
   key: K,
-  values: T[K][]
+  values: T[K][],
 ): SimpleWhere<T> {
   return {
     key,
@@ -182,7 +182,7 @@ export function isNotNull<T>(key: keyof T): SimpleWhere<T> {
 export function between<T, K extends keyof T>(
   key: K,
   min: T[K],
-  max: T[K]
+  max: T[K],
 ): SimpleWhere<T> {
   return {
     key,
diff --git a/src/query-builder/base.ts b/src/query-builder/base.ts
@@ -1,9 +1,9 @@
-import {QueryResult, SqlExecutor} from "../types";
+import { QueryResult, SqlExecutor } from "../types";
 
 export abstract class BaseQueryBuilder<T> {
   protected constructor(
     protected readonly tableName: string,
-    protected readonly executor: SqlExecutor
+    protected readonly executor: SqlExecutor,
   ) {}
 
   protected abstract build(): { sql: string; values: any[] };
diff --git a/src/query-builder/delete.ts b/src/query-builder/delete.ts
@@ -26,7 +26,7 @@ export class DeleteQueryBuilder<T> extends BaseQueryBuilder<T> {
   build(): { sql: string; values: any[] } {
     const { whereClause, values } = buildWhereClause(
       this.whereCondition,
-      this.tableName
+      this.tableName,
     );
 
     const returning = this.returningColumns.join(", ");
diff --git a/src/query-builder/update.ts b/src/query-builder/update.ts
@@ -29,13 +29,13 @@ export class UpdateQueryBuilder<T> extends BaseQueryBuilder<T> {
     // Build WHERE clause
     const { whereClause, values: whereValues } = buildWhereClause(
       this.payload.where,
-      this.tableName
+      this.tableName,
     );
 
     // Build SET clause using the where values as starting point
     const { setClause, values: allValues } = buildSetClause(
       this.payload.data,
-      whereValues
+      whereValues,
     );
 
     // Handle columns for RETURNING
diff --git a/src/repository/index.ts b/src/repository/index.ts
@@ -0,0 +1 @@
+export * from "./repository";
diff --git a/src/schema/column.ts b/src/schema/column.ts
@@ -1,15 +1,23 @@
-
 export class Column {
   private _nullable: boolean = true;
   private _primaryKey: boolean = false;
   private _generateUUID: boolean = false;
   private _unique: boolean = false;
   private _default?: any;
-  private _references?: { table: string; column: string; onDelete?: 'CASCADE' | 'SET NULL' | 'NO ACTION' | 'RESTRICT' | 'SET DEFAULT' };
+  private _references?: {
+    table: string;
+    column: string;
+    onDelete?:
+      | "CASCADE"
+      | "SET NULL"
+      | "NO ACTION"
+      | "RESTRICT"
+      | "SET DEFAULT";
+  };
 
   constructor(
-      public readonly name: string,
-      public readonly type: string
+    public readonly name: string,
+    public readonly type: string,
   ) {}
 
   notNull(): this {
@@ -43,10 +51,19 @@ export class Column {
     return this;
   }
 
-  references({table, column = "id", onDelete}: {
-    table: string,
-    column?: string,
-    onDelete?: "CASCADE" | "SET NULL" | "NO ACTION" | "RESTRICT" | "SET DEFAULT"
+  references({
+    table,
+    column = "id",
+    onDelete,
+  }: {
+    table: string;
+    column?: string;
+    onDelete?:
+      | "CASCADE"
+      | "SET NULL"
+      | "NO ACTION"
+      | "RESTRICT"
+      | "SET DEFAULT";
   }): this {
     this._references = { table, column, onDelete };
     return this;
@@ -82,7 +99,7 @@ export class Column {
     }
 
     if (this._references) {
-      definition += ` REFERENCES ${this._references.table}(${this._references.column}) ON DELETE ${this._references.onDelete ?? 'SET NULL'}`;
+      definition += ` REFERENCES ${this._references.table}(${this._references.column}) ON DELETE ${this._references.onDelete ?? "SET NULL"}`;
     }
 
     return definition;
diff --git a/src/schema/table.ts b/src/schema/table.ts
@@ -5,7 +5,7 @@ export class Table<T> {
 
   constructor(public readonly name: string) {}
 
-  column<K extends keyof T>(name: K, type: string): Column{
+  column<K extends keyof T>(name: K, type: string): Column {
     const column = new Column(name.toString(), type);
     this.columns.push(column);
     return column;
diff --git a/src/tinker.ts b/src/tinker.ts
@@ -1,7 +1,6 @@
 import { seedTestData } from "../test-setup";
 
 async function main() {
-  // await seedTestData();
-  console.log("Hello world");
+  await seedTestData();
 }
 main();
diff --git a/src/utils/clauses.ts b/src/utils/clauses.ts
@@ -6,7 +6,7 @@ import { toSnakeCase } from "./formatting";
  */
 export const buildWhereClause = <T>(
   where: WhereCondition<T> | undefined,
-  tableName: string
+  tableName: string,
 ): { whereClause: string; values: any[] } => {
   // If no where clause is provided, return empty
   if (!where) {
@@ -30,13 +30,13 @@ export const buildWhereClause = <T>(
 const processWhereCondition = <T>(
   where: WhereCondition<T>,
   values: any[],
-  tableName: string
+  tableName: string,
 ): string => {
   // Handle composite conditions (AND/OR)
   if (typeof where === "object") {
     if ("AND" in where && Array.isArray(where.AND) && where.AND.length > 0) {
       const conditions = where.AND.map((condition) =>
-        processWhereCondition(condition, values, tableName)
+        processWhereCondition(condition, values, tableName),
       ).filter(Boolean);
 
       if (conditions.length === 0) return "";
@@ -47,7 +47,7 @@ const processWhereCondition = <T>(
 
     if ("OR" in where && Array.isArray(where.OR) && where.OR.length > 0) {
       const conditions = where.OR.map((condition) =>
-        processWhereCondition(condition, values, tableName)
+        processWhereCondition(condition, values, tableName),
       ).filter(Boolean);
 
       if (conditions.length === 0) return "";
@@ -71,7 +71,7 @@ const processWhereCondition = <T>(
 const processSimpleCondition = <T>(
   condition: SimpleWhere<T>,
   values: any[],
-  tableName: string
+  tableName: string,
 ): string => {
   const { key, operator, value } = condition;
 
@@ -113,7 +113,10 @@ const processSimpleCondition = <T>(
 /**
  * Builds an ORDER BY clause for SQL queries
  */
-export const buildOrderByClause = <T>(orderBy?: Array<OrderBy<T>>, baseTableName?: string): string => {
+export const buildOrderByClause = <T>(
+  orderBy?: Array<OrderBy<T>>,
+  baseTableName?: string,
+): string => {
   if (!orderBy || orderBy.length === 0) {
     return ""; // No order by clause
   }
@@ -142,7 +145,7 @@ export const buildOrderByClause = <T>(orderBy?: Array<OrderBy<T>>, baseTableName
  */
 export const buildJoinClause = <T>(
   joins?: Array<Join<T, any>>,
-  baseTableName?: string
+  baseTableName?: string,
 ): { joinConditionClause: string; joinSelectClause: string[] } => {
   if (!joins || joins.length === 0) {
     return {
@@ -183,7 +186,7 @@ export const buildJoinClause = <T>(
  */
 export const buildSetClause = <T>(
   data: Partial<T>,
-  startValues: any[] = []
+  startValues: any[] = [],
 ): { setClause: string; values: any[] } => {
   if (!data || Object.keys(data).length === 0) {
     return { setClause: "", values: startValues };
diff --git a/src/utils/infer-model.ts b/src/utils/infer-model.ts
@@ -9,4 +9,4 @@
 //
 // export type InferTable<T extends Table<any>> = {
 //     [K in keyof T["columns"]]: InferColumnType<T["columns"][K]>;
-// };
+// };
diff --git a/test-setup.ts b/test-setup.ts
@@ -1,4 +1,4 @@
-import { Pool } from "pg";
+import * as pg from "pg";
 import { PostgresAdapter, Table } from "./src";
 import {
   integer,
@@ -9,6 +9,8 @@ import {
 } from "./src/types/column-type";
 import { faker } from "@faker-js/faker";
 
+const { Pool } = pg;
+
 // Test database configuration
 const TEST_DB_CONFIG = {
   host: process.env.TEST_DB_HOST || "localhost",
@@ -103,21 +105,21 @@ export async function seedTestData() {
         faker.internet.email(),
         faker.number.int({ min: 18, max: 99 }),
         faker.lorem.sentence(),
-      ]
+      ],
     );
   });
   await Promise.all(userInsertPromises);
 
   // Seed posts
   const userIds = (await pool.query(`SELECT id FROM users`)).rows.map(
-    (row) => row.id
+    (row) => row.id,
   );
   const postInsertPromises = userIds.flatMap((userId) => {
     const postCount = faker.number.int({ min: 5, max: 10 });
     return Array.from({ length: postCount }).map(() => {
       return pool.query(
         `INSERT INTO posts (title, content, author_id) VALUES ($1, $2, $3)`,
-        [faker.lorem.words(3), faker.lorem.paragraph(), userId]
+        [faker.lorem.words(3), faker.lorem.paragraph(), userId],
       );
     });
   });
@@ -133,18 +135,18 @@ export async function seedTestData() {
 
   // Seed post_tag_pivot
   const postIds = (await pool.query(`SELECT id FROM posts`)).rows.map(
-    (row) => row.id
+    (row) => row.id,
   );
   const tagIds = (await pool.query(`SELECT id FROM tags`)).rows.map(
-    (row) => row.id
+    (row) => row.id,
   );
   const pivotInsertPromises = postIds.flatMap((postId) => {
     const tagCount = faker.number.int({ min: 1, max: tagIds.length });
     const selectedTags = faker.helpers.arrayElements(tagIds, tagCount);
     return selectedTags.map((tagId) => {
       return pool.query(
         `INSERT INTO post_tag_pivot (post_id, tag_id) VALUES ($1, $2)`,
-        [postId, tagId]
+        [postId, tagId],
       );
     });
   });

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,15 @@ export class PostgresAdapter implements SqlExecutor {`
`6`	`6`	`async executeSQL<T>(sql: string, values: any[]): Promise<QueryResult> {`
`7`	`7`	`try {`
`8`	`8`	`const result = await this.client.query(sql, values);`
	`9`	`+ this.client.release();`
`9`	`10`	`return { rows: result.rows as T[] };`
`10`	`11`	`} catch (error) {`
`11`	`12`	throw new Error(`PostgreSQL error: ${(error as Error).message}`);
	`13`	`+ } finally {`
	`14`	`+ // Ensure the client is released back to the pool`
	`15`	`+ if (this.client.release) {`
	`16`	`+ this.client.release();`
	`17`	`+ }`
`12`	`18`	`}`
`13`	`19`	`}`
`14`	`20`	`}`