review comments

Signed-off-by: grokspawn <jordan@nimblewidget.com>

Author: grokspawn

internal/catalogd/graphql/graphql.go

@@ -49,11 +49,12 @@ type CatalogSchema struct {
 
 // serializableFieldInfo is a JSON-friendly representation of FieldInfo
 type serializableFieldInfo struct {
-	Name         string                            `json:"name"`
-	OriginalName string                            `json:"originalName"`
-	JSONType     string                            `json:"jsonType"`
-	IsArray      bool                              `json:"isArray"`
-	NestedFields map[string]*serializableFieldInfo `json:"nestedFields,omitempty"`
+	Name            string                            `json:"name"`
+	OriginalName    string                            `json:"originalName"`
+	JSONType        string                            `json:"jsonType"`
+	IsArray         bool                              `json:"isArray"`
+	GraphQLTypeName string                            `json:"graphqlTypeName,omitempty"`
+	NestedFields    map[string]*serializableFieldInfo `json:"nestedFields,omitempty"`
 }
 
 // serializableSchemaInfo is a JSON-friendly representation of SchemaInfo
@@ -101,12 +102,38 @@ func stringToKind(s string) reflect.Kind {
 	}
 }
 
+func graphqlTypeName(t graphql.Type) string {
+	if list, ok := t.(*graphql.List); ok {
+		return graphqlTypeName(list.OfType)
+	}
+	return t.Name()
+}
+
+func graphqlTypeFromName(name string, isArray bool) graphql.Type {
+	var base graphql.Type
+	switch name {
+	case "Int":
+		base = graphql.Int
+	case "Float":
+		base = graphql.Float
+	case "Boolean":
+		base = graphql.Boolean
+	default:
+		base = graphql.String
+	}
+	if isArray {
+		return graphql.NewList(base)
+	}
+	return base
+}
+
 func fieldInfoToSerializable(fi *FieldInfo) *serializableFieldInfo {
 	sfi := &serializableFieldInfo{
-		Name:         fi.Name,
-		OriginalName: fi.OriginalName,
-		JSONType:     kindToString(fi.JSONType),
-		IsArray:      fi.IsArray,
+		Name:            fi.Name,
+		OriginalName:    fi.OriginalName,
+		JSONType:        kindToString(fi.JSONType),
+		IsArray:         fi.IsArray,
+		GraphQLTypeName: graphqlTypeName(fi.GraphQLType),
 	}
 	if len(fi.NestedFields) > 0 {
 		sfi.NestedFields = make(map[string]*serializableFieldInfo)
@@ -119,12 +146,18 @@ func fieldInfoToSerializable(fi *FieldInfo) *serializableFieldInfo {
 
 func serializableToFieldInfo(sfi *serializableFieldInfo) *FieldInfo {
 	k := stringToKind(sfi.JSONType)
+	var gqlType graphql.Type
+	if sfi.GraphQLTypeName != "" {
+		gqlType = graphqlTypeFromName(sfi.GraphQLTypeName, sfi.IsArray)
+	} else {
+		gqlType = jsonTypeToGraphQL(k, sfi.IsArray, nil)
+	}
 	fi := &FieldInfo{
 		Name:         sfi.Name,
 		OriginalName: sfi.OriginalName,
 		JSONType:     k,
 		IsArray:      sfi.IsArray,
-		GraphQLType:  jsonTypeToGraphQL(k, sfi.IsArray, nil),
+		GraphQLType:  gqlType,
 	}
 	if len(sfi.NestedFields) > 0 {
 		fi.NestedFields = make(map[string]*FieldInfo)

internal/catalogd/graphql/validation.go

@@ -14,8 +14,10 @@ const (
 )
 
 type queryComplexity struct {
-	aliases int
-	fields  int
+	aliases   int
+	fields    int
+	fragments map[string]*ast.FragmentDefinition
+	visited   map[string]bool
 }
 
 // ValidateQueryComplexity parses the query AST and rejects it if it exceeds
@@ -26,7 +28,15 @@ func ValidateQueryComplexity(query string) error {
 		return fmt.Errorf("query parse error: %w", err)
 	}
 
-	c := &queryComplexity{}
+	c := &queryComplexity{
+		fragments: make(map[string]*ast.FragmentDefinition),
+		visited:   make(map[string]bool),
+	}
+	for _, def := range doc.Definitions {
+		if frag, ok := def.(*ast.FragmentDefinition); ok {
+			c.fragments[frag.Name.Value] = frag
+		}
+	}
 	for _, def := range doc.Definitions {
 		if op, ok := def.(*ast.OperationDefinition); ok {
 			if err := c.walkSelectionSet(op.SelectionSet, 1); err != nil {
@@ -66,7 +76,16 @@ func (c *queryComplexity) walkSelectionSet(ss *ast.SelectionSet, depth int) erro
 				return err
 			}
 		case *ast.FragmentSpread:
-			c.fields++
+			name := s.Name.Value
+			if c.visited[name] {
+				continue
+			}
+			c.visited[name] = true
+			if frag, ok := c.fragments[name]; ok {
+				if err := c.walkSelectionSet(frag.SelectionSet, depth+1); err != nil {
+					return err
+				}
+			}
 		}
 	}
 	return nil

internal/catalogd/storage/localdir.go

@@ -92,7 +92,7 @@ func (s *LocalDirV1) Store(ctx context.Context, catalog string, fsys fs.FS) erro
 	if s.graphqlSvc != nil {
 		s.graphqlSvc.InvalidateCache(catalog)
 
-		if _, err := s.graphqlSvc.GetSchema(context.Background(), catalog); err != nil {
+		if _, err := s.graphqlSvc.GetSchema(ctx, catalog); err != nil {
 			// Schema build failed — remove the catalog to maintain consistency.
 			// Re-acquire the write lock for the rollback since it touches shared filesystem state.
 			s.m.Lock()