@willyim/drizzle-audit 0.4.0 → 0.6.0

package/dist/src/d1/sql.js

@@ -13,29 +13,63 @@ function assertNonEmpty(value, label) {
     }
     return value;
 }
+/**
+ * Normalizes the context columns from the install options, de-duplicating by
+ * column name. For D1 the KV key defaults to the column name itself.
+ */
+function normalizeContextColumns(options) {
+    const resolved = [];
+    const seen = new Set();
+    for (const entry of options.contextColumns ?? []) {
+        const column = entry.column?.trim();
+        if (!column) {
+            throw new Error("contextColumns[].column must not be empty");
+        }
+        if (seen.has(column)) {
+            continue;
+        }
+        seen.add(column);
+        resolved.push({
+            column,
+            sessionKey: entry.sessionKey?.trim() || column,
+            index: entry.index ?? true,
+        });
+    }
+    return resolved;
+}
+/** Builds the column-name suffix for an INSERT column list. */
+function contextColsClause(contextColumns) {
+    return contextColumns.map((c) => `, ${quoteIdent(c.column)}`).join("");
+}
+/** Builds the matching VALUES suffix that reads each KV row from the context table. */
+function contextValuesClause(contextColumns, contextTable) {
+    return contextColumns
+        .map((c) => `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = ${quoteLiteral(c.sessionKey)})`)
+        .join("");
+}
 /**
  * Generates SQL to install the audit_logs table and _audit_context table.
  *
- * The _audit_context table stores user_id (and optionally workspace_id) for
- * the current transaction. Since D1/SQLite has no session variables, triggers
+ * The _audit_context table stores user_id (and any configured context columns)
+ * for the current transaction. Since D1/SQLite has no session variables, triggers
  * read context from this table instead.
  */
 export function createD1AuditInstallSql(options = {}) {
     const auditTable = assertNonEmpty(options.auditTable ?? DEFAULT_AUDIT_TABLE, "auditTable");
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     const auditColumns = [
         "id INTEGER PRIMARY KEY AUTOINCREMENT",
         "table_name TEXT NOT NULL",
         "operation TEXT NOT NULL CHECK (operation IN ('INSERT', 'UPDATE', 'DELETE'))",
         "row_id TEXT",
         "user_id TEXT",
-        ...(workspaceIdColumn ? [`${quoteIdent(workspaceIdColumn)} TEXT`] : []),
+        ...contextColumns.map((c) => `${quoteIdent(c.column)} TEXT`),
         "old_data TEXT",
         "new_data TEXT",
         "created_at TEXT NOT NULL DEFAULT (datetime('now'))",
     ];
-    const contextColumns = [
+    const contextTableColumns = [
         "key TEXT PRIMARY KEY",
         "value TEXT",
     ];
@@ -43,16 +77,14 @@ export function createD1AuditInstallSql(options = {}) {
         `CREATE INDEX IF NOT EXISTS ${quoteIdent(`${auditTable}_table_name_idx`)} ON ${quoteIdent(auditTable)} (table_name);`,
         `CREATE INDEX IF NOT EXISTS ${quoteIdent(`${auditTable}_row_id_idx`)} ON ${quoteIdent(auditTable)} (row_id);`,
         `CREATE INDEX IF NOT EXISTS ${quoteIdent(`${auditTable}_user_id_idx`)} ON ${quoteIdent(auditTable)} (user_id);`,
-        ...(workspaceIdColumn
-            ? [
-                `CREATE INDEX IF NOT EXISTS ${quoteIdent(`${auditTable}_${workspaceIdColumn}_idx`)} ON ${quoteIdent(auditTable)} (${quoteIdent(workspaceIdColumn)});`,
-            ]
-            : []),
+        ...contextColumns
+            .filter((c) => c.index)
+            .map((c) => `CREATE INDEX IF NOT EXISTS ${quoteIdent(`${auditTable}_${c.column}_idx`)} ON ${quoteIdent(auditTable)} (${quoteIdent(c.column)});`),
         `CREATE INDEX IF NOT EXISTS ${quoteIdent(`${auditTable}_created_at_idx`)} ON ${quoteIdent(auditTable)} (created_at);`,
     ];
     return [
         `CREATE TABLE IF NOT EXISTS ${quoteIdent(auditTable)} (\n  ${auditColumns.join(",\n  ")}\n);`,
-        `CREATE TABLE IF NOT EXISTS ${quoteIdent(contextTable)} (\n  ${contextColumns.join(",\n  ")}\n);`,
+        `CREATE TABLE IF NOT EXISTS ${quoteIdent(contextTable)} (\n  ${contextTableColumns.join(",\n  ")}\n);`,
         ...indexStatements,
     ].join("\n\n");
 }
@@ -63,7 +95,7 @@ function buildInsertTriggerSql(target, options) {
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
     const triggerPrefix = target.triggerPrefix ?? table;
     const triggerName = `${triggerPrefix}_audit_insert`;
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     return `
 DROP TRIGGER IF EXISTS ${quoteIdent(triggerName)};
 
@@ -71,12 +103,12 @@ CREATE TRIGGER ${quoteIdent(triggerName)}
 AFTER INSERT ON ${quoteIdent(table)}
 FOR EACH ROW
 BEGIN
-  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${workspaceIdColumn ? `, ${quoteIdent(workspaceIdColumn)}` : ""})
+  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${contextColsClause(contextColumns)})
   VALUES (
     ${quoteLiteral(table)},
     'INSERT',
     NEW.${quoteIdent(rowIdColumn)},
-    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${workspaceIdColumn ? `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'workspace_id')` : ""}
+    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${contextValuesClause(contextColumns, contextTable)}
   );
 END;`.trim();
 }
