@omnifyjp/omnify 1.1.6 → 1.1.7

package/package.json

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

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

@@ -1,7 +1,7 @@
 /**
- * Port of BaseModelGenerator.php — generates abstract BaseModel with morph map.
+ * Generates the abstract BaseModel class.
+ * Morph map registration is handled exclusively by OmnifyServiceProvider.
  */
-import { SchemaReader } from './schema-reader.js';
 import type { GeneratedFile, PhpConfig } from './types.js';
-/** Generate the abstract BaseModel class with morph map. */
-export declare function generateBaseModel(reader: SchemaReader, config: PhpConfig): GeneratedFile[];
+/** Generate the abstract BaseModel class. */
+export declare function generateBaseModel(config: PhpConfig): GeneratedFile[];

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

@@ -1,30 +1,17 @@
 /**
- * Port of BaseModelGenerator.php — generates abstract BaseModel with morph map.
+ * Generates the abstract BaseModel class.
+ * Morph map registration is handled exclusively by OmnifyServiceProvider.
  */
-import { toPascalCase } from './naming-helper.js';
 import { baseFile } from './types.js';
-/** Generate the abstract BaseModel class with morph map. */
-export function generateBaseModel(reader, config) {
+/** Generate the abstract BaseModel class. */
+export function generateBaseModel(config) {
     const baseNamespace = config.models.baseNamespace;
-    const modelNamespace = config.models.namespace;
-    // Build morph map entries from project-owned visible object schemas
-    const morphMap = {};
-    for (const name of Object.keys(reader.getProjectVisibleObjectSchemas())) {
-        const modelName = toPascalCase(name);
-        morphMap[modelName] = `\\${modelNamespace}\\${modelName}::class`;
-    }
-    // Sort for consistent output
-    const sortedKeys = Object.keys(morphMap).sort();
-    const morphEntries = sortedKeys
-        .map(k => `        '${k}' => ${morphMap[k]},`)
-        .join('\n');
     const content = `<?php
 
 namespace ${baseNamespace};
 
 /**
  * Base model class for all Omnify-generated models.
- * Contains model mapping for polymorphic relations.
  *
  * DO NOT EDIT - This file is auto-generated by Omnify.
  * Any changes will be overwritten on next generation.
@@ -33,35 +20,9 @@ namespace ${baseNamespace};
  */
 
 use Illuminate\\Database\\Eloquent\\Model;
-use Illuminate\\Database\\Eloquent\\Relations\\Relation;
 
 abstract class BaseModel extends Model
 {
-    /**
-     * Model class map for polymorphic relations.
-     */
-    protected static array $modelMap = [
-${morphEntries}
-    ];
-
-    /**
-     * Boot the model and register morph map.
-     */
-    protected static function boot(): void
-    {
-        parent::boot();
-
-        // Register morph map for polymorphic relations
-        Relation::enforceMorphMap(static::$modelMap);
-    }
-
-    /**
-     * Get the model class for a given morph type.
-     */
-    public static function getModelClass(string $morphType): ?string
-    {
-        return static::$modelMap[$morphType] ?? null;
-    }
 }
 `;
     return [

package/ts-dist/php/index.js

@@ -29,7 +29,7 @@ export function generatePhp(data, overrides) {
     const config = derivePhpConfig(overrides);
     const files = [];
     // Infrastructure files
-    files.push(...generateBaseModel(reader, config));
+    files.push(...generateBaseModel(config));
     files.push(...generateTrait(config));
     files.push(...generateServiceProvider(reader, config));
     // Per-schema files

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

@@ -167,6 +167,12 @@ function generateUserModel(name, config) {
     const factoryNamespace = config.factories.namespace;
     const content = `<?php
 
+/**
+ * ${modelName} Model
+ *
+ * SAFE TO EDIT - This file is never overwritten by Omnify.
+ */
+
 namespace ${modelNamespace};
 
 use ${baseNamespace}\\${modelName}BaseModel;
@@ -174,23 +180,12 @@ use ${factoryNamespace}\\${modelName}Factory;
 use Illuminate\\Database\\Eloquent\\Factories\\HasFactory;
 
 /**
- * ${modelName} Model
- *
- * This file is generated once and can be customized.
- * Add your custom methods and logic here.
+ * ${modelName} — add project-specific model logic here.
  */
 class ${modelName} extends ${modelName}BaseModel
 {
     use HasFactory;
 
-    /**
-     * Create a new model instance.
-     */
-    public function __construct(array $attributes = [])
-    {
-        parent::__construct($attributes);
-    }
-
     /**
      * Create a new factory instance for the model.
      */
@@ -199,7 +194,7 @@ class ${modelName} extends ${modelName}BaseModel
         return ${modelName}Factory::new();
     }
 
-    // Add your custom methods here
+    //
 }
 `;
     return userFile(`${config.models.path}/${modelName}.php`, content);

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

@@ -113,6 +113,35 @@ use ${localesClass};
 
 abstract class ${modelName}${action}RequestBase extends FormRequest
 {
+    /**
+     * Determine if the user is authorized to make this request.
+     * Override this method in the concrete request class to add authorization logic.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \\Illuminate\\Contracts\\Validation\\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+        return $this->schemaRules();
+    }
+
+    /**
+     * Get custom attributes for validator errors.
+     *
+     * @return array<string, string>
+     */
+    public function attributes(): array
+    {
+        return $this->schemaAttributes();
+    }
+
     /**
      * Get the schema-defined validation rules.
      *
@@ -167,54 +196,19 @@ function generateUserRequest(name, config, action) {
 
 namespace ${requestNamespace};
 
-use Illuminate\\Http\\Request;
 use ${baseNamespace}\\${modelName}${action}RequestBase;
 
+/**
+ * ${modelName}${action}Request — add project-specific authorization and validation here.
+ *
+ * Inherited from base:
+ *   - authorize(): bool  (returns true — override for auth checks)
+ *   - rules(): array     (returns schemaRules() — override to add custom rules)
+ *   - attributes(): array (returns schemaAttributes() — override to rename fields)
+ */
 class ${modelName}${action}Request extends ${modelName}${action}RequestBase
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, \\Illuminate\\Contracts\\Validation\\ValidationRule|array<mixed>|string>
-     */
-    public function rules(): array
-    {
-        return array_merge($this->schemaRules(), [
-            // Custom rules here
-        ]);
-    }
-
-    /**
-     * Get custom attributes for validator errors.
-     *
-     * @return array<string, string>
-     */
-    public function attributes(): array
-    {
-        return array_merge($this->schemaAttributes(), [
-            // Custom attributes here
-        ]);
-    }
-
-    /**
-     * Get the error messages for the defined validation rules.
-     *
-     * @return array<string, string>
-     */
-    public function messages(): array
-    {
-        return [
-            // Custom messages here
-        ];
-    }
+    //
 }
 `;
     return userFile(`${config.requests.path}/${modelName}${action}Request.php`, content);

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

@@ -89,6 +89,16 @@ use Illuminate\\Http\\Resources\\Json\\JsonResource;
 
 class ${modelName}ResourceBase extends JsonResource
 {
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return $this->schemaArray($request);
+    }
+
     /**
      * Transform the schema-defined fields into an array.
      *
@@ -118,34 +128,17 @@ function generateUserResource(name, config) {
 
 namespace ${resourceNamespace};
 
-use Illuminate\\Http\\Request;
 use ${baseNamespace}\\${modelName}ResourceBase;
 
+/**
+ * ${modelName}Resource — add project-specific serialization here.
+ *
+ * Inherited from base:
+ *   - toArray(Request \\$request): array  (returns schemaArray(\\$request) — override to add fields)
+ */
 class ${modelName}Resource extends ${modelName}ResourceBase
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return array_merge($this->schemaArray($request), [
-            // Custom fields here
-        ]);
-    }
-
-    /**
-     * Get additional data that should be returned with the resource array.
-     *
-     * @return array<string, mixed>
-     */
-    public function with(Request $request): array
-    {
-        return [
-            // Additional metadata here
-        ];
-    }
+    //
 }
 `;
     return userFile(`${config.resources.path}/${modelName}Resource.php`, content);