@nextlyhq/adapter-drizzle 0.0.2-alpha.60 → 0.0.2-alpha.62

package/dist/{adapter-DjPoLjBK.d.ts → adapter-BRvxUZrS.d.ts}

@@ -1,9 +1,36 @@
 import { AnyRelations, SQL } from 'drizzle-orm';
+import { T as TransactionContext, S as SelectOptions, W as WhereClause, U as UpdateOptions, D as DeleteOptions, e as UpsertOptions, f as TransactionOptions, g as DatabaseCapabilities, P as PoolStats, I as InsertOptions, a as Migration, d as MigrationResult } from './migration-BnT96HFp.js';
 import { S as SupportedDialect, a as SqlParam, T as TableResolver } from './core-CVO7WYDj.js';
-import { T as TransactionContext, e as TransactionOptions, D as DatabaseCapabilities, P as PoolStats, S as SelectOptions, I as InsertOptions, W as WhereClause, U as UpdateOptions, f as DeleteOptions, g as UpsertOptions, a as Migration, d as MigrationResult } from './migration-Bj84e15B.js';
 import { T as TableDefinition, C as CreateTableOptions, D as DropTableOptions, A as AlterTableOperation, a as AlterTableOptions } from './schema-BIQ0YQZ_.js';
 import { D as DatabaseErrorKind, a as DatabaseError } from './error-BrdknH2s.js';
 
+/**
+ * Transaction CRUD forwarder helper for database adapters.
+ *
+ * @remarks
+ * Encapsulates the delegation pattern where a transaction context forwards its
+ * CRUD methods to the adapter's implementation while passing the transaction-bound
+ * Drizzle executor.
+ *
+ * @packageDocumentation
+ */
+
+/**
+ * Interface representing an adapter that can execute CRUD operations with an optional executor.
+ */
+interface TransactionCrudDelegator {
+    select<T = unknown>(table: string, options?: SelectOptions, executor?: unknown): Promise<T[]>;
+    selectOne<T = unknown>(table: string, options?: SelectOptions, executor?: unknown): Promise<T | null>;
+    update<T = unknown>(table: string, data: Record<string, unknown>, where: WhereClause, options?: UpdateOptions, executor?: unknown): Promise<T[]>;
+    updateCount(table: string, data: Record<string, unknown>, where: WhereClause, executor?: unknown): Promise<number>;
+    delete(table: string, where: WhereClause, options?: DeleteOptions, executor?: unknown): Promise<number>;
+    upsert<T = unknown>(table: string, data: Record<string, unknown>, options: UpsertOptions, executor?: unknown): Promise<T>;
+}
+/**
+ * Transaction context CRUD methods provided by the forwarder.
+ */
+type TransactionCrudForwarders = Pick<TransactionContext, "select" | "selectOne" | "update" | "updateCount" | "delete" | "upsert" | "getDrizzle">;
+
 /**
  * Base database adapter abstract class.
  *
@@ -708,12 +735,35 @@ declare abstract class DrizzleAdapter {
      * @protected
      */
     protected createDatabaseError(kind: DatabaseErrorKind, message: string, cause?: Error): DatabaseError;