@@ -87,7 +119,7 @@ function buildUpdateTriggerSql(target, options) {
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
     const triggerPrefix = target.triggerPrefix ?? table;
     const triggerName = `${triggerPrefix}_audit_update`;
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     return `
 DROP TRIGGER IF EXISTS ${quoteIdent(triggerName)};
 
@@ -95,12 +127,12 @@ CREATE TRIGGER ${quoteIdent(triggerName)}
 AFTER UPDATE ON ${quoteIdent(table)}
 FOR EACH ROW
 BEGIN
-  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${workspaceIdColumn ? `, ${quoteIdent(workspaceIdColumn)}` : ""})
+  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${contextColsClause(contextColumns)})
   VALUES (
     ${quoteLiteral(table)},
     'UPDATE',
     NEW.${quoteIdent(rowIdColumn)},
-    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${workspaceIdColumn ? `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'workspace_id')` : ""}
+    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${contextValuesClause(contextColumns, contextTable)}
   );
 END;`.trim();
 }
@@ -111,7 +143,7 @@ function buildDeleteTriggerSql(target, options) {
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
     const triggerPrefix = target.triggerPrefix ?? table;
     const triggerName = `${triggerPrefix}_audit_delete`;
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     return `
 DROP TRIGGER IF EXISTS ${quoteIdent(triggerName)};
 
@@ -119,12 +151,12 @@ CREATE TRIGGER ${quoteIdent(triggerName)}
 AFTER DELETE ON ${quoteIdent(table)}
 FOR EACH ROW
 BEGIN
-  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${workspaceIdColumn ? `, ${quoteIdent(workspaceIdColumn)}` : ""})
+  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${contextColsClause(contextColumns)})
   VALUES (
     ${quoteLiteral(table)},
     'DELETE',
     OLD.${quoteIdent(rowIdColumn)},
-    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${workspaceIdColumn ? `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'workspace_id')` : ""}
+    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${contextValuesClause(contextColumns, contextTable)}
   );
 END;`.trim();
 }
