diff --git a/src/NJsonSchema/DefaultTypeNameGenerator.cs b/src/NJsonSchema/DefaultTypeNameGenerator.cs index 417270ead..cd29eae0a 100644 --- a/src/NJsonSchema/DefaultTypeNameGenerator.cs +++ b/src/NJsonSchema/DefaultTypeNameGenerator.cs @@ -62,12 +62,14 @@ public virtual string Generate(JsonSchema schema, string? typeNameHint, IEnumera } var typeName = Generate(schema, typeNameHint); + typeName = RemoveIllegalCharacters(typeName); + if (string.IsNullOrEmpty(typeName) || reservedTypeNames.Contains(typeName)) { typeName = GenerateAnonymousTypeName(typeNameHint, reservedTypeNames); } - return RemoveIllegalCharacters(typeName); + return typeName; } /// Generates the type name for the given schema.