@omnifyjp/ts 6.0.0 → 6.0.2

package/dist/php/model-generator.js

@@ -712,19 +712,19 @@ function buildRelations(schemaName, properties, propertyOrder, modelNamespace, r
         const target = prop['target'] ?? '';
         const ns = target ? resolveRelatedModelNamespace(target, modelNamespace, config, reader) : modelNamespace;
         const targetTableName = target ? reader.getTableName(target) : '';
-        // 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
+        // For ManyToMany, look up the explicit `kind: pivot` schema by pivotFor
+        // pair (user-authored filenames may predate the sorted-name convention)
+        // 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;
         let pivotTableName;
         if (relation === 'ManyToMany' && target) {
-            const pivotName = [schemaName, target].sort().join('');
-            const pivotSchema = reader.getSchema(pivotName);
+            const pivotMatch = reader.findPivotSchema(schemaName, target);
+            const pivotSchema = pivotMatch?.schema;
             const conventionalPivotTable = [toSnakeCase(schemaName), toSnakeCase(target)].sort().join('_');
-            const resolvedPivotTable = pivotSchema ? reader.getTableName(pivotName) : '';
+            const resolvedPivotTable = pivotMatch ? reader.getTableName(pivotMatch.name) : '';
             if (resolvedPivotTable && resolvedPivotTable !== conventionalPivotTable) {
                 pivotTableName = resolvedPivotTable;
             }

package/dist/php/schema-reader.d.ts

@@ -11,6 +11,13 @@ export declare class SchemaReader {
     getRoot(): SchemasJson;
     getSchemas(): Record<string, SchemaDefinition>;
     getSchema(name: string): SchemaDefinition | undefined;
+    /** Find a pivot by its logical pair, independent of the pivot schema's
+     * filename/name. User-authored pivots predate the sorted `<A><B>` naming
+     * convention and may be called `CouponBranch` for `[Coupon, Branch]`. */
+    findPivotSchema(a: string, b: string): {
+        name: string;
+        schema: SchemaDefinition;
+    } | undefined;
     getObjectSchemas(): Record<string, SchemaDefinition>;
     getVisibleObjectSchemas(): Record<string, SchemaDefinition>;
     getEnumSchemas(): Record<string, SchemaDefinition>;

package/dist/php/schema-reader.js

@@ -23,6 +23,20 @@ export class SchemaReader {
     getSchema(name) {
         return this.data.schemas?.[name];
     }
+    /** Find a pivot by its logical pair, independent of the pivot schema's
+     * filename/name. User-authored pivots predate the sorted `<A><B>` naming
+     * convention and may be called `CouponBranch` for `[Coupon, Branch]`. */
+    findPivotSchema(a, b) {
+        const wanted = [a, b].sort().join(':');
+        for (const [name, schema] of Object.entries(this.getSchemas())) {
+            if (schema.kind !== 'pivot' || schema.pivotFor?.length !== 2)
+                continue;
+            if ([...schema.pivotFor].sort().join(':') === wanted) {
+                return { name, schema };
+            }
+        }
+        return undefined;
+    }
     getObjectSchemas() {
         const result = {};
         for (const [name, schema] of Object.entries(this.getSchemas())) {

package/package.json

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