@dockstat/sqlite-wrapper 1.3.2 → 1.3.4

package/README.md

@@ -12,22 +12,26 @@ Schema-first table helpers, an expressive chainable QueryBuilder, safe defaults
 ## 🆕 What's New in v1.3
 
 ### Bug Fixes
+
 - **Fixed Boolean parsing** — Boolean columns now correctly convert SQLite's `0`/`1` to JavaScript `true`/`false`
 - **Fixed Wrong packing** — Before the `publish` script was added, workspace dependencies were not correctly propagated
 
 ### New Features
+
 - **Auto-detection of JSON & Boolean columns** — No more manual parser configuration! Columns using `column.json()` or `column.boolean()` are automatically detected from schema
 - **Automatic backups with retention** — Configure `autoBackup` to create periodic backups with automatic cleanup of old files
 - **Backup & Restore API** — New `backup()`, `restore()`, and `listBackups()` methods
 - **`getPath()` method** — Get the database file path
 
 ### Architecture Improvements
+
 - **New `utils/` module** — Reusable utilities for SQL building, logging, and row transformation
 - **Structured logging** — Cleaner, more consistent log output with dedicated loggers per component
 - **Reduced code duplication** — Extracted common patterns into shared utilities
 - **Better maintainability** — Clearer separation of concerns across modules
 
 ### Breaking Changes
+
 - None! v1.3 is fully backward compatible with v1.2.x
 
 ---
@@ -284,7 +288,10 @@ const activeAdmins = userTable
   .all();
 
 // Get first match
-const user = userTable.select(["*"]).where({ email: "alice@example.com" }).first();
+const user = userTable
+  .select(["*"])
+  .where({ email: "alice@example.com" })
+  .first();
 
 // Count records
 const count = userTable.where({ active: true }).count();
@@ -321,7 +328,10 @@ userTable.insertOrIgnore({ email: "existing@example.com", name: "Name" });
 userTable.insertOrReplace({ email: "existing@example.com", name: "New Name" });
 
 // Insert and get the row back
