fix(codegen): use singular noun (not by-id query name) as findFirst/findOne result key

Author: yyyyaaa

graphql/codegen/src/__tests__/codegen/__snapshots__/model-generator.test.ts.snap

@@ -306,7 +306,7 @@ export class OrganizationModel {
   findFirst<S extends OrganizationSelect>(args: FindFirstArgs<S, OrganizationFilter, OrganizationsOrderBy> & {
     select: S;
   } & StrictSelect<S, OrganizationSelect>): QueryBuilder<{
-    organizationById: InferSelectResult<OrganizationWithRelations, S> | null;
+    organization: InferSelectResult<OrganizationWithRelations, S> | null;
   }> {
     const {
       document,
@@ -319,23 +319,23 @@ export class OrganizationModel {
       client: this.client,
       operation: "query",
       operationName: "Organization",
-      fieldName: "organizationById",
+      fieldName: "organization",
       document,
       variables,
       transform: (data: {
         allOrganizations?: {
           nodes?: InferSelectResult<OrganizationWithRelations, S>[];
         };
       }) => ({
-        "organizationById": data.allOrganizations?.nodes?.[0] ?? null
+        "organization": data.allOrganizations?.nodes?.[0] ?? null
       })
     });
   }
   findOne<S extends OrganizationSelect>(args: {
     id: string;
     select: S;
   } & StrictSelect<S, OrganizationSelect>): QueryBuilder<{
-    organizationById: InferSelectResult<OrganizationWithRelations, S> | null;
+    organization: InferSelectResult<OrganizationWithRelations, S> | null;
   }> {
     const {
       document,
@@ -345,7 +345,7 @@ export class OrganizationModel {
       client: this.client,
       operation: "query",
       operationName: "Organization",
-      fieldName: "organizationById",
+      fieldName: "organization",
       document,
       variables
     });

graphql/codegen/src/core/codegen/orm/model-generator.ts

@@ -19,7 +19,6 @@ import {
   getGeneratedFileHeader,
   getOrderByTypeName,
   getPrimaryKeyInfo,
-  getSingleRowQueryName,
   getTableNames,
   hasValidPrimaryKey,
   lcFirst,
@@ -193,7 +192,10 @@ export function generateModelFile(
   const pkField = pkFields[0];
   const pluralQueryName = table.query?.all ?? pluralName;
   const singleQueryName = table.query?.one;
-  const singleResultFieldName = getSingleRowQueryName(table);
+  // The unwrapped result key for findFirst/findOne — must be the friendly
+  // singular noun (e.g. "animal"), NOT the GraphQL by-id query name (e.g.
+  // "animalById"), so the surface aligns with the rest of the SDK.
+  const singleResultFieldName = singularName;
   const createMutationName = table.query?.create ?? `create${typeName}`;
   const updateMutationName = table.query?.update;
   const deleteMutationName = table.query?.delete;