+    /**
+     * Helper to create transaction context CRUD forwarding methods.
+     *
+     * @param txDb - Thunk returning the transaction-bound Drizzle executor
+     * @returns Object providing forwarded CRUD and getDrizzle methods
+     *
+     * @protected
+     */
+    protected createTransactionForwarders(txDb: () => unknown): TransactionCrudForwarders;
+    /**
+     * Classify an error into a DatabaseError.
+     *
+     * @remarks
+     * Subclasses can override this method to add dialect-specific error code classification.
+     *
+     * @param error - Original error
+     * @param sql - SQL statement that caused the error (optional)
+     * @returns DatabaseError instance
+     *
+     * @protected
+     */
+    protected classifyError(error: unknown, sql?: string): DatabaseError;
     /**
      * Handle query errors and convert to DatabaseError.
      *
      * @remarks
      * Protected helper for consistent error handling across CRUD operations.
-     * Subclasses can override to add dialect-specific error classification.
+     * Delegates to `classifyError` and attaches operation and table context if not present.
+     * Subclasses override `classifyError` to provide dialect-specific error code classification.
      *
      * @param error - Original error
      * @param operation - Operation that failed
@@ -725,4 +775,4 @@ declare abstract class DrizzleAdapter {
     protected handleQueryError(error: unknown, operation: string, table: string): DatabaseError;
 }
 
-export { DrizzleAdapter as D };
+export { DrizzleAdapter as D, type TransactionCrudDelegator as T, type TransactionCrudForwarders as a };

package/dist/{adapter-BG7MnOUw.d.cts → adapter-BeMxQXZs.d.cts}

@@ -1,9 +1,36 @@
 import { AnyRelations, SQL } from 'drizzle-orm';
+import { T as TransactionContext, S as SelectOptions, W as WhereClause, U as UpdateOptions, D as DeleteOptions, e as UpsertOptions, f as TransactionOptions, g as DatabaseCapabilities, P as PoolStats, I as InsertOptions, a as Migration, d as MigrationResult } from './migration-DhMuYiIm.cjs';
 import { S as SupportedDialect, a as SqlParam, T as TableResolver } from './core-CVO7WYDj.cjs';
-import { T as TransactionContext, e as TransactionOptions, D as DatabaseCapabilities, P as PoolStats, S as SelectOptions, I as InsertOptions, W as WhereClause, U as UpdateOptions, f as DeleteOptions, g as UpsertOptions, a as Migration, d as MigrationResult } from './migration-BUc56kip.cjs';
 import { T as TableDefinition, C as CreateTableOptions, D as DropTableOptions, A as AlterTableOperation, a as AlterTableOptions } from './schema-BDn8WfSL.cjs';
 import { D as DatabaseErrorKind, a as DatabaseError } from './error-BrdknH2s.cjs';
 
+/**
+ * Transaction CRUD forwarder helper for database adapters.
+ *
+ * @remarks
+ * Encapsulates the delegation pattern where a transaction context forwards its
+ * CRUD methods to the adapter's implementation while passing the transaction-bound
+ * Drizzle executor.
+ *
+ * @packageDocumentation
+ */
+
+/**
+ * Interface representing an adapter that can execute CRUD operations with an optional executor.
+ */
+interface TransactionCrudDelegator {
+    select<T = unknown>(table: string, options?: SelectOptions, executor?: unknown): Promise<T[]>;
+    selectOne<T = unknown>(table: string, options?: SelectOptions, executor?: unknown): Promise<T | null>;
+    update<T = unknown>(table: string, data: Record<string, unknown>, where: WhereClause, options?: UpdateOptions, executor?: unknown): Promise<T[]>;
+    updateCount(table: string, data: Record<string, unknown>, where: WhereClause, executor?: unknown): Promise<number>;
+    delete(table: string, where: WhereClause, options?: DeleteOptions, executor?: unknown): Promise<number>;
+    upsert<T = unknown>(table: string, data: Record<string, unknown>, options: UpsertOptions, executor?: unknown): Promise<T>;
+}
+/**
+ * Transaction context CRUD methods provided by the forwarder.
+ */
+type TransactionCrudForwarders = Pick<TransactionContext, "select" | "selectOne" | "update" | "updateCount" | "delete" | "upsert" | "getDrizzle">;
+
 /**
  * Base database adapter abstract class.
  *
@@ -708,12 +735,35 @@ declare abstract class DrizzleAdapter {
      * @protected
      */
     protected createDatabaseError(kind: DatabaseErrorKind, message: string, cause?: Error): DatabaseError;
