@geekmidas/audit 2.1.0 → 2.2.1

package/dist/knex.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"knex.cjs","names":["connection: DatabaseConnection","db: DatabaseConnection","auditor: TransactionAwareAuditor<Knex.Transaction>","cb: (trx: Knex.Transaction) => Promise<T>","settings?: TransactionSettings","trx: Knex.Transaction","config: KnexAuditStorageConfig","records: AuditRecord[]","trx?: unknown","options: AuditQueryOptions","row: AuditLogTable","options: Omit<AuditQueryOptions, 'limit' | 'offset'>","callback: () => Promise<T>","db?: DatabaseConnection","query: any","record: AuditRecord","value: unknown","actor: NonNullable<AuditRecord['actor']>","entityId: string"],"sources":["../src/knex.ts"],"sourcesContent":["import type { Knex } from 'knex';\nimport { nanoid } from 'nanoid';\nimport type {\n\tAuditQueryOptions,\n\tAuditStorage,\n\tTransactionAwareAuditor,\n} from './storage';\nimport type { AuditRecord } from './types';\n\nexport type { TransactionAwareAuditor };\n\nexport interface TransactionSettings {\n\tisolationLevel?: Knex.IsolationLevels;\n}\n\nexport type DatabaseConnection = Knex | Knex.Transaction;\n\n/**\n * Type guard for an active Knex transaction.\n *\n * Knex marks transaction instances with `isTransaction`, and a completed\n * transaction can no longer be used, so a settled transaction is treated as a\n * plain connection.\n */\nfunction isActiveTransaction(\n\tconnection: DatabaseConnection,\n): connection is Knex.Transaction {\n\treturn (\n\t\tconnection.isTransaction === true &&\n\t\t!(connection as Knex.Transaction).isCompleted()\n\t);\n}\n\n/**\n * Execute a callback within a database transaction with automatic audit handling.\n *\n * This wrapper ensures that:\n * 1. The transaction is automatically registered with the auditor\n * 2. Manual audits (via `auditor.audit()`) are flushed BEFORE the transaction commits\n * 3. If audit flush fails, the entire transaction rolls back\n * 4. If the callback fails, audits are NOT written (atomic consistency)\n *\n * **Note:** Declarative audits (defined via `.audit([...])` on the endpoint builder)\n * are processed AFTER the handler returns, so they run outside this transaction.\n * If you need all audits to be atomic with your database operations, use manual\n * audits via `auditor.audit()` inside this wrapper.\n *\n * @param db - Database connection (Knex instance or Transaction)\n * @param auditor - Auditor instance that will receive the transaction\n * @param cb - Callback to execute within the transaction\n * @param settings - Optional transaction settings (isolation level)\n * @returns The result of the callback\n *\n * @example\n * ```typescript\n * import { withAuditableTransaction } from '@geekmidas/audit/knex';\n *\n * const result = await withAuditableTransaction(\n *   services.database,\n *   auditor,\n *   async (trx) => {\n *     const [user] = await trx('users').insert(data).returning('*');\n *\n *     // Manual audits are atomic with the transaction\n *     auditor.audit('user.created', { userId: user.id, email: user.email });\n *\n *     return user;\n *   },\n * );\n * // Audits are automatically flushed inside the transaction before commit\n * ```\n */\nexport async function withAuditableTransaction<T>(\n\tdb: DatabaseConnection,\n\tauditor: TransactionAwareAuditor<Knex.Transaction>,\n\tcb: (trx: Knex.Transaction) => Promise<T>,\n\tsettings?: TransactionSettings,\n): Promise<T> {\n\tconst execute = async (trx: Knex.Transaction): Promise<T> => {\n\t\t// Register transaction with auditor\n\t\tauditor.setTransaction(trx);\n\n\t\t// Execute the callback\n\t\tconst result = await cb(trx);\n\n\t\t// Flush audits BEFORE transaction commits\n\t\t// If this fails, the transaction will roll back\n\t\tawait auditor.flush(trx);\n\n\t\treturn result;\n\t};\n\n\t// If already in a transaction, just run with it.\n\t// Knex would otherwise open a savepoint, which commits independently.\n\tif (isActiveTransaction(db)) {\n\t\treturn execute(db);\n\t}\n\n\treturn db.transaction(execute, settings);\n}\n\n/**\n * Shape of a row in the audit log table.\n * Use this to describe your audit table when declaring Knex table types.\n *\n * Property names are camelCase to match the Kysely storage. Pair this with\n * `knexSnakeCaseMappers()` if your database columns are snake_case.\n *\n * @example\n * ```typescript\n * import { knexSnakeCaseMappers } from 'objection';\n *\n * const db = knex({\n *   client: 'pg',\n *   connection: process.env.DATABASE_URL,\n *   ...knexSnakeCaseMappers(),\n * });\n *\n * declare module 'knex/types/tables' {\n *   interface Tables {\n *     audit_logs: AuditLogTable;\n *   }\n * }\n * ```\n */\nexport interface AuditLogTable {\n\tid: string;\n\ttype: string;\n\toperation: string;\n\ttable: string | null;\n\tentityId: string | null;\n\toldValues: unknown | null;\n\tnewValues: unknown | null;\n\tpayload: unknown | null;\n\ttimestamp: Date;\n\tactorId: string | null;\n\tactorType: string | null;\n\tactorData: unknown | null;\n\tmetadata: unknown | null;\n}\n\n/**\n * Insertable version of AuditLogTable where id is optional.\n * Use this when your database auto-generates IDs or when using the autoId option.\n */\nexport type InsertableAuditLogTable = Omit<AuditLogTable, 'id'> & {\n\tid?: string;\n};\n\n/**\n * Configuration for KnexAuditStorage.\n */\nexport interface KnexAuditStorageConfig {\n\t/** Knex database instance */\n\tdb: Knex;\n\t/** Table name for audit logs */\n\ttableName: string;\n\t/**\n\t * Service name of the database service.\n\t * When set, endpoint adaptors will automatically use the audit transaction as `db`\n\t * in the handler context if the endpoint's database service has the same name.\n\t */\n\tdatabaseServiceName?: string;\n\t/**\n\t * Let the database auto-generate IDs (e.g., via DEFAULT gen_random_uuid()).\n\t * When true, the ID field is omitted from inserts if not provided.\n\t * When false (default), IDs are generated using nanoid if not provided.\n\t * @default false\n\t */\n\tautoId?: boolean;\n}\n\n/**\n * Knex-based audit storage implementation.\n * Stores audit records in a database table using Knex.\n *\n * @example\n * ```typescript\n * const storage = new KnexAuditStorage({\n *   db: knexDb,\n *   tableName: 'audit_logs',\n * });\n *\n * const auditor = new DefaultAuditor({\n *   actor: { id: 'user-123', type: 'user' },\n *   storage,\n * });\n * ```\n */\nexport class KnexAuditStorage implements AuditStorage {\n\tprivate readonly db: Knex;\n\tprivate readonly tableName: string;\n\tprivate readonly autoId: boolean;\n\treadonly databaseServiceName?: string;\n\n\tconstructor(config: KnexAuditStorageConfig) {\n\t\tthis.db = config.db;\n\t\tthis.tableName = config.tableName;\n\t\tthis.databaseServiceName = config.databaseServiceName;\n\t\tthis.autoId = config.autoId ?? false;\n\t}\n\n\tasync write(records: AuditRecord[], trx?: unknown): Promise<void> {\n\t\tif (records.length === 0) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst db = (trx as Knex.Transaction) ?? this.db;\n\t\tconst rows = records.map((record) => this.toRow(record));\n\n\t\tawait db(this.tableName).insert(rows);\n\t}\n\n\tasync query(options: AuditQueryOptions): Promise<AuditRecord[]> {\n\t\tlet query = this.db(this.tableName).select('*');\n\n\t\tquery = this.applyFilters(query, options);\n\n\t\t// Ordering\n\t\tconst orderBy = options.orderBy ?? 'timestamp';\n\t\tconst orderDirection = options.orderDirection ?? 'desc';\n\t\tquery = query.orderBy(\n\t\t\torderBy === 'timestamp' ? 'timestamp' : 'type',\n\t\t\torderDirection,\n\t\t);\n\n\t\t// Pagination\n\t\tif (options.limit !== undefined) {\n\t\t\tquery = query.limit(options.limit);\n\t\t}\n\t\tif (options.offset !== undefined) {\n\t\t\tquery = query.offset(options.offset);\n\t\t}\n\n\t\tconst rows = await query;\n\t\treturn rows.map((row: AuditLogTable) => this.fromRow(row));\n\t}\n\n\tasync count(\n\t\toptions: Omit<AuditQueryOptions, 'limit' | 'offset'>,\n\t): Promise<number> {\n\t\tlet query = this.db(this.tableName).count({ count: 'id' });\n\n\t\tquery = this.applyFilters(query, options);\n\n\t\tconst result = await query.first();\n\t\treturn Number(result?.count ?? 0);\n\t}\n\n\t/**\n\t * Get the Knex database instance for transactional operations.\n\t * Used by endpoint adaptors to automatically wrap handlers in transactions.\n\t */\n\tgetDatabase(): Knex {\n\t\treturn this.db;\n\t}\n\n\t/**\n\t * Execute a callback within a Knex transaction with automatic audit handling.\n\t * The auditor is registered with the transaction and audits are flushed\n\t * before the transaction commits.\n\t *\n\t * If the provided db connection is already a transaction, it will be reused\n\t * instead of opening a savepoint.\n\t */\n\tasync withTransaction<T>(\n\t\tauditor: TransactionAwareAuditor<Knex.Transaction>,\n\t\tcallback: () => Promise<T>,\n\t\tdb?: DatabaseConnection,\n\t): Promise<T> {\n\t\tconst connection = db ?? this.db;\n\n\t\t// If already in a transaction, reuse it\n\t\tif (isActiveTransaction(connection)) {\n\t\t\tauditor.setTransaction(connection);\n\t\t\tconst result = await callback();\n\t\t\tawait auditor.flush(connection);\n\t\t\treturn result;\n\t\t}\n\n\t\t// Create new transaction\n\t\treturn connection.transaction(async (trx) => {\n\t\t\tauditor.setTransaction(trx);\n\t\t\tconst result = await callback();\n\t\t\tawait auditor.flush(trx);\n\t\t\treturn result;\n\t\t});\n\t}\n\n\tprivate applyFilters(query: any, options: AuditQueryOptions): any {\n\t\t// Type filter\n\t\tif (options.type !== undefined) {\n\t\t\tif (Array.isArray(options.type)) {\n\t\t\t\tquery = query.whereIn('type', options.type);\n\t\t\t} else {\n\t\t\t\tquery = query.where('type', options.type);\n\t\t\t}\n\t\t}\n\n\t\t// Entity ID filter\n\t\tif (options.entityId !== undefined) {\n\t\t\tconst entityId =\n\t\t\t\ttypeof options.entityId === 'string'\n\t\t\t\t\t? options.entityId\n\t\t\t\t\t: JSON.stringify(options.entityId);\n\t\t\tquery = query.where('entityId', entityId);\n\t\t}\n\n\t\t// Table filter\n\t\tif (options.table !== undefined) {\n\t\t\tquery = query.where('table', options.table);\n\t\t}\n\n\t\t// Actor ID filter\n\t\tif (options.actorId !== undefined) {\n\t\t\tquery = query.where('actorId', options.actorId);\n\t\t}\n\n\t\t// Date range filters\n\t\tif (options.from !== undefined) {\n\t\t\tquery = query.where('timestamp', '>=', options.from);\n\t\t}\n\t\tif (options.to !== undefined) {\n\t\t\tquery = query.where('timestamp', '<=', options.to);\n\t\t}\n\n\t\treturn query;\n\t}\n\n\tprivate toRow(record: AuditRecord): AuditLogTable {\n\t\t// If autoId is true, let database generate ID (ignore record.id)\n\t\t// If autoId is false (default), use record.id or generate with nanoid\n\t\tconst id = this.autoId ? undefined : record.id || nanoid();\n\n\t\treturn {\n\t\t\t...(id && { id }),\n\t\t\ttype: record.type,\n\t\t\toperation: record.operation,\n\t\t\ttable: record.table ?? null,\n\t\t\tentityId:\n\t\t\t\trecord.entityId === undefined\n\t\t\t\t\t? null\n\t\t\t\t\t: typeof record.entityId === 'string'\n\t\t\t\t\t\t? record.entityId\n\t\t\t\t\t\t: JSON.stringify(record.entityId),\n\t\t\toldValues: this.toJsonColumn(record.oldValues),\n\t\t\tnewValues: this.toJsonColumn(record.newValues),\n\t\t\tpayload: this.toJsonColumn(record.payload),\n\t\t\ttimestamp: record.timestamp,\n\t\t\tactorId: record.actor?.id ?? null,\n\t\t\tactorType: record.actor?.type ?? null,\n\t\t\tactorData:\n\t\t\t\trecord.actor !== undefined\n\t\t\t\t\t? this.toJsonColumn(this.getActorData(record.actor))\n\t\t\t\t\t: null,\n\t\t\tmetadata: this.toJsonColumn(record.metadata),\n\t\t} as AuditLogTable;\n\t}\n\n\tprivate fromRow(row: AuditLogTable): AuditRecord {\n\t\tconst actor =\n\t\t\trow.actorId !== null || row.actorType !== null\n\t\t\t\t? {\n\t\t\t\t\t\tid: row.actorId ?? undefined,\n\t\t\t\t\t\ttype: row.actorType ?? undefined,\n\t\t\t\t\t\t...(row.actorData ? this.parseJson(row.actorData) : {}),\n\t\t\t\t\t}\n\t\t\t\t: undefined;\n\n\t\treturn {\n\t\t\tid: row.id,\n\t\t\ttype: row.type,\n\t\t\toperation: row.operation as AuditRecord['operation'],\n\t\t\ttable: row.table ?? undefined,\n\t\t\tentityId: row.entityId ? this.parseEntityId(row.entityId) : undefined,\n\t\t\toldValues: row.oldValues ? this.parseJson(row.oldValues) : undefined,\n\t\t\tnewValues: row.newValues ? this.parseJson(row.newValues) : undefined,\n\t\t\tpayload: row.payload ? this.parseJson(row.payload) : undefined,\n\t\t\ttimestamp: row.timestamp,\n\t\t\tactor,\n\t\t\tmetadata: row.metadata ? this.parseJson(row.metadata) : undefined,\n\t\t};\n\t}\n\n\t/**\n\t * Serialize a JSON value for insertion.\n\t *\n\t * Unlike Kysely, Knex has no per-column type information to tell a json/jsonb\n\t * column from an object it should bind as a composite value, so plain objects\n\t * are stringified before they reach the driver.\n\t */\n\tprivate toJsonColumn(value: unknown): string | null {\n\t\tif (value === undefined || value === null) {\n\t\t\treturn null;\n\t\t}\n\t\treturn JSON.stringify(value);\n\t}\n\n\t/**\n\t * Parse a JSON value that may already be parsed (e.g., from jsonb columns).\n\t */\n\tprivate parseJson(value: unknown): Record<string, unknown> {\n\t\tif (typeof value === 'object' && value !== null) {\n\t\t\treturn value as Record<string, unknown>;\n\t\t}\n\t\tif (typeof value === 'string') {\n\t\t\treturn JSON.parse(value);\n\t\t}\n\t\treturn {};\n\t}\n\n\tprivate getActorData(\n\t\tactor: NonNullable<AuditRecord['actor']>,\n\t): Record<string, unknown> {\n\t\tconst { id, type, ...rest } = actor;\n\t\treturn rest;\n\t}\n\n\tprivate parseEntityId(entityId: string): string | Record<string, unknown> {\n\t\ttry {\n\t\t\tconst parsed = JSON.parse(entityId);\n\t\t\tif (typeof parsed === 'object' && parsed !== null) {\n\t\t\t\treturn parsed;\n\t\t\t}\n\t\t\treturn entityId;\n\t\t} catch {\n\t\t\treturn entityId;\n\t\t}\n\t}\n}\n"],"mappings":";;;;;;;;;;;AAwBA,SAAS,oBACRA,YACiC;AACjC,QACC,WAAW,kBAAkB,SAC5B,AAAC,WAAgC,aAAa;AAEhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCD,eAAsB,yBACrBC,IACAC,SACAC,IACAC,UACa;CACb,MAAM,UAAU,OAAOC,QAAsC;AAE5D,UAAQ,eAAe,IAAI;EAG3B,MAAM,SAAS,MAAM,GAAG,IAAI;AAI5B,QAAM,QAAQ,MAAM,IAAI;AAExB,SAAO;CACP;AAID,KAAI,oBAAoB,GAAG,CAC1B,QAAO,QAAQ,GAAG;AAGnB,QAAO,GAAG,YAAY,SAAS,SAAS;AACxC;;;;;;;;;;;;;;;;;;AA0FD,IAAa,mBAAb,MAAsD;CACrD,AAAiB;CACjB,AAAiB;CACjB,AAAiB;CACjB,AAAS;CAET,YAAYC,QAAgC;AAC3C,OAAK,KAAK,OAAO;AACjB,OAAK,YAAY,OAAO;AACxB,OAAK,sBAAsB,OAAO;AAClC,OAAK,SAAS,OAAO,UAAU;CAC/B;CAED,MAAM,MAAMC,SAAwBC,KAA8B;AACjE,MAAI,QAAQ,WAAW,EACtB;EAGD,MAAM,KAAM,OAA4B,KAAK;EAC7C,MAAM,OAAO,QAAQ,IAAI,CAAC,WAAW,KAAK,MAAM,OAAO,CAAC;AAExD,QAAM,GAAG,KAAK,UAAU,CAAC,OAAO,KAAK;CACrC;CAED,MAAM,MAAMC,SAAoD;EAC/D,IAAI,QAAQ,KAAK,GAAG,KAAK,UAAU,CAAC,OAAO,IAAI;AAE/C,UAAQ,KAAK,aAAa,OAAO,QAAQ;EAGzC,MAAM,UAAU,QAAQ,WAAW;EACnC,MAAM,iBAAiB,QAAQ,kBAAkB;AACjD,UAAQ,MAAM,QACb,YAAY,cAAc,cAAc,QACxC,eACA;AAGD,MAAI,QAAQ,iBACX,SAAQ,MAAM,MAAM,QAAQ,MAAM;AAEnC,MAAI,QAAQ,kBACX,SAAQ,MAAM,OAAO,QAAQ,OAAO;EAGrC,MAAM,OAAO,MAAM;AACnB,SAAO,KAAK,IAAI,CAACC,QAAuB,KAAK,QAAQ,IAAI,CAAC;CAC1D;CAED,MAAM,MACLC,SACkB;EAClB,IAAI,QAAQ,KAAK,GAAG,KAAK,UAAU,CAAC,MAAM,EAAE,OAAO,KAAM,EAAC;AAE1D,UAAQ,KAAK,aAAa,OAAO,QAAQ;EAEzC,MAAM,SAAS,MAAM,MAAM,OAAO;AAClC,SAAO,OAAO,QAAQ,SAAS,EAAE;CACjC;;;;;CAMD,cAAoB;AACnB,SAAO,KAAK;CACZ;;;;;;;;;CAUD,MAAM,gBACLT,SACAU,UACAC,IACa;EACb,MAAM,aAAa,MAAM,KAAK;AAG9B,MAAI,oBAAoB,WAAW,EAAE;AACpC,WAAQ,eAAe,WAAW;GAClC,MAAM,SAAS,MAAM,UAAU;AAC/B,SAAM,QAAQ,MAAM,WAAW;AAC/B,UAAO;EACP;AAGD,SAAO,WAAW,YAAY,OAAO,QAAQ;AAC5C,WAAQ,eAAe,IAAI;GAC3B,MAAM,SAAS,MAAM,UAAU;AAC/B,SAAM,QAAQ,MAAM,IAAI;AACxB,UAAO;EACP,EAAC;CACF;CAED,AAAQ,aAAaC,OAAYL,SAAiC;AAEjE,MAAI,QAAQ,gBACX,KAAI,MAAM,QAAQ,QAAQ,KAAK,CAC9B,SAAQ,MAAM,QAAQ,QAAQ,QAAQ,KAAK;MAE3C,SAAQ,MAAM,MAAM,QAAQ,QAAQ,KAAK;AAK3C,MAAI,QAAQ,qBAAwB;GACnC,MAAM,kBACE,QAAQ,aAAa,WACzB,QAAQ,WACR,KAAK,UAAU,QAAQ,SAAS;AACpC,WAAQ,MAAM,MAAM,YAAY,SAAS;EACzC;AAGD,MAAI,QAAQ,iBACX,SAAQ,MAAM,MAAM,SAAS,QAAQ,MAAM;AAI5C,MAAI,QAAQ,mBACX,SAAQ,MAAM,MAAM,WAAW,QAAQ,QAAQ;AAIhD,MAAI,QAAQ,gBACX,SAAQ,MAAM,MAAM,aAAa,MAAM,QAAQ,KAAK;AAErD,MAAI,QAAQ,cACX,SAAQ,MAAM,MAAM,aAAa,MAAM,QAAQ,GAAG;AAGnD,SAAO;CACP;CAED,AAAQ,MAAMM,QAAoC;EAGjD,MAAM,KAAK,KAAK,kBAAqB,OAAO,MAAM,oBAAQ;AAE1D,SAAO;GACN,GAAI,MAAM,EAAE,GAAI;GAChB,MAAM,OAAO;GACb,WAAW,OAAO;GAClB,OAAO,OAAO,SAAS;GACvB,UACC,OAAO,sBACJ,cACO,OAAO,aAAa,WAC1B,OAAO,WACP,KAAK,UAAU,OAAO,SAAS;GACpC,WAAW,KAAK,aAAa,OAAO,UAAU;GAC9C,WAAW,KAAK,aAAa,OAAO,UAAU;GAC9C,SAAS,KAAK,aAAa,OAAO,QAAQ;GAC1C,WAAW,OAAO;GAClB,SAAS,OAAO,OAAO,MAAM;GAC7B,WAAW,OAAO,OAAO,QAAQ;GACjC,WACC,OAAO,mBACJ,KAAK,aAAa,KAAK,aAAa,OAAO,MAAM,CAAC,GAClD;GACJ,UAAU,KAAK,aAAa,OAAO,SAAS;EAC5C;CACD;CAED,AAAQ,QAAQL,KAAiC;EAChD,MAAM,QACL,IAAI,YAAY,QAAQ,IAAI,cAAc,OACvC;GACA,IAAI,IAAI;GACR,MAAM,IAAI;GACV,GAAI,IAAI,YAAY,KAAK,UAAU,IAAI,UAAU,GAAG,CAAE;EACtD;AAGJ,SAAO;GACN,IAAI,IAAI;GACR,MAAM,IAAI;GACV,WAAW,IAAI;GACf,OAAO,IAAI;GACX,UAAU,IAAI,WAAW,KAAK,cAAc,IAAI,SAAS;GACzD,WAAW,IAAI,YAAY,KAAK,UAAU,IAAI,UAAU;GACxD,WAAW,IAAI,YAAY,KAAK,UAAU,IAAI,UAAU;GACxD,SAAS,IAAI,UAAU,KAAK,UAAU,IAAI,QAAQ;GAClD,WAAW,IAAI;GACf;GACA,UAAU,IAAI,WAAW,KAAK,UAAU,IAAI,SAAS;EACrD;CACD;;;;;;;;CASD,AAAQ,aAAaM,OAA+B;AACnD,MAAI,oBAAuB,UAAU,KACpC,QAAO;AAER,SAAO,KAAK,UAAU,MAAM;CAC5B;;;;CAKD,AAAQ,UAAUA,OAAyC;AAC1D,aAAW,UAAU,YAAY,UAAU,KAC1C,QAAO;AAER,aAAW,UAAU,SACpB,QAAO,KAAK,MAAM,MAAM;AAEzB,SAAO,CAAE;CACT;CAED,AAAQ,aACPC,OAC0B;EAC1B,MAAM,EAAE,IAAI,KAAM,GAAG,MAAM,GAAG;AAC9B,SAAO;CACP;CAED,AAAQ,cAAcC,UAAoD;AACzE,MAAI;GACH,MAAM,SAAS,KAAK,MAAM,SAAS;AACnC,cAAW,WAAW,YAAY,WAAW,KAC5C,QAAO;AAER,UAAO;EACP,QAAO;AACP,UAAO;EACP;CACD;AACD"}