@@ -160,7 +192,7 @@ function buildInsertTriggerWithColumnsSql(target, options) {
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
     const triggerPrefix = target.triggerPrefix ?? table;
     const triggerName = `${triggerPrefix}_audit_insert`;
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     return `
 DROP TRIGGER IF EXISTS ${quoteIdent(triggerName)};
 
@@ -168,12 +200,12 @@ CREATE TRIGGER ${quoteIdent(triggerName)}
 AFTER INSERT ON ${quoteIdent(table)}
 FOR EACH ROW
 BEGIN
-  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${workspaceIdColumn ? `, ${quoteIdent(workspaceIdColumn)}` : ""}, new_data)
+  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${contextColsClause(contextColumns)}, new_data)
   VALUES (
     ${quoteLiteral(table)},
     'INSERT',
     NEW.${quoteIdent(rowIdColumn)},
-    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${workspaceIdColumn ? `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'workspace_id')` : ""},
+    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${contextValuesClause(contextColumns, contextTable)},
     ${buildJsonObjectExpr(target.columns, "NEW")}
   );
 END;`.trim();
@@ -185,7 +217,7 @@ function buildUpdateTriggerWithColumnsSql(target, options) {
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
     const triggerPrefix = target.triggerPrefix ?? table;
     const triggerName = `${triggerPrefix}_audit_update`;
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     return `
 DROP TRIGGER IF EXISTS ${quoteIdent(triggerName)};
 
@@ -193,12 +225,12 @@ CREATE TRIGGER ${quoteIdent(triggerName)}
 AFTER UPDATE ON ${quoteIdent(table)}
 FOR EACH ROW
 BEGIN
-  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${workspaceIdColumn ? `, ${quoteIdent(workspaceIdColumn)}` : ""}, old_data, new_data)
+  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${contextColsClause(contextColumns)}, old_data, new_data)
   VALUES (
     ${quoteLiteral(table)},
     'UPDATE',
     NEW.${quoteIdent(rowIdColumn)},
-    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${workspaceIdColumn ? `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'workspace_id')` : ""},
+    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${contextValuesClause(contextColumns, contextTable)},
     ${buildJsonObjectExpr(target.columns, "OLD")},
     ${buildJsonObjectExpr(target.columns, "NEW")}
   );
@@ -211,7 +243,7 @@ function buildDeleteTriggerWithColumnsSql(target, options) {
     const contextTable = assertNonEmpty(options.contextTable ?? DEFAULT_CONTEXT_TABLE, "contextTable");
     const triggerPrefix = target.triggerPrefix ?? table;
     const triggerName = `${triggerPrefix}_audit_delete`;
-    const workspaceIdColumn = options.workspaceIdColumn?.trim();
+    const contextColumns = normalizeContextColumns(options);
     return `
 DROP TRIGGER IF EXISTS ${quoteIdent(triggerName)};
 
@@ -219,12 +251,12 @@ CREATE TRIGGER ${quoteIdent(triggerName)}
 AFTER DELETE ON ${quoteIdent(table)}
 FOR EACH ROW
 BEGIN
