@delmaredigital/payload-better-auth 0.1.5 → 0.2.2

package/dist/adapter/index.js

@@ -1,368 +1,417 @@
-'use strict';
-
-// src/adapter/index.ts
-var DEFAULT_COLLECTIONS = {
-  user: "users",
-  session: "sessions",
-  account: "accounts",
-  verification: "verifications"
+/**
+ * Payload CMS Adapter for Better Auth
+ *
+ * A clean adapter that bridges Better Auth to Payload collections.
+ * Follows the same factory pattern as payload-auth for compatibility.
+ *
+ * @packageDocumentation
+ */
+const DEFAULT_COLLECTIONS = {
+    user: 'users',
+    session: 'sessions',
+    account: 'accounts',
+    verification: 'verifications',
 };
-function payloadAdapter({
-  payloadClient,
-  adapterConfig
-}) {
-  const { collections = {}, enableDebugLogs = false, idType } = adapterConfig;
-  const finalCollections = { ...DEFAULT_COLLECTIONS, ...collections };
-  const log = (...args) => {
-    if (enableDebugLogs) console.log("[payload-adapter]", ...args);
-  };
-  async function resolvePayloadClient() {
-    return typeof payloadClient === "function" ? await payloadClient() : payloadClient;
-  }
-  function getCollection(model) {
-    return finalCollections[model] ?? model;
-  }
-  function transformFieldName(fieldName) {
-    if (fieldName.endsWith("Id") && fieldName !== "id" && fieldName !== "accountId" && fieldName !== "providerId") {
-      return fieldName.slice(0, -2);
-    }
-    return fieldName;
-  }
-  function convertWhere(where) {
-    if (!where || where.length === 0) return {};
-    if (where.length === 1) {
-      const w = where[0];
-      return {
-        [transformFieldName(w.field)]: convertOperator(w.operator, w.value)
-      };
-    }
-    const andConditions = where.filter((w) => w.connector !== "OR");
-    const orConditions = where.filter((w) => w.connector === "OR");
-    const result = {};
-    if (andConditions.length > 0) {
-      result.and = andConditions.map((w) => ({
-        [transformFieldName(w.field)]: convertOperator(w.operator, w.value)
-      }));
-    }
-    if (orConditions.length > 0) {
-      result.or = orConditions.map((w) => ({
-        [transformFieldName(w.field)]: convertOperator(w.operator, w.value)
-      }));
-    }
-    return result;
-  }
-  function convertOperator(operator, value) {
-    switch (operator) {
-      case "eq":
-        return { equals: value };
-      case "ne":
-        return { not_equals: value };
-      case "gt":
-        return { greater_than: value };
-      case "gte":
-        return { greater_than_equal: value };
-      case "lt":
-        return { less_than: value };
-      case "lte":
-        return { less_than_equal: value };
-      case "in":
-        return { in: value };
-      case "contains":
-        return { contains: value };
-      case "starts_with":
-        return { like: `${value}%` };
-      case "ends_with":
-        return { like: `%${value}` };
-      default:
-        return { equals: value };
+/**
+ * Creates a Better Auth adapter that uses Payload CMS as the database.
+ *
+ * Returns a factory function that Better Auth calls with its options.
+ * This matches the pattern used by other Better Auth adapters.
+ *
+ * @example
+ * ```ts
+ * import { payloadAdapter } from '@delmare/payload-better-auth/adapter'
+ *
+ * const auth = betterAuth({
+ *   database: payloadAdapter({
+ *     payloadClient: payload,
+ *     adapterConfig: {
+ *       idType: 'number', // Use Payload's default SERIAL IDs
+ *       collections: { user: 'users' },
+ *     },
+ *   }),
+ *   // Required when using serial/integer IDs
+ *   advanced: {
+ *     database: {
+ *       generateId: 'serial',
+ *     },
+ *   },
+ * })
+ * ```
+ */
+export function payloadAdapter({ payloadClient, adapterConfig, }) {
+    const { collections = {}, enableDebugLogs = false, idType } = adapterConfig;
+    const finalCollections = { ...DEFAULT_COLLECTIONS, ...collections };
+    const log = (...args) => {
+        if (enableDebugLogs)
+            console.log('[payload-adapter]', ...args);
+    };
+    async function resolvePayloadClient() {
+        return typeof payloadClient === 'function'
+            ? await payloadClient()
+            : payloadClient;
     }
-  }
-  function extractSingleId(where) {
-    if ("and" in where || "or" in where) return null;
-    const idCondition = where.id;
-    if (idCondition && typeof idCondition === "object" && "equals" in idCondition) {
-      const value = idCondition.equals;
-      if (typeof value === "string" || typeof value === "number") {
-        return value;
-      }
+    function getCollection(model) {
+        return (finalCollections[model] ?? model);
     }
-    return null;
-  }
-  function transformInput(data) {
-    const result = {};
-    for (const [key, value] of Object.entries(data)) {
-      if (key.endsWith("Id") && key !== "id" && key !== "accountId" && key !== "providerId") {
-        const fieldName = key.slice(0, -2);
-        if (idType === "number" && typeof value === "string") {
-          const num = parseInt(value, 10);
-          result[fieldName] = isNaN(num) ? value : num;
-        } else {
-          result[fieldName] = value;
+    /**
+     * Transform field name for where clause (Better Auth → Payload)
+     * Converts relationship fields like `userId` to `user`
+     */
+    function transformFieldName(fieldName) {
+        if (fieldName.endsWith('Id') &&
+            fieldName !== 'id' &&
+            fieldName !== 'accountId' &&
+            fieldName !== 'providerId') {
+            return fieldName.slice(0, -2);
         }
-      } else {
-        result[key] = value;
-      }
-    }
-    return result;
-  }
-  function transformOutput(doc) {
-    if (!doc || typeof doc !== "object") return doc;
-    const result = { ...doc };
-    if ("id" in result && result.id !== void 0) {
-      result.id = String(result.id);
+        return fieldName;
     }
-    for (const [key, value] of Object.entries(result)) {
-      if (value && typeof value === "object" && "id" in value) {
-        result[`${key}Id`] = String(value.id);
-        delete result[key];
-      } else if (typeof value === "string" && /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(value)) {
-        result[key] = new Date(value);
-      }
-    }
-    return result;
-  }
-  function convertId(id) {
-    if (idType === "number" && typeof id === "string") {
-      const num = parseInt(id, 10);
-      return isNaN(num) ? id : num;
+    /**
+     * Convert Better Auth where clause to Payload where clause
+     */
+    function convertWhere(where) {
+        if (!where || where.length === 0)
+            return {};
+        if (where.length === 1) {
+            const w = where[0];
+            return {
+                [transformFieldName(w.field)]: convertOperator(w.operator, w.value),
+            };
+        }
+        const andConditions = where.filter((w) => w.connector !== 'OR');
+        const orConditions = where.filter((w) => w.connector === 'OR');
+        const result = {};
+        if (andConditions.length > 0) {
+            result.and = andConditions.map((w) => ({
+                [transformFieldName(w.field)]: convertOperator(w.operator, w.value),
+            }));
+        }
+        if (orConditions.length > 0) {
+            result.or = orConditions.map((w) => ({
+                [transformFieldName(w.field)]: convertOperator(w.operator, w.value),
+            }));
+        }
+        return result;
     }
-    if (idType === "text" && typeof id === "number") {
-      return String(id);
+    function convertOperator(operator, value) {
+        switch (operator) {
+            case 'eq':
+                return { equals: value };
+            case 'ne':
+                return { not_equals: value };
+            case 'gt':
+                return { greater_than: value };
+            case 'gte':
+                return { greater_than_equal: value };
+            case 'lt':
+                return { less_than: value };
+            case 'lte':
+                return { less_than_equal: value };
+            case 'in':
+                return { in: value };
+            case 'contains':
+                return { contains: value };
+            case 'starts_with':
+                return { like: `${value}%` };
+            case 'ends_with':
+                return { like: `%${value}` };
+            default:
+                return { equals: value };
+        }
     }
-    return id;
-  }
-  async function handleJoins(payload, doc, model, join) {
-    const result = { ...doc };
-    for (const [joinKey, joinConfig] of Object.entries(join)) {
-      if (!joinConfig) continue;
-      const limit = typeof joinConfig === "object" ? joinConfig.limit : void 0;
-      log("handleJoins", { model, joinKey, docId: doc.id });
-      if (model === "user" && joinKey === "account") {
-        const accounts = await payload.find({
-          collection: getCollection("account"),
-          where: { user: { equals: doc.id } },
-          limit: limit ?? 100,
-          depth: 0
-        });
-        result[joinKey] = accounts.docs.map((a) => transformOutput(a));
-      } else if (model === "session" && joinKey === "user") {
-        const userId = doc.userId;
-        if (userId) {
-          try {
-            const user = await payload.findByID({
-              collection: getCollection("user"),
-              id: userId,
-              depth: 0
-            });
-            result[joinKey] = transformOutput(user);
-          } catch {
-            result[joinKey] = null;
-          }
+    function extractSingleId(where) {
+        if ('and' in where || 'or' in where)
+            return null;
+        const idCondition = where.id;
+        if (idCondition &&
+            typeof idCondition === 'object' &&
+            'equals' in idCondition) {
+            const value = idCondition.equals;
+            if (typeof value === 'string' || typeof value === 'number') {
+                return value;
+            }
         }
-      } else if (model === "account" && joinKey === "user") {
-        const userId = doc.userId;
-        if (userId) {
-          try {
-            const user = await payload.findByID({
-              collection: getCollection("user"),
-              id: userId,
-              depth: 0
-            });
-            result[joinKey] = transformOutput(user);
-          } catch {
-            result[joinKey] = null;
-          }
+        return null;
+    }
+    /**
+     * Transform input data (Better Auth → Payload field names)
+     * Also converts relationship IDs to the correct type based on idType
+     */
+    function transformInput(data) {
+        const result = {};
+        for (const [key, value] of Object.entries(data)) {
+            if (key.endsWith('Id') &&
+                key !== 'id' &&
+                key !== 'accountId' &&
+                key !== 'providerId') {
+                // Transform userId -> user and convert to correct ID type for relationships
+                const fieldName = key.slice(0, -2);
+                if (idType === 'number' && typeof value === 'string') {
+                    const num = parseInt(value, 10);
+                    result[fieldName] = isNaN(num) ? value : num;
+                }
+                else {
+                    result[fieldName] = value;
+                }
+            }
+            else {
+                result[key] = value;
+            }
         }
-      }
+        return result;
     }
-    return result;
-  }
-  return (_options) => {
-    log("Adapter initialized", { collections: finalCollections });
-    return {
-      id: "payload-adapter",
-      async create({
-        model,
-        data
-      }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const transformedData = transformInput(data);
-        log("create", { collection, data: transformedData });
-        try {
-          const result = await payload.create({
-            collection,
-            data: transformedData,
-            depth: 0
-          });
-          return transformOutput(result);
-        } catch (error) {
-          console.error("[payload-adapter] create failed:", {
-            collection,
-            model,
-            error: error instanceof Error ? error.message : error
-          });
-          throw error;
+    /**
+     * Transform output data (Payload → Better Auth field names)
+     */
+    function transformOutput(doc) {
+        if (!doc || typeof doc !== 'object')
+            return doc;
+        const result = { ...doc };
+        if ('id' in result && result.id !== undefined) {
+            result.id = String(result.id);
         }
-      },
-      async findOne({
-        model,
-        where,
-        select: _select,
-        join
-      }) {
-        try {
-          const payload = await resolvePayloadClient();
-          const collection = getCollection(model);
-          const payloadWhere = convertWhere(where);
-          const id = extractSingleId(payloadWhere);
-          if (id) {
-            try {
-              const result2 = await payload.findByID({
-                collection,
-                id: convertId(id),
-                depth: 1
-              });
-              let doc2 = transformOutput(result2);
-              if (join) {
-                doc2 = await handleJoins(payload, doc2, model, join);
-              }
-              return doc2;
-            } catch (error) {
-              if (error instanceof Error && "status" in error && error.status === 404) {
-                return null;
-              }
-              throw error;
+        for (const [key, value] of Object.entries(result)) {
+            if (value && typeof value === 'object' && 'id' in value) {
+                result[`${key}Id`] = String(value.id);
+                delete result[key];
+            }
+            else if (typeof value === 'string' &&
+                /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/.test(value)) {
+                result[key] = new Date(value);
             }
-          }
-          const result = await payload.find({
-            collection,
-            where: payloadWhere,
-            limit: 1,
-            depth: 1
-          });
-          let doc = result.docs[0] ? transformOutput(result.docs[0]) : null;
-          if (doc && join) {
-            doc = await handleJoins(payload, doc, model, join);
-          }
-          return doc;
-        } catch (error) {
-          console.error("[payload-adapter] findOne FAILED", {
-            model,
-            where,
-            error
-          });
-          throw error;
         }
-      },
-      async findMany({
-        model,
-        where,
-        limit,
-        offset,
-        sortBy
-      }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const payloadWhere = convertWhere(where);
-        const result = await payload.find({
-          collection,
-          where: payloadWhere,
-          limit: limit ?? 100,
-          page: offset ? Math.floor(offset / (limit ?? 100)) + 1 : 1,
-          sort: sortBy ? `${sortBy.direction === "desc" ? "-" : ""}${sortBy.field}` : void 0,
-          depth: 1
-        });
-        return result.docs.map((doc) => transformOutput(doc));
-      },
-      async update({
-        model,
-        where,
-        update: data
-      }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const payloadWhere = convertWhere(where);
-        const transformedData = transformInput(data);
-        const id = extractSingleId(payloadWhere);
-        if (id) {
-          const result2 = await payload.update({
-            collection,
-            id: convertId(id),
-            data: transformedData,
-            depth: 1
-          });
-          return transformOutput(result2);
+        return result;
+    }
+    function convertId(id) {
+        if (idType === 'number' && typeof id === 'string') {
+            const num = parseInt(id, 10);
+            return isNaN(num) ? id : num;
         }
-        const result = await payload.update({
-          collection,
-          where: payloadWhere,
-          data: transformedData,
-          depth: 1
-        });
-        return result.docs[0] ? transformOutput(result.docs[0]) : null;
-      },
-      async updateMany({
-        model,
-        where,
-        update: data
-      }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const payloadWhere = convertWhere(where);
-        const transformedData = transformInput(data);
-        const result = await payload.update({
-          collection,
-          where: payloadWhere,
-          data: transformedData,
-          depth: 0
-        });
-        return result.docs.length;
-      },
-      async delete({ model, where }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const payloadWhere = convertWhere(where);
-        const id = extractSingleId(payloadWhere);
-        if (id) {
-          await payload.delete({ collection, id: convertId(id) });
-          return;
+        if (idType === 'text' && typeof id === 'number') {
+            return String(id);
         }
-        await payload.delete({ collection, where: payloadWhere });
-      },
-      async deleteMany({
-        model,
-        where
-      }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const payloadWhere = convertWhere(where);
-        const result = await payload.delete({
-          collection,
-          where: payloadWhere
-        });
-        return result.docs.length;
-      },
-      async count({
-        model,
-        where
-      }) {
-        const payload = await resolvePayloadClient();
-        const collection = getCollection(model);
-        const payloadWhere = convertWhere(where);
-        const result = await payload.count({
-          collection,
-          where: payloadWhere
-        });
-        return result.totalDocs;
-      },
-      async transaction(callback) {
-        return callback(this);
-      }
+        return id;
+    }
+    /**
+     * Handle join requests - fetch related data
+     */
+    async function handleJoins(payload, doc, model, join) {
+        const result = { ...doc };
+        for (const [joinKey, joinConfig] of Object.entries(join)) {
+            if (!joinConfig)
+                continue;
+            const limit = typeof joinConfig === 'object' ? joinConfig.limit : undefined;
+            log('handleJoins', { model, joinKey, docId: doc.id });
+            if (model === 'user' && joinKey === 'account') {
+                const accounts = await payload.find({
+                    collection: getCollection('account'),
+                    where: { user: { equals: doc.id } },
+                    limit: limit ?? 100,
+                    depth: 0,
+                });
+                result[joinKey] = accounts.docs.map((a) => transformOutput(a));
+            }
+            else if (model === 'session' && joinKey === 'user') {
+                const userId = doc.userId;
+                if (userId) {
+                    try {
+                        const user = await payload.findByID({
+                            collection: getCollection('user'),
+                            id: userId,
+                            depth: 0,
+                        });
+                        result[joinKey] = transformOutput(user);
+                    }
+                    catch {
+                        result[joinKey] = null;
+                    }
+                }
+            }
+            else if (model === 'account' && joinKey === 'user') {
+                const userId = doc.userId;
+                if (userId) {
+                    try {
+                        const user = await payload.findByID({
+                            collection: getCollection('user'),
+                            id: userId,
+                            depth: 0,
+                        });
+                        result[joinKey] = transformOutput(user);
+                    }
+                    catch {
+                        result[joinKey] = null;
+                    }
+                }
+            }
+            // Extensibility: Add more join patterns here for plugins
+        }
+        return result;
+    }
+    return (_options) => {
+        log('Adapter initialized', { collections: finalCollections });
+        return {
+            id: 'payload-adapter',
+            async create({ model, data, }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const transformedData = transformInput(data);
+                log('create', { collection, data: transformedData });
+                try {
+                    const result = await payload.create({
+                        collection,
+                        data: transformedData,
+                        depth: 0,
+                    });
+                    return transformOutput(result);
+                }
+                catch (error) {
+                    console.error('[payload-adapter] create failed:', {
+                        collection,
+                        model,
+                        error: error instanceof Error ? error.message : error,
+                    });
+                    throw error;
+                }
+            },
+            async findOne({ model, where, select: _select, join, }) {
+                try {
+                    const payload = await resolvePayloadClient();
+                    const collection = getCollection(model);
+                    const payloadWhere = convertWhere(where);
+                    const id = extractSingleId(payloadWhere);
+                    if (id) {
+                        try {
+                            const result = await payload.findByID({
+                                collection,
+                                id: convertId(id),
+                                depth: 1,
+                            });
+                            let doc = transformOutput(result);
+                            if (join) {
+                                doc = await handleJoins(payload, doc, model, join);
+                            }
+                            return doc;
+                        }
+                        catch (error) {
+                            if (error instanceof Error &&
+                                'status' in error &&
+                                error.status === 404) {
+                                return null;
+                            }
+                            throw error;
+                        }
+                    }
+                    const result = await payload.find({
+                        collection,
+                        where: payloadWhere,
+                        limit: 1,
+                        depth: 1,
+                    });
+                    let doc = result.docs[0]
+                        ? transformOutput(result.docs[0])
+                        : null;
+                    if (doc && join) {
+                        doc = await handleJoins(payload, doc, model, join);
+                    }
+                    return doc;
+                }
+                catch (error) {
+                    console.error('[payload-adapter] findOne FAILED', {
+                        model,
+                        where,
+                        error,
+                    });
+                    throw error;
+                }
+            },
+            async findMany({ model, where, limit, offset, sortBy, }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const payloadWhere = convertWhere(where);
+                const result = await payload.find({
+                    collection,
+                    where: payloadWhere,
+                    limit: limit ?? 100,
+                    page: offset ? Math.floor(offset / (limit ?? 100)) + 1 : 1,
+                    sort: sortBy
+                        ? `${sortBy.direction === 'desc' ? '-' : ''}${sortBy.field}`
+                        : undefined,
+                    depth: 1,
+                });
+                return result.docs.map((doc) => transformOutput(doc));
+            },
+            async update({ model, where, update: data, }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const payloadWhere = convertWhere(where);
+                const transformedData = transformInput(data);
+                const id = extractSingleId(payloadWhere);
+                if (id) {
+                    const result = await payload.update({
+                        collection,
+                        id: convertId(id),
+                        data: transformedData,
+                        depth: 1,
+                    });
+                    return transformOutput(result);
+                }
+                const result = await payload.update({
+                    collection,
+                    where: payloadWhere,
+                    data: transformedData,
+                    depth: 1,
+                });
+                return result.docs[0] ? transformOutput(result.docs[0]) : null;
+            },
+            async updateMany({ model, where, update: data, }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const payloadWhere = convertWhere(where);
+                const transformedData = transformInput(data);
+                const result = await payload.update({
+                    collection,
+                    where: payloadWhere,
+                    data: transformedData,
+                    depth: 0,
+                });
+                return result.docs.length;
+            },
+            async delete({ model, where }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const payloadWhere = convertWhere(where);
+                const id = extractSingleId(payloadWhere);
+                if (id) {
+                    await payload.delete({ collection, id: convertId(id) });
+                    return;
+                }
+                await payload.delete({ collection, where: payloadWhere });
+            },
+            async deleteMany({ model, where, }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const payloadWhere = convertWhere(where);
+                const result = await payload.delete({
+                    collection,
+                    where: payloadWhere,
+                });
+                return result.docs.length;
+            },
+            async count({ model, where, }) {
+                const payload = await resolvePayloadClient();
+                const collection = getCollection(model);
+                const payloadWhere = convertWhere(where);
+                const result = await payload.count({
+                    collection,
+                    where: payloadWhere,
+                });
+                return result.totalDocs;
+            },
+            async transaction(callback) {
+                return callback(this);
+            },
+        };
     };
-  };
 }
-
-exports.payloadAdapter = payloadAdapter;
-//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map