package/dist/knex.d.cts

@@ -0,0 +1,178 @@
+import { AuditQueryOptions, AuditRecord, AuditStorage, TransactionAwareAuditor } from "./Auditor-DpBHXIJM.cjs";
+import { Knex } from "knex";
+
+//#region src/knex.d.ts
+interface TransactionSettings {
+  isolationLevel?: Knex.IsolationLevels;
+}
+type DatabaseConnection = Knex | Knex.Transaction;
+/**
+ * Execute a callback within a database transaction with automatic audit handling.
+ *
+ * This wrapper ensures that:
+ * 1. The transaction is automatically registered with the auditor
+ * 2. Manual audits (via `auditor.audit()`) are flushed BEFORE the transaction commits
+ * 3. If audit flush fails, the entire transaction rolls back
+ * 4. If the callback fails, audits are NOT written (atomic consistency)
+ *
+ * **Note:** Declarative audits (defined via `.audit([...])` on the endpoint builder)
+ * are processed AFTER the handler returns, so they run outside this transaction.
+ * If you need all audits to be atomic with your database operations, use manual
+ * audits via `auditor.audit()` inside this wrapper.
+ *
+ * @param db - Database connection (Knex instance or Transaction)
+ * @param auditor - Auditor instance that will receive the transaction
+ * @param cb - Callback to execute within the transaction
+ * @param settings - Optional transaction settings (isolation level)
+ * @returns The result of the callback
+ *
+ * @example
+ * ```typescript
+ * import { withAuditableTransaction } from '@geekmidas/audit/knex';
+ *
+ * const result = await withAuditableTransaction(
+ *   services.database,
+ *   auditor,
+ *   async (trx) => {
+ *     const [user] = await trx('users').insert(data).returning('*');
+ *
+ *     // Manual audits are atomic with the transaction
+ *     auditor.audit('user.created', { userId: user.id, email: user.email });
+ *
+ *     return user;
+ *   },
+ * );
+ * // Audits are automatically flushed inside the transaction before commit
+ * ```
+ */
+declare function withAuditableTransaction<T>(db: DatabaseConnection, auditor: TransactionAwareAuditor<Knex.Transaction>, cb: (trx: Knex.Transaction) => Promise<T>, settings?: TransactionSettings): Promise<T>;
+/**
+ * Shape of a row in the audit log table.
+ * Use this to describe your audit table when declaring Knex table types.
+ *
+ * Property names are camelCase to match the Kysely storage. Pair this with
+ * `knexSnakeCaseMappers()` if your database columns are snake_case.
+ *
+ * @example
+ * ```typescript
+ * import { knexSnakeCaseMappers } from 'objection';
+ *
+ * const db = knex({
+ *   client: 'pg',
+ *   connection: process.env.DATABASE_URL,
+ *   ...knexSnakeCaseMappers(),
+ * });
+ *
+ * declare module 'knex/types/tables' {
+ *   interface Tables {
+ *     audit_logs: AuditLogTable;
+ *   }
+ * }
+ * ```
+ */
+interface AuditLogTable {
+  id: string;
+  type: string;
+  operation: string;
+  table: string | null;
+  entityId: string | null;
+  oldValues: unknown | null;
+  newValues: unknown | null;
+  payload: unknown | null;
+  timestamp: Date;
+  actorId: string | null;
+  actorType: string | null;
+  actorData: unknown | null;
+  metadata: unknown | null;
+}
+/**
+ * Insertable version of AuditLogTable where id is optional.
+ * Use this when your database auto-generates IDs or when using the autoId option.
+ */
+type InsertableAuditLogTable = Omit<AuditLogTable, 'id'> & {
+  id?: string;
+};
+/**
+ * Configuration for KnexAuditStorage.
+ */
+interface KnexAuditStorageConfig {
+  /** Knex database instance */
+  db: Knex;
+  /** Table name for audit logs */
+  tableName: string;
+  /**
+   * Service name of the database service.
+   * When set, endpoint adaptors will automatically use the audit transaction as `db`
+   * in the handler context if the endpoint's database service has the same name.
+   */
+  databaseServiceName?: string;
+  /**
+   * Let the database auto-generate IDs (e.g., via DEFAULT gen_random_uuid()).
+   * When true, the ID field is omitted from inserts if not provided.
+   * When false (default), IDs are generated using nanoid if not provided.
+   * @default false
+   */
+  autoId?: boolean;
+}
+/**
+ * Knex-based audit storage implementation.
+ * Stores audit records in a database table using Knex.
+ *
+ * @example
+ * ```typescript
+ * const storage = new KnexAuditStorage({
+ *   db: knexDb,
+ *   tableName: 'audit_logs',
+ * });
+ *
+ * const auditor = new DefaultAuditor({
+ *   actor: { id: 'user-123', type: 'user' },
+ *   storage,
+ * });
+ * ```
+ */
+declare class KnexAuditStorage implements AuditStorage {
+  private readonly db;
+  private readonly tableName;
+  private readonly autoId;
+  readonly databaseServiceName?: string;
+  constructor(config: KnexAuditStorageConfig);
+  write(records: AuditRecord[], trx?: unknown): Promise<void>;
+  query(options: AuditQueryOptions): Promise<AuditRecord[]>;
+  count(options: Omit<AuditQueryOptions, 'limit' | 'offset'>): Promise<number>;
+  /**
+   * Get the Knex database instance for transactional operations.
+   * Used by endpoint adaptors to automatically wrap handlers in transactions.
+   */
+  getDatabase(): Knex;
+  /**
+   * Execute a callback within a Knex transaction with automatic audit handling.
+   * The auditor is registered with the transaction and audits are flushed
+   * before the transaction commits.
+   *
+   * If the provided db connection is already a transaction, it will be reused
+   * instead of opening a savepoint.
+   */
+  withTransaction<T>(auditor: TransactionAwareAuditor<Knex.Transaction>, callback: () => Promise<T>, db?: DatabaseConnection): Promise<T>;
+  private applyFilters;
+  private toRow;
+  private fromRow;
+  /**
+   * Serialize a JSON value for insertion.
+   *
+   * Unlike Kysely, Knex has no per-column type information to tell a json/jsonb
+   * column from an object it should bind as a composite value, so plain objects
+   * are stringified before they reach the driver.
+   */
+  private toJsonColumn;
+  /**
+   * Parse a JSON value that may already be parsed (e.g., from jsonb columns).
+   */
+  private parseJson;
+  private getActorData;
+  private parseEntityId;
+}
+//# sourceMappingURL=knex.d.ts.map
+//#endregion
+export { AuditLogTable, DatabaseConnection, InsertableAuditLogTable, KnexAuditStorage, KnexAuditStorageConfig, TransactionAwareAuditor, TransactionSettings, withAuditableTransaction };
+//# sourceMappingURL=knex.d.cts.map