-  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${workspaceIdColumn ? `, ${quoteIdent(workspaceIdColumn)}` : ""}, old_data)
+  INSERT INTO ${quoteIdent(auditTable)} (table_name, operation, row_id, user_id${contextColsClause(contextColumns)}, old_data)
   VALUES (
     ${quoteLiteral(table)},
     'DELETE',
     OLD.${quoteIdent(rowIdColumn)},
-    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${workspaceIdColumn ? `,\n    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'workspace_id')` : ""},
+    (SELECT value FROM ${quoteIdent(contextTable)} WHERE key = 'user_id')${contextValuesClause(contextColumns, contextTable)},
     ${buildJsonObjectExpr(target.columns, "OLD")}
   );
 END;`.trim();

package/dist/src/d1/types.d.ts

@@ -6,13 +6,21 @@ import type { SQL } from "drizzle-orm";
 export type D1AuditSqlExecutor = {
     run: (query: SQL) => unknown;
 };
+export type AuditContextColumn = {
+    /** Column added to the audit table (TEXT, nullable). */
+    column: string;
+    /** The `_audit_context` key the trigger reads. Default `${column}`. */
+    sessionKey?: string;
+    /** Create an index on the column. Default true. */
+    index?: boolean;
+};
 export type D1AuditInstallOptions = {
     /** Name of the audit log table (default: "audit_logs") */
     auditTable?: string;
     /** Name of the context table used to pass user_id to triggers (default: "_audit_context") */
     contextTable?: string;
-    /** Optional workspace column name (e.g. "workspace_id") */
-    workspaceIdColumn?: string;
+    /** Extra context columns added to the audit table and populated by triggers from the _audit_context KV table. */
+    contextColumns?: AuditContextColumn[];
 };
 export type D1AuditTriggerTarget = {
     table: string;

package/dist/src/d1/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/d1/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEtC;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,6FAA6F;IAC7F,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,2DAA2D;IAC3D,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/d1/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,aAAa,CAAA;AAEtC;;;GAGG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAA;CAC7B,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,wDAAwD;IACxD,MAAM,EAAE,MAAM,CAAA;IACd,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,mDAAmD;IACnD,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,0DAA0D;IAC1D,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,6FAA6F;IAC7F,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,iHAAiH;IACjH,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA"}

package/dist/src/d1-runtime/with-audit.d.ts

@@ -2,7 +2,8 @@ import { type InferInsertModel, type InferSelectModel, type SQL } from "drizzle-
 import type { SQLiteTable } from "drizzle-orm/sqlite-core";
 export type AuditContext = {
     userId: string;
-    workspaceId?: string;
+    /** Map of extra audit context column name → value (matching contextColumns). */
+    context?: Record<string, string>;
 };
 export type AuditLogInsertShape = {
     table_name: string;
@@ -55,7 +56,7 @@ export type AuditedDb<TDb extends DrizzleSQLiteDb> = {
  *
  * @param db - A Drizzle SQLite database instance (D1, better-sqlite3, libsql)
  * @param auditTable - The Drizzle table definition for audit_logs
- * @param context - The audit context (userId, optional workspaceId)
+ * @param context - The audit context (userId, optional context columns)
  *
  * @example
  * import { withAudit } from "drizzle-audit/d1-runtime"

package/dist/src/d1-runtime/with-audit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-audit.d.ts","sourceRoot":"","sources":["../../../src/d1-runtime/with-audit.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACT,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAgB,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAIxE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;IAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,GAAG,CAAA;CAC9B,CAAA;AAgBD,MAAM,MAAM,SAAS,CAAC,GAAG,SAAS,eAAe,IAAI;IACnD;;;OAGG;IACH,MAAM,EAAE,CAAC,CAAC,SAAS,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,KACtB,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;IAEjC;;;;OAIG;IACH,MAAM,EAAE,CAAC,CAAC,SAAS,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEnC;;;;OAIG;IACH,MAAM,EAAE,CAAC,CAAC,SAAS,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,GAAG,KACP,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEnC,2DAA2D;IAC3D,EAAE,EAAE,GAAG,CAAA;CACR,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,SAAS,CAAC,GAAG,SAAS,eAAe,EACnD,EAAE,EAAE,GAAG,EACP,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,YAAY,GACpB,SAAS,CAAC,GAAG,CAAC,CA8FhB"}
+{"version":3,"file":"with-audit.d.ts","sourceRoot":"","sources":["../../../src/d1-runtime/with-audit.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,gBAAgB,EACrB,KAAK,gBAAgB,EACrB,KAAK,GAAG,EACT,MAAM,aAAa,CAAA;AACpB,OAAO,KAAK,EAAgB,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAIxE,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,MAAM,CAAA;IACd,gFAAgF;IAChF,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG;IAChC,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAA;IAC3B,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,GAAG,CAAA;CAC9B,CAAA;AAgBD,MAAM,MAAM,SAAS,CAAC,GAAG,SAAS,eAAe,IAAI;IACnD;;;OAGG;IACH,MAAM,EAAE,CAAC,CAAC,SAAS,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,KACtB,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAA;IAEjC;;;;OAIG;IACH,MAAM,EAAE,CAAC,CAAC,SAAS,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,GAAG,EACV,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,KAC/B,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEnC;;;;OAIG;IACH,MAAM,EAAE,CAAC,CAAC,SAAS,WAAW,EAC5B,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,GAAG,KACP,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;IAEnC,2DAA2D;IAC3D,EAAE,EAAE,GAAG,CAAA;CACR,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,SAAS,CAAC,GAAG,SAAS,eAAe,EACnD,EAAE,EAAE,GAAG,EACP,UAAU,EAAE,WAAW,EACvB,OAAO,EAAE,YAAY,GACpB,SAAS,CAAC,GAAG,CAAC,CAqGhB"}

package/dist/src/d1-runtime/with-audit.js

@@ -21,7 +21,7 @@ function getRowId(row, pk) {
  *
  * @param db - A Drizzle SQLite database instance (D1, better-sqlite3, libsql)
  * @param auditTable - The Drizzle table definition for audit_logs
- * @param context - The audit context (userId, optional workspaceId)
+ * @param context - The audit context (userId, optional context columns)
  *
  * @example
  * import { withAudit } from "drizzle-audit/d1-runtime"
@@ -43,7 +43,7 @@ function getRowId(row, pk) {
  * audited.db.select().from(users).all()
  */
 export function withAudit(db, auditTable, context) {
-    const workspaceIdColumn = (() => {
+    const extraColumns = (() => {
         const cols = getTableColumns(auditTable);
         const known = new Set([
             "id",
@@ -55,10 +55,17 @@ export function withAudit(db, auditTable, context) {
             "new_data",
             "created_at",
         ]);
-        const extra = Object.keys(cols).find((k) => !known.has(k));
-        return extra ?? null;
+        return Object.keys(cols).filter((k) => !known.has(k));
     })();
+    const contextValues = { ...(context.context ?? {}) };
     function buildAuditRow(tableName, operation, rowId, oldData, newData) {
+        const extra = {};
+        for (const column of extraColumns) {
+            const value = contextValues[column];
+            if (value !== undefined && value !== "") {
+                extra[column] = value;
+            }
+        }
         return {
             table_name: tableName,
             operation,
@@ -66,9 +73,7 @@ export function withAudit(db, auditTable, context) {
             user_id: context.userId,
             old_data: oldData ? JSON.stringify(oldData) : null,
             new_data: newData ? JSON.stringify(newData) : null,
-            ...(workspaceIdColumn && context.workspaceId
-                ? { [workspaceIdColumn]: context.workspaceId }
-                : {}),
+            ...extra,
         };
     }
     return {

package/dist/src/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./postgres/index.js";
-export * from "./d1/index.js";
+export { clearD1AuditContext, createAttachD1AuditTriggerSql, createAttachD1AuditTriggersSql, createAttachD1AuditTriggerSqlWithColumns, createAttachD1AuditTriggersSqlWithColumns, createD1AuditInstallSql, d1AuditContextTable, d1AuditLogTable, setD1AuditContext, withD1AuditedTransaction, } from "./d1/index.js";
+export type { D1AuditContextOptions, D1AuditInstallOptions, D1AuditLogTableOptions, D1AuditSqlExecutor, D1AuditTriggerTarget, D1AuditTriggerTargetWithColumns, } from "./d1/index.js";
 export * from "./d1-runtime/index.js";
 export * from "./compute-diff.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,cAAc,eAAe,CAAA;AAC7B,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAA;AACnC,OAAO,EACL,mBAAmB,EACnB,6BAA6B,EAC7B,8BAA8B,EAC9B,wCAAwC,EACxC,yCAAyC,EACzC,uBAAuB,EACvB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,wBAAwB,GACzB,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,qBAAqB,EACrB,qBAAqB,EACrB,sBAAsB,EACtB,kBAAkB,EAClB,oBAAoB,EACpB,+BAA+B,GAChC,MAAM,eAAe,CAAA;AACtB,cAAc,uBAAuB,CAAA;AACrC,cAAc,mBAAmB,CAAA"}

package/dist/src/index.js

@@ -1,4 +1,4 @@
 export * from "./postgres/index.js";
-export * from "./d1/index.js";
+export { clearD1AuditContext, createAttachD1AuditTriggerSql, createAttachD1AuditTriggersSql, createAttachD1AuditTriggerSqlWithColumns, createAttachD1AuditTriggersSqlWithColumns, createD1AuditInstallSql, d1AuditContextTable, d1AuditLogTable, setD1AuditContext, withD1AuditedTransaction, } from "./d1/index.js";
 export * from "./d1-runtime/index.js";
 export * from "./compute-diff.js";

package/dist/src/postgres/audit-log-schema.d.ts

@@ -1,6 +1,7 @@
+import type { AuditContextColumn } from "./types.js";
 export type PgAuditLogTableOptions = {
-    /** When set (e.g. "workspace_id"), the table definition includes this optional column to match the install. */
-    workspaceIdColumn?: string;
+    /** Extra context columns to include in the table definition, matching the install. */
+    contextColumns?: AuditContextColumn[];
 };
 export declare function pgAuditLogTable(options?: PgAuditLogTableOptions): import("drizzle-orm/pg-core").PgTableWithColumns<{
     name: "audit_logs";

package/dist/src/postgres/audit-log-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"audit-log-schema.d.ts","sourceRoot":"","sources":["../../../src/postgres/audit-log-schema.ts"],"names":[],"mappings":"AASA,MAAM,MAAM,sBAAsB,GAAG;IACnC,+GAA+G;IAC/G,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,CAAA;AAED,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2B/D"}
+{"version":3,"file":"audit-log-schema.d.ts","sourceRoot":"","sources":["../../../src/postgres/audit-log-schema.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAEpD,MAAM,MAAM,sBAAsB,GAAG;IACnC,sFAAsF;IACtF,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAA;CACtC,CAAA;AAiBD,wBAAgB,eAAe,CAAC,OAAO,CAAC,EAAE,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyB/D"}

package/dist/src/postgres/audit-log-schema.js

@@ -1,15 +1,25 @@
 import { bigserial, index, jsonb, pgTable, text, timestamp, } from "drizzle-orm/pg-core";
+function resolveColumns(options) {
+    const columns = [];
+    const seen = new Set();
+    for (const entry of options?.contextColumns ?? []) {
+        const column = entry.column?.trim();
+        if (column && !seen.has(column)) {
+            seen.add(column);
+            columns.push(column);
+        }
+    }
+    return columns;
+}
 export function pgAuditLogTable(options) {
-    const workspaceIdColumn = options?.workspaceIdColumn?.trim();
+    const contextColumns = resolveColumns(options);
     const columns = {
         id: bigserial("id", { mode: "number" }).primaryKey(),
         table_name: text("table_name").notNull(),
         operation: text("operation").notNull(),
         row_id: text("row_id"),
         user_id: text("user_id"),
-        ...(workspaceIdColumn
-            ? { [workspaceIdColumn]: text(workspaceIdColumn) }
-            : {}),
+        ...Object.fromEntries(contextColumns.map((c) => [c, text(c)])),
         old_data: jsonb("old_data"),
         new_data: jsonb("new_data"),
         created_at: timestamp("created_at", { withTimezone: true })

package/dist/src/postgres/index.d.ts

@@ -1,6 +1,7 @@
 export { pgAuditLogTable } from "./audit-log-schema.js";
 export type { PgAuditLogTableOptions } from "./audit-log-schema.js";
-export { createAttachAuditTriggerSql, createAttachAuditTriggersSql, createAuditAddWorkspaceColumnSql, createAuditInstallSql, } from "./sql.js";
+export { createAttachAuditTriggerSql, createAttachAuditTriggersSql, createAuditAddContextColumnsSql, createAuditInstallSql, } from "./sql.js";
 export { setAuditContext, withAuditedTransaction } from "./runtime.js";
-export type { AuditInstallOptions, AuditSqlExecutor, AuditTransactionCapable, AuditTriggerTarget, } from "./types.js";
+export type { AuditContextOptions } from "./runtime.js";
+export type { AuditContextColumn, AuditInstallOptions, AuditSqlExecutor, AuditTransactionCapable, AuditTriggerTarget, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/src/postgres/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/postgres/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,YAAY,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,EAC5B,gCAAgC,EAChC,qBAAqB,GACtB,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AAEtE,YAAY,EACV,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/postgres/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACvD,YAAY,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EACL,2BAA2B,EAC3B,4BAA4B,EAC5B,+BAA+B,EAC/B,qBAAqB,GACtB,MAAM,UAAU,CAAA;AACjB,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAA;AACtE,YAAY,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAA;AAEvD,YAAY,EACV,kBAAkB,EAClB,mBAAmB,EACnB,gBAAgB,EAChB,uBAAuB,EACvB,kBAAkB,GACnB,MAAM,YAAY,CAAA"}

package/dist/src/postgres/index.js

@@ -1,3 +1,3 @@
 export { pgAuditLogTable } from "./audit-log-schema.js";
-export { createAttachAuditTriggerSql, createAttachAuditTriggersSql, createAuditAddWorkspaceColumnSql, createAuditInstallSql, } from "./sql.js";
+export { createAttachAuditTriggerSql, createAttachAuditTriggersSql, createAuditAddContextColumnsSql, createAuditInstallSql, } from "./sql.js";
 export { setAuditContext, withAuditedTransaction } from "./runtime.js";

package/dist/src/postgres/runtime.d.ts

@@ -1,10 +1,8 @@
 import type { AuditSqlExecutor, AuditTransactionCapable } from "./types.js";
-export declare function setAuditContext(db: AuditSqlExecutor, actorId: string, contextKey?: string, options?: {
-    workspaceId?: string;
-    workspaceContextKey?: string;
-}): Promise<void>;
-export declare function withAuditedTransaction<TTransaction extends AuditSqlExecutor, TResult>(db: AuditTransactionCapable<TTransaction>, actorId: string, callback: (tx: TTransaction) => Promise<TResult> | TResult, contextKey?: string, options?: {
-    workspaceId?: string;
-    workspaceContextKey?: string;
-}): Promise<TResult>;
+export type AuditContextOptions = {
+    /** Map of session GUC name → value to set for the transaction. */
+    context?: Record<string, string>;
+};
+export declare function setAuditContext(db: AuditSqlExecutor, actorId: string, contextKey?: string, options?: AuditContextOptions): Promise<void>;
+export declare function withAuditedTransaction<TTransaction extends AuditSqlExecutor, TResult>(db: AuditTransactionCapable<TTransaction>, actorId: string, callback: (tx: TTransaction) => Promise<TResult> | TResult, contextKey?: string, options?: AuditContextOptions): Promise<TResult>;
 //# sourceMappingURL=runtime.d.ts.map

package/dist/src/postgres/runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/postgres/runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,uBAAuB,EACxB,MAAM,YAAY,CAAA;AAQnB,wBAAsB,eAAe,CACnC,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,EACf,UAAU,SAAgB,EAC1B,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,iBAajE;AAED,wBAAsB,sBAAsB,CAC1C,YAAY,SAAS,gBAAgB,EACrC,OAAO,EAEP,EAAE,EAAE,uBAAuB,CAAC,YAAY,CAAC,EACzC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,EAC1D,UAAU,SAAgB,EAC1B,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,oBAQjE"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/postgres/runtime.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,uBAAuB,EACxB,MAAM,YAAY,CAAA;AAwBnB,MAAM,MAAM,mBAAmB,GAAG;IAChC,kEAAkE;IAClE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACjC,CAAA;AAED,wBAAsB,eAAe,CACnC,EAAE,EAAE,gBAAgB,EACpB,OAAO,EAAE,MAAM,EACf,UAAU,SAAgB,EAC1B,OAAO,CAAC,EAAE,mBAAmB,iBAa9B;AAED,wBAAsB,sBAAsB,CAC1C,YAAY,SAAS,gBAAgB,EACrC,OAAO,EAEP,EAAE,EAAE,uBAAuB,CAAC,YAAY,CAAC,EACzC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,CAAC,EAAE,EAAE,YAAY,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,EAC1D,UAAU,SAAgB,EAC1B,OAAO,CAAC,EAAE,mBAAmB,oBAQ9B"}

package/dist/src/postgres/runtime.js

@@ -4,12 +4,24 @@ function assertActorId(actorId) {
         throw new Error("actorId must not be empty");
     }
 }
+/**
+ * Builds the `context` GUC map from a set of options. Empty/undefined values
+ * are dropped so the trigger's NULLIF yields NULL.
+ */
+function resolveContext(options) {
+    const context = {};
+    for (const [key, value] of Object.entries(options?.context ?? {})) {
+        if (value !== undefined && value !== "") {
+            context[key] = value;
+        }
+    }
+    return context;
+}
 export async function setAuditContext(db, actorId, contextKey = "app.user_id", options) {
     assertActorId(actorId);
     await db.execute(sql `select set_config(${contextKey}, ${actorId}, true) as audit_context`);
-    if (options?.workspaceId !== undefined && options.workspaceId !== "") {
-        const wsKey = options.workspaceContextKey ?? "app.workspace_id";
-        await db.execute(sql `select set_config(${wsKey}, ${options.workspaceId}, true) as workspace_context`);
+    for (const [key, value] of Object.entries(resolveContext(options))) {
+        await db.execute(sql `select set_config(${key}, ${value}, true) as audit_context`);
     }
 }
 export async function withAuditedTransaction(db, actorId, callback, contextKey = "app.user_id", options) {

package/dist/src/postgres/sql.d.ts

@@ -3,12 +3,15 @@ export declare function createAuditInstallSql(options?: AuditInstallOptions): st
 export declare function createAttachAuditTriggerSql(target: AuditTriggerTarget, options?: AuditInstallOptions): string;
 export declare function createAttachAuditTriggersSql(targets: AuditTriggerTarget[], options?: AuditInstallOptions): string;
 /**
- * Generates SQL to add the workspace column and replace the trigger function on an
- * existing audit_logs table. Use in a new migration when adding workspace_id after
- * the initial install. Options must match your install (auditSchema, auditTable,
- * triggerFunctionName, contextKey, workspaceIdColumn).
+ * Generates SQL to add context columns and regenerate the trigger function on an
+ * existing audit_logs table. Use in a new migration when adding context columns
+ * after the initial install.
+ *
+ * Pass the FULL set of context columns the audit table should have (the trigger is
+ * a single CREATE OR REPLACE, so it must reference every column). Columns are added
+ * with `ADD COLUMN IF NOT EXISTS`, so already-present columns are left untouched.
+ * Options must match your install (auditSchema, auditTable, triggerFunctionName,
+ * contextKey).
  */
-export declare function createAuditAddWorkspaceColumnSql(options: AuditInstallOptions & {
-    workspaceIdColumn: string;
-}): string;
+export declare function createAuditAddContextColumnsSql(options?: AuditInstallOptions): string;
 //# sourceMappingURL=sql.d.ts.map

package/dist/src/postgres/sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../src/postgres/sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AAqHzE,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,mBAAwB,UA6DtE;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,GAAE,mBAAwB,UAiClC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,GAAE,mBAAwB,UASlC;AAED;;;;;GAKG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,mBAAmB,GAAG;IAAE,iBAAiB,EAAE,MAAM,CAAA;CAAE,UAkC7D"}
+{"version":3,"file":"sql.d.ts","sourceRoot":"","sources":["../../../src/postgres/sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,YAAY,CAAA;AAkJnB,wBAAgB,qBAAqB,CAAC,OAAO,GAAE,mBAAwB,UA8DtE;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,kBAAkB,EAC1B,OAAO,GAAE,mBAAwB,UAiClC;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,kBAAkB,EAAE,EAC7B,OAAO,GAAE,mBAAwB,UASlC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAAC,OAAO,GAAE,mBAAwB,UA2ChF"}