@delmaredigital/payload-better-auth 0.3.7 → 0.3.8

package/dist/adapter/index.js

@@ -5,13 +5,11 @@
  * eliminating hardcoded field mappings and supporting all Better Auth plugins.
  *
  * @packageDocumentation
- */
-import { createAdapterFactory, } from 'better-auth/adapters';
+ */ import { createAdapterFactory } from 'better-auth/adapters';
 /**
  * Detect ID type from Better Auth options.
  * Defaults to 'number' (SERIAL) since Payload uses SERIAL IDs by default.
- */
-function detectIdType(options) {
+ */ function detectIdType(options) {
     const generateId = options.advanced?.database?.generateId;
     // If explicitly set to something other than 'serial', use text (UUID)
     if (generateId !== undefined && generateId !== 'serial') {
@@ -53,49 +51,66 @@ function detectIdType(options) {
  *   session: { modelName: 'auth_session' }, // → 'auth_sessions' collection
  * })
  * ```
- */
-export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
+ */ export function payloadAdapter({ payloadClient, adapterConfig = {} }) {
     const { enableDebugLogs = false, idFieldsAllowlist = [], idFieldsBlocklist = [] } = adapterConfig;
     const idFieldsAllowlistSet = new Set(idFieldsAllowlist);
     const idFieldsBlocklistSet = new Set(idFieldsBlocklist);
     // Resolve payload client (supports lazy initialization)
     async function resolvePayloadClient() {
-        return typeof payloadClient === 'function'
-            ? await payloadClient()
-            : payloadClient;
+        return typeof payloadClient === 'function' ? await payloadClient() : payloadClient;
     }
     function convertOperator(operator, value) {
-        switch (operator) {
+        switch(operator){
             case 'eq':
-                return { equals: value };
+                return {
+                    equals: value
+                };
             case 'ne':
-                return { not_equals: value };
+                return {
+                    not_equals: value
+                };
             case 'gt':
-                return { greater_than: value };
+                return {
+                    greater_than: value
+                };
             case 'gte':
-                return { greater_than_equal: value };
+                return {
+                    greater_than_equal: value
+                };
             case 'lt':
-                return { less_than: value };
+                return {
+                    less_than: value
+                };
             case 'lte':
-                return { less_than_equal: value };
+                return {
+                    less_than_equal: value
+                };
             case 'in':
-                return { in: value };
+                return {
+                    in: value
+                };
             case 'contains':
-                return { contains: value };
+                return {
+                    contains: value
+                };
             case 'starts_with':
-                return { like: `${value}%` };
+                return {
+                    like: `${value}%`
+                };
             case 'ends_with':
-                return { like: `%${value}` };
+                return {
+                    like: `%${value}`
+                };
             default:
-                return { equals: value };
+                return {
+                    equals: value
+                };
         }
     }
     /**
-     * Extract single ID from where clause for optimization
-     */
-    function extractSingleId(where) {
-        if (where.length !== 1)
-            return null;
+   * Extract single ID from where clause for optimization
+   */ function extractSingleId(where) {
+        if (where.length !== 1) return null;
         const w = where[0];
         if (w.field === 'id' && w.operator === 'eq') {
             const value = w.value;
@@ -106,7 +121,7 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
         return null;
     }
     // Return the adapter factory function
-    return (options) => {
+    return (options)=>{
         // Determine ID type: explicit config > auto-detect
         // Defaults to 'number' (SERIAL) since Payload uses SERIAL IDs by default
         const idType = adapterConfig.idType ?? detectIdType(options);
@@ -115,19 +130,20 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
         // This would cause Better Auth to generate UUIDs which won't work with SERIAL columns
         // Don't warn if generateId is undefined - that's the expected default case
         if (idType === 'number' && generateId !== undefined && generateId !== 'serial') {
-            console.warn('[payload-adapter] Warning: Using SERIAL (number) IDs but `generateId` is set to a non-serial value. ' +
-                'Either set `advanced: { database: { generateId: "serial" } }` to let Payload generate IDs, ' +
-                'or set `adapterConfig: { idType: "text" }` if using UUIDs.');
+            console.warn('[payload-adapter] Warning: Using SERIAL (number) IDs but `generateId` is set to a non-serial value. ' + 'Either set `advanced: { database: { generateId: "serial" } }` to let Payload generate IDs, ' + 'or set `adapterConfig: { idType: "text" }` if using UUIDs.');
         }
         // Warn if modelName appears to be already plural (ends with 's')
         // With usePlural: true, providing 'users' would become 'userss'
-        const coreModels = ['user', 'session', 'account', 'verification'];
-        for (const model of coreModels) {
+        const coreModels = [
+            'user',
+            'session',
+            'account',
+            'verification'
+        ];
+        for (const model of coreModels){
             const modelName = options[model]?.modelName;
             if (modelName && modelName.endsWith('s')) {
-                console.warn(`[payload-adapter] Warning: modelName '${modelName}' for '${model}' appears to be plural. ` +
-                    `Use singular form (e.g., '${modelName.slice(0, -1)}') - it gets pluralized automatically. ` +
-                    `Using plural names will result in double-pluralization (e.g., '${modelName}s').`);
+                console.warn(`[payload-adapter] Warning: modelName '${modelName}' for '${model}' appears to be plural. ` + `Use singular form (e.g., '${modelName.slice(0, -1)}') - it gets pluralized automatically. ` + `Using plural names will result in double-pluralization (e.g., '${modelName}s').`);
             }
         }
         // Create adapter config for createAdapterFactory
@@ -148,18 +164,17 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
             // Payload doesn't expose transaction API at collection level
             transaction: false,
             // Enable debug logs if configured
-            debugLogs: enableDebugLogs,
+            debugLogs: enableDebugLogs
         };
         // We need to resolve the payload client before creating the adapter
         // The factory pattern requires we return an adapter synchronously,
         // so we'll resolve it lazily on first operation
         let resolvedPayload = null;
         let resolvePromise = null;
-        const getPayload = async () => {
-            if (resolvedPayload)
-                return resolvedPayload;
+        const getPayload = async ()=>{
+            if (resolvedPayload) return resolvedPayload;
             if (!resolvePromise) {
-                resolvePromise = resolvePayloadClient().then((p) => {
+                resolvePromise = resolvePayloadClient().then((p)=>{
                     resolvedPayload = p;
                     return p;
                 });
@@ -167,7 +182,7 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
             return resolvePromise;
         };
         // Helper to convert ID based on type
-        const convertId = (id) => {
+        const convertId = (id)=>{
             if (idType === 'number' && typeof id === 'string') {
                 const num = parseInt(id, 10);
                 return isNaN(num) ? id : num;
@@ -181,41 +196,40 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
         // The factory handles all schema-aware transformations for us
         const adapterFactory = createAdapterFactory({
             config: factoryConfig,
-            adapter: ({ schema, getModelName, getFieldName, debugLog, }) => {
+            adapter: ({ schema, getModelName, getFieldName, debugLog })=>{
                 // Log initialization
                 if (enableDebugLogs) {
                     debugLog('Adapter initialized', {
                         idType,
-                        schema: Object.keys(schema),
+                        schema: Object.keys(schema)
                     });
                 }
                 /**
-                 * Get the schema for a model, handling plural/singular lookups.
-                 * Better Auth queries with plural names when usePlural is true,
-                 * but schema keys are singular.
-                 */
-                function getModelSchema(model) {
+         * Get the schema for a model, handling plural/singular lookups.
+         * Better Auth queries with plural names when usePlural is true,
+         * but schema keys are singular.
+         */ function getModelSchema(model) {
                     // First try direct lookup
-                    if (schema[model])
-                        return schema[model];
+                    if (schema[model]) return schema[model];
                     // Try singular form (strip trailing 's') for plural model names
                     const singular = model.endsWith('s') ? model.slice(0, -1) : model;
-                    if (schema[singular])
-                        return schema[singular];
+                    if (schema[singular]) return schema[singular];
                     // Try without 'ies' → 'y' conversion (e.g., 'verifications' → 'verification')
                     // This handles edge cases but 'verifications' → 'verification' works with simple 's' strip
                     return undefined;
                 }
                 /**
-                 * Transform a Better Auth field name to a Payload field name.
-                 *
-                 * For reference fields (those with `references` in schema), Payload collections
-                 * use the field name without the `Id`/`_id` suffix (e.g., `userId` → `user`).
-                 * This matches how betterAuthCollections() generates relationship fields.
-                 */
-                function getPayloadFieldName(model, field) {
+         * Transform a Better Auth field name to a Payload field name.
+         *
+         * For reference fields (those with `references` in schema), Payload collections
+         * use the field name without the `Id`/`_id` suffix (e.g., `userId` → `user`).
+         * This matches how betterAuthCollections() generates relationship fields.
+         */ function getPayloadFieldName(model, field) {
                     // First apply any custom field name mappings from BetterAuthOptions
-                    const mappedField = getFieldName({ model, field });
+                    const mappedField = getFieldName({
+                        model,
+                        field
+                    });
                     // Check if this field is a reference field in the schema
                     const modelSchema = getModelSchema(model);
                     if (modelSchema?.fields?.[field]?.references) {
@@ -226,16 +240,14 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                     return mappedField;
                 }
                 /**
-                 * Transform input data from Better Auth format to Payload format.
-                 * Converts reference field names (e.g., `userId` → `user`) and
-                 * converts reference field values to the correct ID type.
-                 */
-                function transformDataForPayload(model, data) {
+         * Transform input data from Better Auth format to Payload format.
+         * Converts reference field names (e.g., `userId` → `user`) and
+         * converts reference field values to the correct ID type.
+         */ function transformDataForPayload(model, data) {
                     const modelSchema = getModelSchema(model);
-                    if (!modelSchema?.fields)
-                        return data;
+                    if (!modelSchema?.fields) return data;
                     const transformed = {};
-                    for (const [key, value] of Object.entries(data)) {
+                    for (const [key, value] of Object.entries(data)){
                         const payloadKey = getPayloadFieldName(model, key);
                         let transformedValue = value;
                         // If this is a reference field, convert the ID to the correct type
@@ -247,8 +259,7 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                                 if (!isNaN(numValue)) {
                                     transformedValue = numValue;
                                 }
-                            }
-                            else if (idType === 'text' && typeof value === 'number') {
+                            } else if (idType === 'text' && typeof value === 'number') {
                                 transformedValue = String(value);
                             }
                         }
@@ -259,28 +270,28 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                             model,
                             inputKeys: Object.keys(data),
                             outputKeys: Object.keys(transformed),
-                            transformedData: transformed,
+                            transformedData: transformed
                         });
                     }
                     return transformed;
                 }
                 /**
-                 * Transform output data from Payload format to Better Auth format.
-                 * Converts reference field names back (e.g., `user` → `userId`).
-                 */
-                function transformDataFromPayload(model, data) {
+         * Transform output data from Payload format to Better Auth format.
+         * Converts reference field names back (e.g., `user` → `userId`).
+         */ function transformDataFromPayload(model, data) {
                     const modelSchema = getModelSchema(model);
-                    if (!modelSchema?.fields || !data)
-                        return data;
-                    const transformed = { ...data };
+                    if (!modelSchema?.fields || !data) return data;
+                    const transformed = {
+                        ...data
+                    };
                     // For each field in the schema that has references,
                     // check if Payload returned the stripped name and map it back
-                    for (const [fieldKey, fieldDef] of Object.entries(modelSchema.fields)) {
+                    for (const [fieldKey, fieldDef] of Object.entries(modelSchema.fields)){
                         if (fieldDef.references) {
                             const payloadFieldName = fieldKey.replace(/(_id|Id)$/, '');
                             if (payloadFieldName in data && !(fieldKey in transformed)) {
                                 transformed[fieldKey] = data[payloadFieldName];
-                                // Keep both for compatibility - Better Auth expects userId
+                            // Keep both for compatibility - Better Auth expects userId
                             }
                         }
                     }
@@ -288,10 +299,9 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                     // Heuristic: fields ending in 'Id' or '_id' containing numeric strings
                     // Modified by allowlist (add) and blocklist (exclude)
                     if (idType === 'number') {
-                        for (const [key, value] of Object.entries(transformed)) {
+                        for (const [key, value] of Object.entries(transformed)){
                             // Skip if not a string or already processed as a reference
-                            if (typeof value !== 'string')
-                                continue;
+                            if (typeof value !== 'string') continue;
                             // Check if field should be converted
                             const matchesHeuristic = /(?:Id|_id)$/.test(key);
                             const inAllowlist = idFieldsAllowlistSet.has(key);
@@ -307,36 +317,34 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                     return transformed;
                 }
                 /**
-                 * Convert Better Auth where clause to Payload where clause.
-                 * Handles field name transformations for reference fields.
-                 */
-                function convertWhereToPayload(model, where) {
-                    if (!where || where.length === 0)
-                        return {};
+         * Convert Better Auth where clause to Payload where clause.
+         * Handles field name transformations for reference fields.
+         */ function convertWhereToPayload(model, where) {
+                    if (!where || where.length === 0) return {};
                     if (where.length === 1) {
                         const w = where[0];
                         return {
-                            [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value),
+                            [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value)
                         };
                     }
-                    const andConditions = where.filter((w) => w.connector !== 'OR');
-                    const orConditions = where.filter((w) => w.connector === 'OR');
+                    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) => ({
-                            [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value),
-                        }));
+                        result.and = andConditions.map((w)=>({
+                                [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value)
+                            }));
                     }
                     if (orConditions.length > 0) {
-                        result.or = orConditions.map((w) => ({
-                            [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value),
-                        }));
+                        result.or = orConditions.map((w)=>({
+                                [getPayloadFieldName(model, w.field)]: convertOperator(w.operator, w.value)
+                            }));
                     }
                     return result;
                 }
                 // Get Payload collection slug from model name
                 // Uses factory's getModelName which respects BetterAuthOptions.modelName config
-                const getCollection = (model) => {
+                const getCollection = (model)=>{
                     return getModelName(model);
                 };
                 // The CustomAdapter interface uses generics (T) for return types.
@@ -345,12 +353,17 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                 // when implementing generic interfaces with concrete implementations.
                 // The official Better Auth adapters do the same (visible in compiled .mjs).
                 return {
-                    create: async ({ model, data }) => {
+                    create: async ({ model, data })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         const payloadData = transformDataForPayload(model, data);
                         if (enableDebugLogs) {
-                            debugLog('create', { collection, model, data, payloadData });
+                            debugLog('create', {
+                                collection,
+                                model,
+                                data,
+                                payloadData
+                            });
                         }
                         try {
                             const result = await payload.create({
@@ -358,27 +371,34 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                                 data: payloadData,
                                 depth: 0,
                                 // Bypass access control - Better Auth handles its own auth
-                                overrideAccess: true,
+                                overrideAccess: true
                             });
                             // Transform back and merge with input data for Better Auth
                             // Database result takes precedence (handles hooks that modify data like firstUserAdmin)
                             const transformed = transformDataFromPayload(model, result);
-                            return { ...data, ...transformed };
-                        }
-                        catch (error) {
+                            return {
+                                ...data,
+                                ...transformed
+                            };
+                        } catch (error) {
                             console.error('[payload-adapter] create failed:', {
                                 collection,
                                 model,
-                                error: error instanceof Error ? error.message : error,
+                                error: error instanceof Error ? error.message : error
                             });
                             throw error;
                         }
                     },
-                    findOne: async ({ model, where, select, join }) => {
+                    findOne: async ({ model, where, select, join })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         if (enableDebugLogs) {
-                            debugLog('findOne', { collection, model, where, join });
+                            debugLog('findOne', {
+                                collection,
+                                model,
+                                where,
+                                join
+                            });
                         }
                         try {
                             // Optimize for single ID queries
@@ -389,14 +409,11 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                                         collection,
                                         id: convertId(id),
                                         depth: join ? 1 : 0,
-                                        overrideAccess: true,
+                                        overrideAccess: true
                                     });
                                     return transformDataFromPayload(model, result);
-                                }
-                                catch (error) {
-                                    if (error instanceof Error &&
-                                        'status' in error &&
-                                        error.status === 404) {
+                                } catch (error) {
+                                    if (error instanceof Error && 'status' in error && error.status === 404) {
                                         return null;
                                     }
                                     throw error;
@@ -408,22 +425,20 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                                 where: payloadWhere,
                                 limit: 1,
                                 depth: join ? 1 : 0,
-                                overrideAccess: true,
+                                overrideAccess: true
                             });
-                            if (!result.docs[0])
-                                return null;
+                            if (!result.docs[0]) return null;
                             return transformDataFromPayload(model, result.docs[0]);
-                        }
-                        catch (error) {
+                        } catch (error) {
                             console.error('[payload-adapter] findOne failed:', {
                                 model,
                                 where,
-                                error,
+                                error
                             });
                             throw error;
                         }
                     },
-                    findMany: async ({ model, where, limit, offset, sortBy, join }) => {
+                    findMany: async ({ model, where, limit, offset, sortBy, join })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         if (enableDebugLogs) {
@@ -433,7 +448,7 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                                 where,
                                 limit,
                                 offset,
-                                sortBy,
+                                sortBy
                             });
                         }
                         const payloadWhere = where ? convertWhereToPayload(model, where) : {};
@@ -442,20 +457,24 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                             where: payloadWhere,
                             limit: limit ?? 100,
                             page: offset ? Math.floor(offset / (limit ?? 100)) + 1 : 1,
-                            sort: sortBy
-                                ? `${sortBy.direction === 'desc' ? '-' : ''}${getPayloadFieldName(model, sortBy.field)}`
-                                : undefined,
+                            sort: sortBy ? `${sortBy.direction === 'desc' ? '-' : ''}${getPayloadFieldName(model, sortBy.field)}` : undefined,
                             depth: join ? 1 : 0,
-                            overrideAccess: true,
+                            overrideAccess: true
                         });
-                        return result.docs.map((doc) => transformDataFromPayload(model, doc));
+                        return result.docs.map((doc)=>transformDataFromPayload(model, doc));
                     },
-                    update: async ({ model, where, update: data }) => {
+                    update: async ({ model, where, update: data })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         const payloadData = transformDataForPayload(model, data);
                         if (enableDebugLogs) {
-                            debugLog('update', { collection, model, where, data, payloadData });
+                            debugLog('update', {
+                                collection,
+                                model,
+                                where,
+                                data,
+                                payloadData
+                            });
                         }
                         // Optimize for single ID queries
                         const id = extractSingleId(where);
@@ -465,10 +484,13 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                                 id: convertId(id),
                                 data: payloadData,
                                 depth: 0,
-                                overrideAccess: true,
+                                overrideAccess: true
                             });
                             const transformed = transformDataFromPayload(model, result);
-                            return { ...data, ...transformed };
+                            return {
+                                ...data,
+                                ...transformed
+                            };
                         }
                         const payloadWhere = convertWhereToPayload(model, where);
                         const result = await payload.update({
@@ -476,19 +498,27 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                             where: payloadWhere,
                             data: payloadData,
                             depth: 0,
-                            overrideAccess: true,
+                            overrideAccess: true
                         });
-                        if (!result.docs[0])
-                            return null;
+                        if (!result.docs[0]) return null;
                         const transformed = transformDataFromPayload(model, result.docs[0]);
-                        return { ...data, ...transformed };
+                        return {
+                            ...data,
+                            ...transformed
+                        };
                     },
-                    updateMany: async ({ model, where, update: data }) => {
+                    updateMany: async ({ model, where, update: data })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         const payloadData = transformDataForPayload(model, data);
                         if (enableDebugLogs) {
-                            debugLog('updateMany', { collection, model, where, data, payloadData });
+                            debugLog('updateMany', {
+                                collection,
+                                model,
+                                where,
+                                data,
+                                payloadData
+                            });
                         }
                         const payloadWhere = convertWhereToPayload(model, where);
                         const result = await payload.update({
@@ -496,15 +526,19 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                             where: payloadWhere,
                             data: payloadData,
                             depth: 0,
-                            overrideAccess: true,
+                            overrideAccess: true
                         });
                         return result.docs.length;
                     },
-                    delete: async ({ model, where }) => {
+                    delete: async ({ model, where })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         if (enableDebugLogs) {
-                            debugLog('delete', { collection, model, where });
+                            debugLog('delete', {
+                                collection,
+                                model,
+                                where
+                            });
                         }
                         // Optimize for single ID queries
                         const id = extractSingleId(where);
@@ -512,45 +546,58 @@ export function payloadAdapter({ payloadClient, adapterConfig = {}, }) {
                             await payload.delete({
                                 collection,
                                 id: convertId(id),
-                                overrideAccess: true,
+                                overrideAccess: true
                             });
                             return;
                         }
                         const payloadWhere = convertWhereToPayload(model, where);
-                        await payload.delete({ collection, where: payloadWhere, overrideAccess: true });
+                        await payload.delete({
+                            collection,
+                            where: payloadWhere,
+                            overrideAccess: true
+                        });
                     },
-                    deleteMany: async ({ model, where }) => {
+                    deleteMany: async ({ model, where })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         if (enableDebugLogs) {
-                            debugLog('deleteMany', { collection, model, where });
+                            debugLog('deleteMany', {
+                                collection,
+                                model,
+                                where
+                            });
                         }
                         const payloadWhere = convertWhereToPayload(model, where);
                         const result = await payload.delete({
                             collection,
                             where: payloadWhere,
-                            overrideAccess: true,
+                            overrideAccess: true
                         });
                         return result.docs.length;
                     },
-                    count: async ({ model, where }) => {
+                    count: async ({ model, where })=>{
                         const payload = await getPayload();
                         const collection = getCollection(model);
                         if (enableDebugLogs) {
-                            debugLog('count', { collection, model, where });
+                            debugLog('count', {
+                                collection,
+                                model,
+                                where
+                            });
                         }
                         const payloadWhere = where ? convertWhereToPayload(model, where) : {};
                         const result = await payload.count({
                             collection,
                             where: payloadWhere,
-                            overrideAccess: true,
+                            overrideAccess: true
                         });
                         return result.totalDocs;
-                    },
+                    }
                 };
-            },
+            }
         });
         return adapterFactory(options);
     };
 }
+
 //# sourceMappingURL=index.js.map