package/dist/knex.d.cts.map

@@ -0,0 +1 @@
+{"version":3,"file":"knex.d.cts","names":[],"sources":["../src/knex.ts"],"sourcesContent":[],"mappings":";;;;AAWiB,UAAA,mBAAA,CACC;EAGN,cAAA,CAAA,EAHM,IAAA,CAAK,eAGO;;AAAG,KAArB,kBAAA,GAAqB,IAAA,GAAO,IAAA,CAAK,WAAZ;;AAAuB;AAyDxD;;;;;;;;;;;AAKU;AAgDV;AAoBA;;;;AAA0C;AAO1C;AAqCA;;;;;;;;;;;;;;;;;;AAgFI,iBArMkB,wBAqMlB,CAAA,CAAA,CAAA,CAAA,EAAA,EApMC,kBAoMD,EAAA,OAAA,EAnMM,uBAmMN,CAnM8B,IAAA,CAAK,WAmMnC,CAAA,EAAA,EAAA,EAAA,CAAA,GAAA,EAlMO,IAAA,CAAK,WAkMZ,EAAA,GAlM4B,OAkM5B,CAlMoC,CAkMpC,CAAA,EAAA,QAAA,CAAA,EAjMQ,mBAiMR,CAAA,EAhMD,OAgMC,CAhMO,CAgMP,CAAA;;AAhFiD;;;;;;;;;;;;;;;;;;;;;;;UAhEpC,aAAA;;;;;;;;;aASL;;;;;;;;;;KAWA,uBAAA,GAA0B,KAAK;;;;;;UAO1B,sBAAA;;MAEZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAmCQ,gBAAA,YAA4B;;;;;sBAMpB;iBAOC,+BAA+B;iBAW/B,oBAAoB,QAAQ;iBA0BvC,KAAK,yCACZ;;;;;iBAaY;;;;;;;;;8BAaL,wBAAwB,IAAA,CAAK,8BACtB,QAAQ,SACnB,qBACH,QAAQ"}

