@better-auth/cli 1.3.5-beta.3 → 1.3.5-beta.5

package/dist/index.mjs

@@ -588,11 +588,17 @@ const generatePrismaSchema = async ({
     for (const field in fields) {
       const attr = fields[field];
       if (attr.references) {
-        const referencedModel = capitalizeFirstLetter(attr.references.model);
-        if (!manyToManyRelations.has(referencedModel)) {
-          manyToManyRelations.set(referencedModel, /* @__PURE__ */ new Set());
+        const referencedOriginalModel = attr.references.model;
+        const referencedCustomModel = tables[referencedOriginalModel]?.modelName || referencedOriginalModel;
+        const referencedModelNameCap = capitalizeFirstLetter(
+          referencedCustomModel
+        );
+        if (!manyToManyRelations.has(referencedModelNameCap)) {
+          manyToManyRelations.set(referencedModelNameCap, /* @__PURE__ */ new Set());
         }
-        manyToManyRelations.get(referencedModel).add(capitalizeFirstLetter(table));
+        const currentCustomModel = tables[table]?.modelName || table;
+        const currentModelNameCap = capitalizeFirstLetter(currentCustomModel);
+        manyToManyRelations.get(referencedModelNameCap).add(currentModelNameCap);
       }
     }
   }
@@ -625,9 +631,10 @@ const generatePrismaSchema = async ({
           return isOptional ? "Int[]" : "Int[]";
         }
       };
+      const originalTableName = table;
+      const customModelName = tables[table]?.modelName || table;
+      const modelName = capitalizeFirstLetter(customModelName);
       const fields = tables[table]?.fields;
-      const originalTable = tables[table]?.modelName;
-      const modelName = capitalizeFirstLetter(originalTable || "");
       const prismaModel = builder.findByType("model", {
         name: modelName
       });
@@ -644,17 +651,18 @@ const generatePrismaSchema = async ({
       }
       for (const field in fields) {
         const attr = fields[field];
+        const fieldName = attr.fieldName || field;
         if (prismaModel) {
           const isAlreadyExist = builder.findByType("field", {
-            name: field,
+            name: fieldName,
             within: prismaModel.properties
           });
           if (isAlreadyExist) {
             continue;
           }
         }
-        builder.model(modelName).field(
-          field,
+        const fieldBuilder = builder.model(modelName).field(
+          fieldName,
           field === "id" && options.advanced?.database?.useNumberId ? getType({
             isBigint: false,
             isOptional: false,
@@ -665,10 +673,20 @@ const generatePrismaSchema = async ({
             type: attr.references?.field === "id" ? options.advanced?.database?.useNumberId ? "number" : "string" : attr.type
           })
         );
+        if (field === "id") {
+          fieldBuilder.attribute("id");
+          if (provider === "mongodb") {
+            fieldBuilder.attribute(`map("_id")`);
+          }
+        } else if (fieldName !== field) {
+          fieldBuilder.attribute(`map("${field}")`);
+        }
         if (attr.unique) {
-          builder.model(modelName).blockAttribute(`unique([${field}])`);
+          builder.model(modelName).blockAttribute(`unique([${fieldName}])`);
         }
         if (attr.references) {
+          const referencedOriginalModelName = attr.references.model;
+          const referencedCustomModelName = tables[referencedOriginalModelName]?.modelName || referencedOriginalModelName;
           let action = "Cascade";
           if (attr.references.onDelete === "no action") action = "NoAction";
           else if (attr.references.onDelete === "set null") action = "SetNull";
@@ -676,14 +694,14 @@ const generatePrismaSchema = async ({
             action = "SetDefault";
           else if (attr.references.onDelete === "restrict") action = "Restrict";
           builder.model(modelName).field(
-            `${attr.references.model.toLowerCase()}`,
-            capitalizeFirstLetter(attr.references.model)
+            `${referencedCustomModelName.toLowerCase()}`,
+            capitalizeFirstLetter(referencedCustomModelName)
           ).attribute(
-            `relation(fields: [${field}], references: [${attr.references.field}], onDelete: ${action})`
+            `relation(fields: [${fieldName}], references: [${attr.references.field}], onDelete: ${action})`
           );
         }
         if (!attr.unique && !attr.references && provider === "mysql" && attr.type === "string") {
-          builder.model(modelName).field(field).attribute("db.Text");
+          builder.model(modelName).field(fieldName).attribute("db.Text");
         }
       }
       if (manyToManyRelations.has(modelName)) {
@@ -702,15 +720,20 @@ const generatePrismaSchema = async ({
         name: "map",
         within: prismaModel?.properties
       });
-      if (originalTable !== modelName && !hasAttribute) {
-        builder.model(modelName).blockAttribute("map", originalTable);
+      const hasChanged = customModelName !== originalTableName;
+      if (!hasAttribute) {
+        builder.model(modelName).blockAttribute(
+          "map",
+          `${hasChanged ? customModelName : originalTableName}`
+        );
       }
     }
   });
+  const schemaChanged = schema.trim() !== schemaPrisma.trim();
   return {
-    code: schema.trim() === schemaPrisma.trim() ? "" : schema,
+    code: schemaChanged ? schema : "",
     fileName: filePath,
-    overwrite: true
+    overwrite: schemaPrismaExist && schemaChanged
   };
 };
 const getNewPrisma = (provider) => `generator client {
@@ -757,7 +780,6 @@ const generateSchema = (opts) => {
   );
   process.exit(1);
 };
-const getGenerator = generateSchema;
 
 async function generateAction(opts) {
   const options = z.object({
@@ -787,7 +809,7 @@ async function generateAction(opts) {
     process.exit(1);
   });
   const spinner = yoctoSpinner({ text: "preparing schema..." }).start();
-  const schema = await getGenerator({
+  const schema = await generateSchema({
     adapter,
     file: options.output,
     options: config
@@ -797,7 +819,7 @@ async function generateAction(opts) {
     logger.info("Your schema is already up to date.");
     process.exit(0);
   }
-  if (schema.append || schema.overwrite) {
+  if (schema.overwrite) {
     let confirm2 = options.y || options.yes;
     if (!confirm2) {
       const response = await prompts({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/cli",
-  "version": "1.3.5-beta.3",
+  "version": "1.3.5-beta.5",
   "description": "The CLI for Better Auth",
   "module": "dist/index.mjs",
   "repository": {
@@ -55,7 +55,7 @@
     "semver": "^7.7.1",
     "tinyexec": "^0.3.1",
     "yocto-spinner": "^0.1.1",
-    "better-auth": "1.3.5-beta.3"
+    "better-auth": "1.3.5-beta.5"
   },
   "peerDependencies": {
     "zod": "3.25.0 || ^4.0.0"