refactor: Index field directive

internal/request/graphql/schema/collection.go

@@ -133,7 +133,7 @@
 
 		for _, directive := range field.Directives {
 			if directive.Name.Value == types.IndexDirectiveLabel {
-				index, err := fieldIndexFromAST(field, directive)
+				index, err := indexFromAST(directive, field)
 				if err != nil {
 					return client.CollectionDefinition{}, err
 				}
@@ -164,7 +164,7 @@
 
 	for _, directive := range def.Directives {
 		if directive.Name.Value == types.IndexDirectiveLabel {
-			index, err := indexFromAST(directive)
+			index, err := indexFromAST(directive, nil)
 			if err != nil {
 				return client.CollectionDefinition{}, err
 			}
@@ -239,110 +239,131 @@
 	return true
 }
 
-func fieldIndexFromAST(field *ast.FieldDefinition, directive *ast.Directive) (client.IndexDescription, error) {
-	desc := client.IndexDescription{
-		Fields: []client.IndexedFieldDescription{
-			{
-				Name: field.Name.Value,
-			},
-		},
-	}
+func indexFromAST(directive *ast.Directive, fieldDef *ast.FieldDefinition) (client.IndexDescription, error) {
+	var name string
+	var unique bool
+
+	var direction *ast.EnumValue
+	var includes *ast.ListValue
+
 	for _, arg := range directive.Arguments {
 		switch arg.Name.Value {
 		case types.IndexDirectivePropName:
 			nameVal, ok := arg.Value.(*ast.StringValue)
 			if !ok {
 				return client.IndexDescription{}, ErrIndexWithInvalidArg
 			}
-			desc.Name = nameVal.Value
-			if !IsValidIndexName(desc.Name) {
-				return client.IndexDescription{}, NewErrIndexWithInvalidName(desc.Name)
+			name = nameVal.Value
+			if !IsValidIndexName(name) {
+				return client.IndexDescription{}, NewErrIndexWithInvalidName(name)
 			}
-		case types.IndexDirectivePropUnique:
-			boolVal, ok := arg.Value.(*ast.BooleanValue)
+
+		case types.IndexDirectivePropIncludes:
+			includesVal, ok := arg.Value.(*ast.ListValue)
 			if !ok {
 				return client.IndexDescription{}, ErrIndexWithInvalidArg
 			}
-			desc.Unique = boolVal.Value
+			includes = includesVal
+
 		case types.IndexDirectivePropDirection:
-			dirVal, ok := arg.Value.(*ast.EnumValue)
+			directionVal, ok := arg.Value.(*ast.EnumValue)
 			if !ok {
 				return client.IndexDescription{}, ErrIndexWithInvalidArg
 			}
-			if dirVal.Value == types.FieldOrderDESC {
-				desc.Fields[0].Descending = true
+			direction = directionVal
+
+		case types.IndexDirectivePropUnique:
+			uniqueVal, ok := arg.Value.(*ast.BooleanValue)
+			if !ok {
+				return client.IndexDescription{}, ErrIndexWithInvalidArg
 			}
+			unique = uniqueVal.Value
+
 		default:
 			return client.IndexDescription{}, ErrIndexWithUnknownArg
 		}
 	}
-	return desc, nil
-}
 
-func indexFromAST(directive *ast.Directive) (client.IndexDescription, error) {
-	desc := client.IndexDescription{}
-	var directions *ast.ListValue
-	for _, arg := range directive.Arguments {
-		switch arg.Name.Value {
-		case types.IndexDirectivePropName:
-			nameVal, ok := arg.Value.(*ast.StringValue)
-			if !ok {
-				return client.IndexDescription{}, ErrIndexWithInvalidArg
-			}
-			desc.Name = nameVal.Value
-			if !IsValidIndexName(desc.Name) {
-				return client.IndexDescription{}, ErrIndexWithInvalidArg
-			}
-		case types.IndexDirectivePropFields:
-			fieldsVal, ok := arg.Value.(*ast.ListValue)
-			if !ok {
-				return client.IndexDescription{}, ErrIndexWithInvalidArg
-			}
-			for _, field := range fieldsVal.Values {
-				fieldVal, ok := field.(*ast.StringValue)
-				if !ok {
-					return client.IndexDescription{}, ErrIndexWithInvalidArg
-				}
-				desc.Fields = append(desc.Fields, client.IndexedFieldDescription{
-					Name: fieldVal.Value,
-				})
-			}
-		case types.IndexDirectivePropDirections:
-			var ok bool
-			directions, ok = arg.Value.(*ast.ListValue)
-			if !ok {
-				return client.IndexDescription{}, ErrIndexWithInvalidArg
+	var containsField bool
+	var fields []client.IndexedFieldDescription
+
+	if includes != nil {
+		for _, include := range includes.Values {
+			field, err := indexFieldFromAST(include, direction)
+			if err != nil {
+				return client.IndexDescription{}, err
 			}
-		case types.IndexDirectivePropUnique:
-			boolVal, ok := arg.Value.(*ast.BooleanValue)
-			if !ok {
-				return client.IndexDescription{}, ErrIndexWithInvalidArg
+			if fieldDef != nil && fieldDef.Name.Value == field.Name {
+				containsField = true
 			}
-			desc.Unique = boolVal.Value
-		default:
-			return client.IndexDescription{}, ErrIndexWithUnknownArg
+			fields = append(fields, field)
 		}
 	}
-	if len(desc.Fields) == 0 {
+
+	// implicitly add the field if it is not already in the list
+	if !containsField && fieldDef != nil {
+		field := client.IndexedFieldDescription{
+			Name: fieldDef.Name.Value,
+		}
+		if direction != nil {
+			field.Descending = direction.Value == types.FieldOrderDESC
+		}
+		fields = append(fields, field)
+	}
+
+	if len(fields) == 0 {
 		return client.IndexDescription{}, ErrIndexMissingFields
 	}
-	if directions != nil {
-		if len(directions.Values) != len(desc.Fields) {
-			return client.IndexDescription{}, ErrIndexWithInvalidArg
-		}
-		for i := range desc.Fields {
-			dirVal, ok := directions.Values[i].(*ast.EnumValue)
+
+	return client.IndexDescription{
+		Name:   name,
+		Fields: fields,
+		Unique: unique,
+	}, nil
+}
+
+func indexFieldFromAST(value ast.Value, defaultDirection *ast.EnumValue) (client.IndexedFieldDescription, error) {
+	argTypeObject, ok := value.(*ast.ObjectValue)
+	if !ok {
+		return client.IndexedFieldDescription{}, ErrIndexWithInvalidArg
+	}
+
+	var name string
+	var direction *ast.EnumValue
+
+	for _, field := range argTypeObject.Fields {
+		switch field.Name.Value {
+		case types.IndexFieldInputName:
+			nameVal, ok := field.Value.(*ast.StringValue)
 			if !ok {
-				return client.IndexDescription{}, ErrIndexWithInvalidArg
+				return client.IndexedFieldDescription{}, ErrIndexWithInvalidArg
 			}
-			if dirVal.Value == types.FieldOrderASC {
-				desc.Fields[i].Descending = false
-			} else if dirVal.Value == types.FieldOrderDESC {
-				desc.Fields[i].Descending = true
+			name = nameVal.Value
+
+		case types.IndexFieldInputDirection:
+			directionVal, ok := field.Value.(*ast.EnumValue)
+			if !ok {
+				return client.IndexedFieldDescription{}, ErrIndexWithInvalidArg
 			}
+			direction = directionVal
+
+		default:
+			return client.IndexedFieldDescription{}, ErrIndexWithUnknownArg
 		}
 	}
-	return desc, nil
+
+	var descending bool
+	if direction == nil && defaultDirection != nil {
+		direction = defaultDirection
+	}
+	if direction != nil {
+		descending = direction.Value == types.FieldOrderDESC
+	}
+
+	return client.IndexedFieldDescription{
+		Name:       name,
+		Descending: descending,
+	}, nil
 }
 
 func fieldsFromAST(