-const newUser = userTable.insertAndGet({ name: "Charlie", email: "charlie@example.com" });
+const newUser = userTable.insertAndGet({
+  name: "Charlie",
+  email: "charlie@example.com",
+});
 ```
 
 ### UPDATE Operations

package/package.json

@@ -1,19 +1,17 @@
 {
   "name": "@dockstat/sqlite-wrapper",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "A TypeScript wrapper around bun:sqlite with type-safe query building",
   "type": "module",
-  "main": "./index.ts",
-  "types": "./index.ts",
+  "main": "./src/index.ts",
+  "types": "./src/index.ts",
   "exports": {
-    ".": "./index.ts",
-    "./types": "./types.ts",
-    "./utils": "./utils/index.ts"
+    ".": "./src/index.ts",
+    "./types": "./src/types.ts",
+    "./utils": "./src/utils/index.ts"
   },
   "files": [
-    "index.ts",
-    "query-builder/**/*",
-    "utils/**/*",
+    "src",
     "README.md",
     "types.ts"
   ],

package/src/index.ts

@@ -0,0 +1,590 @@
+import { Database, type SQLQueryBindings } from "bun:sqlite"
+import { Logger } from "@dockstat/logger"
+import type { ColumnDefinition, IndexColumn, IndexMethod, Parser, TableOptions } from "./types"
+import { backup as helperBackup } from "./lib/backup/backup"
+import { setupAutoBackup as helperSetupAutoBackup } from "./lib/backup/setupAutoBackup"
+
+// helpers
+import { createIndex as helperCreateIndex } from "./lib/index/createIndex"
+import { dropIndex as helperDropIndex } from "./lib/index/dropIndex"
+import { buildColumnSQL } from "./lib/table/buildColumnSQL"
+import { buildTableConstraints } from "./lib/table/buildTableConstraint"
+import { getTableComment as helperGetTableComment } from "./lib/table/getTableComment"
+import { isTableSchema } from "./lib/table/isTableSchema"
+import { setTableComment as helperSetTableComment } from "./lib/table/setTableComment"
+import { QueryBuilder } from "./query-builder/index"
+import { createLogger, type SqliteLogger } from "./utils"
+import { listBackups as helperListBackups } from "./lib/backup/listBackups"
+import { restore as helperRestore } from "./lib/backup/restore"
+
+// Re-export all types and utilities
+export { QueryBuilder }
+export type {
+  ArrayKey,
+  ColumnConstraints,
+  ColumnDefinition,
+  ColumnNames,
+  DefaultExpression,
+  DeleteResult,
+  ForeignKeyAction,
+  InsertOptions,
+  InsertResult,
+  RegexCondition,
+  SQLiteType,
+  TableConstraints,
+  TableOptions,
+  TableSchema,
+  UpdateResult,
+  WhereCondition,
+} from "./types"
+
+// Re-export helper utilities
+export {
+  column,
+  defaultExpr,
+  SQLiteFunctions,
+  SQLiteKeywords,
+  SQLiteTypes,
+  sql,
+} from "./types"
+
+/**
+ * Auto-backup configuration options
+ */
+export interface AutoBackupOptions {
+  /** Enable automatic backups */
+  enabled: boolean
+  /** Directory to store backup files */
+  directory: string
+  /** Backup interval in milliseconds (default: 1 hour) */
+  intervalMs?: number
+  /** Maximum number of backups to retain (default: 10) */
+  maxBackups?: number
+  /** Prefix for backup filenames (default: 'backup') */
+  filenamePrefix?: string
+  /** Whether to compress backups using gzip (default: false) */
+  compress?: boolean
+}
+
+/**
+ * Database configuration options
+ */
+export interface DBOptions {
+  /** PRAGMA settings to apply on database open */
+  pragmas?: Array<[string, SQLQueryBindings]>
+  /** Paths to SQLite extensions to load */
+  loadExtensions?: string[]
+  /** Auto-backup configuration */
+  autoBackup?: AutoBackupOptions
+}
+
+class DB {
+  protected db: Database
+  protected dbPath: string
+  private autoBackupTimer: ReturnType<typeof setInterval> | null = null
+  private autoBackupOptions: AutoBackupOptions | null = null
+  private baseLogger: Logger
+  private dbLog: SqliteLogger
+  private backupLog: SqliteLogger
+  private tableLog: SqliteLogger
+
+  /**
+   * Open or create a SQLite database at `path`.
+   *
+   * @param path - Path to the SQLite file (e.g. "app.db"). Use ":memory:" for in-memory DB.
+   * @param options - Optional database configuration
+   */
+  constructor(path: string, options?: DBOptions, baseLogger?: Logger) {
+    if (!baseLogger) {
+      this.baseLogger = new Logger("Sqlite-Wrapper")
+    } else {
+      this.baseLogger = baseLogger
+    }
+
+    // Wire base logger so sqlite-wrapper logs inherit the same LogHook/parents as the consumer.
+    this.dbLog = createLogger("DB", this.baseLogger)
+    this.backupLog = createLogger("Backup", this.baseLogger)
+    this.tableLog = createLogger("Table", this.baseLogger)
+
+    this.dbLog.connection(path, "open")
+
+    this.dbPath = path
+    this.db = new Database(path)
+
+    // Apply PRAGMA settings if provided
+    if (options?.pragmas) {
+      for (const [name, value] of options.pragmas) {
+        this.pragma(name, value)
+      }
+    }
+
+    // Load extensions if provided
+    if (options?.loadExtensions) {
+      for (const extensionPath of options.loadExtensions) {
+        this.loadExtension(extensionPath)
+      }
+    }
+
+    // Setup auto-backup if configured
+    if (options?.autoBackup?.enabled) {
+      const res = helperSetupAutoBackup(this.dbPath, this.db, this.backupLog, options.autoBackup)
+      this.autoBackupTimer = res.timer
+      this.autoBackupOptions = res.autoBackupOptions
+    }
+  }
+
+  /**
+   * List all available backups
+   *
+   * @returns Array of backup file information
+   */
+  listBackups(): Array<{ filename: string; path: string; size: number; created: Date }> {
+    return helperListBackups(this.autoBackupOptions, this.backupLog)
+  }
+
+  /**
+   * Create a backup of the database
+   *
+   * @param customPath - Optional custom path for the backup file. If not provided, uses auto-backup settings or generates a timestamped filename.
+   * @returns The path to the created backup file
+   */
+  backup(customPath?: string): string {
+    return helperBackup(
+      this.dbPath,
+      this.db,
+      this.backupLog,
+      this.autoBackupOptions ?? undefined,
+      customPath
+    )
+  }
+
+  /**
+   * Stop auto-backup if it's running
+   */
+  stopAutoBackup(): void {
+    if (this.autoBackupTimer) {
+      clearInterval(this.autoBackupTimer)
+      this.autoBackupTimer = null
+      this.backupLog.info("Auto-backup stopped")
+    }
+  }
+
+  /**
+   * Get the database file path
+   */
+  getPath(): string {
+    return this.dbPath
+  }
+
+  /**
+   * Get a typed QueryBuilder for a given table name.
+   */
+  table<T extends Record<string, unknown>>(
+    tableName: string,
+    parser: Partial<Parser<T>> = {}
+  ): QueryBuilder<T> {
+    const pObj: Parser<T> = {
+      JSON: parser.JSON || [],
+      MODULE: parser.MODULE || {},
+      BOOLEAN: parser.BOOLEAN || [],
+    }
+
+    this.tableLog.debug(`Creating QueryBuilder for: ${tableName}`)
+    return new QueryBuilder<T>(this.db, tableName, pObj, this.baseLogger)
+  }
+
+  /**
+   * Close the underlying SQLite database handle.
+   * Also stops auto-backup if it's running.
+   */
+  close(): void {
+    this.dbLog.connection(this.dbPath, "close")
+    this.stopAutoBackup()
+    this.db.close()
+  }
+
+  restore(backupPath: string, targetPath?: string): void {
+    const reopened = helperRestore(this.dbPath, this.db, this.backupLog, backupPath, targetPath)
+    if (reopened instanceof Database) {
+      this.db = reopened
+    }
+  }
+
+  /**
+   * Create a table with comprehensive type safety and feature support.
+   *
+   * @param tableName - Table name to create.
+   * @param columns - Column definitions (string, legacy object, or type-safe schema).
+   * @param options - Table options including constraints and metadata.
+   *
+   * @throws {Error} If column definitions are invalid or constraints conflict.
+   */
+  createTable<_T extends Record<string, unknown> = Record<string, unknown>>(
+    tableName: string,
+    columns: Record<keyof _T, ColumnDefinition>,
+    options?: TableOptions<_T>
+  ): QueryBuilder<_T> {
+    const temp = options?.temporary ? "TEMPORARY " : tableName === ":memory" ? "TEMPORARY " : ""
+    const ifNot = options?.ifNotExists ? "IF NOT EXISTS " : ""
+    const withoutRowId = options?.withoutRowId ? " WITHOUT ROWID" : ""
+
+    const quoteIdent = (s: string) => `"${s.replace(/"/g, '""')}"`
+
+    let columnDefs: string
+    let tableConstraints: string[] = []
+
+    if (isTableSchema(columns)) {
+      //  comprehensive type-safe approach
+      const parts: string[] = []
+      for (const [colName, colDef] of Object.entries(columns)) {
+        if (!colName) continue
+
+        const sqlDef = buildColumnSQL(colName, colDef)
+        parts.push(`${quoteIdent(colName)} ${sqlDef}`)
+      }
+
+      if (parts.length === 0) {
+        throw new Error("No columns provided")
+      }
+
+      columnDefs = parts.join(", ")
+
+      // Add table-level constraints
+      if (options?.constraints) {
+        tableConstraints = buildTableConstraints(options.constraints)
+      }
+    } else {
+      // Original object-based approach
+      const parts: string[] = []
+      for (const [col, def] of Object.entries(columns)) {
+        if (!col) continue
+
+        const defTrim = def || ""
+        if (!defTrim) {
+          throw new Error(`Missing SQL type/constraints for column "${col}"`)
+        }
+        parts.push(`${quoteIdent(col)} ${defTrim}`)
+      }
+
+      if (parts.length === 0) {
+        throw new Error("No columns provided")
+      }
+      columnDefs = parts.join(", ")
+    }
+
+    const allDefinitions = [columnDefs, ...tableConstraints].join(", ")
+
+    const columnNames = Object.keys(columns)
+    this.tableLog.tableCreate(tableName, columnNames)
+
+    const sql = `CREATE ${temp}TABLE ${ifNot}${quoteIdent(
+      tableName
+    )} (${allDefinitions})${withoutRowId};`
+
+    this.db.run(sql)
+
+    // Store table comment as metadata if provided
+    if (options?.comment) {
+      helperSetTableComment(this.db, this.tableLog, tableName, options.comment)
+    }
+
+    // Auto-detect JSON and BOOLEAN columns from schema
+    const autoDetectedJson: Array<keyof _T> = []
+    const autoDetectedBoolean: Array<keyof _T> = []
+
+    if (isTableSchema(columns)) {
+      for (const [colName, colDef] of Object.entries(columns)) {
+        if (colDef.type === "JSON") {
+          autoDetectedJson.push(colName as keyof _T)
+        }
+        if (colDef.type === "BOOLEAN") {
+          autoDetectedBoolean.push(colName as keyof _T)
+        }
+      }
+    }
+
+    // Merge auto-detected columns with user-provided parser options
+    const userJson = options?.parser?.JSON || []
+    const userBoolean = options?.parser?.BOOLEAN || []
+    const userModule = options?.parser?.MODULE || {}
+
+    // Combine and deduplicate
+    const mergedJson = [...new Set([...autoDetectedJson, ...userJson])] as Array<keyof _T>
+    const mergedBoolean = [...new Set([...autoDetectedBoolean, ...userBoolean])] as Array<keyof _T>
+
+    const pObj = {
+      JSON: mergedJson,
+      MODULE: userModule,
+      BOOLEAN: mergedBoolean,
+    }
+
+    this.tableLog.parserConfig(
+      pObj.JSON.map(String),
+      pObj.BOOLEAN.map(String),
+      Object.keys(pObj.MODULE)
+    )
+
+    return this.table<_T>(tableName, pObj)
+  }
+
+  /**
+   * Create an index on a table
+   */
+  createIndex(
+    indexName: string,
+    tableName: string,
+    columns: IndexColumn | IndexColumn[],
+    options?: {
+      unique?: boolean
+      ifNotExists?: boolean
+      /** Alias for `where` */
+      partial?: string
+      /** WHERE clause for partial indexes */
+      where?: string
+      /** Index method (USING ...) */
+      using?: IndexMethod
+    }
+  ): void {
+    helperCreateIndex(this.db, indexName, tableName, columns, options)
+  }
+
+  /**
+   * Drop a table
+   */
+  dropTable(tableName: string, options?: { ifExists?: boolean }): void {
+    const ifExists = options?.ifExists ? "IF EXISTS " : ""
+    const quoteIdent = (s: string) => `"${s.replace(/"/g, '""')}"`
+    const sql = `DROP TABLE ${ifExists}${quoteIdent(tableName)};`
+    this.db.run(sql)
+  }
+
+  /**
+   * Drop an index
+   */
+  dropIndex(indexName: string, options?: { ifExists?: boolean }): void {
+    helperDropIndex(this.db, indexName, options)
+  }
+
+  /**
+   * Store table comment as metadata (using a system table if needed)
+   */
+  getTableComment(tableName: string): string | null {
+    return helperGetTableComment(this.db, tableName)
+  }
+
+  /**
+   * runute a raw SQL statement
+   */
+  run(sql: string): void {
+    this.tableLog.debug(`Running SQL: ${sql}`)
+    this.db.run(sql)
+  }
+
+  /**
+   * Prepare a SQL statement for repeated runution
+   */
+  prepare(sql: string) {
+    return this.db.prepare(sql)
+  }
+
+  /**
+   * runute a transaction
+   */
+  transaction<T>(fn: () => T): T {
+    return this.db.transaction(fn)()
+  }
+
+  /**
+   * Begin a transaction manually
+   */
+  begin(mode?: "DEFERRED" | "IMMEDIATE" | "EXCLUSIVE"): void {
+    const modeStr = mode ? ` ${mode}` : ""
+    this.db.run(`BEGIN${modeStr}`)
+  }
+
+  /**
+   * Commit a transaction
+   */
+  commit(): void {
+    this.dbLog.transaction("commit")
+    this.run("COMMIT")
+  }
+
+  /**
+   * Rollback a transaction
+   */
+  rollback(): void {
+    this.dbLog.transaction("rollback")
+    this.run("ROLLBACK")
+  }
+
+  /**
+   * Create a savepoint
+   */
+  savepoint(name: string): void {
+    const quotedName = `"${name.replace(/"/g, '""')}"`
+    this.db.run(`SAVEPOINT ${quotedName}`)
+  }
+
+  /**
+   * Release a savepoint
+   */
+  releaseSavepoint(name: string): void {
+    const quotedName = `"${name.replace(/"/g, '""')}"`
+    this.db.run(`RELEASE SAVEPOINT ${quotedName}`)
+  }
+
+  /**
+   * Rollback to a savepoint
+   */
+  rollbackToSavepoint(name: string): void {
+    const quotedName = `"${name.replace(/"/g, '""')}"`
+    this.db.run(`ROLLBACK TO SAVEPOINT ${quotedName}`)
+  }
+
+  /**
+   * Vacuum the database (reclaim space and optimize)
+   */
+  vacuum() {
+    const result = this.db.run("VACUUM")
+    this.dbLog.debug("Vacuum completed")
+    return result
+  }
+
+  /**
+   * Analyze the database (update statistics for query optimizer)
+   */
+  analyze(tableName?: string): void {
+    if (tableName) {
+      const quotedName = `"${tableName.replace(/"/g, '""')}"`
+      this.db.run(`ANALYZE ${quotedName}`)
+    } else {
+      this.db.run("ANALYZE")
+    }
+  }
+
+  /**
+   * Check database integrity
+   */
+  integrityCheck(): Array<{ integrity_check: string }> {
+    const stmt = this.db.prepare("PRAGMA integrity_check")
+    return stmt.all() as Array<{ integrity_check: string }>
+  }
+
+  /**
+   * Get database schema information
+   */
+  getSchema(): Array<{ name: string; type: string; sql: string }> {
+    const stmt = this.db.prepare(`
+      SELECT name, type, sql
+      FROM sqlite_master
+      WHERE type IN ('table', 'index', 'view', 'trigger')
+      ORDER BY type, name
+    `)
+    return stmt.all() as Array<{ name: string; type: string; sql: string }>
+  }
+
+  /**
+   * Get table info (columns, types, constraints)
+   */
+  getTableInfo(tableName: string): Array<{
+    cid: number
+    name: string
+    type: string
+    notnull: number
+    dflt_value: SQLQueryBindings
+    pk: number
+  }> {
+    const stmt = this.db.prepare(`PRAGMA table_info("${tableName.replace(/"/g, '""')}")`)
+    return stmt.all() as Array<{
+      cid: number
+      name: string
+      type: string
+      notnull: number
+      dflt_value: SQLQueryBindings
+      pk: number
+    }>
+  }
+
+  /**
+   * Get foreign key information for a table
+   */
+  getForeignKeys(tableName: string): Array<{
+    id: number
+    seq: number
+    table: string
+    from: string
+    to: string
+    on_update: string
+    on_delete: string
+    match: string
+  }> {
+    const stmt = this.db.prepare(`PRAGMA foreign_key_list("${tableName.replace(/"/g, '""')}")`)
+    return stmt.all() as Array<{
+      id: number
+      seq: number
+      table: string
+      from: string
+      to: string
+      on_update: string
+      on_delete: string
+      match: string
+    }>
+  }
+
+  /**
+   * Get index information for a table
+   */
+  getIndexes(tableName: string): Array<{
+    name: string
+    unique: number
+    origin: string
+    partial: number
+  }> {
+    const stmt = this.db.prepare(`PRAGMA index_list("${tableName.replace(/"/g, '""')}")`)
+    return stmt.all() as Array<{
+      name: string
+      unique: number
+      origin: string
+      partial: number
+    }>
+  }
+
+  /**
+   * Set or get a PRAGMA value.
+   *
+   * @param name - PRAGMA name (e.g., "foreign_keys", "journal_mode")
+   * @param value - Value to set (omit to get current value)
+   * @returns Current value when getting, undefined when setting
+   */
+  pragma(name: string, value?: SQLQueryBindings): SQLQueryBindings | undefined {
+    if (value !== undefined) {
+      this.db.run(`PRAGMA ${name} = ${value}`)
+      return undefined
+    }
+    const result = this.db.prepare(`PRAGMA ${name}`).get() as Record<string, SQLQueryBindings>
+    return Object.values(result)[0]
+  }
+
+  /**
+   * Load a SQLite extension.
+   *
+   * @param path - Absolute path to the compiled SQLite extension
+   */
+  loadExtension(path: string): void {
+    this.db.loadExtension(path)
+  }
+
+  /**
+   * Get direct access to the underlying SQLite database instance.
+   * Use this for advanced operations not covered by the wrapper.
+   *
+   * @returns The underlying Database instance
+   */
+  getDb(): Database {
+    return this.db
+  }
+}
+
+export { DB }
+export default DB

