@proofkit/better-auth 0.3.0 → 0.3.1-beta.1

package/dist/esm/migrate.js

@@ -1,5 +1,14 @@
 import chalk from "chalk";
 import z from "zod/v4";
+function normalizeBetterAuthFieldType(fieldType) {
+  if (typeof fieldType === "string") {
+    return fieldType;
+  }
+  if (Array.isArray(fieldType)) {
+    return fieldType.map(String).join("|");
+  }
+  return String(fieldType);
+}
 async function getMetadata(fetch, databaseName) {
   var _a;
   console.log("getting metadata...");
@@ -19,7 +28,7 @@ async function getMetadata(fetch, databaseName) {
 }
 async function planMigration(fetch, betterAuthSchema, databaseName) {
   const metadata = await getMetadata(fetch, databaseName);
-  let entitySetToType = {};
+  const entitySetToType = {};
   if (metadata) {
     for (const [key, value] of Object.entries(metadata)) {
       if (value.$Kind === "EntitySet" && value.$Type) {
@@ -31,13 +40,25 @@ async function planMigration(fetch, betterAuthSchema, databaseName) {
   const existingTables = metadata ? Object.entries(entitySetToType).reduce(
     (acc, [entitySetName, entityTypeKey]) => {
       const entityType = metadata[entityTypeKey];
-      if (!entityType) return acc;
+      if (!entityType) {
+        return acc;
+      }
       const fields = Object.entries(entityType).filter(
-        ([fieldKey, fieldValue]) => typeof fieldValue === "object" && fieldValue !== null && "$Type" in fieldValue
-      ).map(([fieldKey, fieldValue]) => ({
-        name: fieldKey,
-        type: fieldValue.$Type === "Edm.String" ? "varchar" : fieldValue.$Type === "Edm.DateTimeOffset" ? "timestamp" : fieldValue.$Type === "Edm.Decimal" || fieldValue.$Type === "Edm.Int32" || fieldValue.$Type === "Edm.Int64" ? "numeric" : "varchar"
-      }));
+        ([_fieldKey, fieldValue]) => typeof fieldValue === "object" && fieldValue !== null && "$Type" in fieldValue
+      ).map(([fieldKey, fieldValue]) => {
+        let type = "varchar";
+        if (fieldValue.$Type === "Edm.String") {
+          type = "varchar";
+        } else if (fieldValue.$Type === "Edm.DateTimeOffset") {
+          type = "timestamp";
+        } else if (fieldValue.$Type === "Edm.Decimal" || fieldValue.$Type === "Edm.Int32" || fieldValue.$Type === "Edm.Int64") {
+          type = "numeric";
+        }
+        return {
+          name: fieldKey,
+          type
+        };
+      });
       acc[entitySetName] = fields;
       return acc;
     },
@@ -45,38 +66,27 @@ async function planMigration(fetch, betterAuthSchema, databaseName) {
   ) : {};
   const baTables = Object.entries(betterAuthSchema).sort((a, b) => (a[1].order ?? 0) - (b[1].order ?? 0)).map(([key, value]) => ({
     ...value,
-    keyName: key
+    modelName: key
+    // Use the key as modelName since getSchema uses table names as keys
   }));
   const migrationPlan = [];
   for (const baTable of baTables) {
-    const fields = Object.entries(baTable.fields).map(
-      ([key, field]) => ({
+    const fields = Object.entries(baTable.fields).map(([key, field]) => {
+      const t = normalizeBetterAuthFieldType(field.type);
+      let type = "varchar";
+      if (t.includes("boolean") || t.includes("number")) {
+        type = "numeric";
+      } else if (t.includes("date")) {
+        type = "timestamp";
+      }
+      return {
         name: field.fieldName ?? key,
-        type: field.type === "boolean" || field.type.includes("number") ? "numeric" : field.type === "date" ? "timestamp" : "varchar"
-      })
-    );
-    const tableExists = Object.prototype.hasOwnProperty.call(
-      existingTables,
-      baTable.modelName
-    );
-    if (!tableExists) {
-      migrationPlan.push({
-        tableName: baTable.modelName,
-        operation: "create",
-        fields: [
-          {
-            name: "id",
-            type: "varchar",
-            primary: true,
-            unique: true
-          },
-          ...fields
-        ]
-      });
-    } else {
-      const existingFields = (existingTables[baTable.modelName] || []).map(
-        (f) => f.name
-      );
+        type
+      };
+    });
+    const tableExists = baTable.modelName in existingTables;
+    if (tableExists) {
+      const existingFields = (existingTables[baTable.modelName] || []).map((f) => f.name);
       const existingFieldMap = (existingTables[baTable.modelName] || []).reduce(
         (acc, f) => {
           acc[f.name] = f.type;
@@ -84,16 +94,14 @@ async function planMigration(fetch, betterAuthSchema, databaseName) {
         },
         {}
       );
-      fields.forEach((field) => {
+      for (const field of fields) {
         if (existingFields.includes(field.name) && existingFieldMap[field.name] !== field.type) {
           console.warn(
             `⚠️ WARNING: Field '${field.name}' in table '${baTable.modelName}' exists but has type '${existingFieldMap[field.name]}' (expected '${field.type}'). Change the field type in FileMaker to avoid potential errors.`
           );
         }
-      });
-      const fieldsToAdd = fields.filter(
-        (f) => !existingFields.includes(f.name)
-      );
+      }
+      const fieldsToAdd = fields.filter((f) => !existingFields.includes(f.name));
       if (fieldsToAdd.length > 0) {
         migrationPlan.push({
           tableName: baTable.modelName,
@@ -101,6 +109,20 @@ async function planMigration(fetch, betterAuthSchema, databaseName) {
           fields: fieldsToAdd
         });
       }
+    } else {
+      migrationPlan.push({
+        tableName: baTable.modelName,
+        operation: "create",
+        fields: [
+          {
+            name: "id",
+            type: "varchar",
+            primary: true,
+            unique: true
+          },
+          ...fields
+        ]
+      });
     }
   }
   return migrationPlan;
@@ -117,10 +139,7 @@ async function executeMigration(fetch, migrationPlan) {
         }
       });
       if (result.error) {
-        console.error(
-          `Failed to create table ${step.tableName}:`,
-          result.error
-        );
+        console.error(`Failed to create table ${step.tableName}:`, result.error);
         throw new Error(`Migration failed: ${result.error}`);
       }
     } else if (step.operation === "update") {
@@ -130,10 +149,7 @@ async function executeMigration(fetch, migrationPlan) {
         body: { fields: step.fields }
       });
       if (result.error) {
-        console.error(
-          `Failed to update table ${step.tableName}:`,
-          result.error
-        );
+        console.error(`Failed to update table ${step.tableName}:`, result.error);
         throw new Error(`Migration failed: ${result.error}`);
       }
     }
@@ -199,8 +215,12 @@ ${emoji} ${step.operation === "create" ? chalk.bold.green("Create table") : chal
     if (step.fields.length) {
       for (const field of step.fields) {
         let fieldDesc = `    - ${field.name} (${field.type}`;
-        if (field.primary) fieldDesc += ", primary";
-        if (field.unique) fieldDesc += ", unique";
+        if (field.primary) {
+          fieldDesc += ", primary";
+        }
+        if (field.unique) {
+          fieldDesc += ", unique";
+        }
         fieldDesc += ")";
         console.log(fieldDesc);
       }

package/dist/esm/migrate.js.map

@@ -1 +1 @@
-{"version":3,"file":"migrate.js","sources":["../../src/migrate.ts"],"sourcesContent":["import { type BetterAuthDbSchema } from \"better-auth/db\";\nimport { type Metadata } from \"fm-odata-client\";\nimport chalk from \"chalk\";\nimport z from \"zod/v4\";\nimport { createRawFetch } from \"./odata\";\n\nexport async function getMetadata(\n  fetch: ReturnType<typeof createRawFetch>[\"fetch\"],\n  databaseName: string,\n) {\n  console.log(\"getting metadata...\");\n  const result = await fetch(\"/$metadata\", {\n    method: \"GET\",\n    headers: { accept: \"application/json\" },\n    output: z\n      .looseObject({\n        $Version: z.string(),\n        \"@ServerVersion\": z.string(),\n      })\n      .or(z.null())\n      .catch(null),\n  });\n\n  if (result.error) {\n    console.error(\"Failed to get metadata:\", result.error);\n    return null;\n  }\n\n  return (result.data?.[databaseName] ?? null) as Metadata | null;\n}\n\nexport async function planMigration(\n  fetch: ReturnType<typeof createRawFetch>[\"fetch\"],\n  betterAuthSchema: BetterAuthDbSchema,\n  databaseName: string,\n): Promise<MigrationPlan> {\n  const metadata = await getMetadata(fetch, databaseName);\n\n  // Build a map from entity set name to entity type key\n  let entitySetToType: Record<string, string> = {};\n  if (metadata) {\n    for (const [key, value] of Object.entries(metadata)) {\n      if (value.$Kind === \"EntitySet\" && value.$Type) {\n        // $Type is like 'betterauth_test.fmp12.proofkit_user_'\n        const typeKey = value.$Type.split(\".\").pop(); // e.g., 'proofkit_user_'\n        entitySetToType[key] = typeKey || key;\n      }\n    }\n  }\n\n  const existingTables = metadata\n    ? Object.entries(entitySetToType).reduce(\n        (acc, [entitySetName, entityTypeKey]) => {\n          const entityType = metadata[entityTypeKey];\n          if (!entityType) return acc;\n          const fields = Object.entries(entityType)\n            .filter(\n              ([fieldKey, fieldValue]) =>\n                typeof fieldValue === \"object\" &&\n                fieldValue !== null &&\n                \"$Type\" in fieldValue,\n            )\n            .map(([fieldKey, fieldValue]) => ({\n              name: fieldKey,\n              type:\n                fieldValue.$Type === \"Edm.String\"\n                  ? \"varchar\"\n                  : fieldValue.$Type === \"Edm.DateTimeOffset\"\n                    ? \"timestamp\"\n                    : fieldValue.$Type === \"Edm.Decimal\" ||\n                        fieldValue.$Type === \"Edm.Int32\" ||\n                        fieldValue.$Type === \"Edm.Int64\"\n                      ? \"numeric\"\n                      : \"varchar\",\n            }));\n          acc[entitySetName] = fields;\n          return acc;\n        },\n        {} as Record<string, { name: string; type: string }[]>,\n      )\n    : {};\n\n  const baTables = Object.entries(betterAuthSchema)\n    .sort((a, b) => (a[1].order ?? 0) - (b[1].order ?? 0))\n    .map(([key, value]) => ({\n      ...value,\n      keyName: key,\n    }));\n\n  const migrationPlan: MigrationPlan = [];\n\n  for (const baTable of baTables) {\n    const fields: FmField[] = Object.entries(baTable.fields).map(\n      ([key, field]) => ({\n        name: field.fieldName ?? key,\n        type:\n          field.type === \"boolean\" || field.type.includes(\"number\")\n            ? \"numeric\"\n            : field.type === \"date\"\n              ? \"timestamp\"\n              : \"varchar\",\n      }),\n    );\n\n    // get existing table or create it\n    const tableExists = Object.prototype.hasOwnProperty.call(\n      existingTables,\n      baTable.modelName,\n    );\n\n    if (!tableExists) {\n      migrationPlan.push({\n        tableName: baTable.modelName,\n        operation: \"create\",\n        fields: [\n          {\n            name: \"id\",\n            type: \"varchar\",\n            primary: true,\n            unique: true,\n          },\n          ...fields,\n        ],\n      });\n    } else {\n      const existingFields = (existingTables[baTable.modelName] || []).map(\n        (f) => f.name,\n      );\n      const existingFieldMap = (existingTables[baTable.modelName] || []).reduce(\n        (acc, f) => {\n          acc[f.name] = f.type;\n          return acc;\n        },\n        {} as Record<string, string>,\n      );\n      // Warn about type mismatches (optional, not in plan)\n      fields.forEach((field) => {\n        if (\n          existingFields.includes(field.name) &&\n          existingFieldMap[field.name] !== field.type\n        ) {\n          console.warn(\n            `⚠️ WARNING: Field '${field.name}' in table '${baTable.modelName}' exists but has type '${existingFieldMap[field.name]}' (expected '${field.type}'). Change the field type in FileMaker to avoid potential errors.`,\n          );\n        }\n      });\n      const fieldsToAdd = fields.filter(\n        (f) => !existingFields.includes(f.name),\n      );\n      if (fieldsToAdd.length > 0) {\n        migrationPlan.push({\n          tableName: baTable.modelName,\n          operation: \"update\",\n          fields: fieldsToAdd,\n        });\n      }\n    }\n  }\n\n  return migrationPlan;\n}\n\nexport async function executeMigration(\n  fetch: ReturnType<typeof createRawFetch>[\"fetch\"],\n  migrationPlan: MigrationPlan,\n) {\n  for (const step of migrationPlan) {\n    if (step.operation === \"create\") {\n      console.log(\"Creating table:\", step.tableName);\n      const result = await fetch(\"/FileMaker_Tables\", {\n        method: \"POST\",\n        body: {\n          tableName: step.tableName,\n          fields: step.fields,\n        },\n      });\n\n      if (result.error) {\n        console.error(\n          `Failed to create table ${step.tableName}:`,\n          result.error,\n        );\n        throw new Error(`Migration failed: ${result.error}`);\n      }\n    } else if (step.operation === \"update\") {\n      console.log(\"Adding fields to table:\", step.tableName);\n      const result = await fetch(`/FileMaker_Tables/${step.tableName}`, {\n        method: \"PATCH\",\n        body: { fields: step.fields },\n      });\n\n      if (result.error) {\n        console.error(\n          `Failed to update table ${step.tableName}:`,\n          result.error,\n        );\n        throw new Error(`Migration failed: ${result.error}`);\n      }\n    }\n  }\n}\n\nconst genericFieldSchema = z.object({\n  name: z.string(),\n  nullable: z.boolean().optional(),\n  primary: z.boolean().optional(),\n  unique: z.boolean().optional(),\n  global: z.boolean().optional(),\n  repetitions: z.number().optional(),\n});\n\nconst stringFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"varchar\"),\n  maxLength: z.number().optional(),\n  default: z.enum([\"USER\", \"USERNAME\", \"CURRENT_USER\"]).optional(),\n});\n\nconst numericFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"numeric\"),\n});\n\nconst dateFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"date\"),\n  default: z.enum([\"CURRENT_DATE\", \"CURDATE\"]).optional(),\n});\n\nconst timeFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"time\"),\n  default: z.enum([\"CURRENT_TIME\", \"CURTIME\"]).optional(),\n});\n\nconst timestampFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"timestamp\"),\n  default: z.enum([\"CURRENT_TIMESTAMP\", \"CURTIMESTAMP\"]).optional(),\n});\n\nconst containerFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"container\"),\n  externalSecurePath: z.string().optional(),\n});\n\nconst fieldSchema = z.discriminatedUnion(\"type\", [\n  stringFieldSchema,\n  numericFieldSchema,\n  dateFieldSchema,\n  timeFieldSchema,\n  timestampFieldSchema,\n  containerFieldSchema,\n]);\n\ntype FmField = z.infer<typeof fieldSchema>;\n\nconst migrationPlanSchema = z\n  .object({\n    tableName: z.string(),\n    operation: z.enum([\"create\", \"update\"]),\n    fields: z.array(fieldSchema),\n  })\n  .array();\n\nexport type MigrationPlan = z.infer<typeof migrationPlanSchema>;\n\nexport function prettyPrintMigrationPlan(migrationPlan: MigrationPlan) {\n  if (!migrationPlan.length) {\n    console.log(\"No changes to apply. Database is up to date.\");\n    return;\n  }\n  console.log(chalk.bold.green(\"Migration plan:\"));\n  for (const step of migrationPlan) {\n    const emoji = step.operation === \"create\" ? \"✅\" : \"✏️\";\n    console.log(\n      `\\n${emoji} ${step.operation === \"create\" ? chalk.bold.green(\"Create table\") : chalk.bold.yellow(\"Update table\")}: ${step.tableName}`,\n    );\n    if (step.fields.length) {\n      for (const field of step.fields) {\n        let fieldDesc = `    - ${field.name} (${field.type}`;\n        if (field.primary) fieldDesc += \", primary\";\n        if (field.unique) fieldDesc += \", unique\";\n        fieldDesc += \")\";\n        console.log(fieldDesc);\n      }\n    } else {\n      console.log(\"    (No fields to add)\");\n    }\n  }\n  console.log(\"\");\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"migrate.js","sources":["../../src/migrate.ts"],"sourcesContent":["import type { DBFieldAttribute } from \"better-auth/db\";\nimport chalk from \"chalk\";\nimport type { Metadata } from \"fm-odata-client\";\nimport z from \"zod/v4\";\nimport type { createRawFetch } from \"./odata\";\n\n/** Schema type returned by better-auth's getSchema function */\ntype BetterAuthSchema = Record<string, { fields: Record<string, DBFieldAttribute>; order: number }>;\n\nfunction normalizeBetterAuthFieldType(fieldType: unknown): string {\n  if (typeof fieldType === \"string\") {\n    return fieldType;\n  }\n  if (Array.isArray(fieldType)) {\n    return fieldType.map(String).join(\"|\");\n  }\n  return String(fieldType);\n}\n\nexport async function getMetadata(fetch: ReturnType<typeof createRawFetch>[\"fetch\"], databaseName: string) {\n  console.log(\"getting metadata...\");\n  const result = await fetch(\"/$metadata\", {\n    method: \"GET\",\n    headers: { accept: \"application/json\" },\n    output: z\n      .looseObject({\n        $Version: z.string(),\n        \"@ServerVersion\": z.string(),\n      })\n      .or(z.null())\n      .catch(null),\n  });\n\n  if (result.error) {\n    console.error(\"Failed to get metadata:\", result.error);\n    return null;\n  }\n\n  return (result.data?.[databaseName] ?? null) as Metadata | null;\n}\n\nexport async function planMigration(\n  fetch: ReturnType<typeof createRawFetch>[\"fetch\"],\n  betterAuthSchema: BetterAuthSchema,\n  databaseName: string,\n): Promise<MigrationPlan> {\n  const metadata = await getMetadata(fetch, databaseName);\n\n  // Build a map from entity set name to entity type key\n  const entitySetToType: Record<string, string> = {};\n  if (metadata) {\n    for (const [key, value] of Object.entries(metadata)) {\n      if (value.$Kind === \"EntitySet\" && value.$Type) {\n        // $Type is like 'betterauth_test.fmp12.proofkit_user_'\n        const typeKey = value.$Type.split(\".\").pop(); // e.g., 'proofkit_user_'\n        entitySetToType[key] = typeKey || key;\n      }\n    }\n  }\n\n  const existingTables = metadata\n    ? Object.entries(entitySetToType).reduce(\n        (acc, [entitySetName, entityTypeKey]) => {\n          const entityType = metadata[entityTypeKey];\n          if (!entityType) {\n            return acc;\n          }\n          const fields = Object.entries(entityType)\n            .filter(\n              ([_fieldKey, fieldValue]) =>\n                typeof fieldValue === \"object\" && fieldValue !== null && \"$Type\" in fieldValue,\n            )\n            .map(([fieldKey, fieldValue]) => {\n              let type = \"varchar\";\n              if (fieldValue.$Type === \"Edm.String\") {\n                type = \"varchar\";\n              } else if (fieldValue.$Type === \"Edm.DateTimeOffset\") {\n                type = \"timestamp\";\n              } else if (\n                fieldValue.$Type === \"Edm.Decimal\" ||\n                fieldValue.$Type === \"Edm.Int32\" ||\n                fieldValue.$Type === \"Edm.Int64\"\n              ) {\n                type = \"numeric\";\n              }\n              return {\n                name: fieldKey,\n                type,\n              };\n            });\n          acc[entitySetName] = fields;\n          return acc;\n        },\n        {} as Record<string, { name: string; type: string }[]>,\n      )\n    : {};\n\n  const baTables = Object.entries(betterAuthSchema)\n    .sort((a, b) => (a[1].order ?? 0) - (b[1].order ?? 0))\n    .map(([key, value]) => ({\n      ...value,\n      modelName: key, // Use the key as modelName since getSchema uses table names as keys\n    }));\n\n  const migrationPlan: MigrationPlan = [];\n\n  for (const baTable of baTables) {\n    const fields: FmField[] = Object.entries(baTable.fields).map(([key, field]) => {\n      // Better Auth's FieldType can be a string literal union or arrays.\n      // Normalize it to a string so our FM mapping logic remains stable.\n      // Use .includes() for all checks to handle array types like [\"boolean\", \"null\"] → \"boolean|null\"\n      const t = normalizeBetterAuthFieldType(field.type);\n      let type: \"varchar\" | \"numeric\" | \"timestamp\" = \"varchar\";\n      if (t.includes(\"boolean\") || t.includes(\"number\")) {\n        type = \"numeric\";\n      } else if (t.includes(\"date\")) {\n        type = \"timestamp\";\n      }\n      return {\n        name: field.fieldName ?? key,\n        type,\n      };\n    });\n\n    // get existing table or create it\n    const tableExists = baTable.modelName in existingTables;\n\n    if (tableExists) {\n      const existingFields = (existingTables[baTable.modelName] || []).map((f) => f.name);\n      const existingFieldMap = (existingTables[baTable.modelName] || []).reduce(\n        (acc, f) => {\n          acc[f.name] = f.type;\n          return acc;\n        },\n        {} as Record<string, string>,\n      );\n      // Warn about type mismatches (optional, not in plan)\n      for (const field of fields) {\n        if (existingFields.includes(field.name) && existingFieldMap[field.name] !== field.type) {\n          console.warn(\n            `⚠️ WARNING: Field '${field.name}' in table '${baTable.modelName}' exists but has type '${existingFieldMap[field.name]}' (expected '${field.type}'). Change the field type in FileMaker to avoid potential errors.`,\n          );\n        }\n      }\n      const fieldsToAdd = fields.filter((f) => !existingFields.includes(f.name));\n      if (fieldsToAdd.length > 0) {\n        migrationPlan.push({\n          tableName: baTable.modelName,\n          operation: \"update\",\n          fields: fieldsToAdd,\n        });\n      }\n    } else {\n      migrationPlan.push({\n        tableName: baTable.modelName,\n        operation: \"create\",\n        fields: [\n          {\n            name: \"id\",\n            type: \"varchar\",\n            primary: true,\n            unique: true,\n          },\n          ...fields,\n        ],\n      });\n    }\n  }\n\n  return migrationPlan;\n}\n\nexport async function executeMigration(\n  fetch: ReturnType<typeof createRawFetch>[\"fetch\"],\n  migrationPlan: MigrationPlan,\n) {\n  for (const step of migrationPlan) {\n    if (step.operation === \"create\") {\n      console.log(\"Creating table:\", step.tableName);\n      const result = await fetch(\"/FileMaker_Tables\", {\n        method: \"POST\",\n        body: {\n          tableName: step.tableName,\n          fields: step.fields,\n        },\n      });\n\n      if (result.error) {\n        console.error(`Failed to create table ${step.tableName}:`, result.error);\n        throw new Error(`Migration failed: ${result.error}`);\n      }\n    } else if (step.operation === \"update\") {\n      console.log(\"Adding fields to table:\", step.tableName);\n      const result = await fetch(`/FileMaker_Tables/${step.tableName}`, {\n        method: \"PATCH\",\n        body: { fields: step.fields },\n      });\n\n      if (result.error) {\n        console.error(`Failed to update table ${step.tableName}:`, result.error);\n        throw new Error(`Migration failed: ${result.error}`);\n      }\n    }\n  }\n}\n\nconst genericFieldSchema = z.object({\n  name: z.string(),\n  nullable: z.boolean().optional(),\n  primary: z.boolean().optional(),\n  unique: z.boolean().optional(),\n  global: z.boolean().optional(),\n  repetitions: z.number().optional(),\n});\n\nconst stringFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"varchar\"),\n  maxLength: z.number().optional(),\n  default: z.enum([\"USER\", \"USERNAME\", \"CURRENT_USER\"]).optional(),\n});\n\nconst numericFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"numeric\"),\n});\n\nconst dateFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"date\"),\n  default: z.enum([\"CURRENT_DATE\", \"CURDATE\"]).optional(),\n});\n\nconst timeFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"time\"),\n  default: z.enum([\"CURRENT_TIME\", \"CURTIME\"]).optional(),\n});\n\nconst timestampFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"timestamp\"),\n  default: z.enum([\"CURRENT_TIMESTAMP\", \"CURTIMESTAMP\"]).optional(),\n});\n\nconst containerFieldSchema = genericFieldSchema.extend({\n  type: z.literal(\"container\"),\n  externalSecurePath: z.string().optional(),\n});\n\nconst fieldSchema = z.discriminatedUnion(\"type\", [\n  stringFieldSchema,\n  numericFieldSchema,\n  dateFieldSchema,\n  timeFieldSchema,\n  timestampFieldSchema,\n  containerFieldSchema,\n]);\n\ntype FmField = z.infer<typeof fieldSchema>;\n\nconst migrationPlanSchema = z\n  .object({\n    tableName: z.string(),\n    operation: z.enum([\"create\", \"update\"]),\n    fields: z.array(fieldSchema),\n  })\n  .array();\n\nexport type MigrationPlan = z.infer<typeof migrationPlanSchema>;\n\nexport function prettyPrintMigrationPlan(migrationPlan: MigrationPlan) {\n  if (!migrationPlan.length) {\n    console.log(\"No changes to apply. Database is up to date.\");\n    return;\n  }\n  console.log(chalk.bold.green(\"Migration plan:\"));\n  for (const step of migrationPlan) {\n    const emoji = step.operation === \"create\" ? \"✅\" : \"✏️\";\n    console.log(\n      `\\n${emoji} ${step.operation === \"create\" ? chalk.bold.green(\"Create table\") : chalk.bold.yellow(\"Update table\")}: ${step.tableName}`,\n    );\n    if (step.fields.length) {\n      for (const field of step.fields) {\n        let fieldDesc = `    - ${field.name} (${field.type}`;\n        if (field.primary) {\n          fieldDesc += \", primary\";\n        }\n        if (field.unique) {\n          fieldDesc += \", unique\";\n        }\n        fieldDesc += \")\";\n        console.log(fieldDesc);\n      }\n    } else {\n      console.log(\"    (No fields to add)\");\n    }\n  }\n  console.log(\"\");\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/odata/index.d.ts

@@ -1,19 +1,19 @@
 import { Result } from 'neverthrow';
 import { z } from 'zod/v4';
-type BasicAuthCredentials = {
+interface BasicAuthCredentials {
     username: string;
     password: string;
-};
-type OttoAPIKeyAuth = {
+}
+interface OttoAPIKeyAuth {
     apiKey: string;
-};
+}
 type ODataAuth = BasicAuthCredentials | OttoAPIKeyAuth;
-export type FmOdataConfig = {
+export interface FmOdataConfig {
     serverUrl: string;
     auth: ODataAuth;
     database: string;
     logging?: true | "verbose" | "none";
-};
+}
 export declare function validateUrl(input: string): Result<URL, unknown>;
 export declare function createRawFetch(args: FmOdataConfig): {
     baseURL: string;

package/dist/esm/odata/index.js

@@ -15,7 +15,7 @@ function createRawFetch(args) {
   }
   let baseURL = result.value.origin;
   if ("apiKey" in args.auth) {
-    baseURL += `/otto`;
+    baseURL += "/otto";
   }
   baseURL += `/fmi/odata/v4/${args.database}`;
   const authHeaders = {};
@@ -52,33 +52,20 @@ function createRawFetch(args) {
         body: processedBody
       };
       if (args.logging === "verbose" || args.logging === true) {
-        logger.info(
-          "raw-fetch",
-          `${requestInit.method || "GET"} ${url}`
-        );
+        logger.info("raw-fetch", `${requestInit.method || "GET"} ${url}`);
         if (requestInit.body) {
           logger.info("raw-fetch", "Request body:", requestInit.body);
         }
       }
       const response = await fetch(url, requestInit);
       if (args.logging === "verbose" || args.logging === true) {
-        logger.info(
-          "raw-fetch",
-          `Response status: ${response.status} ${response.statusText}`
-        );
-        logger.info(
-          "raw-fetch",
-          `Response headers:`,
-          Object.fromEntries(response.headers.entries())
-        );
+        logger.info("raw-fetch", `Response status: ${response.status} ${response.statusText}`);
+        logger.info("raw-fetch", "Response headers:", Object.fromEntries(response.headers.entries()));
       }
       if (!response.ok) {
         const errorText = await response.text().catch(() => "Unknown error");
         if (args.logging === "verbose" || args.logging === true) {
-          logger.error(
-            "raw-fetch",
-            `HTTP Error ${response.status}: ${errorText}`
-          );
+          logger.error("raw-fetch", `HTTP Error ${response.status}: ${errorText}`);
         }
         return {
           error: `HTTP ${response.status}: ${errorText}`,
@@ -88,48 +75,29 @@ function createRawFetch(args) {
       let responseData;
       const contentType = response.headers.get("content-type");
       if (args.logging === "verbose" || args.logging === true) {
-        logger.info(
-          "raw-fetch",
-          `Response content-type: ${contentType || "none"}`
-        );
+        logger.info("raw-fetch", `Response content-type: ${contentType || "none"}`);
       }
       if (contentType == null ? void 0 : contentType.includes("application/json")) {
         try {
           const responseText = await response.text();
           if (args.logging === "verbose" || args.logging === true) {
-            logger.info(
-              "raw-fetch",
-              `Raw response text: "${responseText}"`
-            );
-            logger.info(
-              "raw-fetch",
-              `Response text length: ${responseText.length}`
-            );
+            logger.info("raw-fetch", `Raw response text: "${responseText}"`);
+            logger.info("raw-fetch", `Response text length: ${responseText.length}`);
           }
           if (responseText.trim() === "") {
             if (args.logging === "verbose" || args.logging === true) {
-              logger.info(
-                "raw-fetch",
-                "Empty JSON response, returning null"
-              );
+              logger.info("raw-fetch", "Empty JSON response, returning null");
             }
             responseData = null;
           } else {
             responseData = JSON.parse(responseText);
             if (args.logging === "verbose" || args.logging === true) {
-              logger.info(
-                "raw-fetch",
-                "Successfully parsed JSON response"
-              );
+              logger.info("raw-fetch", "Successfully parsed JSON response");
             }
           }
         } catch (parseError) {
           if (args.logging === "verbose" || args.logging === true) {
-            logger.error(
-              "raw-fetch",
-              "JSON parse error:",
-              parseError
-            );
+            logger.error("raw-fetch", "JSON parse error:", parseError);
           }
           return {
             error: `Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : "Unknown parse error"}`,
@@ -139,27 +107,18 @@ function createRawFetch(args) {
       } else if (contentType == null ? void 0 : contentType.includes("text/")) {
         responseData = await response.text();
         if (args.logging === "verbose" || args.logging === true) {
-          logger.info(
-            "raw-fetch",
-            `Text response: "${responseData}"`
-          );
+          logger.info("raw-fetch", `Text response: "${responseData}"`);
         }
       } else {
         try {
           responseData = await response.text();
           if (args.logging === "verbose" || args.logging === true) {
-            logger.info(
-              "raw-fetch",
-              `Unknown content-type response as text: "${responseData}"`
-            );
+            logger.info("raw-fetch", `Unknown content-type response as text: "${responseData}"`);
           }
         } catch {
           responseData = null;
           if (args.logging === "verbose" || args.logging === true) {
-            logger.info(
-              "raw-fetch",
-              "Could not parse response as text, returning null"
-            );
+            logger.info("raw-fetch", "Could not parse response as text, returning null");
           }
         }
       }
@@ -170,12 +129,11 @@ function createRawFetch(args) {
             data: validation.data,
             response
           };
-        } else {
-          return {
-            error: `Validation failed: ${validation.error.message}`,
-            response
-          };
         }
+        return {
+          error: `Validation failed: ${validation.error.message}`,
+          response
+        };
       }
       return {
         data: responseData,

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/odata/index.ts"],"sourcesContent":["import { logger as betterAuthLogger } from \"better-auth\";\nimport { err, ok, Result } from \"neverthrow\";\nimport { z } from \"zod/v4\";\n\ntype BasicAuthCredentials = {\n  username: string;\n  password: string;\n};\ntype OttoAPIKeyAuth = {\n  apiKey: string;\n};\ntype ODataAuth = BasicAuthCredentials | OttoAPIKeyAuth;\n\nexport type FmOdataConfig = {\n  serverUrl: string;\n  auth: ODataAuth;\n  database: string;\n  logging?: true | \"verbose\" | \"none\";\n};\n\nexport function validateUrl(input: string): Result<URL, unknown> {\n  try {\n    const url = new URL(input);\n    return ok(url);\n  } catch (error) {\n    return err(error);\n  }\n}\n\nexport function createRawFetch(args: FmOdataConfig) {\n  const result = validateUrl(args.serverUrl);\n\n  if (result.isErr()) {\n    throw new Error(\"Invalid server URL\");\n  }\n\n  let baseURL = result.value.origin;\n  if (\"apiKey\" in args.auth) {\n    baseURL += `/otto`;\n  }\n  baseURL += `/fmi/odata/v4/${args.database}`;\n\n  // Create authentication headers\n  const authHeaders: Record<string, string> = {};\n  if (\"apiKey\" in args.auth) {\n    authHeaders.Authorization = `Bearer ${args.auth.apiKey}`;\n  } else {\n    const credentials = btoa(`${args.auth.username}:${args.auth.password}`);\n    authHeaders.Authorization = `Basic ${credentials}`;\n  }\n\n  // Enhanced fetch function with body handling, validation, and structured responses\n  const wrappedFetch = async <TOutput = any>(\n    input: string | URL | Request,\n    options?: Omit<RequestInit, \"body\"> & {\n      body?: any; // Allow any type for body\n      output?: z.ZodSchema<TOutput>; // Optional schema for validation\n    },\n  ): Promise<{ data?: TOutput; error?: string; response?: Response }> => {\n    try {\n      let url: string;\n\n      // Handle different input types\n      if (typeof input === \"string\") {\n        // If it's already a full URL, use as-is, otherwise prepend baseURL\n        url = input.startsWith(\"http\")\n          ? input\n          : `${baseURL}${input.startsWith(\"/\") ? input : `/${input}`}`;\n      } else if (input instanceof URL) {\n        url = input.toString();\n      } else if (input instanceof Request) {\n        url = input.url;\n      } else {\n        url = String(input);\n      }\n\n      // Handle body serialization\n      let processedBody = options?.body;\n      if (\n        processedBody &&\n        typeof processedBody === \"object\" &&\n        !(processedBody instanceof FormData) &&\n        !(processedBody instanceof URLSearchParams) &&\n        !(processedBody instanceof ReadableStream)\n      ) {\n        processedBody = JSON.stringify(processedBody);\n      }\n\n      // Merge headers\n      const headers = {\n        \"Content-Type\": \"application/json\",\n        ...authHeaders,\n        ...(options?.headers || {}),\n      };\n\n      const requestInit: RequestInit = {\n        ...options,\n        headers,\n        body: processedBody,\n      };\n\n      // Optional logging\n      if (args.logging === \"verbose\" || args.logging === true) {\n        betterAuthLogger.info(\n          \"raw-fetch\",\n          `${requestInit.method || \"GET\"} ${url}`,\n        );\n        if (requestInit.body) {\n          betterAuthLogger.info(\"raw-fetch\", \"Request body:\", requestInit.body);\n        }\n      }\n\n      const response = await fetch(url, requestInit);\n\n      // Optional logging for response details\n      if (args.logging === \"verbose\" || args.logging === true) {\n        betterAuthLogger.info(\n          \"raw-fetch\",\n          `Response status: ${response.status} ${response.statusText}`,\n        );\n        betterAuthLogger.info(\n          \"raw-fetch\",\n          `Response headers:`,\n          Object.fromEntries(response.headers.entries()),\n        );\n      }\n\n      // Check if response is ok\n      if (!response.ok) {\n        const errorText = await response.text().catch(() => \"Unknown error\");\n        if (args.logging === \"verbose\" || args.logging === true) {\n          betterAuthLogger.error(\n            \"raw-fetch\",\n            `HTTP Error ${response.status}: ${errorText}`,\n          );\n        }\n        return {\n          error: `HTTP ${response.status}: ${errorText}`,\n          response,\n        };\n      }\n\n      // Parse response based on content type\n      let responseData: any;\n      const contentType = response.headers.get(\"content-type\");\n\n      if (args.logging === \"verbose\" || args.logging === true) {\n        betterAuthLogger.info(\n          \"raw-fetch\",\n          `Response content-type: ${contentType || \"none\"}`,\n        );\n      }\n\n      if (contentType?.includes(\"application/json\")) {\n        try {\n          const responseText = await response.text();\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.info(\n              \"raw-fetch\",\n              `Raw response text: \"${responseText}\"`,\n            );\n            betterAuthLogger.info(\n              \"raw-fetch\",\n              `Response text length: ${responseText.length}`,\n            );\n          }\n\n          // Handle empty responses\n          if (responseText.trim() === \"\") {\n            if (args.logging === \"verbose\" || args.logging === true) {\n              betterAuthLogger.info(\n                \"raw-fetch\",\n                \"Empty JSON response, returning null\",\n              );\n            }\n            responseData = null;\n          } else {\n            responseData = JSON.parse(responseText);\n            if (args.logging === \"verbose\" || args.logging === true) {\n              betterAuthLogger.info(\n                \"raw-fetch\",\n                \"Successfully parsed JSON response\",\n              );\n            }\n          }\n        } catch (parseError) {\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.error(\n              \"raw-fetch\",\n              \"JSON parse error:\",\n              parseError,\n            );\n          }\n          return {\n            error: `Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : \"Unknown parse error\"}`,\n            response,\n          };\n        }\n      } else if (contentType?.includes(\"text/\")) {\n        // Handle text responses (text/plain, text/html, etc.)\n        responseData = await response.text();\n        if (args.logging === \"verbose\" || args.logging === true) {\n          betterAuthLogger.info(\n            \"raw-fetch\",\n            `Text response: \"${responseData}\"`,\n          );\n        }\n      } else {\n        // For other content types, try to get text but don't fail if it's binary\n        try {\n          responseData = await response.text();\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.info(\n              \"raw-fetch\",\n              `Unknown content-type response as text: \"${responseData}\"`,\n            );\n          }\n        } catch {\n          // If text parsing fails (e.g., binary data), return null\n          responseData = null;\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.info(\n              \"raw-fetch\",\n              \"Could not parse response as text, returning null\",\n            );\n          }\n        }\n      }\n\n      // Validate output if schema provided\n      if (options?.output) {\n        const validation = options.output.safeParse(responseData);\n        if (validation.success) {\n          return {\n            data: validation.data,\n            response,\n          };\n        } else {\n          return {\n            error: `Validation failed: ${validation.error.message}`,\n            response,\n          };\n        }\n      }\n\n      // Return unvalidated data\n      return {\n        data: responseData as TOutput,\n        response,\n      };\n    } catch (error) {\n      return {\n        error:\n          error instanceof Error ? error.message : \"Unknown error occurred\",\n      };\n    }\n  };\n\n  return {\n    baseURL,\n    fetch: wrappedFetch,\n  };\n}\n"],"names":["betterAuthLogger"],"mappings":"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"}
+{"version":3,"file":"index.js","sources":["../../../src/odata/index.ts"],"sourcesContent":["/** biome-ignore-all lint/suspicious/noExplicitAny: library code */\nimport { logger as betterAuthLogger } from \"better-auth\";\nimport { err, ok, type Result } from \"neverthrow\";\nimport type { z } from \"zod/v4\";\n\ninterface BasicAuthCredentials {\n  username: string;\n  password: string;\n}\ninterface OttoAPIKeyAuth {\n  apiKey: string;\n}\ntype ODataAuth = BasicAuthCredentials | OttoAPIKeyAuth;\n\nexport interface FmOdataConfig {\n  serverUrl: string;\n  auth: ODataAuth;\n  database: string;\n  logging?: true | \"verbose\" | \"none\";\n}\n\nexport function validateUrl(input: string): Result<URL, unknown> {\n  try {\n    const url = new URL(input);\n    return ok(url);\n  } catch (error) {\n    return err(error);\n  }\n}\n\nexport function createRawFetch(args: FmOdataConfig) {\n  const result = validateUrl(args.serverUrl);\n\n  if (result.isErr()) {\n    throw new Error(\"Invalid server URL\");\n  }\n\n  let baseURL = result.value.origin;\n  if (\"apiKey\" in args.auth) {\n    baseURL += \"/otto\";\n  }\n  baseURL += `/fmi/odata/v4/${args.database}`;\n\n  // Create authentication headers\n  const authHeaders: Record<string, string> = {};\n  if (\"apiKey\" in args.auth) {\n    authHeaders.Authorization = `Bearer ${args.auth.apiKey}`;\n  } else {\n    const credentials = btoa(`${args.auth.username}:${args.auth.password}`);\n    authHeaders.Authorization = `Basic ${credentials}`;\n  }\n\n  // Enhanced fetch function with body handling, validation, and structured responses\n  const wrappedFetch = async <TOutput = any>(\n    input: string | URL | Request,\n    options?: Omit<RequestInit, \"body\"> & {\n      body?: any; // Allow any type for body\n      output?: z.ZodSchema<TOutput>; // Optional schema for validation\n    },\n  ): Promise<{ data?: TOutput; error?: string; response?: Response }> => {\n    try {\n      let url: string;\n\n      // Handle different input types\n      if (typeof input === \"string\") {\n        // If it's already a full URL, use as-is, otherwise prepend baseURL\n        url = input.startsWith(\"http\") ? input : `${baseURL}${input.startsWith(\"/\") ? input : `/${input}`}`;\n      } else if (input instanceof URL) {\n        url = input.toString();\n      } else if (input instanceof Request) {\n        url = input.url;\n      } else {\n        url = String(input);\n      }\n\n      // Handle body serialization\n      let processedBody = options?.body;\n      if (\n        processedBody &&\n        typeof processedBody === \"object\" &&\n        !(processedBody instanceof FormData) &&\n        !(processedBody instanceof URLSearchParams) &&\n        !(processedBody instanceof ReadableStream)\n      ) {\n        processedBody = JSON.stringify(processedBody);\n      }\n\n      // Merge headers\n      const headers = {\n        \"Content-Type\": \"application/json\",\n        ...authHeaders,\n        ...(options?.headers || {}),\n      };\n\n      const requestInit: RequestInit = {\n        ...options,\n        headers,\n        body: processedBody,\n      };\n\n      // Optional logging\n      if (args.logging === \"verbose\" || args.logging === true) {\n        betterAuthLogger.info(\"raw-fetch\", `${requestInit.method || \"GET\"} ${url}`);\n        if (requestInit.body) {\n          betterAuthLogger.info(\"raw-fetch\", \"Request body:\", requestInit.body);\n        }\n      }\n\n      const response = await fetch(url, requestInit);\n\n      // Optional logging for response details\n      if (args.logging === \"verbose\" || args.logging === true) {\n        betterAuthLogger.info(\"raw-fetch\", `Response status: ${response.status} ${response.statusText}`);\n        betterAuthLogger.info(\"raw-fetch\", \"Response headers:\", Object.fromEntries(response.headers.entries()));\n      }\n\n      // Check if response is ok\n      if (!response.ok) {\n        const errorText = await response.text().catch(() => \"Unknown error\");\n        if (args.logging === \"verbose\" || args.logging === true) {\n          betterAuthLogger.error(\"raw-fetch\", `HTTP Error ${response.status}: ${errorText}`);\n        }\n        return {\n          error: `HTTP ${response.status}: ${errorText}`,\n          response,\n        };\n      }\n\n      // Parse response based on content type\n      let responseData: any;\n      const contentType = response.headers.get(\"content-type\");\n\n      if (args.logging === \"verbose\" || args.logging === true) {\n        betterAuthLogger.info(\"raw-fetch\", `Response content-type: ${contentType || \"none\"}`);\n      }\n\n      if (contentType?.includes(\"application/json\")) {\n        try {\n          const responseText = await response.text();\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.info(\"raw-fetch\", `Raw response text: \"${responseText}\"`);\n            betterAuthLogger.info(\"raw-fetch\", `Response text length: ${responseText.length}`);\n          }\n\n          // Handle empty responses\n          if (responseText.trim() === \"\") {\n            if (args.logging === \"verbose\" || args.logging === true) {\n              betterAuthLogger.info(\"raw-fetch\", \"Empty JSON response, returning null\");\n            }\n            responseData = null;\n          } else {\n            responseData = JSON.parse(responseText);\n            if (args.logging === \"verbose\" || args.logging === true) {\n              betterAuthLogger.info(\"raw-fetch\", \"Successfully parsed JSON response\");\n            }\n          }\n        } catch (parseError) {\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.error(\"raw-fetch\", \"JSON parse error:\", parseError);\n          }\n          return {\n            error: `Failed to parse JSON response: ${parseError instanceof Error ? parseError.message : \"Unknown parse error\"}`,\n            response,\n          };\n        }\n      } else if (contentType?.includes(\"text/\")) {\n        // Handle text responses (text/plain, text/html, etc.)\n        responseData = await response.text();\n        if (args.logging === \"verbose\" || args.logging === true) {\n          betterAuthLogger.info(\"raw-fetch\", `Text response: \"${responseData}\"`);\n        }\n      } else {\n        // For other content types, try to get text but don't fail if it's binary\n        try {\n          responseData = await response.text();\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.info(\"raw-fetch\", `Unknown content-type response as text: \"${responseData}\"`);\n          }\n        } catch {\n          // If text parsing fails (e.g., binary data), return null\n          responseData = null;\n          if (args.logging === \"verbose\" || args.logging === true) {\n            betterAuthLogger.info(\"raw-fetch\", \"Could not parse response as text, returning null\");\n          }\n        }\n      }\n\n      // Validate output if schema provided\n      if (options?.output) {\n        const validation = options.output.safeParse(responseData);\n        if (validation.success) {\n          return {\n            data: validation.data,\n            response,\n          };\n        }\n        return {\n          error: `Validation failed: ${validation.error.message}`,\n          response,\n        };\n      }\n\n      // Return unvalidated data\n      return {\n        data: responseData as TOutput,\n        response,\n      };\n    } catch (error) {\n      return {\n        error: error instanceof Error ? error.message : \"Unknown error occurred\",\n      };\n    }\n  };\n\n  return {\n    baseURL,\n    fetch: wrappedFetch,\n  };\n}\n"],"names":["betterAuthLogger"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofkit/better-auth",
-  "version": "0.3.0",
+  "version": "0.3.1-beta.1",
   "description": "FileMaker adapter for Better Auth",
   "type": "module",
   "main": "dist/esm/index.js",
@@ -36,36 +36,40 @@
     "url": "git+https://github.com/proofgeist/proofkit.git"
   },
   "dependencies": {
-    "@babel/preset-react": "^7.27.1",
-    "@babel/preset-typescript": "^7.27.1",
+    "@babel/preset-react": "^7.28.5",
+    "@babel/preset-typescript": "^7.28.5",
     "@commander-js/extra-typings": "^14.0.0",
-    "@tanstack/vite-config": "^0.2.0",
-    "better-auth": "^1.2.10",
-    "c12": "^3.0.4",
+    "@tanstack/vite-config": "^0.2.1",
+    "better-auth": "^1.4.11",
+    "c12": "^3.3.3",
     "chalk": "5.4.1",
-    "commander": "^14.0.0",
-    "dotenv": "^16.5.0",
-    "fs-extra": "^11.3.0",
+    "commander": "^14.0.2",
+    "dotenv": "^16.6.1",
+    "fs-extra": "^11.3.3",
     "neverthrow": "^8.2.0",
-    "odata-query": "^8.0.4",
+    "odata-query": "^8.0.7",
     "prompts": "^2.4.2",
-    "vite": "^6.3.4",
-    "zod": "3.25.64"
+    "vite": "^6.4.1",
+    "zod": "^4.3.5"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/prompts": "^2.4.9",
     "@vitest/ui": "^3.2.4",
-    "fm-odata-client": "^3.0.1",
-    "publint": "^0.3.12",
-    "typescript": "^5.9.2",
-    "vitest": "^3.2.4"
+    "fm-odata-client": "^3.0.2",
+    "publint": "^0.3.16",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.17"
   },
   "scripts": {
     "dev": "pnpm build:watch",
     "test": "vitest run",
+    "test:e2e": "doppler run -c test_betterauth -- vitest run tests/e2e",
+    "typecheck": "tsc --noEmit",
     "build": "vite build && publint --strict",
     "build:watch": "vite build --watch",
-    "ci": "pnpm run build && pnpm run test"
+    "ci": "pnpm run build && pnpm run test",
+    "lint": "biome check . --write",
+    "lint:summary": "biome check . --reporter=summary"
   }
 }