@omnifyjp/ts 5.9.20 → 5.9.21

package/dist/php/model-generator.js

@@ -723,7 +723,9 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
             const pivotName = [schemaName, target].sort().join('');
             const pivotSchema = reader.getSchema(pivotName);
             if (pivotSchema?.properties) {
-                pivotProperties = Object.keys(pivotSchema.properties).map(toSnakeCase);
+                pivotProperties = Object.entries(pivotSchema.properties).map(([propName, prop]) => prop.type === 'Association' && !prop.mappedBy
+                    ? prop.column || toFkColumnName(propName)
+                    : toSnakeCase(propName));
             }
         }
         const result = buildRelation(propName, prop, ns, { sourceTableName, targetTableName, pivotProperties });

package/dist/php/policy-generator.js

@@ -126,6 +126,11 @@ function generateBasePolicyClass(name, schema, reader, config) {
         methods.push(buildMethod('forceDelete', modelName, true, forceDeleteBody));
     }
     const cidrHelper = needsCidrHelper ? buildCidrHelper() : '';
+    const imports = [...new Set([
+            `use ${modelNamespace}\\${modelName};`,
+            'use App\\Models\\User;',
+            'use Illuminate\\Auth\\Access\\HandlesAuthorization;',
+        ])].join('\n');
     const content = `<?php
 
 namespace ${baseNamespace};
@@ -137,9 +142,7 @@ namespace ${baseNamespace};
  * @generated by omnify
  */
 
-use ${modelNamespace}\\${modelName};
-use App\\Models\\User;
-use Illuminate\\Auth\\Access\\HandlesAuthorization;
+${imports}
 
 class ${modelName}PolicyBase
 {

package/dist/php/relation-builder.js

@@ -135,7 +135,9 @@ function belongsToMany(propName, property, target, ns, context) {
     // v5.0.0; pivot columns now live on the pivot schema itself.
     const pivotCols = context?.pivotProperties ?? [];
     if (pivotCols.length > 0) {
-        const fields = pivotCols.map(k => `'${toSnakeCase(k)}'`).join(', ');
+        // Callers pass physical column names. Association properties on an
+        // explicit pivot are resolved to `<name>_id` before reaching here.
+        const fields = pivotCols.map(k => `'${k}'`).join(', ');
         chain += `\n            ->withPivot(${fields})`;
     }
     chain += `\n            ->withTimestamps()`;

package/dist/types.d.ts

@@ -338,6 +338,8 @@ export interface PropertyDefinition {
     readonly morphName?: string;
     readonly joinTable?: string;
     readonly mappedBy?: string;
+    /** Physical FK column override for owning ManyToOne/OneToOne associations. */
+    readonly column?: string;
     readonly orderBy?: readonly OrderByItem[];
     readonly useCurrent?: boolean;
     readonly deprecated?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omnifyjp/ts",
-  "version": "5.9.20",
+  "version": "5.9.21",
   "description": "TypeScript model type generator from Omnify schemas.json",
   "type": "module",
   "main": "dist/index.js",