package/dist/knex.d.mts

@@ -0,0 +1,178 @@
+import { AuditQueryOptions, AuditRecord, AuditStorage, TransactionAwareAuditor } from "./Auditor-CW2NrfHS.mjs";
+import { Knex } from "knex";
+
+//#region src/knex.d.ts
+interface TransactionSettings {
+  isolationLevel?: Knex.IsolationLevels;
+}
+type DatabaseConnection = Knex | Knex.Transaction;
+/**
+ * Execute a callback within a database transaction with automatic audit handling.
+ *
+ * This wrapper ensures that:
+ * 1. The transaction is automatically registered with the auditor
+ * 2. Manual audits (via `auditor.audit()`) are flushed BEFORE the transaction commits
+ * 3. If audit flush fails, the entire transaction rolls back
+ * 4. If the callback fails, audits are NOT written (atomic consistency)
+ *
+ * **Note:** Declarative audits (defined via `.audit([...])` on the endpoint builder)
+ * are processed AFTER the handler returns, so they run outside this transaction.
+ * If you need all audits to be atomic with your database operations, use manual
+ * audits via `auditor.audit()` inside this wrapper.
+ *
+ * @param db - Database connection (Knex instance or Transaction)
+ * @param auditor - Auditor instance that will receive the transaction
+ * @param cb - Callback to execute within the transaction
+ * @param settings - Optional transaction settings (isolation level)
+ * @returns The result of the callback
+ *
+ * @example
+ * ```typescript
+ * import { withAuditableTransaction } from '@geekmidas/audit/knex';
+ *
+ * const result = await withAuditableTransaction(
+ *   services.database,
+ *   auditor,
+ *   async (trx) => {
+ *     const [user] = await trx('users').insert(data).returning('*');
+ *
+ *     // Manual audits are atomic with the transaction
+ *     auditor.audit('user.created', { userId: user.id, email: user.email });
+ *
+ *     return user;
+ *   },
+ * );
+ * // Audits are automatically flushed inside the transaction before commit
+ * ```
+ */
+declare function withAuditableTransaction<T>(db: DatabaseConnection, auditor: TransactionAwareAuditor<Knex.Transaction>, cb: (trx: Knex.Transaction) => Promise<T>, settings?: TransactionSettings): Promise<T>;
+/**
+ * Shape of a row in the audit log table.
+ * Use this to describe your audit table when declaring Knex table types.
+ *
+ * Property names are camelCase to match the Kysely storage. Pair this with
+ * `knexSnakeCaseMappers()` if your database columns are snake_case.
+ *
+ * @example
+ * ```typescript
+ * import { knexSnakeCaseMappers } from 'objection';
+ *
+ * const db = knex({
+ *   client: 'pg',
+ *   connection: process.env.DATABASE_URL,
+ *   ...knexSnakeCaseMappers(),
+ * });
+ *
+ * declare module 'knex/types/tables' {
+ *   interface Tables {
+ *     audit_logs: AuditLogTable;
+ *   }
+ * }
+ * ```
+ */
+interface AuditLogTable {
+  id: string;
+  type: string;
+  operation: string;
+  table: string | null;
+  entityId: string | null;
+  oldValues: unknown | null;
+  newValues: unknown | null;
+  payload: unknown | null;
+  timestamp: Date;
+  actorId: string | null;
+  actorType: string | null;
+  actorData: unknown | null;
+  metadata: unknown | null;
+}
+/**
+ * Insertable version of AuditLogTable where id is optional.
+ * Use this when your database auto-generates IDs or when using the autoId option.
+ */
+type InsertableAuditLogTable = Omit<AuditLogTable, 'id'> & {
+  id?: string;
+};
+/**
+ * Configuration for KnexAuditStorage.
+ */
+interface KnexAuditStorageConfig {
+  /** Knex database instance */
+  db: Knex;
+  /** Table name for audit logs */
+  tableName: string;
+  /**
+   * Service name of the database service.
+   * When set, endpoint adaptors will automatically use the audit transaction as `db`
+   * in the handler context if the endpoint's database service has the same name.
+   */
+  databaseServiceName?: string;
+  /**
+   * Let the database auto-generate IDs (e.g., via DEFAULT gen_random_uuid()).
+   * When true, the ID field is omitted from inserts if not provided.
+   * When false (default), IDs are generated using nanoid if not provided.
+   * @default false
+   */
+  autoId?: boolean;
+}
+/**
+ * Knex-based audit storage implementation.
+ * Stores audit records in a database table using Knex.
+ *
+ * @example
+ * ```typescript
+ * const storage = new KnexAuditStorage({
+ *   db: knexDb,
+ *   tableName: 'audit_logs',
+ * });
+ *
+ * const auditor = new DefaultAuditor({
+ *   actor: { id: 'user-123', type: 'user' },
+ *   storage,
+ * });
+ * ```
+ */
+declare class KnexAuditStorage implements AuditStorage {
+  private readonly db;
+  private readonly tableName;
+  private readonly autoId;
+  readonly databaseServiceName?: string;
+  constructor(config: KnexAuditStorageConfig);
+  write(records: AuditRecord[], trx?: unknown): Promise<void>;
+  query(options: AuditQueryOptions): Promise<AuditRecord[]>;
+  count(options: Omit<AuditQueryOptions, 'limit' | 'offset'>): Promise<number>;
+  /**
+   * Get the Knex database instance for transactional operations.
+   * Used by endpoint adaptors to automatically wrap handlers in transactions.
+   */
+  getDatabase(): Knex;
+  /**
+   * Execute a callback within a Knex transaction with automatic audit handling.
+   * The auditor is registered with the transaction and audits are flushed
+   * before the transaction commits.
+   *
+   * If the provided db connection is already a transaction, it will be reused
+   * instead of opening a savepoint.
+   */
+  withTransaction<T>(auditor: TransactionAwareAuditor<Knex.Transaction>, callback: () => Promise<T>, db?: DatabaseConnection): Promise<T>;
+  private applyFilters;
+  private toRow;
+  private fromRow;
+  /**
+   * Serialize a JSON value for insertion.
+   *
+   * Unlike Kysely, Knex has no per-column type information to tell a json/jsonb
+   * column from an object it should bind as a composite value, so plain objects
+   * are stringified before they reach the driver.
+   */
+  private toJsonColumn;
+  /**
+   * Parse a JSON value that may already be parsed (e.g., from jsonb columns).
+   */
+  private parseJson;
+  private getActorData;
+  private parseEntityId;
+}
+//# sourceMappingURL=knex.d.ts.map
+//#endregion
+export { AuditLogTable, DatabaseConnection, InsertableAuditLogTable, KnexAuditStorage, KnexAuditStorageConfig, TransactionAwareAuditor, TransactionSettings, withAuditableTransaction };
+//# sourceMappingURL=knex.d.mts.map

