@better-auth/cli 1.2.6-beta.6 → 1.2.6

package/dist/index.mjs

@@ -404,20 +404,33 @@ const generateDrizzleSchema = async ({
   const tables = getAuthTables(options);
   const filePath = file || "./auth-schema.ts";
   const databaseType = adapter.options?.provider;
-  const usePlural = adapter.options?.usePlural;
-  const timestampAndBoolean = databaseType !== "sqlite" ? "timestamp, boolean" : "";
-  const int = databaseType === "mysql" ? "int" : "integer";
-  const hasBigint = Object.values(tables).some(
-    (table) => Object.values(table.fields).some((field) => field.bigint)
-  );
-  const bigint = databaseType !== "sqlite" ? "bigint" : "";
-  const text = databaseType === "mysql" ? "varchar, text" : "text";
-  let code = `import { ${databaseType}Table, ${text}, ${int}${hasBigint ? `, ${bigint}` : ""}, ${timestampAndBoolean} } from "drizzle-orm/${databaseType}-core";
-			`;
+  if (!databaseType) {
+    throw new Error(
+      `Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`
+    );
+  }
   const fileExist = existsSync(filePath);
-  for (const table in tables) {
+  let code = generateImport({ databaseType, tables });
+  for (const tableKey in tables) {
     let getType = function(name, field) {
+      if (!databaseType) {
+        throw new Error(
+          `Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`
+        );
+      }
       name = convertToSnakeCase(name);
+      if (field.references?.field === "id") {
+        if (options.advanced?.database?.useNumberId) {
+          if (databaseType === "pg") {
+            return `serial('${name}').primaryKey()`;
+          } else if (databaseType === "mysql") {
+            return `int('${name}').autoIncrement().primaryKey()`;
+          } else {
+            return `integer({ mode: 'number' }).primaryKey({ autoIncrement: true })`;
+          }
+        }
+        return databaseType === "pg" ? `uuid('${name}')` : `text('${name}')`;
+      }
       const type = field.type;
       const typeMap = {
         string: {
@@ -439,20 +452,45 @@ const generateDrizzleSchema = async ({
           sqlite: `integer('${name}', { mode: 'timestamp' })`,
           pg: `timestamp('${name}')`,
           mysql: `timestamp('${name}')`
+        },
+        "number[]": {
+          sqlite: `integer('${name}').array()`,
+          pg: field.bigint ? `bigint('${name}', { mode: 'number' }).array()` : `integer('${name}').array()`,
+          mysql: field.bigint ? `bigint('${name}', { mode: 'number' }).array()` : `int('${name}').array()`
+        },
+        "string[]": {
+          sqlite: `text('${name}').array()`,
+          pg: `text('${name}').array()`,
+          mysql: `text('${name}').array()`
         }
       };
-      return typeMap[type][databaseType || "sqlite"];
+      return typeMap[type][databaseType];
     };
-    const modelName = usePlural ? `${tables[table].modelName}s` : tables[table].modelName;
-    const fields = tables[table].fields;
-    const id = databaseType === "mysql" ? `varchar("id", { length: 36 }).primaryKey()` : `text("id").primaryKey()`;
+    const table = tables[tableKey];
+    const modelName = getModelName(table.modelName, adapter.options);
+    const fields = table.fields;
+    let id = "";
+    if (options.advanced?.database?.useNumberId) {
+      id = `int("id").autoincrement.primaryKey()`;
+    } else {
+      if (databaseType === "mysql") {
+        id = `varchar('id', { length: 36 }).primaryKey()`;
+      } else if (databaseType === "pg") {
+        id = `uuid('id').primaryKey()`;
+      } else {
+        id = `text('id').primaryKey()`;
+      }
+    }
     const schema = `export const ${modelName} = ${databaseType}Table("${convertToSnakeCase(
       modelName
     )}", {
 					id: ${id},
 					${Object.keys(fields).map((field) => {
       const attr = fields[field];
-      return `${field}: ${getType(field, attr)}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${attr.references ? `.references(()=> ${usePlural ? `${attr.references.model}s` : attr.references.model}.${attr.references.field}, { onDelete: 'cascade' })` : ""}`;
+      return `${field}: ${getType(field, attr)}${attr.required ? ".notNull()" : ""}${attr.unique ? ".unique()" : ""}${attr.references ? `.references(()=> ${getModelName(
+        attr.references.model,
+        adapter.options
+      )}.${attr.references.field}, { onDelete: '${attr.references.onDelete || "cascade"}' })` : ""}`;
     }).join(",\n ")}
 				});`;
     code += `
@@ -465,6 +503,27 @@ ${schema}
     overwrite: fileExist
   };
 };
+function generateImport({
+  databaseType,
+  tables
+}) {
+  let imports = [];
+  const hasBigint = Object.values(tables).some(
+    (table) => Object.values(table.fields).some((field) => field.bigint)
+  );
+  imports.push(`${databaseType}Table`);
+  imports.push(
+    databaseType === "mysql" ? "varchar, text" : databaseType === "pg" ? "uuid, text" : "text"
+  );
+  imports.push(hasBigint ? databaseType !== "sqlite" ? "bigint" : "" : "");
+  imports.push(databaseType !== "sqlite" ? "timestamp, boolean" : "");
+  imports.push(databaseType === "mysql" ? "int" : "integer");
+  return `import { ${imports.map((x) => x.trim()).filter((x) => x !== "").join(", ")} } from "drizzle-orm/${databaseType}-core";
+`;
+}
+function getModelName(modelName, options) {
+  return options?.usePlural ? `${modelName}s` : modelName;
+}
 
 const generatePrismaSchema = async ({
   adapter,
@@ -500,7 +559,11 @@ const generatePrismaSchema = async ({
   }
   const schema = produceSchema(schemaPrisma, (builder) => {
     for (const table in tables) {
-      let getType = function(type, isOptional, isBigint) {
+      let getType = function({
+        isBigint,
+        isOptional,
+        type
+      }) {
         if (type === "string") {
           return isOptional ? "String?" : "String";
         }
@@ -533,7 +596,11 @@ const generatePrismaSchema = async ({
         if (provider === "mongodb") {
           builder.model(modelName).field("id", "String").attribute("id").attribute(`map("_id")`);
         } else {
-          builder.model(modelName).field("id", "String").attribute("id");
+          if (options.advanced?.database?.useNumberId) {
+            builder.model(modelName).field("id", "Int").attribute("id").attribute("default(autoincrement())");
+          } else {
+            builder.model(modelName).field("id", "String").attribute("id");
+          }
         }
       }
       for (const field in fields) {
@@ -549,17 +616,31 @@ const generatePrismaSchema = async ({
         }
         builder.model(modelName).field(
           field,
-          getType(attr.type, !attr?.required, attr?.bigint || false)
+          field === "id" && options.advanced?.database?.useNumberId ? getType({
+            isBigint: false,
+            isOptional: false,
+            type: "number"
+          }) : getType({
+            isBigint: attr?.bigint || false,
+            isOptional: !attr?.required,
+            type: attr.references?.field === "id" ? options.advanced?.database?.useNumberId ? "number" : "string" : attr.type
+          })
         );
         if (attr.unique) {
           builder.model(modelName).blockAttribute(`unique([${field}])`);
         }
         if (attr.references) {
+          let action = "Cascade";
+          if (attr.references.onDelete === "no action") action = "NoAction";
+          else if (attr.references.onDelete === "set null") action = "SetNull";
+          else if (attr.references.onDelete === "set default")
+            action = "SetDefault";
+          else if (attr.references.onDelete === "restrict") action = "Restrict";
           builder.model(modelName).field(
             `${attr.references.model.toLowerCase()}`,
             capitalizeFirstLetter(attr.references.model)
           ).attribute(
-            `relation(fields: [${field}], references: [${attr.references.field}], onDelete: Cascade)`
+            `relation(fields: [${field}], references: [${attr.references.field}], onDelete: ${action})`
           );
         }
         if (!attr.unique && !attr.references && provider === "mysql" && attr.type === "string") {
@@ -589,7 +670,8 @@ const generatePrismaSchema = async ({
   });
   return {
     code: schema.trim() === schemaPrisma.trim() ? "" : schema,
-    fileName: filePath
+    fileName: filePath,
+    overwrite: true
   };
 };
 const getNewPrisma = (provider) => `generator client {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.2.6-beta.6",
+  "version": "1.2.6",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
   "repository": {
@@ -46,7 +46,7 @@
     "tinyexec": "^0.3.1",
     "yocto-spinner": "^0.1.1",
     "zod": "^3.23.8",
-    "better-auth": "1.2.6-beta.6"
+    "better-auth": "1.2.6"
   },
   "files": [
     "dist"