@famgia/omnify-laravel 0.0.49 → 0.0.51

package/dist/index.js

@@ -22,7 +22,7 @@ import {
   schemaToBlueprint,
   toColumnName,
   toTableName
-} from "./chunk-RP2B7BTK.js";
+} from "./chunk-FSVH5TYU.js";
 export {
   formatColumnMethod,
   formatForeignKey,

package/dist/plugin.cjs

@@ -106,7 +106,7 @@ function propertyToColumnMethod(propertyName, property, options = {}) {
     }
   }
   const baseProp = property;
-  if (baseProp.primaryKey) {
+  if (baseProp.primary) {
     modifiers.push({ method: "primary" });
   }
   if (baseProp.nullable) {
@@ -480,7 +480,7 @@ function schemaToBlueprint(schema, allSchemas, options = {}) {
   } else if (schema.properties) {
     const pkColumns = [];
     for (const [propName, property] of Object.entries(schema.properties)) {
-      if (property.primaryKey) {
+      if (property.primary) {
         pkColumns.push(toColumnName(propName));
       }
     }
@@ -1330,10 +1330,28 @@ function generateEntityBaseModel(schema, schemas, options, stubContent, authStub
   const className = toPascalCase(schema.name);
   const tableName = schema.options?.tableName ?? pluralize(toSnakeCase(schema.name));
   const isAuth = schema.options?.authenticatable ?? false;
-  const primaryKey = "id";
-  const idType = schema.options?.idType ?? "BigInt";
-  const isUuid = idType === "Uuid";
-  const isStringKey = idType === "Uuid" || idType === "String";
+  const hasAutoId2 = schema.options?.id !== false;
+  let primaryKey = "id";
+  let isStringKey = false;
+  let isUuid = false;
+  let isNonIncrementing = false;
+  if (hasAutoId2) {
+    const idType = schema.options?.idType ?? "BigInt";
+    isUuid = idType === "Uuid";
+    isStringKey = idType === "Uuid" || idType === "String";
+    isNonIncrementing = isUuid;
+  } else {
+    const properties2 = schema.properties ?? {};
+    for (const [propName, propDef] of Object.entries(properties2)) {
+      if (propDef.primary === true) {
+        primaryKey = toSnakeCase(propName);
+        const propType = propDef.type;
+        isStringKey = propType === "String" || propType === "Text" || propType === "Email";
+        isNonIncrementing = true;
+        break;
+      }
+    }
+  }
   const imports = [];
   const traits = [];
   const fillable = [];
@@ -1454,7 +1472,7 @@ ${docProperties.join("\n")}
     protected $keyType = 'string';
 
 ` : "";
-  const incrementing = isUuid ? `    /**
+  const incrementing = isNonIncrementing ? `    /**
      * Indicates if the IDs are auto-incrementing.
      */
     public $incrementing = false;