package/dist/knex.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"knex.d.mts","names":[],"sources":["../src/knex.ts"],"sourcesContent":[],"mappings":";;;;AAWiB,UAAA,mBAAA,CACC;EAGN,cAAA,CAAA,EAHM,IAAA,CAAK,eAGO;;AAAG,KAArB,kBAAA,GAAqB,IAAA,GAAO,IAAA,CAAK,WAAZ;;AAAuB;AAyDxD;;;;;;;;;;;AAKU;AAgDV;AAoBA;;;;AAA0C;AAO1C;AAqCA;;;;;;;;;;;;;;;;;;AAgFI,iBArMkB,wBAqMlB,CAAA,CAAA,CAAA,CAAA,EAAA,EApMC,kBAoMD,EAAA,OAAA,EAnMM,uBAmMN,CAnM8B,IAAA,CAAK,WAmMnC,CAAA,EAAA,EAAA,EAAA,CAAA,GAAA,EAlMO,IAAA,CAAK,WAkMZ,EAAA,GAlM4B,OAkM5B,CAlMoC,CAkMpC,CAAA,EAAA,QAAA,CAAA,EAjMQ,mBAiMR,CAAA,EAhMD,OAgMC,CAhMO,CAgMP,CAAA;;AAhFiD;;;;;;;;;;;;;;;;;;;;;;;UAhEpC,aAAA;;;;;;;;;aASL;;;;;;;;;;KAWA,uBAAA,GAA0B,KAAK;;;;;;UAO1B,sBAAA;;MAEZ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cAmCQ,gBAAA,YAA4B;;;;;sBAMpB;iBAOC,+BAA+B;iBAW/B,oBAAoB,QAAQ;iBA0BvC,KAAK,yCACZ;;;;;iBAaY;;;;;;;;;8BAaL,wBAAwB,IAAA,CAAK,8BACtB,QAAQ,SACnB,qBACH,QAAQ"}

