@better-auth/cli 1.4.0-beta.4 → 1.4.0-beta.6

package/dist/index.mjs

@@ -2277,9 +2277,9 @@ const generateDrizzleSchema = async ({
           mysql: field.bigint ? `bigint('${name}', { mode: 'number' })` : `int('${name}')`
         },
         date: {
-          sqlite: `integer('${name}', { mode: 'timestamp' })`,
+          sqlite: `integer('${name}', { mode: 'timestamp_ms' })`,
           pg: `timestamp('${name}')`,
-          mysql: `timestamp('${name}')`
+          mysql: `timestamp('${name}', { fsp: 3 })`
         },
         "number[]": {
           sqlite: `integer('${name}').array()`,
@@ -2307,7 +2307,7 @@ const generateDrizzleSchema = async ({
       if (databaseType === "pg") {
         id = `serial("id").primaryKey()`;
       } else if (databaseType === "sqlite") {
-        id = `int("id").primaryKey()`;
+        id = `integer("id", { mode: "number" }).primaryKey({ autoIncrement: true })`;
       } else {
         id = `int("id").autoincrement().primaryKey()`;
       }
@@ -2327,11 +2327,16 @@ const generateDrizzleSchema = async ({
 					id: ${id},
 					${Object.keys(fields).map((field) => {
       const attr = fields[field];
-      let type = getType(field, attr);
+      const fieldName = attr.fieldName || field;
+      let type = getType(fieldName, attr);
       if (attr.defaultValue !== null && typeof attr.defaultValue !== "undefined") {
         if (typeof attr.defaultValue === "function") {
           if (attr.type === "date" && attr.defaultValue.toString().includes("new Date()")) {
-            type += `.defaultNow()`;
+            if (databaseType === "sqlite") {
+              type += `.default(sql\`(cast(unixepoch('subsecond') * 1000 as integer))\`)`;
+            } else {
+              type += `.defaultNow()`;
+            }
           } else {
             type += `.$defaultFn(${attr.defaultValue})`;
           }
@@ -2346,10 +2351,10 @@ const generateDrizzleSchema = async ({
           type += `.$onUpdate(${attr.onUpdate})`;
         }
       }
-      return `${field}: ${type}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${attr.references ? `.references(()=> ${getModelName(
+      return `${fieldName}: ${type}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${attr.references ? `.references(()=> ${getModelName(
         tables[attr.references.model]?.modelName || attr.references.model,
         adapter.options
-      )}.${attr.references.field}, { onDelete: '${attr.references.onDelete || "cascade"}' })` : ""}`;
+      )}.${fields[attr.references.field]?.fieldName || attr.references.field}, { onDelete: '${attr.references.onDelete || "cascade"}' })` : ""}`;
     }).join(",\n ")}
 				});`;
     code += `
@@ -2370,7 +2375,8 @@ function generateImport({
   tables,
   options
 }) {
-  let imports = [];
+  const rootImports = [];
+  const coreImports = [];
   let hasBigint = false;
   let hasJson = false;
   for (const table of Object.values(tables)) {
@@ -2381,12 +2387,14 @@ function generateImport({
     if (hasJson && hasBigint) break;
   }
   const useNumberId = options.advanced?.database?.useNumberId;
-  imports.push(`${databaseType}Table`);
-  imports.push(
+  coreImports.push(`${databaseType}Table`);
+  coreImports.push(
     databaseType === "mysql" ? "varchar, text" : databaseType === "pg" ? "text" : "text"
   );
-  imports.push(hasBigint ? databaseType !== "sqlite" ? "bigint" : "" : "");
-  imports.push(databaseType !== "sqlite" ? "timestamp, boolean" : "");
+  coreImports.push(
+    hasBigint ? databaseType !== "sqlite" ? "bigint" : "" : ""
+  );
+  coreImports.push(databaseType !== "sqlite" ? "timestamp, boolean" : "");
   if (databaseType === "mysql") {
     const hasNonBigintNumber = Object.values(tables).some(
       (table) => Object.values(table.fields).some(
@@ -2395,7 +2403,7 @@ function generateImport({
     );
     const needsInt = !!useNumberId || hasNonBigintNumber;
     if (needsInt) {
-      imports.push("int");
+      coreImports.push("int");
     }
   } else if (databaseType === "pg") {
     const hasNonBigintNumber = Object.values(tables).some(
@@ -2410,17 +2418,26 @@ function generateImport({
     );
     const needsInteger = hasNonBigintNumber || options.advanced?.database?.useNumberId && hasFkToId;
     if (needsInteger) {
-      imports.push("integer");
+      coreImports.push("integer");
     }
   } else {
-    imports.push("integer");
+    coreImports.push("integer");
   }
-  imports.push(useNumberId ? databaseType === "pg" ? "serial" : "" : "");
+  coreImports.push(useNumberId ? databaseType === "pg" ? "serial" : "" : "");
   if (hasJson) {
-    if (databaseType === "pg") imports.push("jsonb");
-    if (databaseType === "mysql") imports.push("json");
+    if (databaseType === "pg") coreImports.push("jsonb");
+    if (databaseType === "mysql") coreImports.push("json");
   }
-  return `import { ${imports.map((x) => x.trim()).filter((x) => x !== "").join(", ")} } from "drizzle-orm/${databaseType}-core";
+  const hasSQLiteTimestamp = databaseType === "sqlite" && Object.values(tables).some(
+    (table) => Object.values(table.fields).some(
+      (field) => field.type === "date" && field.defaultValue && typeof field.defaultValue === "function" && field.defaultValue.toString().includes("new Date()")
+    )
+  );
+  if (hasSQLiteTimestamp) {
+    rootImports.push("sql");
+  }
+  return `${rootImports.length > 0 ? `import { ${rootImports.join(", ")} } from "drizzle-orm";
+` : ""}import { ${coreImports.map((x) => x.trim()).filter((x) => x !== "").join(", ")} } from "drizzle-orm/${databaseType}-core";
 `;
 }
 function getModelName(modelName, options) {
@@ -2509,10 +2526,7 @@ const generatePrismaSchema = async ({
           builder.model(modelName).field("id", "String").attribute("id").attribute(`map("_id")`);
         } else {
           if (options.advanced?.database?.useNumberId) {
-            const col = builder.model(modelName).field("id", "Int").attribute("id");
-            if (provider !== "sqlite") {
-              col.attribute("default(autoincrement())");
-            }
+            builder.model(modelName).field("id", "Int").attribute("id").attribute("default(autoincrement())");
           } else {
             builder.model(modelName).field("id", "String").attribute("id");
           }
@@ -2547,8 +2561,6 @@ const generatePrismaSchema = async ({
           if (provider === "mongodb") {
             fieldBuilder.attribute(`map("_id")`);
           }
-        } else if (fieldName !== field) {
-          fieldBuilder.attribute(`map("${field}")`);
         }
         if (attr.unique) {
           builder.model(modelName).blockAttribute(`unique([${fieldName}])`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.4.0-beta.4",
+  "version": "1.4.0-beta.6",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
   "repository": {
@@ -56,7 +56,7 @@
     "tinyexec": "^0.3.2",
     "yocto-spinner": "^0.2.3",
     "zod": "^4.1.5",
-    "better-auth": "1.4.0-beta.4"
+    "better-auth": "1.4.0-beta.6"
   },
   "files": [
     "dist"