Fix GraphQL types

Author: tomhollingworth

cmd/sortSchema/graphql/types.go

@@ -26,11 +26,11 @@ type Data struct {
 // operation.
 // See https://spec.graphql.org/June2018/#sec-Schema-Introspection
 type __Schema struct {
-	Types            []__Type      `json:"types"`
-	QueryType        SchemaType    `json:"queryType"`
-	MutationType     SchemaType    `json:"mutationType"`
-	SubscriptionType SchemaType    `json:"subscriptionType"`
-	Directives       []__Directive `json:"directives"`
+	Types            []__ObjectType `json:"types"`
+	QueryType        SchemaType     `json:"queryType"`
+	MutationType     SchemaType     `json:"mutationType"`
+	SubscriptionType SchemaType     `json:"subscriptionType"`
+	Directives       []__Directive  `json:"directives"`
 }
 
 // Sort the child arrays of Schema
@@ -68,29 +68,29 @@ func (s *__Schema) Sort() {
 // See https://spec.graphql.org/June2018/#sec-The-__Type-Type
 type __Type struct {
 	Kind        __TypeKind `json:"kind"`
-	Name        string     `json:"name,omitempty"`
-	Description string     `json:"description,omitempty"`
+	Name        string     `json:"name"`
+	Description string     `json:"description"`
 
 	// OBJECT and INTERFACE only
-	Fields []__Field `json:"fields,omitempty"`
+	Fields []__Field `json:"fields"`
 
 	// OBJECT only
-	Interfaces []__Type `json:"interfaces,omitempty"`
+	Interfaces []__Type `json:"interfaces"`
 
 	// INTERFACE and UNION only
-	PossibleTypes []__Type `json:"possibleTypes,omitempty"`
+	PossibleTypes []__Type `json:"possibleTypes"`
 
 	// ENUM only
-	EnumValues []EnumValue `json:"enumValue,omitempty"`
+	EnumValues []EnumValue `json:"enumValues"`
 
 	// INPUT_OBJECT only
-	InputFields []__InputValue `json:"inputFields,omitempty"`
+	InputFields []__InputValue `json:"inputFields"`
 
 	// NON_NULL and LIST only
 	OfType *__Type `json:"ofType,omitempty"`
 }
 
-// Sort the child arrays of GraphQLType
+// Sort the child arrays of __Type
 func (t *__Type) Sort() {
 	sort.Slice(t.Fields, func(i, j int) bool {
 		return t.Fields[i].Name < t.Fields[j].Name
@@ -124,6 +124,62 @@ func (t *__Type) Sort() {
 	})
 }
 
+// Similar to __Type but without OfType
+type __ObjectType struct {
+	Kind        __TypeKind `json:"kind"`
+	Name        string     `json:"name"`
+	Description string     `json:"description"`
+
+	// OBJECT and INTERFACE only
+	Fields []__Field `json:"fields"`
+
+	// OBJECT only
+	Interfaces []__Type `json:"interfaces"`
+
+	// INTERFACE and UNION only
+	PossibleTypes []__Type `json:"possibleTypes"`
+
+	// ENUM only
+	EnumValues []EnumValue `json:"enumValues"`
+
+	// INPUT_OBJECT only
+	InputFields []__InputValue `json:"inputFields"`
+}
+
+// Sort the child arrays of __ObjectType
+func (t *__ObjectType) Sort() {
+	sort.Slice(t.Fields, func(i, j int) bool {
+		return t.Fields[i].Name < t.Fields[j].Name
+	})
+	for i := range t.Fields {
+		sort.Slice(t.Fields[i].Args, func(j, k int) bool {
+			return t.Fields[i].Args[j].Name < t.Fields[i].Args[k].Name
+		})
+	}
+
+	sort.Slice(t.Interfaces, func(i, j int) bool {
+		return t.Interfaces[i].Name < t.Interfaces[j].Name
+	})
+	for i := range t.Interfaces {
+		t.Interfaces[i].Sort()
+	}
+
+	sort.Slice(t.PossibleTypes, func(i, j int) bool {
+		return t.PossibleTypes[i].Name < t.PossibleTypes[j].Name
+	})
+	for i := range t.PossibleTypes {
+		t.PossibleTypes[i].Sort()
+	}
+
+	sort.Slice(t.EnumValues, func(i, j int) bool {
+		return t.EnumValues[i].Name < t.EnumValues[j].Name
+	})
+
+	sort.Slice(t.InputFields, func(i, j int) bool {
+		return t.InputFields[i].Name < t.InputFields[j].Name
+	})
+}
+
 // There are several different kinds of type. In each kind, different fields
 // are actually valid. These kinds are listed in the __TypeKind enumeration.
 //
@@ -145,22 +201,22 @@ const (
 // See https://spec.graphql.org/June2018/#sec-The-__Field-Type
 type __Field struct {
 	Name              string         `json:"name,omitempty"`
-	Description       string         `json:"description,omitempty"`
+	Description       string         `json:"description"`
 	Args              []__InputValue `json:"args"`
 	Type              __Type         `json:"type"`
 	IsDeprecated      bool           `json:"isDeprecated"`
-	DeprecationReason string         `json:"deprecationReason,omitempty"`
+	DeprecationReason *string        `json:"deprecationReason"`
 }
 
 // The __InputValue type represents field and directive arguments as well as
 // the inputFields of an input object.
 //
 // See https://spec.graphql.org/June2018/#sec-The-__InputValue-Type
 type __InputValue struct {
-	Name         string `json:"name"`
-	Description  string `json:"description,omitempty"`
-	Type         __Type `json:"type"`
-	DefaultValue string `json:"defaultValue"`
+	Name         string  `json:"name"`
+	Description  string  `json:"description,omitempty"`
+	Type         __Type  `json:"type"`
+	DefaultValue *string `json:"defaultValue"`
 }
 
 // The __EnumValue type represents one of possible values of an enum.