@proofkit/better-auth 0.3.1-beta.1 → 0.4.0-beta.11

package/bin/intent.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+// Auto-generated by @tanstack/intent setup
+// Exposes the intent end-user CLI for consumers of this library.
+// Commit this file, then add to your package.json:
+//   "bin": { "intent": "./bin/intent.js" }
+try {
+  await import("@tanstack/intent/intent-library");
+} catch (e) {
+  if (e?.code === "ERR_MODULE_NOT_FOUND" || e?.code === "MODULE_NOT_FOUND") {
+    console.error("@tanstack/intent is not installed.");
+    console.error("");
+    console.error("Install it as a dev dependency:");
+    console.error("  npm add -D @tanstack/intent");
+    console.error("");
+    console.error("Or run directly:");
+    console.error("  npx @tanstack/intent@latest list");
+    process.exit(1);
+  }
+  throw e;
+}

package/dist/esm/adapter.d.ts

@@ -1,12 +1,9 @@
+import { Database } from '../../fmodata/src.js';
 import { CleanedWhere, DBAdapterDebugLogOption } from 'better-auth/adapters';
-import { FmOdataConfig } from './odata.js';
 export interface FileMakerAdapterConfig {
     debugLogs?: DBAdapterDebugLogOption;
     usePlural?: boolean;
-    odata: FmOdataConfig;
-}
-export interface AdapterOptions {
-    config: FileMakerAdapterConfig;
+    database: Database;
 }
 export declare function parseWhere(where?: CleanedWhere[]): string;
-export declare const FileMakerAdapter: (_config?: FileMakerAdapterConfig) => import('better-auth/adapters').AdapterFactory;
+export declare const FileMakerAdapter: (config: FileMakerAdapterConfig) => import('better-auth/adapters').AdapterFactory<import('better-auth').BetterAuthOptions>;

package/dist/esm/adapter.js

@@ -1,26 +1,5 @@
 import { logger } from "better-auth";
-import { createAdapter } from "better-auth/adapters";
-import buildQuery from "odata-query";
-import { z, prettifyError } from "zod/v4";
-import { createRawFetch } from "./odata/index.js";
-const configSchema = z.object({
-  debugLogs: z.unknown().optional(),
-  usePlural: z.boolean().optional(),
-  odata: z.object({
-    serverUrl: z.url(),
-    auth: z.union([z.object({ username: z.string(), password: z.string() }), z.object({ apiKey: z.string() })]),
-    database: z.string().endsWith(".fmp12")
-  })
-});
-const defaultConfig = {
-  debugLogs: false,
-  usePlural: false,
-  odata: {
-    serverUrl: "",
-    auth: { username: "", password: "" },
-    database: ""
-  }
-};
+import { createAdapterFactory } from "better-auth/adapters";
 const FIELD_SPECIAL_CHARS_REGEX = /[\s_]/;
 const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{3})?Z?$/;
 function parseWhere(where) {
@@ -107,43 +86,48 @@ function parseWhere(where) {
   }
   return clauses.join(" ");
 }
