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

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";
@@ -520,6 +569,23 @@ var DrizzleAdapter = class {
     if (names == null || names === "*" || !tableObj || typeof tableObj !== "object") {
       return void 0;
     }
+    const { projection } = this.resolveColumns(tableObj, names);
+    return Object.keys(projection).length ? projection : void 0;
+  }
+  /**
+   * The requested column names split into what this table has and what it does not.
+   *
+   * One resolution, reported both ways, because two callers need different halves
+   * of the same answer: a projection drops what it cannot find, while a distinct
+   * count has to REFUSE it. Resolving twice would let the two disagree about what
+   * "found" means — the SQL-name alias below is exactly the kind of detail a
+   * second implementation gets wrong — and the count would then reject a column
+   * the projection happily uses.
+   *
+   * Both spellings resolve: a caller may name the Drizzle property or the SQL
+   * column, and either maps to the same projection key.
+   */
+  resolveColumns(tableObj, names) {
     const cols = drizzleOrm.getColumns(tableObj);
     const byAnyName = {};
     for (const [jsName, col] of Object.entries(cols)) {
@@ -528,11 +594,13 @@ var DrizzleAdapter = class {
       if (typeof sqlName === "string") byAnyName[sqlName] = { jsName, col };
     }
     const projection = {};
+    const unresolved = [];
     for (const name of names) {
       const hit = byAnyName[name];
       if (hit) projection[hit.jsName] = hit.col;
+      else unresolved.push(name);
     }
-    return Object.keys(projection).length ? projection : void 0;
+    return { projection, unresolved };
   }
   // ============================================================
   // Connection Status (Default implementations, can override)
@@ -704,12 +772,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);
           }
@@ -761,6 +827,93 @@ var DrizzleAdapter = class {
    * });
    * ```
    */
+  /** The registered table object, or a refusal naming what is missing. */
+  requireTableObject(table) {
+    const tableObj = this.getTableObject(table);
+    if (tableObj) return tableObj;
+    throw this.createDatabaseError(
+      "query",
+      `Table "${table}" not found in schema registry. Ensure setTableResolver() has been called during boot.`,
+      void 0
+    );
+  }
+  /**
+   * The columns a distinct count groups by, or `undefined` for a row count.
+   *
+   * 🔴 EVERY named column must resolve, not merely one of them. A `distinctOn`
+   * naming no column this table has would fall through to a row count, and one
+   * naming a valid column beside a misspelled or since-removed column would
+   * count distinct over a NARROWER key than the caller asked for. Both answer a
+   * different question than the one asked, silently; the second is the worse of
+   * the two, because a subset key groups more rows together and so UNDERCOUNTS,
+   * which reads as a plausible number rather than as a fault. Refused here,
+   * where the mistake was made, rather than surfacing as a wrong figure.
+   */
+  countProjection(tableObj, table, options) {
+    const distinctOn = options?.distinctOn;
+    if (!distinctOn?.length) return void 0;
+    const { projection, unresolved } = this.resolveColumns(
+      tableObj,
+      distinctOn
+    );
+    if (unresolved.length > 0) {
+      throw this.createDatabaseError(
+        "query",
+        `distinctOn names ${unresolved.length === 1 ? "a column" : "columns"} that do not exist on "${table}": ${unresolved.join(", ")}`,
+        void 0
+      );
+    }
+    return projection;
+  }
+  /**
+   * `COUNT(*)` over a `SELECT DISTINCT` subquery.
+   *
+   * Its own function because it is a genuinely different query from the plain
+   * count rather than a variation on one, and because building both inline made
+   * the public method a chain of decisions the complexity gate objected to
+   * before a reader would have.
+   */
+  async countDistinctRows(db, tableObj, projection, where) {
+    const inner = db.selectDistinct(projection).from(tableObj).$dynamic();
+    const distinctRows = where ? inner.where(where) : inner;
+    const [row] = await db.select({ value: drizzleOrm.count() }).from(distinctRows.as("nextly_distinct"));
+    return Number(row?.value ?? 0);
+  }
+  /** `COUNT(*)` over the table itself. */
+  async countAllRows(db, tableObj, where) {
+    const base = db.select({ value: drizzleOrm.count() }).from(tableObj).$dynamic();
+    const [row] = await (where ? base.where(where) : base);
+    return Number(row?.value ?? 0);
+  }
+  /**
+   * How many rows match, or how many DISTINCT combinations of some columns do.
+   *
+   * The data layer had no count at all: collection totals go through
+   * `countEntries`, an access-controlled path built for collection tables, and
+   * nothing could count a system table. A caller wanting one selected the rows
+   * and measured the array, which transfers every row to learn a number and
+   * cannot be bounded without making the number wrong.
+   *
+   * 🔴 `distinctOn` compiles to `COUNT(*)` over a `SELECT DISTINCT` SUBQUERY,
+   * never to `COUNT(DISTINCT a, b)`. The inline form is not portable and fails
+   * in the direction that is hardest to notice -- MySQL accepts it, PostgreSQL
+   * needs a row constructor, and SQLite rejects it outright with "wrong number
+   * of arguments to function count()" -- so a query written against one engine
+   * is a syntax error on another. The subquery is the single form all three
+   * accept, and building it here rather than at each call site is what keeps
+   * the answer identical per dialect.
+   */
+  async count(table, options, executor) {
+    const tableObj = this.requireTableObject(table);
+    try {
+      const db = executor ?? this.getDrizzle();
+      const where = options?.where ? buildDrizzleWhere(tableObj, options.where) : void 0;
+      const projection = this.countProjection(tableObj, table, options);
+      return projection ? await this.countDistinctRows(db, tableObj, projection, where) : await this.countAllRows(db, tableObj, where);
+    } catch (error) {
+      throw this.handleQueryError(error, "count", table);
+    }
+  }
   async selectOne(table, options, executor) {
     const results = await this.select(
       table,
@@ -1305,11 +1458,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 +1476,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 +1485,7 @@ var DrizzleAdapter = class {
           params.push(tableName);
           break;
         case "sqlite":
-          sql = `
+          sql3 = `
             SELECT COUNT(*) as count
             FROM sqlite_master
             WHERE type = 'table'
@@ -1348,7 +1501,7 @@ var DrizzleAdapter = class {
           );
       }
       const results = await this.executeQuery(
-        sql,
+        sql3,
         params
       );
       if (results.length === 0) {
@@ -1380,11 +1533,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 +1547,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 +1556,7 @@ var DrizzleAdapter = class {
           `;
           break;
         case "sqlite":
-          sql = `
+          sql3 = `
             SELECT name as table_name
             FROM sqlite_master
             WHERE type = 'table'
@@ -1419,7 +1572,7 @@ var DrizzleAdapter = class {
           );
       }
       const results = await this.executeQuery(
-        sql,
+        sql3,
         params
       );
       return results.map((row) => row.table_name);
@@ -1475,30 +1628,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",