+    /**
+     * Helper to create transaction context CRUD forwarding methods.
+     *
+     * @param txDb - Thunk returning the transaction-bound Drizzle executor
+     * @returns Object providing forwarded CRUD and getDrizzle methods
+     *
+     * @protected
+     */
+    protected createTransactionForwarders(txDb: () => unknown): TransactionCrudForwarders;
+    /**
+     * Classify an error into a DatabaseError.
+     *
+     * @remarks
+     * Subclasses can override this method to add dialect-specific error code classification.
+     *
+     * @param error - Original error
+     * @param sql - SQL statement that caused the error (optional)
+     * @returns DatabaseError instance
+     *
+     * @protected
+     */
+    protected classifyError(error: unknown, sql?: string): DatabaseError;
     /**
      * Handle query errors and convert to DatabaseError.
      *
      * @remarks
      * Protected helper for consistent error handling across CRUD operations.
-     * Subclasses can override to add dialect-specific error classification.
+     * Delegates to `classifyError` and attaches operation and table context if not present.
+     * Subclasses override `classifyError` to provide dialect-specific error code classification.
      *
      * @param error - Original error
      * @param operation - Operation that failed
@@ -725,4 +775,4 @@ declare abstract class DrizzleAdapter {
     protected handleQueryError(error: unknown, operation: string, table: string): DatabaseError;
 }
 
-export { DrizzleAdapter as D };
+export { DrizzleAdapter as D, type TransactionCrudDelegator as T, type TransactionCrudForwarders as a };

package/dist/index.cjs

@@ -3,6 +3,17 @@
 var drizzleOrm = require('drizzle-orm');
 
 // src/adapter.ts
+function buildDrizzleOrderBy(columns, orderBy) {
+  if (!orderBy?.length) return [];
+  return orderBy.flatMap((spec) => {
+    const col = columns[spec.column];
+    if (!col) return [];
+    const direction = spec.direction === "desc" ? drizzleOrm.desc(col) : drizzleOrm.asc(col);
+    if (spec.nulls === void 0) return [direction];
+    const isNull2 = drizzleOrm.sql`${col} is null`;
+    return [spec.nulls === "last" ? drizzleOrm.asc(isNull2) : drizzleOrm.desc(isNull2), direction];
+  });
+}
 function buildDrizzleWhere(table, where) {
   const columns = drizzleOrm.getColumns(table);
   return processWhereClause(columns, where);
@@ -38,13 +49,26 @@ function processWhereClause(columns, where) {
       parts.push(drizzleOrm.not(notCondition));
     }
   }
-  if (parts.length === 0) return void 0;
+  if (parts.length === 0) {
+    if (namesABranch(where)) {
+      throw new Error(
+        `Where clause produced no condition: ${JSON.stringify(where)}. Every branch resolved to nothing, which would match every row. Pass {} to mean "no filter".`
+      );
+    }
+    return void 0;
+  }
   if (parts.length === 1) return parts[0];
   return drizzleOrm.and(...parts);
 }
 function isWhereCondition(item) {
   return "column" in item && "op" in item;
 }
+function namesABranch(where) {
+  return Boolean(where.and?.length || where.or?.length || where.not);
+}
+function containsPattern(value) {
+  return `%${value.replace(/[!%_]/g, (character) => `!${character}`)}%`;
+}
 function buildCondition(columns, cond) {
   const column = columns[cond.column];
   if (!column) {
@@ -83,12 +107,37 @@ function buildCondition(columns, cond) {
     case "NOT BETWEEN":
       return drizzleOrm.notBetween(col, cond.value, cond.valueTo);
     case "CONTAINS":
-      return drizzleOrm.like(col, `%${String(cond.value)}%`);
+      return drizzleOrm.sql`${col} like ${containsPattern(String(cond.value))} escape '!'`;
     default:
       throw new Error(`Unsupported operator: ${cond.op}`);
   }
 }
 
+// src/transaction-forwarders.ts
+function createTransactionForwarders(delegator, txDb) {
+  return {
+    select: async (table, options) => {
+      return delegator.select(table, options, txDb());
+    },
+    selectOne: async (table, options) => {
+      return delegator.selectOne(table, options, txDb());
+    },
+    update: async (table, data, where, options) => {
+      return delegator.update(table, data, where, options, txDb());
+    },
+    updateCount: async (table, data, where) => {
+      return delegator.updateCount(table, data, where, txDb());
+    },
+    delete: async (table, where, options) => {
+      return delegator.delete(table, where, options, txDb());
+    },
+    upsert: async (table, data, options) => {
+      return delegator.upsert(table, data, options, txDb());
+    },
+    getDrizzle: () => txDb()
+  };
+}
+
 // src/types/error.ts
 function isDatabaseError(error) {
   return typeof error === "object" && error !== null && "kind" in error && typeof error.kind === "string";
@@ -704,12 +753,10 @@ var DrizzleAdapter = class {
           }
         }
         if (options?.orderBy?.length) {
-          const columns = drizzleOrm.getColumns(tableObj);
-          const orderClauses = options.orderBy.map((o) => {
-            const col = columns[o.column];
-            if (!col) return void 0;
-            return o.direction === "desc" ? drizzleOrm.desc(col) : drizzleOrm.asc(col);
-          }).filter(Boolean);
+          const orderClauses = buildDrizzleOrderBy(
+            drizzleOrm.getColumns(tableObj),
+            options.orderBy
+          );
           if (orderClauses.length) {
             query = query.orderBy(...orderClauses);
           }
@@ -1305,11 +1352,11 @@ var DrizzleAdapter = class {
    */
   async tableExists(tableName, schema) {
     try {
-      let sql;
+      let sql3;
       const params = [];
       switch (this.dialect) {
         case "postgresql":
-          sql = `
+          sql3 = `
             SELECT EXISTS (
               SELECT FROM information_schema.tables
               WHERE table_schema = COALESCE($1, (
@@ -1323,7 +1370,7 @@ var DrizzleAdapter = class {
           params.push(schema ?? null, tableName);
           break;
         case "mysql":
-          sql = `
+          sql3 = `
             SELECT COUNT(*) as count
             FROM information_schema.tables
             WHERE table_schema = DATABASE()
@@ -1332,7 +1379,7 @@ var DrizzleAdapter = class {
           params.push(tableName);
           break;
         case "sqlite":
-          sql = `
+          sql3 = `
             SELECT COUNT(*) as count
             FROM sqlite_master
             WHERE type = 'table'
@@ -1348,7 +1395,7 @@ var DrizzleAdapter = class {
           );
       }
       const results = await this.executeQuery(
-        sql,
+        sql3,
         params
       );
       if (results.length === 0) {
@@ -1380,11 +1427,11 @@ var DrizzleAdapter = class {
    */
   async listTables(schema) {
     try {
-      let sql;
+      let sql3;
       const params = [];
       switch (this.dialect) {
         case "postgresql":
-          sql = `
+          sql3 = `
             SELECT table_name
             FROM information_schema.tables
             WHERE table_schema = $1
@@ -1394,7 +1441,7 @@ var DrizzleAdapter = class {
           params.push(schema ?? "public");
           break;
         case "mysql":
-          sql = `
+          sql3 = `
             SELECT table_name AS table_name
             FROM information_schema.tables
             WHERE table_schema = DATABASE()
@@ -1403,7 +1450,7 @@ var DrizzleAdapter = class {
           `;
           break;
         case "sqlite":
-          sql = `
+          sql3 = `
             SELECT name as table_name
             FROM sqlite_master
             WHERE type = 'table'
@@ -1419,7 +1466,7 @@ var DrizzleAdapter = class {
           );
       }
       const results = await this.executeQuery(
-        sql,
+        sql3,
         params
       );
       return results.map((row) => row.table_name);
@@ -1475,30 +1522,64 @@ var DrizzleAdapter = class {
     });
   }
   /**
-   * Handle query errors and convert to DatabaseError.
+   * Helper to create transaction context CRUD forwarding methods.
+   *
+   * @param txDb - Thunk returning the transaction-bound Drizzle executor
+   * @returns Object providing forwarded CRUD and getDrizzle methods
+   *
+   * @protected
+   */
+  createTransactionForwarders(txDb) {
+    return createTransactionForwarders(this, txDb);
+  }
+  /**
+   * Classify an error into a DatabaseError.
    *
    * @remarks
-   * Protected helper for consistent error handling across CRUD operations.
-   * Subclasses can override to add dialect-specific error classification.
+   * Subclasses can override this method to add dialect-specific error code classification.
    *
    * @param error - Original error
-   * @param operation - Operation that failed
-   * @param table - Table name
+   * @param sql - SQL statement that caused the error (optional)
    * @returns DatabaseError instance
    *
    * @protected
    */
-  handleQueryError(error, operation, table) {
+  classifyError(error, sql3) {
     if (isDatabaseError(error)) {
       return error;
     }
     const errorMessage = error instanceof Error ? error.message : String(error);
     return this.createDatabaseError(
       "query",
-      `${operation} operation failed on table '${table}': ${errorMessage}`,
+      sql3 ? `Query failed: ${errorMessage}` : errorMessage,
       error instanceof Error ? error : void 0
     );
   }
+  /**
+   * Handle query errors and convert to DatabaseError.
+   *
+   * @remarks
+   * Protected helper for consistent error handling across CRUD operations.
+   * Delegates to `classifyError` and attaches operation and table context if not present.
+   * Subclasses override `classifyError` to provide dialect-specific error code classification.
+   *
+   * @param error - Original error
+   * @param operation - Operation that failed
+   * @param table - Table name
+   * @returns DatabaseError instance
+   *
+   * @protected
+   */
+  handleQueryError(error, operation, table) {
+    const dbError = this.classifyError(error);
+    if (!dbError.message.includes(operation)) {
+      dbError.message = `${operation} operation failed on table '${table}': ${dbError.message}`;
+    }
+    if (!dbError.table) {
+      dbError.table = table;
+    }
+    return dbError;
+  }
 };
 var ALLOWED_DEFAULT_SQL_EXPRESSIONS = /* @__PURE__ */ new Set([
   "current_timestamp",