package/dist/knex.mjs

@@ -0,0 +1,231 @@
+import { nanoid } from "nanoid";
+
+//#region src/knex.ts
+/**
+* Type guard for an active Knex transaction.
+*
+* Knex marks transaction instances with `isTransaction`, and a completed
+* transaction can no longer be used, so a settled transaction is treated as a
+* plain connection.
+*/
+function isActiveTransaction(connection) {
+	return connection.isTransaction === true && !connection.isCompleted();
+}
+/**
+* Execute a callback within a database transaction with automatic audit handling.
+*
+* This wrapper ensures that:
+* 1. The transaction is automatically registered with the auditor
+* 2. Manual audits (via `auditor.audit()`) are flushed BEFORE the transaction commits
+* 3. If audit flush fails, the entire transaction rolls back
+* 4. If the callback fails, audits are NOT written (atomic consistency)
+*
+* **Note:** Declarative audits (defined via `.audit([...])` on the endpoint builder)
+* are processed AFTER the handler returns, so they run outside this transaction.
+* If you need all audits to be atomic with your database operations, use manual
+* audits via `auditor.audit()` inside this wrapper.
+*
+* @param db - Database connection (Knex instance or Transaction)
+* @param auditor - Auditor instance that will receive the transaction
+* @param cb - Callback to execute within the transaction
+* @param settings - Optional transaction settings (isolation level)
+* @returns The result of the callback
+*
+* @example
+* ```typescript
+* import { withAuditableTransaction } from '@geekmidas/audit/knex';
+*
+* const result = await withAuditableTransaction(
+*   services.database,
+*   auditor,
+*   async (trx) => {
+*     const [user] = await trx('users').insert(data).returning('*');
+*
+*     // Manual audits are atomic with the transaction
+*     auditor.audit('user.created', { userId: user.id, email: user.email });
+*
+*     return user;
+*   },
+* );
+* // Audits are automatically flushed inside the transaction before commit
+* ```
+*/
+async function withAuditableTransaction(db, auditor, cb, settings) {
+	const execute = async (trx) => {
+		auditor.setTransaction(trx);
+		const result = await cb(trx);
+		await auditor.flush(trx);
+		return result;
+	};
+	if (isActiveTransaction(db)) return execute(db);
+	return db.transaction(execute, settings);
+}
+/**
+* Knex-based audit storage implementation.
+* Stores audit records in a database table using Knex.
+*
+* @example
+* ```typescript
+* const storage = new KnexAuditStorage({
+*   db: knexDb,
+*   tableName: 'audit_logs',
+* });
+*
+* const auditor = new DefaultAuditor({
+*   actor: { id: 'user-123', type: 'user' },
+*   storage,
+* });
+* ```
+*/
+var KnexAuditStorage = class {
+	db;
+	tableName;
+	autoId;
+	databaseServiceName;
+	constructor(config) {
+		this.db = config.db;
+		this.tableName = config.tableName;
+		this.databaseServiceName = config.databaseServiceName;
+		this.autoId = config.autoId ?? false;
+	}
+	async write(records, trx) {
+		if (records.length === 0) return;
+		const db = trx ?? this.db;
+		const rows = records.map((record) => this.toRow(record));
+		await db(this.tableName).insert(rows);
+	}
+	async query(options) {
+		let query = this.db(this.tableName).select("*");
+		query = this.applyFilters(query, options);
+		const orderBy = options.orderBy ?? "timestamp";
+		const orderDirection = options.orderDirection ?? "desc";
+		query = query.orderBy(orderBy === "timestamp" ? "timestamp" : "type", orderDirection);
+		if (options.limit !== void 0) query = query.limit(options.limit);
+		if (options.offset !== void 0) query = query.offset(options.offset);
+		const rows = await query;
+		return rows.map((row) => this.fromRow(row));
+	}
+	async count(options) {
+		let query = this.db(this.tableName).count({ count: "id" });
+		query = this.applyFilters(query, options);
+		const result = await query.first();
+		return Number(result?.count ?? 0);
+	}
+	/**
+	* Get the Knex database instance for transactional operations.
+	* Used by endpoint adaptors to automatically wrap handlers in transactions.
+	*/
+	getDatabase() {
+		return this.db;
+	}
+	/**
+	* Execute a callback within a Knex transaction with automatic audit handling.
+	* The auditor is registered with the transaction and audits are flushed
+	* before the transaction commits.
+	*
+	* If the provided db connection is already a transaction, it will be reused
+	* instead of opening a savepoint.
+	*/
+	async withTransaction(auditor, callback, db) {
+		const connection = db ?? this.db;
+		if (isActiveTransaction(connection)) {
+			auditor.setTransaction(connection);
+			const result = await callback();
+			await auditor.flush(connection);
+			return result;
+		}
+		return connection.transaction(async (trx) => {
+			auditor.setTransaction(trx);
+			const result = await callback();
+			await auditor.flush(trx);
+			return result;
+		});
+	}
+	applyFilters(query, options) {
+		if (options.type !== void 0) if (Array.isArray(options.type)) query = query.whereIn("type", options.type);
+		else query = query.where("type", options.type);
+		if (options.entityId !== void 0) {
+			const entityId = typeof options.entityId === "string" ? options.entityId : JSON.stringify(options.entityId);
+			query = query.where("entityId", entityId);
+		}
+		if (options.table !== void 0) query = query.where("table", options.table);
+		if (options.actorId !== void 0) query = query.where("actorId", options.actorId);
+		if (options.from !== void 0) query = query.where("timestamp", ">=", options.from);
+		if (options.to !== void 0) query = query.where("timestamp", "<=", options.to);
+		return query;
+	}
+	toRow(record) {
+		const id = this.autoId ? void 0 : record.id || nanoid();
+		return {
+			...id && { id },
+			type: record.type,
+			operation: record.operation,
+			table: record.table ?? null,
+			entityId: record.entityId === void 0 ? null : typeof record.entityId === "string" ? record.entityId : JSON.stringify(record.entityId),
+			oldValues: this.toJsonColumn(record.oldValues),
+			newValues: this.toJsonColumn(record.newValues),
+			payload: this.toJsonColumn(record.payload),
+			timestamp: record.timestamp,
+			actorId: record.actor?.id ?? null,
+			actorType: record.actor?.type ?? null,
+			actorData: record.actor !== void 0 ? this.toJsonColumn(this.getActorData(record.actor)) : null,
+			metadata: this.toJsonColumn(record.metadata)
+		};
+	}
+	fromRow(row) {
+		const actor = row.actorId !== null || row.actorType !== null ? {
+			id: row.actorId ?? void 0,
+			type: row.actorType ?? void 0,
+			...row.actorData ? this.parseJson(row.actorData) : {}
+		} : void 0;
+		return {
+			id: row.id,
+			type: row.type,
+			operation: row.operation,
+			table: row.table ?? void 0,
+			entityId: row.entityId ? this.parseEntityId(row.entityId) : void 0,
+			oldValues: row.oldValues ? this.parseJson(row.oldValues) : void 0,
+			newValues: row.newValues ? this.parseJson(row.newValues) : void 0,
+			payload: row.payload ? this.parseJson(row.payload) : void 0,
+			timestamp: row.timestamp,
+			actor,
+			metadata: row.metadata ? this.parseJson(row.metadata) : void 0
+		};
+	}
+	/**
+	* Serialize a JSON value for insertion.
+	*
+	* Unlike Kysely, Knex has no per-column type information to tell a json/jsonb
+	* column from an object it should bind as a composite value, so plain objects
+	* are stringified before they reach the driver.
+	*/
+	toJsonColumn(value) {
+		if (value === void 0 || value === null) return null;
+		return JSON.stringify(value);
+	}
+	/**
+	* Parse a JSON value that may already be parsed (e.g., from jsonb columns).
+	*/
+	parseJson(value) {
+		if (typeof value === "object" && value !== null) return value;
+		if (typeof value === "string") return JSON.parse(value);
+		return {};
+	}
+	getActorData(actor) {
+		const { id, type,...rest } = actor;
+		return rest;
+	}
+	parseEntityId(entityId) {
+		try {
+			const parsed = JSON.parse(entityId);
+			if (typeof parsed === "object" && parsed !== null) return parsed;
+			return entityId;
+		} catch {
+			return entityId;
+		}
+	}
+};
+
+//#endregion
+export { KnexAuditStorage, withAuditableTransaction };
+//# sourceMappingURL=knex.mjs.map