-const FileMakerAdapter = (_config = defaultConfig) => {
-  const parsed = configSchema.loose().safeParse(_config);
-  if (!parsed.success) {
-    throw new Error(`Invalid configuration: ${prettifyError(parsed.error)}`);
+function buildQueryString(params) {
+  var _a;
+  const parts = [];
+  if (params.top !== void 0) {
+    parts.push(`$top=${params.top}`);
   }
-  const config = parsed.data;
-  const { fetch } = createRawFetch({
-    ...config.odata,
-    logging: config.debugLogs ? "verbose" : "none"
-  });
-  const adapterFactory = createAdapter({
+  if (params.skip !== void 0) {
+    parts.push(`$skip=${params.skip}`);
+  }
+  if (params.filter) {
+    parts.push(`$filter=${encodeURIComponent(params.filter)}`);
+  }
+  if (params.orderBy) {
+    parts.push(`$orderby=${encodeURIComponent(params.orderBy)}`);
+  }
+  if ((_a = params.select) == null ? void 0 : _a.length) {
+    parts.push(`$select=${params.select.map(encodeURIComponent).join(",")}`);
+  }
+  return parts.length > 0 ? `?${parts.join("&")}` : "";
+}
+const FileMakerAdapter = (config) => {
+  if (!config.database || typeof config.database !== "object") {
+    throw new Error("FileMakerAdapter requires a `database` (fmodata Database instance).");
+  }
+  const db = config.database;
+  const adapterFactory = createAdapterFactory({
     config: {
       adapterId: "filemaker",
       adapterName: "FileMaker",
       usePlural: config.usePlural ?? false,
-      // Whether the table names in the schema are plural.
       debugLogs: config.debugLogs ?? false,
-      // Whether to enable debug logs.
       supportsJSON: false,
-      // Whether the database supports JSON. (Default: false)
       supportsDates: false,
-      // Whether the database supports dates. (Default: true)
       supportsBooleans: false,
-      // Whether the database supports booleans. (Default: true)
       supportsNumericIds: false
-      // Whether the database supports auto-incrementing numeric IDs. (Default: true)
     },
     adapter: () => {
       return {
         create: async ({ data, model }) => {
-          if (model === "session") {
-            console.log("session", data);
-          }
-          const result = await fetch(`/${model}`, {
+          const result = await db._makeRequest(`/${model}`, {
             method: "POST",
-            body: data,
-            output: z.looseObject({ id: z.string() })
+            body: JSON.stringify(data)
           });
           if (result.error) {
             throw new Error("Failed to create record");
@@ -154,14 +138,11 @@ const FileMakerAdapter = (_config = defaultConfig) => {
           var _a;
           const filter = parseWhere(where);
           logger.debug("$filter", filter);
-          const query = buildQuery({
+          const query = buildQueryString({
             filter: filter.length > 0 ? filter : void 0
           });
-          const result = await fetch(`/${model}/$count${query}`, {
-            method: "GET",
-            output: z.object({ value: z.number() })
-          });
-          if (!result.data) {
+          const result = await db._makeRequest(`/${model}/$count${query}`);
+          if (result.error) {
             throw new Error("Failed to count records");
           }
           return ((_a = result.data) == null ? void 0 : _a.value) ?? 0;
@@ -170,14 +151,11 @@ const FileMakerAdapter = (_config = defaultConfig) => {
           var _a, _b;
           const filter = parseWhere(where);
           logger.debug("$filter", filter);
-          const query = buildQuery({
+          const query = buildQueryString({
             top: 1,
             filter: filter.length > 0 ? filter : void 0
           });
-          const result = await fetch(`/${model}${query}`, {
-            method: "GET",
-            output: z.object({ value: z.array(z.any()) })
-          });
+          const result = await db._makeRequest(`/${model}${query}`);
           if (result.error) {
             throw new Error("Failed to find record");
           }
@@ -187,17 +165,14 @@ const FileMakerAdapter = (_config = defaultConfig) => {
           var _a;
           const filter = parseWhere(where);
           logger.debug("FIND MANY", { where, filter });
-          const query = buildQuery({
+          const query = buildQueryString({
             top: limit,
             skip: offset,
             orderBy: sortBy ? `${sortBy.field} ${sortBy.direction ?? "asc"}` : void 0,
             filter: filter.length > 0 ? filter : void 0
           });
           logger.debug("QUERY", query);
-          const result = await fetch(`/${model}${query}`, {
-            method: "GET",
-            output: z.object({ value: z.array(z.any()) })
-          });
+          const result = await db._makeRequest(`/${model}${query}`);
           logger.debug("RESULT", result);
           if (result.error) {
             throw new Error("Failed to find records");
@@ -207,45 +182,36 @@ const FileMakerAdapter = (_config = defaultConfig) => {
         delete: async ({ model, where }) => {
           var _a, _b, _c;
           const filter = parseWhere(where);
-          console.log("DELETE", { model, where, filter });
           logger.debug("$filter", filter);
-          const query = buildQuery({
+          const query = buildQueryString({
             top: 1,
             select: [`"id"`],
             filter: filter.length > 0 ? filter : void 0
           });
-          const toDelete = await fetch(`/${model}${query}`, {
-            method: "GET",
-            output: z.object({ value: z.array(z.object({ id: z.string() })) })
-          });
+          const toDelete = await db._makeRequest(`/${model}${query}`);
           const id = (_c = (_b = (_a = toDelete.data) == null ? void 0 : _a.value) == null ? void 0 : _b[0]) == null ? void 0 : _c.id;
           if (!id) {
             return;
           }
-          const result = await fetch(`/${model}('${id}')`, {
+          const result = await db._makeRequest(`/${model}('${id}')`, {
             method: "DELETE"
           });
           if (result.error) {
-            console.log("DELETE ERROR", result.error);
             throw new Error("Failed to delete record");
           }
         },
         deleteMany: async ({ model, where }) => {
           var _a, _b;
           const filter = parseWhere(where);
-          console.log("DELETE MANY", { model, where, filter });
-          const query = buildQuery({
+          const query = buildQueryString({
             select: [`"id"`],
             filter: filter.length > 0 ? filter : void 0
           });
-          const rows = await fetch(`/${model}${query}`, {
-            method: "GET",
-            output: z.object({ value: z.array(z.object({ id: z.string() })) })
-          });
+          const rows = await db._makeRequest(`/${model}${query}`);
           const ids = ((_b = (_a = rows.data) == null ? void 0 : _a.value) == null ? void 0 : _b.map((r) => r.id)) ?? [];
           let deleted = 0;
           for (const id of ids) {
-            const res = await fetch(`/${model}('${id}')`, {
+            const res = await db._makeRequest(`/${model}('${id}')`, {
               method: "DELETE"
             });
             if (!res.error) {
@@ -259,51 +225,42 @@ const FileMakerAdapter = (_config = defaultConfig) => {
           const filter = parseWhere(where);
           logger.debug("UPDATE", { model, where, update });
           logger.debug("$filter", filter);
-          const query = buildQuery({
+          const query = buildQueryString({
             select: [`"id"`],
             filter: filter.length > 0 ? filter : void 0
           });
-          const existing = await fetch(`/${model}${query}`, {
-            method: "GET",
-            output: z.object({ value: z.array(z.object({ id: z.string() })) })
-          });
+          const existing = await db._makeRequest(`/${model}${query}`);
           logger.debug("EXISTING", existing.data);
           const id = (_c = (_b = (_a = existing.data) == null ? void 0 : _a.value) == null ? void 0 : _b[0]) == null ? void 0 : _c.id;
           if (!id) {
             return null;
           }
-          const patchRes = await fetch(`/${model}('${id}')`, {
+          const patchRes = await db._makeRequest(`/${model}('${id}')`, {
             method: "PATCH",
-            body: update
+            body: JSON.stringify(update)
           });
           logger.debug("PATCH RES", patchRes.data);
           if (patchRes.error) {
             return null;
           }
-          const readBack = await fetch(`/${model}('${id}')`, {
-            method: "GET",
-            output: z.record(z.string(), z.unknown())
-          });
+          const readBack = await db._makeRequest(`/${model}('${id}')`);
           logger.debug("READ BACK", readBack.data);
           return readBack.data ?? null;
         },
         updateMany: async ({ model, where, update }) => {
           var _a, _b;
           const filter = parseWhere(where);
-          const query = buildQuery({
+          const query = buildQueryString({
             select: [`"id"`],
             filter: filter.length > 0 ? filter : void 0
           });
-          const rows = await fetch(`/${model}${query}`, {
-            method: "GET",
-            output: z.object({ value: z.array(z.object({ id: z.string() })) })
-          });
+          const rows = await db._makeRequest(`/${model}${query}`);
           const ids = ((_b = (_a = rows.data) == null ? void 0 : _a.value) == null ? void 0 : _b.map((r) => r.id)) ?? [];
           let updated = 0;
           for (const id of ids) {
-            const res = await fetch(`/${model}('${id}')`, {
+            const res = await db._makeRequest(`/${model}('${id}')`, {
               method: "PATCH",
-              body: update
+              body: JSON.stringify(update)
             });
             if (!res.error) {
               updated++;
@@ -314,8 +271,14 @@ const FileMakerAdapter = (_config = defaultConfig) => {
       };
     }
   });
-  adapterFactory.filemakerConfig = config;
-  return adapterFactory;
+  const originalFactory = adapterFactory;
+  const wrappedFactory = ((options) => {
+    const adapter = originalFactory(options);
+    adapter.database = db;
+    return adapter;
+  });
+  wrappedFactory.database = db;
+  return wrappedFactory;
 };
 export {
   FileMakerAdapter,

package/dist/esm/adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"adapter.js","sources":["../../src/adapter.ts"],"sourcesContent":["/** biome-ignore-all lint/suspicious/noExplicitAny: library code */\nimport { logger } from \"better-auth\";\nimport { type CleanedWhere, createAdapter, type DBAdapterDebugLogOption } from \"better-auth/adapters\";\nimport buildQuery from \"odata-query\";\nimport { prettifyError, z } from \"zod/v4\";\nimport { createRawFetch, type FmOdataConfig } from \"./odata\";\n\nconst configSchema = z.object({\n  debugLogs: z.unknown().optional(),\n  usePlural: z.boolean().optional(),\n  odata: z.object({\n    serverUrl: z.url(),\n    auth: z.union([z.object({ username: z.string(), password: z.string() }), z.object({ apiKey: z.string() })]),\n    database: z.string().endsWith(\".fmp12\"),\n  }),\n});\n\nexport interface FileMakerAdapterConfig {\n  /**\n   * Helps you debug issues with the adapter.\n   */\n  debugLogs?: DBAdapterDebugLogOption;\n  /**\n   * If the table names in the schema are plural.\n   */\n  usePlural?: boolean;\n\n  /**\n   * Connection details for the FileMaker server.\n   */\n  odata: FmOdataConfig;\n}\n\nexport interface AdapterOptions {\n  config: FileMakerAdapterConfig;\n}\n\nconst defaultConfig: Required<FileMakerAdapterConfig> = {\n  debugLogs: false,\n  usePlural: false,\n  odata: {\n    serverUrl: \"\",\n    auth: { username: \"\", password: \"\" },\n    database: \"\",\n  },\n};\n\n// Regex patterns for field validation and ISO date detection\nconst FIELD_SPECIAL_CHARS_REGEX = /[\\s_]/;\nconst ISO_DATE_REGEX = /^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z?$/;\n\n/**\n * Parse the where clause to an OData filter string.\n * @param where - The where clause to parse.\n * @returns The OData filter string.\n * @internal\n */\nexport function parseWhere(where?: CleanedWhere[]): string {\n  if (!where || where.length === 0) {\n    return \"\";\n  }\n\n  // Helper to quote field names with special chars or if field is 'id'\n  function quoteField(field: string, value?: any) {\n    // Never quote for null or date values (per test expectations)\n    if (value === null || value instanceof Date) {\n      return field;\n    }\n    // Always quote if field is 'id' or has space or underscore\n    if (field === \"id\" || FIELD_SPECIAL_CHARS_REGEX.test(field)) {\n      return `\"${field}\"`;\n    }\n    return field;\n  }\n\n  // Helper to format values for OData\n  function formatValue(value: any): string {\n    if (value === null) {\n      return \"null\";\n    }\n    if (typeof value === \"boolean\") {\n      return value ? \"true\" : \"false\";\n    }\n    if (value instanceof Date) {\n      return value.toISOString();\n    }\n    if (Array.isArray(value)) {\n      return `(${value.map(formatValue).join(\",\")})`;\n    }\n\n    // Handle strings - check if it's an ISO date string first\n    if (typeof value === \"string\") {\n      // Check if it's an ISO date string (YYYY-MM-DDTHH:mm:ss.sssZ format)\n      if (ISO_DATE_REGEX.test(value)) {\n        return value; // Return ISO date strings without quotes\n      }\n      return `'${value.replace(/'/g, \"''\")}'`; // Regular strings get quotes\n    }\n\n    return value?.toString() ?? \"\";\n  }\n\n  // Map our operators to OData\n  const opMap: Record<string, string> = {\n    eq: \"eq\",\n    ne: \"ne\",\n    lt: \"lt\",\n    lte: \"le\",\n    gt: \"gt\",\n    gte: \"ge\",\n  };\n\n  // Build each clause\n  const clauses: string[] = [];\n  for (let i = 0; i < where.length; i++) {\n    const cond = where[i];\n    if (!cond) {\n      continue;\n    }\n    const field = quoteField(cond.field, cond.value);\n    let clause = \"\";\n    switch (cond.operator) {\n      case \"eq\":\n      case \"ne\":\n      case \"lt\":\n      case \"lte\":\n      case \"gt\":\n      case \"gte\":\n        clause = `${field} ${opMap[cond.operator]} ${formatValue(cond.value)}`;\n        break;\n      case \"in\":\n        if (Array.isArray(cond.value)) {\n          clause = cond.value.map((v) => `${field} eq ${formatValue(v)}`).join(\" or \");\n          clause = `(${clause})`;\n        }\n        break;\n      case \"contains\":\n        clause = `contains(${field}, ${formatValue(cond.value)})`;\n        break;\n      case \"starts_with\":\n        clause = `startswith(${field}, ${formatValue(cond.value)})`;\n        break;\n      case \"ends_with\":\n        clause = `endswith(${field}, ${formatValue(cond.value)})`;\n        break;\n      default:\n        clause = `${field} eq ${formatValue(cond.value)}`;\n    }\n    clauses.push(clause);\n    // Add connector if not last\n    if (i < where.length - 1) {\n      clauses.push((cond.connector || \"and\").toLowerCase());\n    }\n  }\n  return clauses.join(\" \");\n}\n\nexport const FileMakerAdapter = (_config: FileMakerAdapterConfig = defaultConfig) => {\n  const parsed = configSchema.loose().safeParse(_config);\n\n  if (!parsed.success) {\n    throw new Error(`Invalid configuration: ${prettifyError(parsed.error)}`);\n  }\n  const config = parsed.data;\n\n  const { fetch } = createRawFetch({\n    ...config.odata,\n    logging: config.debugLogs ? \"verbose\" : \"none\",\n  });\n\n  const adapterFactory = createAdapter({\n    config: {\n      adapterId: \"filemaker\",\n      adapterName: \"FileMaker\",\n      usePlural: config.usePlural ?? false, // Whether the table names in the schema are plural.\n      debugLogs: config.debugLogs ?? false, // Whether to enable debug logs.\n      supportsJSON: false, // Whether the database supports JSON. (Default: false)\n      supportsDates: false, // Whether the database supports dates. (Default: true)\n      supportsBooleans: false, // Whether the database supports booleans. (Default: true)\n      supportsNumericIds: false, // Whether the database supports auto-incrementing numeric IDs. (Default: true)\n    },\n    adapter: () => {\n      return {\n        create: async ({ data, model }) => {\n          if (model === \"session\") {\n            console.log(\"session\", data);\n          }\n\n          const result = await fetch(`/${model}`, {\n            method: \"POST\",\n            body: data,\n            output: z.looseObject({ id: z.string() }),\n          });\n\n          if (result.error) {\n            throw new Error(\"Failed to create record\");\n          }\n\n          return result.data as any;\n        },\n        count: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"$filter\", filter);\n\n          const query = buildQuery({\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const result = await fetch(`/${model}/$count${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.number() }),\n          });\n          if (!result.data) {\n            throw new Error(\"Failed to count records\");\n          }\n          return (result.data?.value as any) ?? 0;\n        },\n        findOne: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"$filter\", filter);\n\n          const query = buildQuery({\n            top: 1,\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const result = await fetch(`/${model}${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.array(z.any()) }),\n          });\n          if (result.error) {\n            throw new Error(\"Failed to find record\");\n          }\n          return (result.data?.value?.[0] as any) ?? null;\n        },\n        findMany: async ({ model, where, limit, offset, sortBy }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"FIND MANY\", { where, filter });\n\n          const query = buildQuery({\n            top: limit,\n            skip: offset,\n            orderBy: sortBy ? `${sortBy.field} ${sortBy.direction ?? \"asc\"}` : undefined,\n            filter: filter.length > 0 ? filter : undefined,\n          });\n          logger.debug(\"QUERY\", query);\n\n          const result = await fetch(`/${model}${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.array(z.any()) }),\n          });\n          logger.debug(\"RESULT\", result);\n\n          if (result.error) {\n            throw new Error(\"Failed to find records\");\n          }\n\n          return (result.data?.value as any) ?? [];\n        },\n        delete: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          console.log(\"DELETE\", { model, where, filter });\n          logger.debug(\"$filter\", filter);\n\n          // Find a single id matching the filter\n          const query = buildQuery({\n            top: 1,\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const toDelete = await fetch(`/${model}${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.array(z.object({ id: z.string() })) }),\n          });\n\n          const id = toDelete.data?.value?.[0]?.id;\n          if (!id) {\n            // Nothing to delete\n            return;\n          }\n\n          const result = await fetch(`/${model}('${id}')`, {\n            method: \"DELETE\",\n          });\n          if (result.error) {\n            console.log(\"DELETE ERROR\", result.error);\n            throw new Error(\"Failed to delete record\");\n          }\n        },\n        deleteMany: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          console.log(\"DELETE MANY\", { model, where, filter });\n\n          // Find all ids matching the filter\n          const query = buildQuery({\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const rows = await fetch(`/${model}${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.array(z.object({ id: z.string() })) }),\n          });\n\n          const ids = rows.data?.value?.map((r: any) => r.id) ?? [];\n          let deleted = 0;\n          for (const id of ids) {\n            const res = await fetch(`/${model}('${id}')`, {\n              method: \"DELETE\",\n            });\n            if (!res.error) {\n              deleted++;\n            }\n          }\n          return deleted;\n        },\n        update: async ({ model, where, update }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"UPDATE\", { model, where, update });\n          logger.debug(\"$filter\", filter);\n          // Find one id to update\n          const query = buildQuery({\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const existing = await fetch(`/${model}${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.array(z.object({ id: z.string() })) }),\n          });\n          logger.debug(\"EXISTING\", existing.data);\n\n          const id = existing.data?.value?.[0]?.id;\n          if (!id) {\n            return null;\n          }\n\n          const patchRes = await fetch(`/${model}('${id}')`, {\n            method: \"PATCH\",\n            body: update,\n          });\n          logger.debug(\"PATCH RES\", patchRes.data);\n          if (patchRes.error) {\n            return null;\n          }\n\n          // Read back the updated record\n          const readBack = await fetch(`/${model}('${id}')`, {\n            method: \"GET\",\n            output: z.record(z.string(), z.unknown()),\n          });\n          logger.debug(\"READ BACK\", readBack.data);\n          return (readBack.data as any) ?? null;\n        },\n        updateMany: async ({ model, where, update }) => {\n          const filter = parseWhere(where);\n          // Find all ids matching the filter\n          const query = buildQuery({\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const rows = await fetch(`/${model}${query}`, {\n            method: \"GET\",\n            output: z.object({ value: z.array(z.object({ id: z.string() })) }),\n          });\n\n          const ids = rows.data?.value?.map((r: any) => r.id) ?? [];\n          let updated = 0;\n          for (const id of ids) {\n            const res = await fetch(`/${model}('${id}')`, {\n              method: \"PATCH\",\n              body: update,\n            });\n            if (!res.error) {\n              updated++;\n            }\n          }\n          return updated as any;\n        },\n      };\n    },\n  });\n\n  // Expose the FileMaker config for CLI access\n  (adapterFactory as any).filemakerConfig = config as FileMakerAdapterConfig;\n  return adapterFactory;\n};\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"adapter.js","sources":["../../src/adapter.ts"],"sourcesContent":["/** biome-ignore-all lint/suspicious/noExplicitAny: library code */\nimport type { Database } from \"@proofkit/fmodata\";\nimport { logger } from \"better-auth\";\nimport { type CleanedWhere, createAdapterFactory, type DBAdapterDebugLogOption } from \"better-auth/adapters\";\n\nexport interface FileMakerAdapterConfig {\n  /**\n   * Helps you debug issues with the adapter.\n   */\n  debugLogs?: DBAdapterDebugLogOption;\n  /**\n   * If the table names in the schema are plural.\n   */\n  usePlural?: boolean;\n  /**\n   * The fmodata Database instance to use for all OData requests.\n   */\n  database: Database;\n}\n\n// Regex patterns for field validation and ISO date detection\nconst FIELD_SPECIAL_CHARS_REGEX = /[\\s_]/;\nconst ISO_DATE_REGEX = /^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d{3})?Z?$/;\n\n/**\n * Parse the where clause to an OData filter string.\n * @param where - The where clause to parse.\n * @returns The OData filter string.\n * @internal\n */\nexport function parseWhere(where?: CleanedWhere[]): string {\n  if (!where || where.length === 0) {\n    return \"\";\n  }\n\n  // Helper to quote field names with special chars or if field is 'id'\n  function quoteField(field: string, value?: any) {\n    // Never quote for null or date values (per test expectations)\n    if (value === null || value instanceof Date) {\n      return field;\n    }\n    // Always quote if field is 'id' or has space or underscore\n    if (field === \"id\" || FIELD_SPECIAL_CHARS_REGEX.test(field)) {\n      return `\"${field}\"`;\n    }\n    return field;\n  }\n\n  // Helper to format values for OData\n  function formatValue(value: any): string {\n    if (value === null) {\n      return \"null\";\n    }\n    if (typeof value === \"boolean\") {\n      return value ? \"true\" : \"false\";\n    }\n    if (value instanceof Date) {\n      return value.toISOString();\n    }\n    if (Array.isArray(value)) {\n      return `(${value.map(formatValue).join(\",\")})`;\n    }\n\n    // Handle strings - check if it's an ISO date string first\n    if (typeof value === \"string\") {\n      // Check if it's an ISO date string (YYYY-MM-DDTHH:mm:ss.sssZ format)\n      if (ISO_DATE_REGEX.test(value)) {\n        return value; // Return ISO date strings without quotes\n      }\n      return `'${value.replace(/'/g, \"''\")}'`; // Regular strings get quotes\n    }\n\n    return value?.toString() ?? \"\";\n  }\n\n  // Map our operators to OData\n  const opMap: Record<string, string> = {\n    eq: \"eq\",\n    ne: \"ne\",\n    lt: \"lt\",\n    lte: \"le\",\n    gt: \"gt\",\n    gte: \"ge\",\n  };\n\n  // Build each clause\n  const clauses: string[] = [];\n  for (let i = 0; i < where.length; i++) {\n    const cond = where[i];\n    if (!cond) {\n      continue;\n    }\n    const field = quoteField(cond.field, cond.value);\n    let clause = \"\";\n    switch (cond.operator) {\n      case \"eq\":\n      case \"ne\":\n      case \"lt\":\n      case \"lte\":\n      case \"gt\":\n      case \"gte\":\n        clause = `${field} ${opMap[cond.operator]} ${formatValue(cond.value)}`;\n        break;\n      case \"in\":\n        if (Array.isArray(cond.value)) {\n          clause = cond.value.map((v) => `${field} eq ${formatValue(v)}`).join(\" or \");\n          clause = `(${clause})`;\n        }\n        break;\n      case \"contains\":\n        clause = `contains(${field}, ${formatValue(cond.value)})`;\n        break;\n      case \"starts_with\":\n        clause = `startswith(${field}, ${formatValue(cond.value)})`;\n        break;\n      case \"ends_with\":\n        clause = `endswith(${field}, ${formatValue(cond.value)})`;\n        break;\n      default:\n        clause = `${field} eq ${formatValue(cond.value)}`;\n    }\n    clauses.push(clause);\n    // Add connector if not last\n    if (i < where.length - 1) {\n      clauses.push((cond.connector || \"and\").toLowerCase());\n    }\n  }\n  return clauses.join(\" \");\n}\n\n/**\n * Build an OData query string from parameters.\n */\nfunction buildQueryString(params: {\n  top?: number;\n  skip?: number;\n  filter?: string;\n  orderBy?: string;\n  select?: string[];\n}): string {\n  const parts: string[] = [];\n  if (params.top !== undefined) {\n    parts.push(`$top=${params.top}`);\n  }\n  if (params.skip !== undefined) {\n    parts.push(`$skip=${params.skip}`);\n  }\n  if (params.filter) {\n    parts.push(`$filter=${encodeURIComponent(params.filter)}`);\n  }\n  if (params.orderBy) {\n    parts.push(`$orderby=${encodeURIComponent(params.orderBy)}`);\n  }\n  if (params.select?.length) {\n    parts.push(`$select=${params.select.map(encodeURIComponent).join(\",\")}`);\n  }\n  return parts.length > 0 ? `?${parts.join(\"&\")}` : \"\";\n}\n\nexport const FileMakerAdapter = (config: FileMakerAdapterConfig) => {\n  if (!config.database || typeof config.database !== \"object\") {\n    throw new Error(\"FileMakerAdapter requires a `database` (fmodata Database instance).\");\n  }\n\n  const db = config.database;\n\n  const adapterFactory = createAdapterFactory({\n    config: {\n      adapterId: \"filemaker\",\n      adapterName: \"FileMaker\",\n      usePlural: config.usePlural ?? false,\n      debugLogs: config.debugLogs ?? false,\n      supportsJSON: false,\n      supportsDates: false,\n      supportsBooleans: false,\n      supportsNumericIds: false,\n    },\n    adapter: () => {\n      return {\n        create: async ({ data, model }) => {\n          const result = await db._makeRequest<Record<string, any>>(`/${model}`, {\n            method: \"POST\",\n            body: JSON.stringify(data),\n          });\n\n          if (result.error) {\n            throw new Error(\"Failed to create record\");\n          }\n\n          return result.data as any;\n        },\n        count: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"$filter\", filter);\n\n          const query = buildQueryString({\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const result = await db._makeRequest<{ value: number }>(`/${model}/$count${query}`);\n          if (result.error) {\n            throw new Error(\"Failed to count records\");\n          }\n          return (result.data?.value as any) ?? 0;\n        },\n        findOne: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"$filter\", filter);\n\n          const query = buildQueryString({\n            top: 1,\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const result = await db._makeRequest<{ value: any[] }>(`/${model}${query}`);\n          if (result.error) {\n            throw new Error(\"Failed to find record\");\n          }\n          return (result.data?.value?.[0] as any) ?? null;\n        },\n        findMany: async ({ model, where, limit, offset, sortBy }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"FIND MANY\", { where, filter });\n\n          const query = buildQueryString({\n            top: limit,\n            skip: offset,\n            orderBy: sortBy ? `${sortBy.field} ${sortBy.direction ?? \"asc\"}` : undefined,\n            filter: filter.length > 0 ? filter : undefined,\n          });\n          logger.debug(\"QUERY\", query);\n\n          const result = await db._makeRequest<{ value: any[] }>(`/${model}${query}`);\n          logger.debug(\"RESULT\", result);\n\n          if (result.error) {\n            throw new Error(\"Failed to find records\");\n          }\n\n          return (result.data?.value as any) ?? [];\n        },\n        delete: async ({ model, where }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"$filter\", filter);\n\n          // Find a single id matching the filter\n          const query = buildQueryString({\n            top: 1,\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const toDelete = await db._makeRequest<{ value: { id: string }[] }>(`/${model}${query}`);\n\n          const id = toDelete.data?.value?.[0]?.id;\n          if (!id) {\n            return;\n          }\n\n          const result = await db._makeRequest(`/${model}('${id}')`, {\n            method: \"DELETE\",\n          });\n          if (result.error) {\n            throw new Error(\"Failed to delete record\");\n          }\n        },\n        deleteMany: async ({ model, where }) => {\n          const filter = parseWhere(where);\n\n          // Find all ids matching the filter\n          const query = buildQueryString({\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const rows = await db._makeRequest<{ value: { id: string }[] }>(`/${model}${query}`);\n\n          const ids = rows.data?.value?.map((r: any) => r.id) ?? [];\n          let deleted = 0;\n          for (const id of ids) {\n            const res = await db._makeRequest(`/${model}('${id}')`, {\n              method: \"DELETE\",\n            });\n            if (!res.error) {\n              deleted++;\n            }\n          }\n          return deleted;\n        },\n        update: async ({ model, where, update }) => {\n          const filter = parseWhere(where);\n          logger.debug(\"UPDATE\", { model, where, update });\n          logger.debug(\"$filter\", filter);\n\n          // Find one id to update\n          const query = buildQueryString({\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const existing = await db._makeRequest<{ value: { id: string }[] }>(`/${model}${query}`);\n          logger.debug(\"EXISTING\", existing.data);\n\n          const id = existing.data?.value?.[0]?.id;\n          if (!id) {\n            return null;\n          }\n\n          const patchRes = await db._makeRequest(`/${model}('${id}')`, {\n            method: \"PATCH\",\n            body: JSON.stringify(update),\n          });\n          logger.debug(\"PATCH RES\", patchRes.data);\n          if (patchRes.error) {\n            return null;\n          }\n\n          // Read back the updated record\n          const readBack = await db._makeRequest<Record<string, unknown>>(`/${model}('${id}')`);\n          logger.debug(\"READ BACK\", readBack.data);\n          return (readBack.data as any) ?? null;\n        },\n        updateMany: async ({ model, where, update }) => {\n          const filter = parseWhere(where);\n\n          // Find all ids matching the filter\n          const query = buildQueryString({\n            select: [`\"id\"`],\n            filter: filter.length > 0 ? filter : undefined,\n          });\n\n          const rows = await db._makeRequest<{ value: { id: string }[] }>(`/${model}${query}`);\n\n          const ids = rows.data?.value?.map((r: any) => r.id) ?? [];\n          let updated = 0;\n          for (const id of ids) {\n            const res = await db._makeRequest(`/${model}('${id}')`, {\n              method: \"PATCH\",\n              body: JSON.stringify(update),\n            });\n            if (!res.error) {\n              updated++;\n            }\n          }\n          return updated as any;\n        },\n      };\n    },\n  });\n\n  // Expose the Database instance for CLI access.\n  // Set on both the factory function (for pre-getAdapter extraction)\n  // and the returned adapter (for post-getAdapter extraction).\n  const originalFactory = adapterFactory;\n  const wrappedFactory = ((options: unknown) => {\n    const adapter = (originalFactory as (opts: unknown) => Record<string, unknown>)(options);\n    adapter.database = db;\n    return adapter;\n  }) as typeof adapterFactory;\n  (wrappedFactory as unknown as { database: Database }).database = db;\n  return wrappedFactory;\n};\n"],"names":[],"mappings":"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"}

package/dist/esm/cli/index.js

@@ -1,17 +1,18 @@
 #!/usr/bin/env node --no-warnings
 import { Command } from "@commander-js/extra-typings";
+import { FMServerConnection } from "@proofkit/fmodata";
 import { logger } from "better-auth";
-import { getAdapter, getSchema } from "better-auth/db";
+import { getSchema } from "better-auth/db";
 import chalk from "chalk";
 import fs from "fs-extra";
 import prompts from "prompts";
 import { getConfig } from "../better-auth-cli/utils/get-config.js";
 import { planMigration, prettyPrintMigrationPlan, executeMigration } from "../migrate.js";
-import { createRawFetch } from "../odata/index.js";
 import "dotenv/config";
 async function main() {
   const program = new Command();
   program.command("migrate", { isDefault: true }).option("--cwd <path>", "Path to the current working directory", process.cwd()).option("--config <path>", "Path to the config file").option("-u, --username <username>", "Full Access Username").option("-p, --password <password>", "Full Access Password").option("-y, --yes", "Skip confirmation", false).action(async (options) => {
+    var _a, _b, _c, _d;
     const cwd = options.cwd;
     if (!fs.existsSync(cwd)) {
       logger.error(`The directory "${cwd}" does not exist.`);
@@ -27,35 +28,70 @@ async function main() {
       );
       return;
     }
-    const adapter = await getAdapter(config).catch((e) => {
-      logger.error(e.message);
+    const databaseFactory = config.database;
+    if (!databaseFactory || typeof databaseFactory !== "function") {
+      logger.error("No database adapter found in auth config.");
       process.exit(1);
-    });
-    if (adapter.id !== "filemaker") {
+    }
+    let adapter;
+    try {
+      adapter = databaseFactory(config);
+    } catch (e) {
+      logger.error(e instanceof Error ? e.message : String(e));
+      process.exit(1);
+    }
+    if ((adapter == null ? void 0 : adapter.id) !== "filemaker") {
       logger.error("This generator is only compatible with the FileMaker adapter.");
       return;
     }
     const betterAuthSchema = getSchema(config);
-    const adapterConfig = adapter.filemakerConfig;
-    const { fetch } = createRawFetch({
-      ...adapterConfig.odata,
-      auth: (
-        // If the username and password are provided in the CLI, use them to authenticate instead of what's in the config file.
-        options.username && options.password ? {
+    const configDb = adapter.database ?? ((_a = config.database) == null ? void 0 : _a.database);
+    if (!configDb || typeof configDb !== "object" || !("schema" in configDb)) {
+      logger.error(
+        "Could not extract Database instance from adapter. Ensure your auth.ts uses FileMakerAdapter with an fmodata Database."
+      );
+      process.exit(1);
+    }
+    let db = configDb;
+    const dbObj = configDb;
+    const dbName = dbObj._getDatabaseName ?? dbObj.databaseName ?? "";
+    const baseUrl = (_c = (_b = dbObj.context) == null ? void 0 : _b._getBaseUrl) == null ? void 0 : _c.call(_b);
+    const serverUrl = baseUrl ? new URL(baseUrl).origin : void 0;
+    if (options.username && options.password) {
+      if (!dbName) {
+        logger.error("Could not determine database filename from adapter config.");
+        process.exit(1);
+      }
+      if (!baseUrl) {
+        logger.error(
+          "Could not determine server URL from adapter config. Ensure your auth.ts uses FMServerConnection."
+        );
+        process.exit(1);
+      }
+      const fetchClientOptions = (_d = dbObj.context) == null ? void 0 : _d._fetchClientOptions;
+      const connection = new FMServerConnection({
+        serverUrl,
+        auth: {
           username: options.username,
           password: options.password
-        } : adapterConfig.odata.auth
-      ),
-      logging: "verbose"
-      // Enable logging for CLI operations
-    });
-    const migrationPlan = await planMigration(fetch, betterAuthSchema, adapterConfig.odata.database);
+        },
+        fetchClientOptions
+      });
+      db = connection.database(dbName);
+    }
+    let migrationPlan;
+    try {
+      migrationPlan = await planMigration(db, betterAuthSchema);
+    } catch (err) {
+      logger.error(`Failed to read database schema: ${err instanceof Error ? err.message : err}`);
+      process.exit(1);
+    }
     if (migrationPlan.length === 0) {
       logger.info("No changes to apply. Database is up to date.");
       return;
     }
     if (!options.yes) {
-      prettyPrintMigrationPlan(migrationPlan);
+      prettyPrintMigrationPlan(migrationPlan, { serverUrl, fileName: dbName });
       if (migrationPlan.length > 0) {
         console.log(chalk.gray("💡 Tip: You can use the --yes flag to skip this confirmation."));
       }
@@ -69,11 +105,18 @@ async function main() {
         return;
       }
     }
-    await executeMigration(fetch, migrationPlan);
-    logger.info("Migration applied successfully.");
+    try {
+      await executeMigration(db, migrationPlan);
+      logger.info("Migration applied successfully.");
+    } catch {
+      process.exit(1);
+    }
   });
   await program.parseAsync(process.argv);
   process.exit(0);
 }
-main().catch(console.error);
+main().catch((err) => {
+  logger.error(err.message ?? err);
+  process.exit(1);
+});
 //# sourceMappingURL=index.js.map

package/dist/esm/cli/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/cli/index.ts"],"sourcesContent":["#!/usr/bin/env node --no-warnings\nimport { Command } from \"@commander-js/extra-typings\";\nimport { logger } from \"better-auth\";\nimport { getAdapter, getSchema } from \"better-auth/db\";\nimport chalk from \"chalk\";\nimport fs from \"fs-extra\";\nimport prompts from \"prompts\";\nimport type { FileMakerAdapterConfig } from \"../adapter\";\nimport { getConfig } from \"../better-auth-cli/utils/get-config\";\nimport { executeMigration, planMigration, prettyPrintMigrationPlan } from \"../migrate\";\nimport { createRawFetch } from \"../odata\";\nimport \"dotenv/config\";\n\nasync function main() {\n  const program = new Command();\n\n  program\n    .command(\"migrate\", { isDefault: true })\n    .option(\"--cwd <path>\", \"Path to the current working directory\", process.cwd())\n    .option(\"--config <path>\", \"Path to the config file\")\n    .option(\"-u, --username <username>\", \"Full Access Username\")\n    .option(\"-p, --password <password>\", \"Full Access Password\")\n    .option(\"-y, --yes\", \"Skip confirmation\", false)\n\n    .action(async (options) => {\n      const cwd = options.cwd;\n      if (!fs.existsSync(cwd)) {\n        logger.error(`The directory \"${cwd}\" does not exist.`);\n        process.exit(1);\n      }\n\n      const config = await getConfig({\n        cwd,\n        configPath: options.config,\n      });\n      if (!config) {\n        logger.error(\n          \"No configuration file found. Add a `auth.ts` file to your project or pass the path to the configuration file using the `--config` flag.\",\n        );\n        return;\n      }\n\n      const adapter = await getAdapter(config).catch((e) => {\n        logger.error(e.message);\n        process.exit(1);\n      });\n\n      if (adapter.id !== \"filemaker\") {\n        logger.error(\"This generator is only compatible with the FileMaker adapter.\");\n        return;\n      }\n\n      const betterAuthSchema = getSchema(config);\n\n      const adapterConfig = (adapter as unknown as { filemakerConfig: FileMakerAdapterConfig }).filemakerConfig;\n      const { fetch } = createRawFetch({\n        ...adapterConfig.odata,\n        auth:\n          // If the username and password are provided in the CLI, use them to authenticate instead of what's in the config file.\n          options.username && options.password\n            ? {\n                username: options.username,\n                password: options.password,\n              }\n            : adapterConfig.odata.auth,\n        logging: \"verbose\", // Enable logging for CLI operations\n      });\n\n      const migrationPlan = await planMigration(fetch, betterAuthSchema, adapterConfig.odata.database);\n\n      if (migrationPlan.length === 0) {\n        logger.info(\"No changes to apply. Database is up to date.\");\n        return;\n      }\n\n      if (!options.yes) {\n        prettyPrintMigrationPlan(migrationPlan);\n\n        if (migrationPlan.length > 0) {\n          console.log(chalk.gray(\"💡 Tip: You can use the --yes flag to skip this confirmation.\"));\n        }\n\n        const { confirm } = await prompts({\n          type: \"confirm\",\n          name: \"confirm\",\n          message: \"Apply the above changes to your database?\",\n        });\n        if (!confirm) {\n          logger.error(\"Schema changes not applied.\");\n          return;\n        }\n      }\n\n      await executeMigration(fetch, migrationPlan);\n\n      logger.info(\"Migration applied successfully.\");\n    });\n  await program.parseAsync(process.argv);\n  process.exit(0);\n}\n\nmain().catch(console.error);\n"],"names":[],"mappings":";;;;;;;;;;;AAaA,eAAe,OAAO;AACpB,QAAM,UAAU,IAAI,QAAA;AAEpB,UACG,QAAQ,WAAW,EAAE,WAAW,MAAM,EACtC,OAAO,gBAAgB,yCAAyC,QAAQ,IAAA,CAAK,EAC7E,OAAO,mBAAmB,yBAAyB,EACnD,OAAO,6BAA6B,sBAAsB,EAC1D,OAAO,6BAA6B,sBAAsB,EAC1D,OAAO,aAAa,qBAAqB,KAAK,EAE9C,OAAO,OAAO,YAAY;AACzB,UAAM,MAAM,QAAQ;AACpB,QAAI,CAAC,GAAG,WAAW,GAAG,GAAG;AACvB,aAAO,MAAM,kBAAkB,GAAG,mBAAmB;AACrD,cAAQ,KAAK,CAAC;AAAA,IAChB;AAEA,UAAM,SAAS,MAAM,UAAU;AAAA,MAC7B;AAAA,MACA,YAAY,QAAQ;AAAA,IAAA,CACrB;AACD,QAAI,CAAC,QAAQ;AACX,aAAO;AAAA,QACL;AAAA,MAAA;AAEF;AAAA,IACF;AAEA,UAAM,UAAU,MAAM,WAAW,MAAM,EAAE,MAAM,CAAC,MAAM;AACpD,aAAO,MAAM,EAAE,OAAO;AACtB,cAAQ,KAAK,CAAC;AAAA,IAChB,CAAC;AAED,QAAI,QAAQ,OAAO,aAAa;AAC9B,aAAO,MAAM,+DAA+D;AAC5E;AAAA,IACF;AAEA,UAAM,mBAAmB,UAAU,MAAM;AAEzC,UAAM,gBAAiB,QAAmE;AAC1F,UAAM,EAAE,MAAA,IAAU,eAAe;AAAA,MAC/B,GAAG,cAAc;AAAA,MACjB;AAAA;AAAA,QAEE,QAAQ,YAAY,QAAQ,WACxB;AAAA,UACE,UAAU,QAAQ;AAAA,UAClB,UAAU,QAAQ;AAAA,QAAA,IAEpB,cAAc,MAAM;AAAA;AAAA,MAC1B,SAAS;AAAA;AAAA,IAAA,CACV;AAED,UAAM,gBAAgB,MAAM,cAAc,OAAO,kBAAkB,cAAc,MAAM,QAAQ;AAE/F,QAAI,cAAc,WAAW,GAAG;AAC9B,aAAO,KAAK,8CAA8C;AAC1D;AAAA,IACF;AAEA,QAAI,CAAC,QAAQ,KAAK;AAChB,+BAAyB,aAAa;AAEtC,UAAI,cAAc,SAAS,GAAG;AAC5B,gBAAQ,IAAI,MAAM,KAAK,+DAA+D,CAAC;AAAA,MACzF;AAEA,YAAM,EAAE,YAAY,MAAM,QAAQ;AAAA,QAChC,MAAM;AAAA,QACN,MAAM;AAAA,QACN,SAAS;AAAA,MAAA,CACV;AACD,UAAI,CAAC,SAAS;AACZ,eAAO,MAAM,6BAA6B;AAC1C;AAAA,MACF;AAAA,IACF;AAEA,UAAM,iBAAiB,OAAO,aAAa;AAE3C,WAAO,KAAK,iCAAiC;AAAA,EAC/C,CAAC;AACH,QAAM,QAAQ,WAAW,QAAQ,IAAI;AACrC,UAAQ,KAAK,CAAC;AAChB;AAEA,OAAO,MAAM,QAAQ,KAAK;"}
+{"version":3,"file":"index.js","sources":["../../../src/cli/index.ts"],"sourcesContent":["#!/usr/bin/env node --no-warnings\nimport { Command } from \"@commander-js/extra-typings\";\nimport type { Database, FFetchOptions } from \"@proofkit/fmodata\";\nimport { FMServerConnection } from \"@proofkit/fmodata\";\nimport { logger } from \"better-auth\";\nimport { getSchema } from \"better-auth/db\";\nimport chalk from \"chalk\";\nimport fs from \"fs-extra\";\nimport prompts from \"prompts\";\nimport { getConfig } from \"../better-auth-cli/utils/get-config\";\nimport { executeMigration, planMigration, prettyPrintMigrationPlan } from \"../migrate\";\nimport \"dotenv/config\";\n\nasync function main() {\n  const program = new Command();\n\n  program\n    .command(\"migrate\", { isDefault: true })\n    .option(\"--cwd <path>\", \"Path to the current working directory\", process.cwd())\n    .option(\"--config <path>\", \"Path to the config file\")\n    .option(\"-u, --username <username>\", \"Full Access Username\")\n    .option(\"-p, --password <password>\", \"Full Access Password\")\n    .option(\"-y, --yes\", \"Skip confirmation\", false)\n\n    .action(async (options) => {\n      const cwd = options.cwd;\n      if (!fs.existsSync(cwd)) {\n        logger.error(`The directory \"${cwd}\" does not exist.`);\n        process.exit(1);\n      }\n\n      const config = await getConfig({\n        cwd,\n        configPath: options.config,\n      });\n      if (!config) {\n        logger.error(\n          \"No configuration file found. Add a `auth.ts` file to your project or pass the path to the configuration file using the `--config` flag.\",\n        );\n        return;\n      }\n\n      // Resolve adapter directly (getAdapter removed in Better Auth 1.5)\n      const databaseFactory = config.database;\n      if (!databaseFactory || typeof databaseFactory !== \"function\") {\n        logger.error(\"No database adapter found in auth config.\");\n        process.exit(1);\n      }\n      let adapter: { id?: string; database?: unknown };\n      try {\n        adapter = (databaseFactory as (opts: unknown) => { id?: string; database?: unknown })(config);\n      } catch (e) {\n        logger.error(e instanceof Error ? e.message : String(e));\n        process.exit(1);\n      }\n\n      if (adapter?.id !== \"filemaker\") {\n        logger.error(\"This generator is only compatible with the FileMaker adapter.\");\n        return;\n      }\n\n      const betterAuthSchema = getSchema(config);\n\n      // Extract Database from the adapter factory or resolved adapter.\n      // config.database is the FileMakerAdapter factory function (has .database set on it).\n      // adapter is the resolved adapter after getAdapter() calls the factory (also has .database).\n      // Try both: adapter first (post-call), then config.database (pre-call / factory function).\n      const configDb =\n        (adapter as unknown as { database?: Database }).database ??\n        (config.database as unknown as { database?: Database } | undefined)?.database;\n      if (!configDb || typeof configDb !== \"object\" || !(\"schema\" in configDb)) {\n        logger.error(\n          \"Could not extract Database instance from adapter. Ensure your auth.ts uses FileMakerAdapter with an fmodata Database.\",\n        );\n        process.exit(1);\n      }\n      let db: Database = configDb;\n\n      // Extract database name and server URL for display.\n      // Try the public getter first (_getDatabaseName), fall back to the private field (databaseName).\n      const dbObj = configDb as unknown as {\n        _getDatabaseName?: string;\n        databaseName?: string;\n        context?: { _getBaseUrl?: () => string; _fetchClientOptions?: unknown };\n      };\n      const dbName: string = dbObj._getDatabaseName ?? dbObj.databaseName ?? \"\";\n      const baseUrl: string | undefined = dbObj.context?._getBaseUrl?.();\n      const serverUrl = baseUrl ? new URL(baseUrl).origin : undefined;\n\n      // If CLI credential overrides are provided, construct a new connection\n      if (options.username && options.password) {\n        if (!dbName) {\n          logger.error(\"Could not determine database filename from adapter config.\");\n          process.exit(1);\n        }\n\n        if (!baseUrl) {\n          logger.error(\n            \"Could not determine server URL from adapter config. Ensure your auth.ts uses FMServerConnection.\",\n          );\n          process.exit(1);\n        }\n\n        const fetchClientOptions = dbObj.context?._fetchClientOptions as FFetchOptions | undefined;\n        const connection = new FMServerConnection({\n          serverUrl: serverUrl as string,\n          auth: {\n            username: options.username,\n            password: options.password,\n          },\n          fetchClientOptions,\n        });\n\n        db = connection.database(dbName);\n      }\n\n      let migrationPlan: Awaited<ReturnType<typeof planMigration>>;\n      try {\n        migrationPlan = await planMigration(db, betterAuthSchema);\n      } catch (err) {\n        logger.error(`Failed to read database schema: ${err instanceof Error ? err.message : err}`);\n        process.exit(1);\n      }\n\n      if (migrationPlan.length === 0) {\n        logger.info(\"No changes to apply. Database is up to date.\");\n        return;\n      }\n\n      if (!options.yes) {\n        prettyPrintMigrationPlan(migrationPlan, { serverUrl, fileName: dbName });\n\n        if (migrationPlan.length > 0) {\n          console.log(chalk.gray(\"💡 Tip: You can use the --yes flag to skip this confirmation.\"));\n        }\n\n        const { confirm } = await prompts({\n          type: \"confirm\",\n          name: \"confirm\",\n          message: \"Apply the above changes to your database?\",\n        });\n        if (!confirm) {\n          logger.error(\"Schema changes not applied.\");\n          return;\n        }\n      }\n\n      try {\n        await executeMigration(db, migrationPlan);\n        logger.info(\"Migration applied successfully.\");\n      } catch {\n        process.exit(1);\n      }\n    });\n  await program.parseAsync(process.argv);\n  process.exit(0);\n}\n\nmain().catch((err) => {\n  logger.error(err.message ?? err);\n  process.exit(1);\n});\n"],"names":[],"mappings":"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"}