@usebetterdev/audit-drizzle 0.6.1 → 0.8.0

package/dist/index.cjs

@@ -21,19 +21,19 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   auditLogs: () => auditLogs,
-  buildCursorCondition: () => buildCursorCondition,
   buildOrderBy: () => buildOrderBy,
   buildWhereConditions: () => buildWhereConditions,
-  decodeCursor: () => decodeCursor,
+  decodeCursor: () => import_audit_core7.decodeCursor,
   drizzleAuditAdapter: () => drizzleAuditAdapter,
   drizzleSqliteAuditAdapter: () => drizzleSqliteAuditAdapter,
-  encodeCursor: () => encodeCursor,
+  encodeCursor: () => import_audit_core7.encodeCursor,
   sqliteAuditLogs: () => sqliteAuditLogs,
   withAuditProxy: () => withAuditProxy
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/adapter.ts
+var import_audit_core3 = require("@usebetterdev/audit-core");
 var import_drizzle_orm2 = require("drizzle-orm");
 
 // src/schema.ts
@@ -77,23 +77,7 @@ var auditLogs = (0, import_pg_core.pgTable)(
 );
 
 // src/column-map.ts
-var VALID_OPERATIONS = /* @__PURE__ */ new Set([
-  "INSERT",
-  "UPDATE",
-  "DELETE"
-]);
-var VALID_SEVERITIES = /* @__PURE__ */ new Set([
-  "low",
-  "medium",
-  "high",
-  "critical"
-]);
-function isAuditOperation(value) {
-  return VALID_OPERATIONS.has(value);
-}
-function isAuditSeverity(value) {
-  return VALID_SEVERITIES.has(value);
-}
+var import_audit_core = require("@usebetterdev/audit-core");
 function auditLogToRow(log) {
   const row = {
     id: log.id,
@@ -141,7 +125,7 @@ function auditLogToRow(log) {
   return row;
 }
 function rowToAuditLog(row) {
-  if (!isAuditOperation(row.operation)) {
+  if (!(0, import_audit_core.isAuditOperation)(row.operation)) {
     throw new Error(
       `Invalid audit operation: "${row.operation}". Expected one of: INSERT, UPDATE, DELETE`
     );
@@ -172,7 +156,7 @@ function rowToAuditLog(row) {
     log.description = row.description;
   }
   if (row.severity !== null && row.severity !== void 0) {
-    if (!isAuditSeverity(row.severity)) {
+    if (!(0, import_audit_core.isAuditSeverity)(row.severity)) {
       throw new Error(
         `Invalid audit severity: "${row.severity}". Expected one of: low, medium, high, critical`
       );
@@ -198,87 +182,68 @@ function rowToAuditLog(row) {
 }
 
 // src/query.ts
-var import_audit_core = require("@usebetterdev/audit-core");
+var import_audit_core2 = require("@usebetterdev/audit-core");
 var import_drizzle_orm = require("drizzle-orm");
-function escapeLikePattern(input) {
-  return input.replace(/[%_\\]/g, "\\$&");
-}
-function resolveTimeFilter(filter) {
-  if ("date" in filter && filter.date !== void 0) {
-    return filter.date;
-  }
-  if ("duration" in filter && filter.duration !== void 0) {
-    return (0, import_audit_core.parseDuration)(filter.duration);
-  }
-  throw new Error("TimeFilter must have either date or duration");
-}
-function buildWhereConditions(filters) {
-  const conditions = [];
-  if (filters.resource !== void 0) {
-    conditions.push((0, import_drizzle_orm.eq)(auditLogs.tableName, filters.resource.tableName));
-    if (filters.resource.recordId !== void 0) {
-      conditions.push((0, import_drizzle_orm.eq)(auditLogs.recordId, filters.resource.recordId));
+var FIELD_COLUMNS = {
+  tableName: auditLogs.tableName,
+  recordId: auditLogs.recordId,
+  actorId: auditLogs.actorId,
+  severity: auditLogs.severity,
+  operation: auditLogs.operation
+};
+function mapCondition(condition) {
+  switch (condition.kind) {
+    case "eq": {
+      return (0, import_drizzle_orm.eq)(FIELD_COLUMNS[condition.field], condition.value);
     }
-  }
-  if (filters.actorIds !== void 0 && filters.actorIds.length > 0) {
-    if (filters.actorIds.length === 1) {
-      conditions.push((0, import_drizzle_orm.eq)(auditLogs.actorId, filters.actorIds[0]));
-    } else {
-      conditions.push((0, import_drizzle_orm.inArray)(auditLogs.actorId, filters.actorIds));
+    case "in": {
+      return (0, import_drizzle_orm.inArray)(FIELD_COLUMNS[condition.field], condition.values);
     }
-  }
-  if (filters.severities !== void 0 && filters.severities.length > 0) {
-    if (filters.severities.length === 1) {
-      conditions.push((0, import_drizzle_orm.eq)(auditLogs.severity, filters.severities[0]));
-    } else {
-      conditions.push((0, import_drizzle_orm.inArray)(auditLogs.severity, filters.severities));
+    case "timestampGte": {
+      return (0, import_drizzle_orm.gte)(auditLogs.timestamp, condition.value);
     }
-  }
-  if (filters.operations !== void 0 && filters.operations.length > 0) {
-    if (filters.operations.length === 1) {
-      conditions.push((0, import_drizzle_orm.eq)(auditLogs.operation, filters.operations[0]));
-    } else {
-      conditions.push((0, import_drizzle_orm.inArray)(auditLogs.operation, filters.operations));
+    case "timestampLte": {
+      return (0, import_drizzle_orm.lte)(auditLogs.timestamp, condition.value);
     }
-  }
-  if (filters.since !== void 0) {
-    conditions.push((0, import_drizzle_orm.gte)(auditLogs.timestamp, resolveTimeFilter(filters.since)));
-  }
-  if (filters.until !== void 0) {
-    conditions.push((0, import_drizzle_orm.lte)(auditLogs.timestamp, resolveTimeFilter(filters.until)));
-  }
-  if (filters.searchText !== void 0 && filters.searchText.length > 0) {
-    const escaped = escapeLikePattern(filters.searchText);
-    const pattern = `%${escaped}%`;
-    const searchCondition = (0, import_drizzle_orm.or)(
-      (0, import_drizzle_orm.ilike)(auditLogs.label, pattern),
-      (0, import_drizzle_orm.ilike)(auditLogs.description, pattern)
-    );
-    if (searchCondition !== void 0) {
-      conditions.push(searchCondition);
+    case "search": {
+      return (0, import_drizzle_orm.or)(
+        (0, import_drizzle_orm.ilike)(auditLogs.label, condition.pattern),
+        (0, import_drizzle_orm.ilike)(auditLogs.description, condition.pattern)
+      );
+    }
+    case "compliance": {
+      return import_drizzle_orm.sql`${auditLogs.compliance} @> ${JSON.stringify(condition.tags)}::jsonb`;
+    }
+    case "cursor": {
+      const tsCompare = condition.sortOrder === "asc" ? import_drizzle_orm.gt : import_drizzle_orm.lt;
+      const idCompare = condition.sortOrder === "asc" ? import_drizzle_orm.gt : import_drizzle_orm.lt;
+      return (0, import_drizzle_orm.or)(
+        tsCompare(auditLogs.timestamp, condition.timestamp),
+        (0, import_drizzle_orm.and)(
+          (0, import_drizzle_orm.eq)(auditLogs.timestamp, condition.timestamp),
+          idCompare(auditLogs.id, condition.id)
+        )
+      );
     }
   }
-  if (filters.compliance !== void 0 && filters.compliance.length > 0) {
-    conditions.push(
-      import_drizzle_orm.sql`${auditLogs.compliance} @> ${JSON.stringify(filters.compliance)}::jsonb`
-    );
+}
+function buildWhereConditions(filters, cursor, sortOrder) {
+  const decoded = cursor !== void 0 ? (0, import_audit_core2.decodeCursor)(cursor) : void 0;
+  const irConditions = (0, import_audit_core2.interpretFilters)(filters, {
+    cursor: decoded,
+    sortOrder
+  });
+  const sqlConditions = [];
+  for (const c of irConditions) {
+    const mapped = mapCondition(c);
+    if (mapped !== void 0) {
+      sqlConditions.push(mapped);
+    }
   }
-  if (conditions.length === 0) {
+  if (sqlConditions.length === 0) {
     return void 0;
   }
-  return (0, import_drizzle_orm.and)(...conditions);
-}
-function buildCursorCondition(cursor, sortOrder) {
-  const decoded = decodeCursor(cursor);
-  const tsCompare = sortOrder === "asc" ? import_drizzle_orm.gt : import_drizzle_orm.lt;
-  const idCompare = sortOrder === "asc" ? import_drizzle_orm.gt : import_drizzle_orm.lt;
-  return (0, import_drizzle_orm.or)(
-    tsCompare(auditLogs.timestamp, decoded.timestamp),
-    (0, import_drizzle_orm.and)(
-      (0, import_drizzle_orm.eq)(auditLogs.timestamp, decoded.timestamp),
-      idCompare(auditLogs.id, decoded.id)
-    )
-  );
+  return (0, import_drizzle_orm.and)(...sqlConditions);
 }
 function buildOrderBy(sortOrder) {
   if (sortOrder === "asc") {
@@ -286,47 +251,10 @@ function buildOrderBy(sortOrder) {
   }
   return [(0, import_drizzle_orm.desc)(auditLogs.timestamp), (0, import_drizzle_orm.desc)(auditLogs.id)];
 }
-function encodeCursor(timestamp2, id) {
-  const payload = JSON.stringify({ t: timestamp2.toISOString(), i: id });
-  return btoa(payload);
-}
-var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function decodeCursor(cursor) {
-  let parsed;
-  try {
-    parsed = JSON.parse(atob(cursor));
-  } catch {
-    throw new Error("Invalid cursor: failed to decode");
-  }
-  if (typeof parsed !== "object" || parsed === null || !("t" in parsed) || !("i" in parsed)) {
-    throw new Error("Invalid cursor: missing required fields");
-  }
-  const { t, i } = parsed;
-  if (typeof t !== "string" || typeof i !== "string") {
-    throw new Error("Invalid cursor: fields must be strings");
-  }
-  const timestamp2 = new Date(t);
-  if (isNaN(timestamp2.getTime())) {
-    throw new Error("Invalid cursor: invalid timestamp");
-  }
-  if (!UUID_PATTERN.test(i)) {
-    throw new Error("Invalid cursor: id must be a valid UUID");
-  }
-  return { timestamp: timestamp2, id: i };
-}
 
 // src/adapter.ts
 var DEFAULT_LIMIT = 50;
 var MAX_LIMIT = 250;
-function toCount(value) {
-  if (typeof value === "number") {
-    return value;
-  }
-  if (typeof value === "string") {
-    return Number(value);
-  }
-  return 0;
-}
 function drizzleAuditAdapter(db) {
   return {
     async writeLog(log) {
@@ -336,9 +264,7 @@ function drizzleAuditAdapter(db) {
     async queryLogs(spec) {
       const sortOrder = spec.sortOrder ?? "desc";
       const limit = Math.min(spec.limit ?? DEFAULT_LIMIT, MAX_LIMIT);
-      const whereCondition = buildWhereConditions(spec.filters);
-      const cursorCondition = spec.cursor !== void 0 ? buildCursorCondition(spec.cursor, sortOrder) : void 0;
-      const combined = (0, import_drizzle_orm2.and)(whereCondition, cursorCondition);
+      const combined = buildWhereConditions(spec.filters, spec.cursor, sortOrder);
       const fetchLimit = limit + 1;
       const orderColumns = buildOrderBy(sortOrder);
       const query = db.select().from(auditLogs).where(combined).orderBy(...orderColumns).limit(fetchLimit);
@@ -348,7 +274,7 @@ function drizzleAuditAdapter(db) {
       const entries = resultRows.map(rowToAuditLog);
       const lastRow = resultRows[resultRows.length - 1];
       if (hasNextPage && lastRow !== void 0) {
-        return { entries, nextCursor: encodeCursor(lastRow.timestamp, lastRow.id) };
+        return { entries, nextCursor: (0, import_audit_core3.encodeCursor)(lastRow.timestamp, lastRow.id) };
       }
       return { entries };
     },
@@ -382,30 +308,32 @@ function drizzleAuditAdapter(db) {
     },
     async getStats(options) {
       const sinceCondition = options?.since !== void 0 ? (0, import_drizzle_orm2.gte)(auditLogs.timestamp, options.since) : void 0;
+      const untilCondition = options?.until !== void 0 ? (0, import_drizzle_orm2.lt)(auditLogs.timestamp, options.until) : void 0;
+      const timeCondition = (0, import_drizzle_orm2.and)(sinceCondition, untilCondition);
       const summaryQuery = db.select({
         totalLogs: import_drizzle_orm2.sql`count(*)`,
         tablesAudited: import_drizzle_orm2.sql`count(DISTINCT ${auditLogs.tableName})`
-      }).from(auditLogs).where(sinceCondition);
+      }).from(auditLogs).where(timeCondition);
       const eventsPerDayQuery = db.select({
         date: import_drizzle_orm2.sql`date_trunc('day', ${auditLogs.timestamp})::date`,
         count: import_drizzle_orm2.sql`count(*)`
-      }).from(auditLogs).where(sinceCondition).groupBy(import_drizzle_orm2.sql`date_trunc('day', ${auditLogs.timestamp})`).orderBy(import_drizzle_orm2.sql`date_trunc('day', ${auditLogs.timestamp})`).limit(365);
+      }).from(auditLogs).where(timeCondition).groupBy(import_drizzle_orm2.sql`date_trunc('day', ${auditLogs.timestamp})`).orderBy(import_drizzle_orm2.sql`date_trunc('day', ${auditLogs.timestamp})`).limit(365);
       const topActorsQuery = db.select({
         actorId: auditLogs.actorId,
         count: import_drizzle_orm2.sql`count(*)`
-      }).from(auditLogs).where((0, import_drizzle_orm2.and)(sinceCondition, (0, import_drizzle_orm2.isNotNull)(auditLogs.actorId))).groupBy(auditLogs.actorId).orderBy((0, import_drizzle_orm2.desc)(import_drizzle_orm2.sql`count(*)`)).limit(10);
+      }).from(auditLogs).where((0, import_drizzle_orm2.and)(timeCondition, (0, import_drizzle_orm2.isNotNull)(auditLogs.actorId))).groupBy(auditLogs.actorId).orderBy((0, import_drizzle_orm2.desc)(import_drizzle_orm2.sql`count(*)`)).limit(10);
       const topTablesQuery = db.select({
         tableName: auditLogs.tableName,
         count: import_drizzle_orm2.sql`count(*)`
-      }).from(auditLogs).where(sinceCondition).groupBy(auditLogs.tableName).orderBy((0, import_drizzle_orm2.desc)(import_drizzle_orm2.sql`count(*)`)).limit(10);
+      }).from(auditLogs).where(timeCondition).groupBy(auditLogs.tableName).orderBy((0, import_drizzle_orm2.desc)(import_drizzle_orm2.sql`count(*)`)).limit(10);
       const operationQuery = db.select({
         operation: auditLogs.operation,
         count: import_drizzle_orm2.sql`count(*)`
-      }).from(auditLogs).where(sinceCondition).groupBy(auditLogs.operation);
+      }).from(auditLogs).where(timeCondition).groupBy(auditLogs.operation);
       const severityQuery = db.select({
         severity: auditLogs.severity,
         count: import_drizzle_orm2.sql`count(*)`
-      }).from(auditLogs).where((0, import_drizzle_orm2.and)(sinceCondition, (0, import_drizzle_orm2.isNotNull)(auditLogs.severity))).groupBy(auditLogs.severity);
+      }).from(auditLogs).where((0, import_drizzle_orm2.and)(timeCondition, (0, import_drizzle_orm2.isNotNull)(auditLogs.severity))).groupBy(auditLogs.severity);
       const results = await Promise.all([
         summaryQuery,
         eventsPerDayQuery,
@@ -422,7 +350,7 @@ function drizzleAuditAdapter(db) {
         operationRows,
         severityRows
       ] = results;
-      return assembleStats(
+      return (0, import_audit_core3.assembleStats)(
         summaryRows,
         eventsPerDayRows,
         topActorsRows,
@@ -433,42 +361,9 @@ function drizzleAuditAdapter(db) {
     }
   };
 }
-function assembleStats(summaryRows, eventsPerDayRows, topActorsRows, topTablesRows, operationRows, severityRows) {
-  const summary = summaryRows[0];
-  const totalLogs = summary !== void 0 ? toCount(summary.totalLogs) : 0;
-  const tablesAudited = summary !== void 0 ? toCount(summary.tablesAudited) : 0;
-  const eventsPerDay = eventsPerDayRows.map((row) => ({
-    date: row.date instanceof Date ? row.date.toISOString().split("T")[0] : String(row.date),
-    count: toCount(row.count)
-  }));
-  const topActors = topActorsRows.map((row) => ({
-    actorId: String(row.actorId),
-    count: toCount(row.count)
-  }));
-  const topTables = topTablesRows.map((row) => ({
-    tableName: String(row.tableName),
-    count: toCount(row.count)
-  }));
-  const operationBreakdown = {};
-  for (const row of operationRows) {
-    operationBreakdown[String(row.operation)] = toCount(row.count);
-  }
-  const severityBreakdown = {};
-  for (const row of severityRows) {
-    severityBreakdown[String(row.severity)] = toCount(row.count);
-  }
-  return {
-    totalLogs,
-    tablesAudited,
-    eventsPerDay,
-    topActors,
-    topTables,
-    operationBreakdown,
-    severityBreakdown
-  };
-}
 
 // src/sqlite-adapter.ts
+var import_audit_core6 = require("@usebetterdev/audit-core");
 var import_drizzle_orm4 = require("drizzle-orm");
 
 // src/sqlite-schema.ts
@@ -512,23 +407,7 @@ var sqliteAuditLogs = (0, import_sqlite_core.sqliteTable)(
 );
 
 // src/sqlite-column-map.ts
-var VALID_OPERATIONS2 = /* @__PURE__ */ new Set([
-  "INSERT",
-  "UPDATE",
-  "DELETE"
-]);
-var VALID_SEVERITIES2 = /* @__PURE__ */ new Set([
-  "low",
-  "medium",
-  "high",
-  "critical"
-]);
-function isAuditOperation2(value) {
-  return VALID_OPERATIONS2.has(value);
-}
-function isAuditSeverity2(value) {
-  return VALID_SEVERITIES2.has(value);
-}
+var import_audit_core4 = require("@usebetterdev/audit-core");
 function sqliteAuditLogToRow(log) {
   const row = {
     id: log.id,
@@ -576,7 +455,7 @@ function sqliteAuditLogToRow(log) {
   return row;
 }
 function sqliteRowToAuditLog(row) {
-  if (!isAuditOperation2(row.operation)) {
+  if (!(0, import_audit_core4.isAuditOperation)(row.operation)) {
     throw new Error(
       `Invalid audit operation: "${row.operation}". Expected one of: INSERT, UPDATE, DELETE`
     );
@@ -607,7 +486,7 @@ function sqliteRowToAuditLog(row) {
     log.description = row.description;
   }
   if (row.severity !== null && row.severity !== void 0) {
-    if (!isAuditSeverity2(row.severity)) {
+    if (!(0, import_audit_core4.isAuditSeverity)(row.severity)) {
       throw new Error(
         `Invalid audit severity: "${row.severity}". Expected one of: low, medium, high, critical`
       );
@@ -633,89 +512,74 @@ function sqliteRowToAuditLog(row) {
 }
 
 // src/sqlite-query.ts
-var import_audit_core2 = require("@usebetterdev/audit-core");
+var import_audit_core5 = require("@usebetterdev/audit-core");
 var import_drizzle_orm3 = require("drizzle-orm");
-function escapeLikePattern2(input) {
-  return input.replace(/[%_\\]/g, "\\$&");
-}
-function resolveTimeFilter2(filter) {
-  if ("date" in filter && filter.date !== void 0) {
-    return filter.date;
-  }
-  if ("duration" in filter && filter.duration !== void 0) {
-    return (0, import_audit_core2.parseDuration)(filter.duration);
-  }
-  throw new Error("TimeFilter must have either date or duration");
-}
-function buildSqliteWhereConditions(filters) {
-  const conditions = [];
-  if (filters.resource !== void 0) {
-    conditions.push((0, import_drizzle_orm3.eq)(sqliteAuditLogs.tableName, filters.resource.tableName));
-    if (filters.resource.recordId !== void 0) {
-      conditions.push((0, import_drizzle_orm3.eq)(sqliteAuditLogs.recordId, filters.resource.recordId));
+var FIELD_COLUMNS2 = {
+  tableName: sqliteAuditLogs.tableName,
+  recordId: sqliteAuditLogs.recordId,
+  actorId: sqliteAuditLogs.actorId,
+  severity: sqliteAuditLogs.severity,
+  operation: sqliteAuditLogs.operation
+};
+function mapCondition2(condition) {
+  switch (condition.kind) {
+    case "eq": {
+      return (0, import_drizzle_orm3.eq)(FIELD_COLUMNS2[condition.field], condition.value);
     }
-  }
-  if (filters.actorIds !== void 0 && filters.actorIds.length > 0) {
-    if (filters.actorIds.length === 1) {
-      conditions.push((0, import_drizzle_orm3.eq)(sqliteAuditLogs.actorId, filters.actorIds[0]));
-    } else {
-      conditions.push((0, import_drizzle_orm3.inArray)(sqliteAuditLogs.actorId, filters.actorIds));
+    case "in": {
+      return (0, import_drizzle_orm3.inArray)(FIELD_COLUMNS2[condition.field], condition.values);
     }
-  }
-  if (filters.severities !== void 0 && filters.severities.length > 0) {
-    if (filters.severities.length === 1) {
-      conditions.push((0, import_drizzle_orm3.eq)(sqliteAuditLogs.severity, filters.severities[0]));
-    } else {
-      conditions.push((0, import_drizzle_orm3.inArray)(sqliteAuditLogs.severity, filters.severities));
+    case "timestampGte": {
+      return (0, import_drizzle_orm3.gte)(sqliteAuditLogs.timestamp, condition.value);
     }
-  }
-  if (filters.operations !== void 0 && filters.operations.length > 0) {
-    if (filters.operations.length === 1) {
-      conditions.push((0, import_drizzle_orm3.eq)(sqliteAuditLogs.operation, filters.operations[0]));
-    } else {
-      conditions.push((0, import_drizzle_orm3.inArray)(sqliteAuditLogs.operation, filters.operations));
+    case "timestampLte": {
+      return (0, import_drizzle_orm3.lte)(sqliteAuditLogs.timestamp, condition.value);
     }
-  }
-  if (filters.since !== void 0) {
-    conditions.push((0, import_drizzle_orm3.gte)(sqliteAuditLogs.timestamp, resolveTimeFilter2(filters.since)));
-  }
-  if (filters.until !== void 0) {
-    conditions.push((0, import_drizzle_orm3.lte)(sqliteAuditLogs.timestamp, resolveTimeFilter2(filters.until)));
-  }
-  if (filters.searchText !== void 0 && filters.searchText.length > 0) {
-    const escaped = escapeLikePattern2(filters.searchText);
-    const pattern = `%${escaped}%`;
-    const searchCondition = (0, import_drizzle_orm3.or)(
-      (0, import_drizzle_orm3.like)(sqliteAuditLogs.label, pattern),
-      (0, import_drizzle_orm3.like)(sqliteAuditLogs.description, pattern)
-    );
-    if (searchCondition !== void 0) {
-      conditions.push(searchCondition);
+    case "search": {
+      return (0, import_drizzle_orm3.or)(
+        (0, import_drizzle_orm3.like)(sqliteAuditLogs.label, condition.pattern),
+        (0, import_drizzle_orm3.like)(sqliteAuditLogs.description, condition.pattern)
+      );
     }
-  }
-  if (filters.compliance !== void 0 && filters.compliance.length > 0) {
-    for (const tag of filters.compliance) {
-      conditions.push(
-        import_drizzle_orm3.sql`EXISTS (SELECT 1 FROM json_each(${sqliteAuditLogs.compliance}) WHERE value = ${tag})`
+    case "compliance": {
+      const tagConditions = [];
+      for (const tag of condition.tags) {
+        tagConditions.push(
+          import_drizzle_orm3.sql`EXISTS (SELECT 1 FROM json_each(${sqliteAuditLogs.compliance}) WHERE value = ${tag})`
+        );
+      }
+      return (0, import_drizzle_orm3.and)(...tagConditions);
+    }
+    case "cursor": {
+      const tsCompare = condition.sortOrder === "asc" ? import_drizzle_orm3.gt : import_drizzle_orm3.lt;
+      const idCompare = condition.sortOrder === "asc" ? import_drizzle_orm3.gt : import_drizzle_orm3.lt;
+      return (0, import_drizzle_orm3.or)(
+        tsCompare(sqliteAuditLogs.timestamp, condition.timestamp),
+        (0, import_drizzle_orm3.and)(
+          (0, import_drizzle_orm3.eq)(sqliteAuditLogs.timestamp, condition.timestamp),
+          idCompare(sqliteAuditLogs.id, condition.id)
+        )
       );
     }
   }
-  if (conditions.length === 0) {
+}
+function buildSqliteWhereConditions(filters, cursor, sortOrder) {
+  const decoded = cursor !== void 0 ? (0, import_audit_core5.decodeCursor)(cursor) : void 0;
+  const irConditions = (0, import_audit_core5.interpretFilters)(filters, {
+    cursor: decoded,
+    sortOrder
+  });
+  const sqlConditions = [];
+  for (const c of irConditions) {
+    const mapped = mapCondition2(c);
+    if (mapped !== void 0) {
+      sqlConditions.push(mapped);
+    }
+  }
+  if (sqlConditions.length === 0) {
     return void 0;
   }
-  return (0, import_drizzle_orm3.and)(...conditions);
-}
-function buildSqliteCursorCondition(cursor, sortOrder) {
-  const decoded = decodeSqliteCursor(cursor);
-  const tsCompare = sortOrder === "asc" ? import_drizzle_orm3.gt : import_drizzle_orm3.lt;
-  const idCompare = sortOrder === "asc" ? import_drizzle_orm3.gt : import_drizzle_orm3.lt;
-  return (0, import_drizzle_orm3.or)(
-    tsCompare(sqliteAuditLogs.timestamp, decoded.timestamp),
-    (0, import_drizzle_orm3.and)(
-      (0, import_drizzle_orm3.eq)(sqliteAuditLogs.timestamp, decoded.timestamp),
-      idCompare(sqliteAuditLogs.id, decoded.id)
-    )
-  );
+  return (0, import_drizzle_orm3.and)(...sqlConditions);
 }
 function buildSqliteOrderBy(sortOrder) {
   if (sortOrder === "asc") {
@@ -723,47 +587,10 @@ function buildSqliteOrderBy(sortOrder) {
   }
   return [(0, import_drizzle_orm3.desc)(sqliteAuditLogs.timestamp), (0, import_drizzle_orm3.desc)(sqliteAuditLogs.id)];
 }
-function encodeSqliteCursor(timestamp2, id) {
-  const payload = JSON.stringify({ t: timestamp2.toISOString(), i: id });
-  return btoa(payload);
-}
-var UUID_PATTERN2 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-function decodeSqliteCursor(cursor) {
-  let parsed;
-  try {
-    parsed = JSON.parse(atob(cursor));
-  } catch {
-    throw new Error("Invalid cursor: failed to decode");
-  }
-  if (typeof parsed !== "object" || parsed === null || !("t" in parsed) || !("i" in parsed)) {
-    throw new Error("Invalid cursor: missing required fields");
-  }
-  const { t, i } = parsed;
-  if (typeof t !== "string" || typeof i !== "string") {
-    throw new Error("Invalid cursor: fields must be strings");
-  }
-  const timestamp2 = new Date(t);
-  if (isNaN(timestamp2.getTime())) {
-    throw new Error("Invalid cursor: invalid timestamp");
-  }
-  if (!UUID_PATTERN2.test(i)) {
-    throw new Error("Invalid cursor: id must be a valid UUID");
-  }
-  return { timestamp: timestamp2, id: i };
-}
 
 // src/sqlite-adapter.ts
 var DEFAULT_LIMIT2 = 50;
 var MAX_LIMIT2 = 250;
-function toCount2(value) {
-  if (typeof value === "number") {
-    return value;
-  }
-  if (typeof value === "string") {
-    return Number(value);
-  }
-  return 0;
-}
 function drizzleSqliteAuditAdapter(db) {
   return {
     async writeLog(log) {
@@ -773,9 +600,7 @@ function drizzleSqliteAuditAdapter(db) {
     async queryLogs(spec) {
       const sortOrder = spec.sortOrder ?? "desc";
       const limit = Math.min(spec.limit ?? DEFAULT_LIMIT2, MAX_LIMIT2);
-      const whereCondition = buildSqliteWhereConditions(spec.filters);
-      const cursorCondition = spec.cursor !== void 0 ? buildSqliteCursorCondition(spec.cursor, sortOrder) : void 0;
-      const combined = (0, import_drizzle_orm4.and)(whereCondition, cursorCondition);
+      const combined = buildSqliteWhereConditions(spec.filters, spec.cursor, sortOrder);
       const fetchLimit = limit + 1;
       const orderColumns = buildSqliteOrderBy(sortOrder);
       const query = db.select().from(sqliteAuditLogs).where(combined).orderBy(...orderColumns).limit(fetchLimit);
@@ -785,7 +610,7 @@ function drizzleSqliteAuditAdapter(db) {
       const entries = resultRows.map(sqliteRowToAuditLog);
       const lastRow = resultRows[resultRows.length - 1];
       if (hasNextPage && lastRow !== void 0) {
-        return { entries, nextCursor: encodeSqliteCursor(lastRow.timestamp, lastRow.id) };
+        return { entries, nextCursor: (0, import_audit_core6.encodeCursor)(lastRow.timestamp, lastRow.id) };
       }
       return { entries };
     },
@@ -808,35 +633,37 @@ function drizzleSqliteAuditAdapter(db) {
       }
       await db.delete(sqliteAuditLogs).where((0, import_drizzle_orm4.and)(...conditions));
       const changesResult = await db.select({ count: import_drizzle_orm4.sql`changes()` }).from(sqliteAuditLogs);
-      const deletedCount = changesResult[0] !== void 0 ? toCount2(changesResult[0].count) : 0;
+      const deletedCount = changesResult[0] !== void 0 ? (0, import_audit_core6.toCount)(changesResult[0].count) : 0;
       return { deletedCount };
     },
     async getStats(options) {
       const sinceCondition = options?.since !== void 0 ? (0, import_drizzle_orm4.gte)(sqliteAuditLogs.timestamp, options.since) : void 0;
+      const untilCondition = options?.until !== void 0 ? (0, import_drizzle_orm4.lt)(sqliteAuditLogs.timestamp, options.until) : void 0;
+      const timeCondition = (0, import_drizzle_orm4.and)(sinceCondition, untilCondition);
       const summaryQuery = db.select({
         totalLogs: import_drizzle_orm4.sql`count(*)`,
         tablesAudited: import_drizzle_orm4.sql`count(DISTINCT ${sqliteAuditLogs.tableName})`
-      }).from(sqliteAuditLogs).where(sinceCondition);
+      }).from(sqliteAuditLogs).where(timeCondition);
       const eventsPerDayQuery = db.select({
         date: import_drizzle_orm4.sql`strftime('%Y-%m-%d', ${sqliteAuditLogs.timestamp}, 'unixepoch')`,
         count: import_drizzle_orm4.sql`count(*)`
-      }).from(sqliteAuditLogs).where(sinceCondition).groupBy(import_drizzle_orm4.sql`strftime('%Y-%m-%d', ${sqliteAuditLogs.timestamp}, 'unixepoch')`).orderBy(import_drizzle_orm4.sql`strftime('%Y-%m-%d', ${sqliteAuditLogs.timestamp}, 'unixepoch')`).limit(365);
+      }).from(sqliteAuditLogs).where(timeCondition).groupBy(import_drizzle_orm4.sql`strftime('%Y-%m-%d', ${sqliteAuditLogs.timestamp}, 'unixepoch')`).orderBy(import_drizzle_orm4.sql`strftime('%Y-%m-%d', ${sqliteAuditLogs.timestamp}, 'unixepoch')`).limit(365);
       const topActorsQuery = db.select({
         actorId: sqliteAuditLogs.actorId,
         count: import_drizzle_orm4.sql`count(*)`
-      }).from(sqliteAuditLogs).where((0, import_drizzle_orm4.and)(sinceCondition, (0, import_drizzle_orm4.isNotNull)(sqliteAuditLogs.actorId))).groupBy(sqliteAuditLogs.actorId).orderBy((0, import_drizzle_orm4.desc)(import_drizzle_orm4.sql`count(*)`)).limit(10);
+      }).from(sqliteAuditLogs).where((0, import_drizzle_orm4.and)(timeCondition, (0, import_drizzle_orm4.isNotNull)(sqliteAuditLogs.actorId))).groupBy(sqliteAuditLogs.actorId).orderBy((0, import_drizzle_orm4.desc)(import_drizzle_orm4.sql`count(*)`)).limit(10);
       const topTablesQuery = db.select({
         tableName: sqliteAuditLogs.tableName,
         count: import_drizzle_orm4.sql`count(*)`
-      }).from(sqliteAuditLogs).where(sinceCondition).groupBy(sqliteAuditLogs.tableName).orderBy((0, import_drizzle_orm4.desc)(import_drizzle_orm4.sql`count(*)`)).limit(10);
+      }).from(sqliteAuditLogs).where(timeCondition).groupBy(sqliteAuditLogs.tableName).orderBy((0, import_drizzle_orm4.desc)(import_drizzle_orm4.sql`count(*)`)).limit(10);
       const operationQuery = db.select({
         operation: sqliteAuditLogs.operation,
         count: import_drizzle_orm4.sql`count(*)`
-      }).from(sqliteAuditLogs).where(sinceCondition).groupBy(sqliteAuditLogs.operation);
+      }).from(sqliteAuditLogs).where(timeCondition).groupBy(sqliteAuditLogs.operation);
       const severityQuery = db.select({
         severity: sqliteAuditLogs.severity,
         count: import_drizzle_orm4.sql`count(*)`
-      }).from(sqliteAuditLogs).where((0, import_drizzle_orm4.and)(sinceCondition, (0, import_drizzle_orm4.isNotNull)(sqliteAuditLogs.severity))).groupBy(sqliteAuditLogs.severity);
+      }).from(sqliteAuditLogs).where((0, import_drizzle_orm4.and)(timeCondition, (0, import_drizzle_orm4.isNotNull)(sqliteAuditLogs.severity))).groupBy(sqliteAuditLogs.severity);
       const results = await Promise.all([
         summaryQuery,
         eventsPerDayQuery,
@@ -853,7 +680,7 @@ function drizzleSqliteAuditAdapter(db) {
         operationRows,
         severityRows
       ] = results;
-      return assembleStats2(
+      return (0, import_audit_core6.assembleStats)(
         summaryRows,
         eventsPerDayRows,
         topActorsRows,
@@ -864,40 +691,6 @@ function drizzleSqliteAuditAdapter(db) {
     }
   };
 }
-function assembleStats2(summaryRows, eventsPerDayRows, topActorsRows, topTablesRows, operationRows, severityRows) {
-  const summary = summaryRows[0];
-  const totalLogs = summary !== void 0 ? toCount2(summary.totalLogs) : 0;
-  const tablesAudited = summary !== void 0 ? toCount2(summary.tablesAudited) : 0;
-  const eventsPerDay = eventsPerDayRows.map((row) => ({
-    date: String(row.date),
-    count: toCount2(row.count)
-  }));
-  const topActors = topActorsRows.map((row) => ({
-    actorId: String(row.actorId),
-    count: toCount2(row.count)
-  }));
-  const topTables = topTablesRows.map((row) => ({
-    tableName: String(row.tableName),
-    count: toCount2(row.count)
-  }));
-  const operationBreakdown = {};
-  for (const row of operationRows) {
-    operationBreakdown[String(row.operation)] = toCount2(row.count);
-  }
-  const severityBreakdown = {};
-  for (const row of severityRows) {
-    severityBreakdown[String(row.severity)] = toCount2(row.count);
-  }
-  return {
-    totalLogs,
-    tablesAudited,
-    eventsPerDay,
-    topActors,
-    topTables,
-    operationBreakdown,
-    severityBreakdown
-  };
-}
 
 // src/proxy.ts
 var import_drizzle_orm5 = require("drizzle-orm");
@@ -1390,10 +1183,12 @@ async function fireCaptureLog(result, ctx, state) {
     }
   }
 }
+
+// src/index.ts
+var import_audit_core7 = require("@usebetterdev/audit-core");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   auditLogs,
-  buildCursorCondition,
   buildOrderBy,
   buildWhereConditions,
   decodeCursor,