@vantreeseba/drizzle-graphql 10.0.2 → 10.0.3

package/dist/index.cjs

@@ -3178,16 +3178,23 @@ const extractRelationsParams = (relationMap, tables, tableName, info, typeName,
 	if (!info) return;
 	const relationsForTable = relationMap[tableName];
 	if (!relationsForTable) return;
-	const baseField = Object.entries(info.fieldsByTypeName).find(([key, _value]) => key === typeName)?.[1];
+	const baseField = info.fieldsByTypeName[typeName];
 	if (!baseField) return;
+	const selectionsByName = /* @__PURE__ */ new Map();
+	for (const selection of Object.values(baseField)) {
+		const selections = selectionsByName.get(selection.name);
+		if (selections) selections.push(selection);
+		else selectionsByName.set(selection.name, [selection]);
+	}
 	const args = {};
 	for (const [relName, relEntry] of Object.entries(relationsForTable)) {
 		const { targetTableName, targetPkNames } = relEntry;
 		const relTypeName = resolveObjectTypeName(targetTableName, typeNameMapper, resolveName);
-		const field = baseField[relName] ?? Object.values(baseField).find((f) => f.name === relName);
-		if (!field) continue;
-		if (Object.values(baseField).reduce((n, f) => n + (f.name === relName ? 1 : 0), 0) > 1) continue;
-		const relFieldSelection = (field?.fieldsByTypeName)?.[relTypeName];
+		const selections = selectionsByName.get(relName);
+		if (!selections) continue;
+		const field = selections[0];
+		if (selections.length > 1) continue;
+		const relFieldSelection = field.fieldsByTypeName[relTypeName];
 		if (!relFieldSelection) continue;
 		const eagerArgs = field.args;
 		if (!(0, drizzle_orm.is)(relEntry.relation ?? relEntry, drizzle_orm.One) && (eagerArgs?.after != null || !!(eagerArgs?.distinct)?.length || isCursorFieldSelected(relFieldSelection, tables[targetTableName]))) continue;
@@ -3199,8 +3206,7 @@ const extractRelationsParams = (relationMap, tables, tableName, info, typeName,
 		});
 		const thisRecord = {};
 		thisRecord.columns = columns;
-		const relationField = Object.values(baseField).find((e) => e.name === relName);
-		const relationArgs = (0, drizzle_orm.is)(relEntry.relation, drizzle_orm.One) ? relationField?.args : relationField && withDefaultOrderBy(relationField.args ?? {}, targetTableName, defaultOrderBy);
+		const relationArgs = (0, drizzle_orm.is)(relEntry.relation, drizzle_orm.One) ? field.args : withDefaultOrderBy(field.args ?? {}, targetTableName, defaultOrderBy);
 		const offset = relationArgs?.offset ?? void 0;
 		const limit = (0, drizzle_orm.is)(relEntry.relation, drizzle_orm.One) ? relationArgs?.limit ?? void 0 : applyLimitPolicy(relationArgs?.limit, limits?.(targetTableName), {
 			table: targetTableName,
@@ -3215,7 +3221,7 @@ const extractRelationsParams = (relationMap, tables, tableName, info, typeName,
 		thisRecord.orderBy = relationArgs?.orderBy ? (aliasedTable) => extractOrderBy(aliasedTable, relationArgs.orderBy, relationFilterCtx(filterCtx, targetTableName), relWhere) : hasPagination && pkNames.length ? (aliasedTable) => primaryKeyOrderExprs(aliasedTable, pkNames) : void 0;
 		thisRecord.offset = offset;
 		thisRecord.limit = limit;
-		thisRecord.with = extractRelationsParams(relationMap, tables, targetTableName, relationField, relTypeName, options);
+		thisRecord.with = extractRelationsParams(relationMap, tables, targetTableName, field, relTypeName, options);
 		args[relName] = thisRecord;
 	}
 	return args;