@omnifyjp/ts 6.7.15 → 6.7.16

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

@@ -31,10 +31,11 @@ export declare function getReturnType(relation: string): string;
 /**
  * Resolve the child-table FK column for a OneToMany when `mappedBy` / `inversedBy`
  * is absent. Prefer the single inverse ManyToOne on the target (omnify-go#166
- * `column:` override included); if zero or multiple matches, fall back to the
- * owning schema name — not the plural property name. Issue #237.
+ * `column:` override included); if zero matches, fall back to the owning schema
+ * name (external targets). If two or more matches, throw — omnify-go#242.
+ * Issue #237.
  */
-export declare function resolveHasManyForeignKey(_propName: string, target: string, context?: RelationContext): string;
+export declare function resolveHasManyForeignKey(propName: string, target: string, context?: RelationContext): string;
 /**
  * Build a chained `->orderBy('col', 'dir')` PHP fragment from an OrderByList.
  * Returns an empty string if no ordering is configured. Issue #40.

package/dist/php/relation-builder.js

@@ -116,10 +116,11 @@ function hasMany(propName, property, target, ns, context) {
 /**
  * Resolve the child-table FK column for a OneToMany when `mappedBy` / `inversedBy`
  * is absent. Prefer the single inverse ManyToOne on the target (omnify-go#166
- * `column:` override included); if zero or multiple matches, fall back to the
- * owning schema name — not the plural property name. Issue #237.
+ * `column:` override included); if zero matches, fall back to the owning schema
+ * name (external targets). If two or more matches, throw — omnify-go#242.
+ * Issue #237.
  */
-export function resolveHasManyForeignKey(_propName, target, context) {
+export function resolveHasManyForeignKey(propName, target, context) {
     const reader = context?.reader;
     const owningSchemaName = context?.sourceSchemaName;
     if (reader && owningSchemaName && target) {
@@ -127,9 +128,13 @@ export function resolveHasManyForeignKey(_propName, target, context) {
         if (matches.length === 1) {
             return matches[0];
         }
+        if (matches.length >= 2) {
+            const columnList = matches.join(', ');
+            throw new Error(`${owningSchemaName}.${propName}: target ${target} has ${matches.length} ManyToOne associations back to ${owningSchemaName} (${columnList}) — set mappedBy: on the OneToMany to pick one`);
+        }
         return toFkColumnName(owningSchemaName);
     }
-    return toFkColumnName(_propName);
+    return toFkColumnName(propName);
 }
 function findInverseManyToOneFkColumns(reader, targetSchemaName, owningSchemaName) {
     const targetSchema = reader.getSchema(targetSchemaName);

package/package.json

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