@omnifyjp/ts 5.0.1 → 5.0.2

package/dist/php/model-generator.js

@@ -504,7 +504,21 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
         const target = prop['target'] ?? '';
         const ns = target ? reader.resolveModelNamespace(target, modelNamespace) : modelNamespace;
         const targetTableName = target ? reader.getTableName(target) : '';
-        const result = buildRelation(propName, prop, ns, { sourceTableName, targetTableName });
+        // For ManyToMany, look up the explicit `kind: pivot` schema (the
+        // sorted PascalCase concat of source + target — auto-created on
+        // first generate) and pass its property names so belongsToMany
+        // emits `->withPivot('col1', 'col2')`. Without this, custom pivot
+        // columns the user added are unreachable through the relation.
+        const relation = prop['relation'] ?? '';
+        let pivotProperties;
+        if (relation === 'ManyToMany' && target) {
+            const pivotName = [schemaName, target].sort().join('');
+            const pivotSchema = reader.getSchema(pivotName);
+            if (pivotSchema?.properties) {
+                pivotProperties = Object.keys(pivotSchema.properties).map(toSnakeCase);
+            }
+        }
+        const result = buildRelation(propName, prop, ns, { sourceTableName, targetTableName, pivotProperties });
         if (result) {
             methods.push('\n' + result.method);
             declaredMethods.add(toCamelCase(propName));

package/dist/php/relation-builder.d.ts

@@ -8,6 +8,12 @@ interface RelationResult {
 interface RelationContext {
     sourceTableName: string;
     targetTableName: string;
+    /** Property names declared on the explicit `kind: pivot` schema for
+     * this M2M (e.g. `["position", "notes"]`). Surfaced in the generated
+     * `belongsToMany()` chain via `->withPivot(...)` so consumers can
+     * read those columns through the relation. Empty / undefined when
+     * the user has not added custom columns to the pivot schema. */
+    pivotProperties?: string[];
 }
 /** Build Eloquent relation method PHP code. */
 export declare function buildRelation(propName: string, property: Record<string, unknown>, modelNamespace: string, context?: RelationContext): RelationResult | null;

package/dist/php/relation-builder.js

@@ -128,12 +128,15 @@ function belongsToMany(propName, property, target, ns, context) {
         joinTable = generatePivotTableName(context.sourceTableName, context.targetTableName);
     }
     const methodName = toCamelCase(propName);
-    const pivotFields = property['pivotFields'] ?? {};
     const fqcn = `\\${ns}\\${target}`;
     let chain = `$this->belongsToMany(${fqcn}::class, '${joinTable}')`;
-    const fieldKeys = Object.keys(pivotFields);
-    if (fieldKeys.length > 0) {
-        const fields = fieldKeys.map(k => `'${toSnakeCase(k)}'`).join(', ');
+    // withPivot for every column declared on the explicit `kind: pivot`
+    // schema (resolved upstream and passed via context.pivotProperties).
+    // The legacy `pivotFields:` block on the M2M property was removed in
+    // 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(', ');
         chain += `\n            ->withPivot(${fields})`;
     }
     chain += `\n            ->withTimestamps()`;

package/package.json

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