@omnifyjp/omnify 5.8.37 → 5.8.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/omnify",
-  "version": "5.8.37",
+  "version": "5.8.40",
   "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.8.37",
-    "@omnifyjp/omnify-darwin-x64": "5.8.37",
-    "@omnifyjp/omnify-linux-x64": "5.8.37",
-    "@omnifyjp/omnify-linux-arm64": "5.8.37",
-    "@omnifyjp/omnify-win32-x64": "5.8.37"
+    "@omnifyjp/omnify-darwin-arm64": "5.8.40",
+    "@omnifyjp/omnify-darwin-x64": "5.8.40",
+    "@omnifyjp/omnify-linux-x64": "5.8.40",
+    "@omnifyjp/omnify-linux-arm64": "5.8.40",
+    "@omnifyjp/omnify-win32-x64": "5.8.40"
   }
 }

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

@@ -20,9 +20,34 @@ namespace ${ns};
  */
 
 use Illuminate\\Database\\Eloquent\\Model;
+use Illuminate\\Database\\Eloquent\\Relations\\Relation;
 
 class BaseModel extends Model
 {
+    /**
+     * Resolve the polymorphic alias from the morph map, walking up the class
+     * hierarchy so application subclasses of a generated model still resolve.
+     *
+     * Omnify registers the morph map against the generated model classes. A
+     * project that subclasses one and instantiates the subclass would otherwise
+     * throw ClassMorphViolationException under an enforced morph map, because the
+     * subclass itself is absent from the map. Returning the nearest mapped
+     * ancestor's alias keeps stored type values stable across both layers.
+     */
+    public function getMorphClass(): string
+    {
+        $morphMap = Relation::morphMap();
+
+        for ($class = static::class; $class !== false; $class = get_parent_class($class)) {
+            $alias = array_search($class, $morphMap, true);
+
+            if ($alias !== false) {
+                return $alias;
+            }
+        }
+
+        return parent::getMorphClass();
+    }
 }
 `;
     const path = resolveSharedBasePath(config, 'Models', 'BaseModel.php', config.models.basePath);

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

@@ -116,6 +116,31 @@ function generateBaseModel(name, schema, reader, config) {
     const fileAccessors = hasFiles ? buildFileAccessors(properties, propertyOrder, modelNamespace) : '';
     const auditSection = buildAuditSection(options, reader, modelNamespace);
     const nestedSetMethod = buildNestedSetParentIdMethod(nestedSetParentColumn);
+    // Authenticatable base models extend Illuminate's Authenticatable, not
+    // BaseModel, so they cannot inherit its getMorphClass() override. Give them
+    // their own copy so application subclasses (e.g.
+    // `App\Models\User extends App\Models\Omnify\User`) still resolve under an
+    // enforced morph map instead of throwing ClassMorphViolationException. #106
+    const morphClassMethod = isAuthenticatable ? `
+    /**
+     * Resolve the polymorphic alias from the morph map, walking up the class
+     * hierarchy so application subclasses of this generated model still resolve.
+     */
+    public function getMorphClass(): string
+    {
+        $morphMap = \\Illuminate\\Database\\Eloquent\\Relations\\Relation::morphMap();
+
+        for ($class = static::class; $class !== false; $class = get_parent_class($class)) {
+            $alias = array_search($class, $morphMap, true);
+
+            if ($alias !== false) {
+                return $alias;
+            }
+        }
+
+        return parent::getMorphClass();
+    }
+` : '';
     let keyTypeSection = '';
     if (idType === 'Uuid' || idType === 'Ulid' || idType === 'String') {
         keyTypeSection = `
@@ -212,7 +237,7 @@ ${appends}    ];
         return [
 ${casts}        ];
     }
-${auditLogProperties}${relations}${accessors}${fileAccessors}${auditSection}${nestedSetMethod}
+${auditLogProperties}${relations}${accessors}${fileAccessors}${auditSection}${nestedSetMethod}${morphClassMethod}
 }
 `;
     // Replace placeholder class name so the file matches resolved className