@omnifyjp/omnify 3.7.0 → 3.7.1

package/package.json

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

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

@@ -4,6 +4,24 @@
 import { toPascalCase, toSnakeCase, toCamelCase } from './naming-helper.js';
 import { toStoreRules, toUpdateRules, formatRules, hasRuleObject } from './type-mapper.js';
 import { baseFile, userFile, resolveModularBasePath, resolveModularBaseNamespace } from './types.js';
+/**
+ * Resolve the Laravel validation rule type ('integer', 'uuid', or 'string') for
+ * a foreign key column based on the target schema's primary key type.
+ *
+ * Mirrors the FK cast logic in `model-generator.ts` so validation rules and
+ * Eloquent casts agree about the wire format. Issue #36.
+ */
+function resolveFkRuleType(target, reader) {
+    if (!target)
+        return 'integer';
+    const targetSchema = reader.getSchema(target);
+    const id = targetSchema?.options?.id;
+    if (id === 'Uuid')
+        return 'uuid';
+    if (id === 'Ulid' || id === 'String')
+        return 'string';
+    return 'integer';
+}
 /** Generate Store/Update request classes for all project-owned visible object schemas. */
 export function generateRequests(reader, config) {
     const files = [];
@@ -78,9 +96,11 @@ function generateBaseRequest(name, schema, reader, config, action) {
             const relation = prop['relation'] ?? '';
             if (relation === 'ManyToOne') {
                 const snakeName = toSnakeCase(propName) + '_id';
+                const target = prop['target'] ?? '';
+                const targetIdType = resolveFkRuleType(target, reader);
                 const rules = isUpdate
-                    ? toUpdateRules(prop, tableName, modelRouteParam)
-                    : toStoreRules(prop, tableName);
+                    ? toUpdateRules(prop, tableName, modelRouteParam, targetIdType)
+                    : toStoreRules(prop, tableName, targetIdType);
                 rulesLines.push(`            '${snakeName}' => ${formatRules(rules)},`);
                 attributeKeys.push(snakeName);
             }

package/ts-dist/php/type-mapper.d.ts

@@ -6,10 +6,17 @@ type Rule = string | ['rule_in', string[]] | ['rule_unique_ignore', string, stri
 export declare function toCast(type: string, property?: Record<string, unknown>): string | null;
 /** Map Omnify property type to PHP doc type. */
 export declare function toPhpDocType(type: string, nullable?: boolean): string;
-/** Generate validation rules for a property (Store request). */
-export declare function toStoreRules(property: Record<string, unknown>, tableName: string): Rule[];
+/**
+ * Generate validation rules for a property (Store request).
+ *
+ * @param fkRuleType - For ManyToOne associations, the validation rule type
+ *   matching the target schema's primary key ('integer' for Int/BigInt PKs,
+ *   'uuid' for Uuid PKs, 'string' for Ulid/String PKs). Defaults to 'integer'
+ *   for backwards compatibility. Issue #36.
+ */
+export declare function toStoreRules(property: Record<string, unknown>, tableName: string, fkRuleType?: 'integer' | 'uuid' | 'string'): Rule[];
 /** Generate validation rules for a property (Update request). */
-export declare function toUpdateRules(property: Record<string, unknown>, tableName: string, modelRouteParam: string): Rule[];
+export declare function toUpdateRules(property: Record<string, unknown>, tableName: string, modelRouteParam: string, fkRuleType?: 'integer' | 'uuid' | 'string'): Rule[];
 /** Format validation rules as PHP code string. */
 export declare function formatRules(rules: Rule[]): string;
 /** Resolve enum values from property definition. */

package/ts-dist/php/type-mapper.js

@@ -70,8 +70,15 @@ const STRING_TYPES = new Set([
 ]);
 const NUMERIC_TYPES = new Set(['Int', 'BigInt', 'TinyInt', 'Float', 'Decimal']);
 const ARRAY_TYPES = new Set(['Json']);
-/** Generate validation rules for a property (Store request). */
-export function toStoreRules(property, tableName) {
+/**
+ * Generate validation rules for a property (Store request).
+ *
+ * @param fkRuleType - For ManyToOne associations, the validation rule type
+ *   matching the target schema's primary key ('integer' for Int/BigInt PKs,
+ *   'uuid' for Uuid PKs, 'string' for Ulid/String PKs). Defaults to 'integer'
+ *   for backwards compatibility. Issue #36.
+ */
+export function toStoreRules(property, tableName, fkRuleType = 'integer') {
     const type = property['type'] ?? 'String';
     // File type defaults to nullable (uploads are optional, attached separately)
     const nullable = property['nullable'] ?? (type === 'File' ? true : false);
@@ -143,7 +150,7 @@ export function toStoreRules(property, tableName) {
         case 'Association': {
             const relation = property['relation'] ?? '';
             if (relation === 'ManyToOne') {
-                rules.push('integer');
+                rules.push(fkRuleType);
                 const target = property['target'] ?? '';
                 if (target)
                     rules.push(`exists:${toTableName(target)},id`);
@@ -267,8 +274,8 @@ function mergeValidationRules(rules, vr, type) {
     }
 }
 /** Generate validation rules for a property (Update request). */
-export function toUpdateRules(property, tableName, modelRouteParam) {
-    let rules = toStoreRules(property, tableName);
+export function toUpdateRules(property, tableName, modelRouteParam, fkRuleType = 'integer') {
+    let rules = toStoreRules(property, tableName, fkRuleType);
     const unique = property['unique'] ?? false;
     // Replace 'required' with 'sometimes'
     rules = rules.map(r => r === 'required' ? 'sometimes' : r);