@famgia/omnify-laravel 0.0.42 → 0.0.44

package/dist/index.js

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

package/dist/plugin.cjs

@@ -1332,8 +1332,12 @@ function generateEntityBaseModel(schema, schemas, options, stubContent, authStub
   const properties = schema.properties ?? {};
   for (const [propName, propDef] of Object.entries(properties)) {
     const snakeName = toSnakeCase(propName);
-    const phpType = getPhpDocType(propDef, schemas);
-    docProperties.push(` * @property ${phpType} $${snakeName}`);
+    const typeDef = options.customTypes.get(propDef.type);
+    const isCompoundType = typeDef?.compound && typeDef.expand;
+    if (!isCompoundType) {
+      const phpType = getPhpDocType(propDef, schemas);
+      docProperties.push(` * @property ${phpType} $${snakeName}`);
+    }
     if (propDef.type === "Association") {
       const assoc = propDef;
       if (assoc.target) {
@@ -1364,14 +1368,19 @@ function generateEntityBaseModel(schema, schemas, options, stubContent, authStub
       const propWithOptions = propDef;
       const isFillable = propWithOptions.fillable !== false;
       const isHidden = propWithOptions.hidden === true;
-      const typeDef = options.customTypes.get(propDef.type);
-      const isCompoundType = typeDef?.compound && typeDef.expand;
-      if (isCompoundType && typeDef.expand) {
+      const typeDef2 = options.customTypes.get(propDef.type);
+      const isCompoundType2 = typeDef2?.compound && typeDef2.expand;
+      if (isCompoundType2 && typeDef2.expand) {
         const fieldOverrides = propWithOptions.fields ?? {};
-        for (const field of typeDef.expand) {
+        const basePropWithNullable = propDef;
+        for (const field of typeDef2.expand) {
           const suffixSnake = toSnakeCase(field.suffix);
           const fieldName = `${snakeName}_${suffixSnake}`;
           const override = fieldOverrides[field.suffix];
+          const fieldNullable = override?.nullable ?? basePropWithNullable.nullable ?? false;
+          const phpType = field.typescript?.type === "number" ? "int" : "string";
+          const nullSuffix = fieldNullable ? "|null" : "";
+          docProperties.push(` * @property ${phpType}${nullSuffix} $${fieldName}`);
           const fieldFillable = override?.fillable !== void 0 ? override.fillable : isFillable;
           if (fieldFillable) {
             fillable.push(`        '${fieldName}',`);
@@ -1393,8 +1402,8 @@ function generateEntityBaseModel(schema, schemas, options, stubContent, authStub
           hidden.push(`        '${snakeName}',`);
         }
       }
-      if (typeDef?.compound && typeDef.accessors) {
-        for (const accessor of typeDef.accessors) {
+      if (typeDef2?.compound && typeDef2.accessors) {
+        for (const accessor of typeDef2.accessors) {
           const accessorName = `${snakeName}_${toSnakeCase(accessor.name)}`;
           appends.push(`        '${accessorName}',`);
           const methodName = toPascalCase(accessorName);