refactor(codegen): move Result appending into type generation (#6082)

Author: sgulseth

packages/@sanity/codegen/src/typescript/__tests__/findQueriesInSource.test.ts

@@ -74,19 +74,6 @@ describe('findQueries', () => {
     expect(queries.length).toBe(0)
   })
 
-  test("should name queries with 'Result' at the end", () => {
-    const source = `
-      import { groq } from "groq";
-      const postQuery = groq\`*[_type == "author"]\`
-      const res = sanity.fetch(postQueryResult);
-    `
-
-    const queries = findQueriesInSource(source, 'test.ts')
-    const queryResult = queries[0]
-
-    expect(queryResult?.name.substr(-6)).toBe('Result')
-  })
-
   test('should import', () => {
     const source = `
       import { groq } from "groq";
@@ -106,8 +93,7 @@ describe('findQueries', () => {
     }
 
     const queries = findQueriesInSource(source, 'test.ts', undefined, resolver)
-    const queryResult = queries[0]
-
-    expect(queryResult?.name.substr(-6)).toBe('Result')
+    expect(queries.length).toBe(1)
+    expect(queries[0].result).toBe('*[_type == "foo"]')
   })
 })

packages/@sanity/codegen/src/typescript/findQueriesInSource.ts

@@ -46,7 +46,7 @@ export function findQueriesInSource(
         babelTypes.isIdentifier(node.id) &&
         init.tag.name === groqTagName
       ) {
-        const queryName = `${node.id.name}Result`
+        const queryName = `${node.id.name}`
         const queryResult = resolveExpression({
           node: init,
           file,

packages/sanity/src/_internal/cli/threads/typegenGenerate.ts

@@ -95,10 +95,10 @@ async function main() {
         const ast = parse(query)
         const queryTypes = typeEvaluate(ast, schema)
 
-        const type = typeGenerator.generateTypeNodeTypes(queryName, queryTypes)
+        const type = typeGenerator.generateTypeNodeTypes(`${queryName}Result`, queryTypes)
 
         fileQueryTypes.push({
-          queryName: queryName,
+          queryName,
           query,
           type,
           unknownTypes: countUnknownTypes(queryTypes),