cli: fix missing scalar alias

hasura · Dec 12, 2024 · 67ce0d2 · 67ce0d2
1 parent 849466c
commit 67ce0d2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/ndc-http-schema/openapi/internal/oas2.go b/ndc-http-schema/openapi/internal/oas2.go
@@ -210,9 +210,16 @@ func (oc *OAS2Builder) convertComponentSchemas(schemaItem orderedmap.Pair[string
 	typeSchema := typeValue.Schema()
 
 	oc.Logger.Debug("component schema", slog.String("name", typeKey))
+	if _, ok := oc.schema.ObjectTypes[typeKey]; ok {
+		return nil
+	}
+	if _, ok := oc.schema.ScalarTypes[typeKey]; ok {
+		return nil
+	}
 	if typeSchema == nil {
 		return nil
 	}
+
 	typeEncoder, schemaResult, err := newOAS2SchemaBuilder(oc, "", rest.InBody).getSchemaType(typeSchema, []string{typeKey})
 
 	var typeName string
@@ -229,6 +236,13 @@ func (oc *OAS2Builder) convertComponentSchemas(schemaItem orderedmap.Pair[string
 		}
 	}
 
+	// If the result type is a scalar, the builder returns the raw scalar name (String, Int).
+	// We should check and add the alias type to scalar objects
+	pascalTypeName := utils.ToPascalCase(typeKey)
+	if scalarType, ok := oc.schema.ScalarTypes[typeName]; ok && pascalTypeName != typeName {
+		oc.schema.ScalarTypes[pascalTypeName] = scalarType
+	}
+
 	cacheKey := "#/definitions/" + typeKey
 	// treat no-property objects as a Arbitrary JSON scalar
 	if typeEncoder == nil || typeName == string(rest.ScalarJSON) {

diff --git a/ndc-http-schema/openapi/internal/oas3.go b/ndc-http-schema/openapi/internal/oas3.go
@@ -262,6 +262,10 @@ func (oc *OAS3Builder) convertComponentSchemas(schemaItem orderedmap.Pair[string
 	if _, ok := oc.schema.ObjectTypes[typeKey]; ok {
 		return nil
 	}
+	if _, ok := oc.schema.ScalarTypes[typeKey]; ok {
+		return nil
+	}
+
 	typeEncoder, schemaResult, err := newOAS3SchemaBuilder(oc, "", rest.InBody, false).
 		getSchemaType(typeSchema, []string{typeKey})
 	if err != nil {
@@ -282,6 +286,13 @@ func (oc *OAS3Builder) convertComponentSchemas(schemaItem orderedmap.Pair[string
 		}
 	}
 
+	// If the result type is a scalar, the builder returns the raw scalar name (String, Int).
+	// We should check and add the alias type to scalar objects
+	pascalTypeName := utils.ToPascalCase(typeKey)
+	if scalarType, ok := oc.schema.ScalarTypes[typeName]; ok && pascalTypeName != typeName {
+		oc.schema.ScalarTypes[pascalTypeName] = scalarType
+	}
+
 	cacheKey := "#/components/schemas/" + typeKey
 	// treat no-property objects as a Arbitrary JSON scalar
 	if typeEncoder == nil || typeName == string(rest.ScalarJSON) {