package/dist/knex.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"knex.mjs","names":["connection: DatabaseConnection","db: DatabaseConnection","auditor: TransactionAwareAuditor<Knex.Transaction>","cb: (trx: Knex.Transaction) => Promise<T>","settings?: TransactionSettings","trx: Knex.Transaction","config: KnexAuditStorageConfig","records: AuditRecord[]","trx?: unknown","options: AuditQueryOptions","row: AuditLogTable","options: Omit<AuditQueryOptions, 'limit' | 'offset'>","callback: () => Promise<T>","db?: DatabaseConnection","query: any","record: AuditRecord","value: unknown","actor: NonNullable<AuditRecord['actor']>","entityId: string"],"sources":["../src/knex.ts"],"sourcesContent":["import type { Knex } from 'knex';\nimport { nanoid } from 'nanoid';\nimport type {\n\tAuditQueryOptions,\n\tAuditStorage,\n\tTransactionAwareAuditor,\n} from './storage';\nimport type { AuditRecord } from './types';\n\nexport type { TransactionAwareAuditor };\n\nexport interface TransactionSettings {\n\tisolationLevel?: Knex.IsolationLevels;\n}\n\nexport type DatabaseConnection = Knex | Knex.Transaction;\n\n/**\n * Type guard for an active Knex transaction.\n *\n * Knex marks transaction instances with `isTransaction`, and a completed\n * transaction can no longer be used, so a settled transaction is treated as a\n * plain connection.\n */\nfunction isActiveTransaction(\n\tconnection: DatabaseConnection,\n): connection is Knex.Transaction {\n\treturn (\n\t\tconnection.isTransaction === true &&\n\t\t!(connection as Knex.Transaction).isCompleted()\n\t);\n}\n\n/**\n * Execute a callback within a database transaction with automatic audit handling.\n *\n * This wrapper ensures that:\n * 1. The transaction is automatically registered with the auditor\n * 2. Manual audits (via `auditor.audit()`) are flushed BEFORE the transaction commits\n * 3. If audit flush fails, the entire transaction rolls back\n * 4. If the callback fails, audits are NOT written (atomic consistency)\n *\n * **Note:** Declarative audits (defined via `.audit([...])` on the endpoint builder)\n * are processed AFTER the handler returns, so they run outside this transaction.\n * If you need all audits to be atomic with your database operations, use manual\n * audits via `auditor.audit()` inside this wrapper.\n *\n * @param db - Database connection (Knex instance or Transaction)\n * @param auditor - Auditor instance that will receive the transaction\n * @param cb - Callback to execute within the transaction\n * @param settings - Optional transaction settings (isolation level)\n * @returns The result of the callback\n *\n * @example\n * ```typescript\n * import { withAuditableTransaction } from '@geekmidas/audit/knex';\n *\n * const result = await withAuditableTransaction(\n *   services.database,\n *   auditor,\n *   async (trx) => {\n *     const [user] = await trx('users').insert(data).returning('*');\n *\n *     // Manual audits are atomic with the transaction\n *     auditor.audit('user.created', { userId: user.id, email: user.email });\n *\n *     return user;\n *   },\n * );\n * // Audits are automatically flushed inside the transaction before commit\n * ```\n */\nexport async function withAuditableTransaction<T>(\n\tdb: DatabaseConnection,\n\tauditor: TransactionAwareAuditor<Knex.Transaction>,\n\tcb: (trx: Knex.Transaction) => Promise<T>,\n\tsettings?: TransactionSettings,\n): Promise<T> {\n\tconst execute = async (trx: Knex.Transaction): Promise<T> => {\n\t\t// Register transaction with auditor\n\t\tauditor.setTransaction(trx);\n\n\t\t// Execute the callback\n\t\tconst result = await cb(trx);\n\n\t\t// Flush audits BEFORE transaction commits\n\t\t// If this fails, the transaction will roll back\n\t\tawait auditor.flush(trx);\n\n\t\treturn result;\n\t};\n\n\t// If already in a transaction, just run with it.\n\t// Knex would otherwise open a savepoint, which commits independently.\n\tif (isActiveTransaction(db)) {\n\t\treturn execute(db);\n\t}\n\n\treturn db.transaction(execute, settings);\n}\n\n/**\n * Shape of a row in the audit log table.\n * Use this to describe your audit table when declaring Knex table types.\n *\n * Property names are camelCase to match the Kysely storage. Pair this with\n * `knexSnakeCaseMappers()` if your database columns are snake_case.\n *\n * @example\n * ```typescript\n * import { knexSnakeCaseMappers } from 'objection';\n *\n * const db = knex({\n *   client: 'pg',\n *   connection: process.env.DATABASE_URL,\n *   ...knexSnakeCaseMappers(),\n * });\n *\n * declare module 'knex/types/tables' {\n *   interface Tables {\n *     audit_logs: AuditLogTable;\n *   }\n * }\n * ```\n */\nexport interface AuditLogTable {\n\tid: string;\n\ttype: string;\n\toperation: string;\n\ttable: string | null;\n\tentityId: string | null;\n\toldValues: unknown | null;\n\tnewValues: unknown | null;\n\tpayload: unknown | null;\n\ttimestamp: Date;\n\tactorId: string | null;\n\tactorType: string | null;\n\tactorData: unknown | null;\n\tmetadata: unknown | null;\n}\n\n/**\n * Insertable version of AuditLogTable where id is optional.\n * Use this when your database auto-generates IDs or when using the autoId option.\n */\nexport type InsertableAuditLogTable = Omit<AuditLogTable, 'id'> & {\n\tid?: string;\n};\n\n/**\n * Configuration for KnexAuditStorage.\n */\nexport interface KnexAuditStorageConfig {\n\t/** Knex database instance */\n\tdb: Knex;\n\t/** Table name for audit logs */\n\ttableName: string;\n\t/**\n\t * Service name of the database service.\n\t * When set, endpoint adaptors will automatically use the audit transaction as `db`\n\t * in the handler context if the endpoint's database service has the same name.\n\t */\n\tdatabaseServiceName?: string;\n\t/**\n\t * Let the database auto-generate IDs (e.g., via DEFAULT gen_random_uuid()).\n\t * When true, the ID field is omitted from inserts if not provided.\n\t * When false (default), IDs are generated using nanoid if not provided.\n\t * @default false\n\t */\n\tautoId?: boolean;\n}\n\n/**\n * Knex-based audit storage implementation.\n * Stores audit records in a database table using Knex.\n *\n * @example\n * ```typescript\n * const storage = new KnexAuditStorage({\n *   db: knexDb,\n *   tableName: 'audit_logs',\n * });\n *\n * const auditor = new DefaultAuditor({\n *   actor: { id: 'user-123', type: 'user' },\n *   storage,\n * });\n * ```\n */\nexport class KnexAuditStorage implements AuditStorage {\n\tprivate readonly db: Knex;\n\tprivate readonly tableName: string;\n\tprivate readonly autoId: boolean;\n\treadonly databaseServiceName?: string;\n\n\tconstructor(config: KnexAuditStorageConfig) {\n\t\tthis.db = config.db;\n\t\tthis.tableName = config.tableName;\n\t\tthis.databaseServiceName = config.databaseServiceName;\n\t\tthis.autoId = config.autoId ?? false;\n\t}\n\n\tasync write(records: AuditRecord[], trx?: unknown): Promise<void> {\n\t\tif (records.length === 0) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst db = (trx as Knex.Transaction) ?? this.db;\n\t\tconst rows = records.map((record) => this.toRow(record));\n\n\t\tawait db(this.tableName).insert(rows);\n\t}\n\n\tasync query(options: AuditQueryOptions): Promise<AuditRecord[]> {\n\t\tlet query = this.db(this.tableName).select('*');\n\n\t\tquery = this.applyFilters(query, options);\n\n\t\t// Ordering\n\t\tconst orderBy = options.orderBy ?? 'timestamp';\n\t\tconst orderDirection = options.orderDirection ?? 'desc';\n\t\tquery = query.orderBy(\n\t\t\torderBy === 'timestamp' ? 'timestamp' : 'type',\n\t\t\torderDirection,\n\t\t);\n\n\t\t// Pagination\n\t\tif (options.limit !== undefined) {\n\t\t\tquery = query.limit(options.limit);\n\t\t}\n\t\tif (options.offset !== undefined) {\n\t\t\tquery = query.offset(options.offset);\n\t\t}\n\n\t\tconst rows = await query;\n\t\treturn rows.map((row: AuditLogTable) => this.fromRow(row));\n\t}\n\n\tasync count(\n\t\toptions: Omit<AuditQueryOptions, 'limit' | 'offset'>,\n\t): Promise<number> {\n\t\tlet query = this.db(this.tableName).count({ count: 'id' });\n\n\t\tquery = this.applyFilters(query, options);\n\n\t\tconst result = await query.first();\n\t\treturn Number(result?.count ?? 0);\n\t}\n\n\t/**\n\t * Get the Knex database instance for transactional operations.\n\t * Used by endpoint adaptors to automatically wrap handlers in transactions.\n\t */\n\tgetDatabase(): Knex {\n\t\treturn this.db;\n\t}\n\n\t/**\n\t * Execute a callback within a Knex transaction with automatic audit handling.\n\t * The auditor is registered with the transaction and audits are flushed\n\t * before the transaction commits.\n\t *\n\t * If the provided db connection is already a transaction, it will be reused\n\t * instead of opening a savepoint.\n\t */\n\tasync withTransaction<T>(\n\t\tauditor: TransactionAwareAuditor<Knex.Transaction>,\n\t\tcallback: () => Promise<T>,\n\t\tdb?: DatabaseConnection,\n\t): Promise<T> {\n\t\tconst connection = db ?? this.db;\n\n\t\t// If already in a transaction, reuse it\n\t\tif (isActiveTransaction(connection)) {\n\t\t\tauditor.setTransaction(connection);\n\t\t\tconst result = await callback();\n\t\t\tawait auditor.flush(connection);\n\t\t\treturn result;\n\t\t}\n\n\t\t// Create new transaction\n\t\treturn connection.transaction(async (trx) => {\n\t\t\tauditor.setTransaction(trx);\n\t\t\tconst result = await callback();\n\t\t\tawait auditor.flush(trx);\n\t\t\treturn result;\n\t\t});\n\t}\n\n\tprivate applyFilters(query: any, options: AuditQueryOptions): any {\n\t\t// Type filter\n\t\tif (options.type !== undefined) {\n\t\t\tif (Array.isArray(options.type)) {\n\t\t\t\tquery = query.whereIn('type', options.type);\n\t\t\t} else {\n\t\t\t\tquery = query.where('type', options.type);\n\t\t\t}\n\t\t}\n\n\t\t// Entity ID filter\n\t\tif (options.entityId !== undefined) {\n\t\t\tconst entityId =\n\t\t\t\ttypeof options.entityId === 'string'\n\t\t\t\t\t? options.entityId\n\t\t\t\t\t: JSON.stringify(options.entityId);\n\t\t\tquery = query.where('entityId', entityId);\n\t\t}\n\n\t\t// Table filter\n\t\tif (options.table !== undefined) {\n\t\t\tquery = query.where('table', options.table);\n\t\t}\n\n\t\t// Actor ID filter\n\t\tif (options.actorId !== undefined) {\n\t\t\tquery = query.where('actorId', options.actorId);\n\t\t}\n\n\t\t// Date range filters\n\t\tif (options.from !== undefined) {\n\t\t\tquery = query.where('timestamp', '>=', options.from);\n\t\t}\n\t\tif (options.to !== undefined) {\n\t\t\tquery = query.where('timestamp', '<=', options.to);\n\t\t}\n\n\t\treturn query;\n\t}\n\n\tprivate toRow(record: AuditRecord): AuditLogTable {\n\t\t// If autoId is true, let database generate ID (ignore record.id)\n\t\t// If autoId is false (default), use record.id or generate with nanoid\n\t\tconst id = this.autoId ? undefined : record.id || nanoid();\n\n\t\treturn {\n\t\t\t...(id && { id }),\n\t\t\ttype: record.type,\n\t\t\toperation: record.operation,\n\t\t\ttable: record.table ?? null,\n\t\t\tentityId:\n\t\t\t\trecord.entityId === undefined\n\t\t\t\t\t? null\n\t\t\t\t\t: typeof record.entityId === 'string'\n\t\t\t\t\t\t? record.entityId\n\t\t\t\t\t\t: JSON.stringify(record.entityId),\n\t\t\toldValues: this.toJsonColumn(record.oldValues),\n\t\t\tnewValues: this.toJsonColumn(record.newValues),\n\t\t\tpayload: this.toJsonColumn(record.payload),\n\t\t\ttimestamp: record.timestamp,\n\t\t\tactorId: record.actor?.id ?? null,\n\t\t\tactorType: record.actor?.type ?? null,\n\t\t\tactorData:\n\t\t\t\trecord.actor !== undefined\n\t\t\t\t\t? this.toJsonColumn(this.getActorData(record.actor))\n\t\t\t\t\t: null,\n\t\t\tmetadata: this.toJsonColumn(record.metadata),\n\t\t} as AuditLogTable;\n\t}\n\n\tprivate fromRow(row: AuditLogTable): AuditRecord {\n\t\tconst actor =\n\t\t\trow.actorId !== null || row.actorType !== null\n\t\t\t\t? {\n\t\t\t\t\t\tid: row.actorId ?? undefined,\n\t\t\t\t\t\ttype: row.actorType ?? undefined,\n\t\t\t\t\t\t...(row.actorData ? this.parseJson(row.actorData) : {}),\n\t\t\t\t\t}\n\t\t\t\t: undefined;\n\n\t\treturn {\n\t\t\tid: row.id,\n\t\t\ttype: row.type,\n\t\t\toperation: row.operation as AuditRecord['operation'],\n\t\t\ttable: row.table ?? undefined,\n\t\t\tentityId: row.entityId ? this.parseEntityId(row.entityId) : undefined,\n\t\t\toldValues: row.oldValues ? this.parseJson(row.oldValues) : undefined,\n\t\t\tnewValues: row.newValues ? this.parseJson(row.newValues) : undefined,\n\t\t\tpayload: row.payload ? this.parseJson(row.payload) : undefined,\n\t\t\ttimestamp: row.timestamp,\n\t\t\tactor,\n\t\t\tmetadata: row.metadata ? this.parseJson(row.metadata) : undefined,\n\t\t};\n\t}\n\n\t/**\n\t * Serialize a JSON value for insertion.\n\t *\n\t * Unlike Kysely, Knex has no per-column type information to tell a json/jsonb\n\t * column from an object it should bind as a composite value, so plain objects\n\t * are stringified before they reach the driver.\n\t */\n\tprivate toJsonColumn(value: unknown): string | null {\n\t\tif (value === undefined || value === null) {\n\t\t\treturn null;\n\t\t}\n\t\treturn JSON.stringify(value);\n\t}\n\n\t/**\n\t * Parse a JSON value that may already be parsed (e.g., from jsonb columns).\n\t */\n\tprivate parseJson(value: unknown): Record<string, unknown> {\n\t\tif (typeof value === 'object' && value !== null) {\n\t\t\treturn value as Record<string, unknown>;\n\t\t}\n\t\tif (typeof value === 'string') {\n\t\t\treturn JSON.parse(value);\n\t\t}\n\t\treturn {};\n\t}\n\n\tprivate getActorData(\n\t\tactor: NonNullable<AuditRecord['actor']>,\n\t): Record<string, unknown> {\n\t\tconst { id, type, ...rest } = actor;\n\t\treturn rest;\n\t}\n\n\tprivate parseEntityId(entityId: string): string | Record<string, unknown> {\n\t\ttry {\n\t\t\tconst parsed = JSON.parse(entityId);\n\t\t\tif (typeof parsed === 'object' && parsed !== null) {\n\t\t\t\treturn parsed;\n\t\t\t}\n\t\t\treturn entityId;\n\t\t} catch {\n\t\t\treturn entityId;\n\t\t}\n\t}\n}\n"],"mappings":"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"}