package/src/lib/backup/applyRetentionPolicy.ts

@@ -0,0 +1,38 @@
+import type { AutoBackupOptions } from "../../index"
+
+/**
+ * Apply retention policy to remove old backups
+ */
+export function applyRetentionPolicy(backupLog: any, autoBackupOptions: AutoBackupOptions): void {
+  if (!autoBackupOptions) return
+
+  const fs = require("node:fs")
+  const path = require("node:path")
+
+  const backupDir = autoBackupOptions.directory
+  const prefix = autoBackupOptions.filenamePrefix || "backup"
+  const maxBackups = autoBackupOptions.maxBackups || 10
+
+  try {
+    const files = fs
+      .readdirSync(backupDir)
+      .filter((file: string) => file.startsWith(prefix) && file.endsWith(".db"))
+      .map((file: string) => ({
+        name: file,
+        path: path.join(backupDir, file),
+        mtime: fs.statSync(path.join(backupDir, file)).mtime.getTime(),
+      }))
+      .sort((a: { mtime: number }, b: { mtime: number }) => b.mtime - a.mtime) // newest first
+
+    if (files.length > maxBackups) {
+      const toDelete = files.slice(maxBackups)
+      for (const file of toDelete) {
+        fs.unlinkSync(file.path)
+        backupLog.debug(`Removed old backup: ${file.name}`)
+      }
+      backupLog.info(`Retention policy applied: removed ${toDelete.length} old backup(s)`)
+    }
+  } catch (error) {
+    backupLog.error(`Failed to apply retention policy: ${error}`)
+  }
+}