fix: only generate ArrayOf helper when referenced (#40)

Author: Copilot

src/commands/typegen/__tests__/__snapshots__/generate.test.ts.snap

@@ -276,12 +276,6 @@ export type AllSanitySchemaTypes =
 
 export declare const internalGroqTypeReferenceTo: unique symbol
 
-type ArrayOf<T> = Array<
-  T & {
-    _key: string
-  }
->
-
 // Source: src/queries/authorQueries.ts
 // Variable: allAuthorsQuery
 // Query: *[_type == "author"]{  _id,  name,  slug}

src/typescript/__tests__/typeGenerator.test.ts

@@ -183,10 +183,6 @@ describe(TypeGenerator.name, () => {
 
       export declare const internalGroqTypeReferenceTo: unique symbol;
 
-      type ArrayOf<T> = Array<T & {
-        _key: string;
-      }>;
-
       // Source: foo.ts
       // Variable: queryFoo
       // Query: *[_type == "foo"]
@@ -292,10 +288,6 @@ describe(TypeGenerator.name, () => {
 
       export declare const internalGroqTypeReferenceTo: unique symbol;
 
-      type ArrayOf<T> = Array<T & {
-        _key: string;
-      }>;
-
       // Source: foo.ts
       // Variable: queryFoo
       // Query: *[_type == "foo"]
@@ -364,10 +356,6 @@ describe(TypeGenerator.name, () => {
 
       export declare const internalGroqTypeReferenceTo: unique symbol;
 
-      type ArrayOf<T> = Array<T & {
-        _key: string;
-      }>;
-
       "
     `)
   })
@@ -940,11 +928,32 @@ describe(TypeGenerator.name, () => {
 
       export declare const internalGroqTypeReferenceTo: unique symbol;
 
-      type ArrayOf<T> = Array<T & {
-        _key: string;
-      }>;
-
       "
     `)
   })
+
+  test('ArrayOf should NOT be generated when not used (no inline type references)', async () => {
+    const schema: SchemaType = [
+      {
+        attributes: {
+          _id: {type: 'objectAttribute', value: {type: 'string'}},
+          _type: {type: 'objectAttribute', value: {type: 'string', value: 'post'}},
+          title: {
+            type: 'objectAttribute',
+            value: {type: 'string'},
+          },
+        },
+        name: 'post',
+        type: 'document',
+      },
+    ]
+
+    const typeGenerator = new TypeGenerator()
+    const {code} = await typeGenerator.generateTypes({
+      schema,
+    })
+
+    // ArrayOf should NOT be in the output
+    expect(code).not.toContain('ArrayOf')
+  })
 })

src/typescript/schemaTypeGenerator.ts

@@ -34,6 +34,8 @@ export class SchemaTypeGenerator {
       return {stats, tsType}
     },
   )
+  private arrayOfUsed = false
+
   private identifiers = new Map<string, t.Identifier>()
 
   private tsTypes = new Map<string, t.TSType>()
@@ -73,6 +75,10 @@ export class SchemaTypeGenerator {
     return this.tsTypes.has(typeName)
   }
 
+  isArrayOfUsed(): boolean {
+    return this.arrayOfUsed
+  }
+
   *[Symbol.iterator]() {
     for (const {name} of this.schema) {
       yield {name, ...this.getType(name)!}
@@ -88,6 +94,7 @@ export class SchemaTypeGenerator {
    * wrapped in the ArrayOf wrapper that adds _key prop
    */
   private generateArrayOfTsType(typeNode: ArrayTypeNode): t.TSTypeReference {
+    this.arrayOfUsed = true
     const typeNodes = this.generateTsType(typeNode.of)
     return t.tsTypeReference(ARRAY_OF, t.tsTypeParameterInstantiation([typeNodes]))
   }

src/typescript/typeGenerator.ts

@@ -274,7 +274,7 @@ export class TypeGenerator {
   async generateTypes(options: GenerateTypesOptions) {
     const {reporter: report} = options
     const internalReferenceSymbol = this.getInternalReferenceSymbolDeclaration()
-    const arrayOfDeclaration = this.getArrayOfDeclaration()
+    const schemaTypeGenerator = this.getSchemaTypeGenerator(options)
     const schemaTypeDeclarations = this.getSchemaTypeDeclarations(options)
     const allSanitySchemaTypesDeclaration = this.getAllSanitySchemaTypesDeclaration(options)
 
@@ -298,14 +298,19 @@ export class TypeGenerator {
     program.body.push(internalReferenceSymbol.ast)
     code += internalReferenceSymbol.code
 
-    program.body.push(arrayOfDeclaration.ast)
-    code += arrayOfDeclaration.code
-
     const evaluatedModules = await TypeGenerator.getEvaluatedModules({
       ...options,
       schemaTypeDeclarations,
-      schemaTypeGenerator: this.getSchemaTypeGenerator(options),
+      schemaTypeGenerator,
     })
+
+    // Only generate ArrayOf if it's actually used
+    if (schemaTypeGenerator.isArrayOfUsed()) {
+      const arrayOfDeclaration = this.getArrayOfDeclaration()
+      program.body.push(arrayOfDeclaration.ast)
+      code += arrayOfDeclaration.code
+    }
+
     for (const {queries} of evaluatedModules) {
       for (const query of queries) {
         program.body.push(query.ast)