Make getArrayType take type attributes

src/quicktype-core/GraphRewriting.ts

@@ -124,7 +124,7 @@ export class TypeReconstituter<TBuilder extends BaseGraphRewriteBuilder> {
     }
 
     getArrayType(items: TypeRef): void {
-        this.registerAndAddAttributes(this.builderForNewType().getArrayType(items, this._forwardingRef));
+        this.register(this.builderForNewType().getArrayType(this._typeAttributes, items, this._forwardingRef));
     }
 
     setArrayItems(items: TypeRef): void {

src/quicktype-core/TypeBuilder.ts

@@ -359,11 +359,11 @@ export class TypeBuilder {
         return this.addType(forwardingRef, tr => new ArrayType(tr, this.typeGraph, undefined), undefined);
     }
 
-    getArrayType(items: TypeRef, forwardingRef?: TypeRef): TypeRef {
+    getArrayType(attributes: TypeAttributes, items: TypeRef, forwardingRef?: TypeRef): TypeRef {
         return this.getOrAddType(
-            () => arrayTypeIdentity(emptyTypeAttributes, items),
+            () => arrayTypeIdentity(attributes, items),
             tr => new ArrayType(tr, this.typeGraph, items),
-            undefined,
+            attributes,
             forwardingRef
         );
     }

src/quicktype-core/UnifyClasses.ts

@@ -160,8 +160,7 @@ export class UnifyUnionBuilder extends UnionBuilder<BaseGraphRewriteBuilder, Typ
         typeAttributes: TypeAttributes,
         forwardingRef: TypeRef | undefined
     ): TypeRef {
-        const ref = this.typeBuilder.getArrayType(this._unifyTypes(arrays), forwardingRef);
-        this.typeBuilder.addAttributes(ref, typeAttributes);
+        const ref = this.typeBuilder.getArrayType(typeAttributes, this._unifyTypes(arrays), forwardingRef);
         return ref;
     }
 }

src/quicktype-core/input/Inference.ts

@@ -53,10 +53,11 @@ class InferenceUnionBuilder extends UnionBuilder<TypeBuilder, NestedValueArray,
 
     protected makeArray(
         arrays: NestedValueArray,
-        _typeAttributes: TypeAttributes,
+        typeAttributes: TypeAttributes,
         forwardingRef: TypeRef | undefined
     ): TypeRef {
         return this.typeBuilder.getArrayType(
+            typeAttributes,
             this._typeInference.inferType(emptyTypeAttributes, arrays, this._fixed, forwardingRef)
         );
     }

src/quicktype-core/input/JSONSchemaInput.ts

@@ -669,7 +669,7 @@ export async function addTypesInSchema(
                 itemType = typeBuilder.getPrimitiveType("any");
             }
             typeBuilder.addAttributes(itemType, singularAttributes);
-            return typeBuilder.getArrayType(itemType);
+            return typeBuilder.getArrayType(emptyTypeAttributes, itemType);
         }
 
         async function makeObjectType(): Promise<TypeRef> {

src/quicktype-core/rewrites/ResolveIntersections.ts

@@ -320,8 +320,7 @@ class IntersectionUnionBuilder extends UnionBuilder<
     ): TypeRef {
         // FIXME: attributes
         const itemsType = this.makeIntersection(arrays, emptyTypeAttributes);
-        const tref = this.typeBuilder.getArrayType(itemsType, forwardingRef);
-        this.typeBuilder.addAttributes(tref, typeAttributes);
+        const tref = this.typeBuilder.getArrayType(typeAttributes, itemsType, forwardingRef);
         return tref;
     }
 }

src/quicktype-graphql-input/index.ts

@@ -239,6 +239,7 @@ class GQLQuery {
                     return panic("No type for list.");
                 }
                 result = builder.getArrayType(
+                    emptyTypeAttributes,
                     this.makeIRTypeFromFieldNode(builder, fieldNode, fieldType.ofType, containingTypeName)
                 );
                 break;
@@ -454,12 +455,11 @@ function makeGraphQLQueryTypes(
                 )
             })
         );
-        const errorArray = builder.getArrayType(errorType);
-        builder.addAttributes(
-            errorArray,
+        const errorArray = builder.getArrayType(
             namesTypeAttributeKind.makeAttributes(
                 TypeNames.make(new Set(["errors"]), new Set(["graphQLErrors"]), false)
-            )
+            ),
+            errorType
         );
         const t = builder.getClassType(
             makeNamesTypeAttributes(queryName, false),