@dockstat/sqlite-wrapper 1.2.3 → 1.2.5

package/index.ts

@@ -209,9 +209,8 @@ class DB {
    */
   createTable<_T extends Record<string, unknown>>(
     tableName: string,
-    columns: string | Record<string, string> | TableSchema,
-    options?: TableOptions
-  ): void {
+    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 ' : ''
     const withoutRowId = options?.withoutRowId ? ' WITHOUT ROWID' : ''
@@ -276,6 +275,8 @@ class DB {
     if (options?.comment) {
       this.setTableComment(tableName, options.comment)
     }
+
+    return this.table<_T>(tableName)
   }
 
   /**

package/package.json

@@ -1,11 +1,16 @@
 {
   "name": "@dockstat/sqlite-wrapper",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "A TypeScript wrapper around bun:sqlite with type-safe query building",
   "type": "module",
   "main": "./index.ts",
   "types": "./index.ts",
-  "files": ["index.ts", "query-builder/**/*", "README.md", "types.ts"],
+  "files": [
+    "index.ts",
+    "query-builder/**/*",
+    "README.md",
+    "types.ts"
+  ],
   "scripts": {
     "dev": "bun build index.ts",
     "lint": "biome lint .",

package/query-builder/base.ts

@@ -36,7 +36,6 @@ export abstract class BaseQueryBuilder<T extends Record<string, unknown>> {
       regexConditions: [],
       jsonColumns: jsonConfig?.jsonColumns,
     }
-    this.logger.debug(`Created QueryBuilder for table: ${tableName}`)
   }
 
   /**

package/query-builder/select.ts

@@ -183,7 +183,7 @@ export class SelectQueryBuilder<
         `Executing SELECT query - query: ${query}, params: ${JSON.stringify(params)}, hasJsonColumns: ${!!this.state.jsonColumns}`
       )
       const rows = this.getDb()
-        .prepare(query)
+        .prepare(query, params)
         .all() as T[]
       this.getLogger().debug(`Retrieved ${rows.length} rows from database`)
       const transformed = this.transformRowsFromDb(rows)

package/query-builder/where.ts

@@ -206,9 +206,6 @@ export class WhereQueryBuilder<
       throw new Error(`whereOp: operator "${op}" not supported`);
     }
 
-    // Remove any existing conditions for this column
-    this.removeExistingCondition(String(column));
-
     // Handle null special-casing for IS / IS NOT and equality operators
     if (
       (value === null || value === undefined) &&

package/types.ts

@@ -223,6 +223,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 +251,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 +262,8 @@ export interface TableOptions {
   temporary?: boolean;
   /** Table comment */
   comment?: string;
+  /** JSON config for table creation and returned query builder */
+  jsonConfig?: Array<keyof T>;
 }
 
 /**
@@ -372,10 +377,10 @@ 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
+    check: constraints?.validateJson ?? true
       ? "JSON_VALID({{COLUMN}})"
       : constraints?.check,
     ...constraints,
@@ -431,8 +436,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,
   }),
@@ -496,6 +501,7 @@ export const column = {
     constraints?: ColumnConstraints,
   ): ColumnDefinition => ({
     type: SQLiteTypes.TEXT,
+    notNull: true,
     check: `{{COLUMN}} IN (${values.map((v) => `'${v}'`).join(", ")})`,
     ...constraints,
   }),