@dockstat/sqlite-wrapper 1.2.4 → 1.2.6

package/README.md

@@ -19,16 +19,29 @@ bun add @dockstat/sqlite-wrapper
 ```ts
 import { DB, column } from "@dockstat/sqlite-wrapper";
 
-const db = new DB("app.db", { pragmas: [["journal_mode","WAL"], ["foreign_keys","ON"]] });
+type User = {
+  id?: number,
+  name: string,
+  active: boolean,
+  email: string,
+}
 
-db.createTable("users", {
+const db = new DB("app.db", {
+  pragmas: [
+    ["journal_mode","WAL"],
+    ["foreign_keys","ON"]
+  ]
+});
+
+const userTable = db.createTable<User>("users", {
   id: column.id(),
   name: column.text({ notNull: true }),
+  active: column.boolean(),
   email: column.text({ unique: true, notNull: true }),
   created_at: column.createdAt()
 });
 
-const users = db.table("users")
+const users = userTable
   .select(["id","name","email"])
   .where({ active: true })
   .orderBy("created_at").desc()

package/index.ts

@@ -102,7 +102,7 @@ class DB {
     tableName: string,
     jsonConfig?: JsonColumnConfig<T>
   ): QueryBuilder<T> {
-    logger.debug(`Creating QueryBuilder for table: ${tableName}`)
+    logger.debug(`Creating QueryBuilder for table: ${tableName} - JSONConfig: ${JSON.stringify(jsonConfig)}`)
     return new QueryBuilder<T>(this.db, tableName, jsonConfig)
   }
 
@@ -209,8 +209,8 @@ class DB {
    */
   createTable<_T extends Record<string, unknown>>(
     tableName: string,
-    columns: string | Record<string, string> | TableSchema,
-    options?: TableOptions
+    columns: string | Record<string, string> | Partial<Record<Extract<keyof _T, string>, ColumnDefinition>> | TableSchema,
+    options?: TableOptions<_T>,
   ): QueryBuilder<_T> {
     const temp = options?.temporary ? 'TEMPORARY ' : ''
     const ifNot = options?.ifNotExists ? 'IF NOT EXISTS ' : ''
@@ -277,7 +277,7 @@ class DB {
       this.setTableComment(tableName, options.comment)
     }
 
-    return this.table<_T>(tableName)
+    return this.table<_T>(tableName, options?.jsonConfig)
   }
 
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dockstat/sqlite-wrapper",
-  "version": "1.2.4",
+  "version": "1.2.6",
   "description": "A TypeScript wrapper around bun:sqlite with type-safe query building",
   "type": "module",
   "main": "./index.ts",

package/query-builder/base.ts

@@ -34,24 +34,24 @@ export abstract class BaseQueryBuilder<T extends Record<string, unknown>> {
       whereConditions: [],
       whereParams: [],
       regexConditions: [],
-      jsonColumns: jsonConfig?.jsonColumns,
+      jsonColumns: jsonConfig,
     }
   }
 
   /**
     * Reset query builder state
     */
-    protected reset(): void {
-      this.state.whereConditions = []
-      this.state.whereParams = []
-      this.state.regexConditions = []
-      // Reset any ordering, limit, offset, selected columns if present
-      if ('orderColumn' in this) (this as any).orderColumn = undefined
-      if ('orderDirection' in this) (this as any).orderDirection = 'ASC'
-      if ('limitValue' in this) (this as any).limitValue = undefined
-      if ('offsetValue' in this) (this as any).offsetValue = undefined
-      if ('selectedColumns' in this) (this as any).selectedColumns = ['*']
-    }
+  protected reset(): void {
+    this.state.whereConditions = []
+    this.state.whereParams = []
+    this.state.regexConditions = []
+    // Reset any ordering, limit, offset, selected columns if present
+    if ('orderColumn' in this) (this as any).orderColumn = undefined
+    if ('orderDirection' in this) (this as any).orderDirection = 'ASC'
+    if ('limitValue' in this) (this as any).limitValue = undefined
+    if ('offsetValue' in this) (this as any).offsetValue = undefined
+    if ('selectedColumns' in this) (this as any).selectedColumns = ['*']
+  }
 
   /**
    * Get the database instance
@@ -197,11 +197,16 @@ export abstract class BaseQueryBuilder<T extends Record<string, unknown>> {
    * Transform row data before inserting/updating to database (serialize JSON columns).
    */
   protected transformRowToDb(row: Partial<T>): DatabaseRowData {
-    if (!this.state.jsonColumns || !row) return row as DatabaseRowData
+    this.logger.debug(`Transforming row (${JSON.stringify(row)}) to row Data`)
+    if (!this.state.jsonColumns || !row) {
+      return row as DatabaseRowData
+    }
 
     const transformed: DatabaseRowData = { ...row } as DatabaseRowData
+
     for (const column of this.state.jsonColumns) {
       const columnKey = String(column)
+      this.logger.debug(`Checking: ${columnKey}`)
       if (
         transformed[columnKey] !== undefined &&
         transformed[columnKey] !== null

package/query-builder/insert.ts

@@ -9,6 +9,7 @@ import { WhereQueryBuilder } from "./where";
 export class InsertQueryBuilder<
   T extends Record<string, unknown>,
 > extends WhereQueryBuilder<T> {
+
   /**
    * Insert a single row or multiple rows into the table.
    *
@@ -20,11 +21,16 @@ export class InsertQueryBuilder<
     data: Partial<T> | Partial<T>[],
     options?: InsertOptions,
   ): InsertResult {
+    this.getLogger().debug(`Building Data Array: ${data}`)
     const rows = Array.isArray(data) ? data : [data];
 
+
+
     // Transform rows to handle JSON serialization
     const transformedRows = rows.map((row) => this.transformRowToDb(row));
 
+    this.getLogger().debug(`Transformed row: ${JSON.stringify(transformedRows)}`)
+
     if (transformedRows.length === 0) {
       throw new Error("insert: data cannot be empty");
     }

package/types.ts

@@ -1,4 +1,3 @@
-// Enhanced types.ts with comprehensive SQLite support
 import type { Database, SQLQueryBindings } from "bun:sqlite";
 
 /**
@@ -223,6 +222,9 @@ export interface ColumnDefinition extends ColumnConstraints {
  */
 export type TableSchema = Record<string, ColumnDefinition>;
 
+
+export type TypedTableSchema<T extends string = string> = Record<T, ColumnDefinition>;
+
 /**
  * Table constraint types
  */
@@ -248,7 +250,7 @@ export interface TableConstraints {
 /**
  * Enhanced table options
  */
-export interface TableOptions {
+export interface TableOptions<T> {
   /** Add IF NOT EXISTS clause */
   ifNotExists?: boolean;
   /** Create WITHOUT ROWID table */
@@ -259,6 +261,8 @@ export interface TableOptions {
   temporary?: boolean;
   /** Table comment */
   comment?: string;
+
+  jsonConfig?: JsonColumnConfig<T>
 }
 
 /**
@@ -372,7 +376,7 @@ export const column = {
    * Create a JSON column (stored as TEXT)
    */
   json: (
-    constraints?: ColumnConstraints & { validateJson?: boolean },
+    constraints: ColumnConstraints & { validateJson?: boolean },
   ): ColumnDefinition => ({
     type: SQLiteTypes.JSON,
     check: constraints?.validateJson
@@ -431,8 +435,8 @@ export const column = {
     length: 36,
     default: constraints?.generateDefault
       ? defaultExpr(
-          "lower(hex(randomblob(4))) || '-' || lower(hex(randomblob(2))) || '-4' || substr(lower(hex(randomblob(2))),2) || '-' || substr('89ab',abs(random()) % 4 + 1, 1) || substr(lower(hex(randomblob(2))),2) || '-' || lower(hex(randomblob(6)))",
-        )
+        "lower(hex(randomblob(4))) || '-' || lower(hex(randomblob(2))) || '-4' || substr(lower(hex(randomblob(2))),2) || '-' || substr('89ab',abs(random()) % 4 + 1, 1) || substr(lower(hex(randomblob(2))),2) || '-' || lower(hex(randomblob(6)))",
+      )
       : constraints?.default,
     ...constraints,
   }),
@@ -601,9 +605,7 @@ export interface InsertOptions {
 /**
  * JSON column configuration
  */
-export interface JsonColumnConfig<T> {
-  jsonColumns?: Array<keyof T>;
-}
+export type JsonColumnConfig<T> = Array<keyof T>
 
 /**
  * Generic database row type