@omnifyjp/omnify 5.9.1 → 5.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "5.9.1",
+  "version": "5.9.2",
   "description": "Schema-driven code generation for Laravel, TypeScript, and SQL",
   "license": "MIT",
   "repository": {
@@ -36,10 +36,10 @@
     "zod": "^3.24.0"
   },
   "optionalDependencies": {
-    "@omnifyjp/omnify-darwin-arm64": "5.9.1",
-    "@omnifyjp/omnify-darwin-x64": "5.9.1",
-    "@omnifyjp/omnify-linux-x64": "5.9.1",
-    "@omnifyjp/omnify-linux-arm64": "5.9.1",
-    "@omnifyjp/omnify-win32-x64": "5.9.1"
+    "@omnifyjp/omnify-darwin-arm64": "5.9.2",
+    "@omnifyjp/omnify-darwin-x64": "5.9.2",
+    "@omnifyjp/omnify-linux-x64": "5.9.2",
+    "@omnifyjp/omnify-linux-arm64": "5.9.2",
+    "@omnifyjp/omnify-win32-x64": "5.9.2"
   }
 }

package/ts-dist/php/model-generator.js

@@ -115,7 +115,7 @@ function generateBaseModel(name, schema, reader, config) {
     // the generated base model.
     const hasAuditLog = reader.isAuditLogEnabled(name);
     const imports = buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable, hasTranslatable, properties, needsUuidTrait, needsUlidTrait, hasNestedSet, config.nestedset.namespace, hasFiles, modelNamespace, localesNamespace, traitsNamespace, sharedModelsNamespace, config, hasAuditLog);
-    const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder);
+    const docProperties = buildDocProperties(properties, expandedProperties, propertyOrder, reader, config);
     const baseClass = isAuthenticatable ? 'Authenticatable' : 'BaseModel';
     const implementsClause = hasTranslatable ? ' implements TranslatableContract' : '';
     const traits = buildTraits(hasSoftDelete, isAuthenticatable, hasTranslatable, needsUuidTrait, needsUlidTrait, hasNestedSet, hasFiles, hasAuditLog);
@@ -409,8 +409,14 @@ function buildImports(baseNamespace, modelName, hasSoftDelete, isAuthenticatable
     }
     return lines.join('\n') + '\n';
 }
-function buildDocProperties(properties, expandedProperties, propertyOrder) {
+function buildDocProperties(properties, expandedProperties, propertyOrder, reader, config) {
     const lines = [];
+    // Mirror buildCasts: EnumRef columns are cast to their generated enum class,
+    // so document them with that class (not `string`) — otherwise static analysis
+    // sees a string and rejects `$model->col->value` / enum comparisons.
+    const globalEnumNs = config
+        ? resolveGlobalEnumNamespace(config, config.models.namespace)
+        : '';
     for (const propName of propertyOrder) {
         const prop = properties[propName];
         if (!prop)
@@ -445,6 +451,16 @@ function buildDocProperties(properties, expandedProperties, propertyOrder) {
         }
         const nullable = prop['nullable'] ?? false;
         const snakeName = toSnakeCase(propName);
+        // EnumRef → document the generated enum class (fully-qualified, matching the
+        // cast) only when the referenced enum schema exists; else fall through.
+        if (type === 'EnumRef') {
+            const enumName = prop['enum'];
+            if (typeof enumName === 'string' && reader.getSchema(enumName)?.kind === 'enum' && globalEnumNs) {
+                const enumType = `\\${globalEnumNs}\\${enumClassName(enumName)}`;
+                lines.push(` * @property ${nullable ? `${enumType}|null` : enumType} $${snakeName}`);
+                continue;
+            }
+        }
         const phpDocType = toPhpDocType(type, nullable);
         lines.push(` * @property ${phpDocType} $${snakeName}`);
     }