Generator Epic: Major Refactor

.editorconfig

@@ -33,7 +33,7 @@ trim_trailing_whitespace = true
 
 # MSBuild project files
 [*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj,msbuildproj,props,targets}]
-indent_size = 2
+indent_size = 4
 
 # Xml config files
 [*.{ruleset,config,nuspec,resx,vsixmanifest,vsct,runsettings}]
@@ -84,7 +84,7 @@ dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case
 # Constants are PascalCase
 dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
-dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style
+dotnet_naming_rule.constants_should_be_pascal_case.style = non_private_static_field_style
 
 dotnet_naming_symbols.constants.applicable_kinds = field, local
 dotnet_naming_symbols.constants.required_modifiers = const
@@ -94,7 +94,7 @@ dotnet_naming_style.constant_style.capitalization = pascal_case
 # Static fields are camelCase
 dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
 dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
-dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
+dotnet_naming_rule.static_fields_should_be_camel_case.style = camel_case_style
 
 dotnet_naming_symbols.static_fields.applicable_kinds = field
 dotnet_naming_symbols.static_fields.required_modifiers = static
@@ -104,7 +104,7 @@ dotnet_naming_style.static_field_style.capitalization = camel_case
 # Instance fields are camelCase
 dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
 dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
-dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
+dotnet_naming_rule.instance_fields_should_be_camel_case.style = camel_case_style
 
 dotnet_naming_symbols.instance_fields.applicable_kinds = field
 
@@ -122,7 +122,7 @@ dotnet_naming_style.camel_case_style.capitalization = camel_case
 # Local functions are PascalCase
 dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions
-dotnet_naming_rule.local_functions_should_be_pascal_case.style = local_function_style
+dotnet_naming_rule.local_functions_should_be_pascal_case.style = non_private_static_field_style
 
 dotnet_naming_symbols.local_functions.applicable_kinds = local_function
 
@@ -131,7 +131,7 @@ dotnet_naming_style.local_function_style.capitalization = pascal_case
 # By default, name items with PascalCase
 dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion
 dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members
-dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style
+dotnet_naming_rule.members_should_be_pascal_case.style = non_private_static_field_style
 
 dotnet_naming_symbols.all_members.applicable_kinds = *
 
@@ -209,6 +209,7 @@ dotnet_diagnostic.SA1130.severity = silent
 
 # IDE1006: Naming Styles - StyleCop handles these for us
 dotnet_diagnostic.IDE1006.severity = none
+dotnet_diagnostic.IDE0290.severity = silent
 
 dotnet_diagnostic.DOC100.severity = silent
 dotnet_diagnostic.DOC104.severity = warning
@@ -226,7 +227,7 @@ csharp_prefer_simple_using_statement = true:suggestion
 csharp_style_namespace_declarations = file_scoped:silent
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
-csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_prefer_primary_constructors = false:silent
 csharp_prefer_system_threading_lock = true:suggestion
 csharp_style_expression_bodied_lambdas = when_on_single_line:silent
 csharp_style_expression_bodied_local_functions = when_on_single_line:silent

.runsettings

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <RunConfiguration>
+    <EnvironmentVariables>
+      <DiffEngine_ToolOrder></DiffEngine_ToolOrder>
+      <DiffEngine_Disabled>true</DiffEngine_Disabled>
+      <DiffEngine_TargetOnLeft>false</DiffEngine_TargetOnLeft>
+      <DiffEngine_MaxInstances>5</DiffEngine_MaxInstances>
+    </EnvironmentVariables>
+  </RunConfiguration>
+</RunSettings>

nvim-diff.runsettings

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <RunConfiguration>
+    <EnvironmentVariables>
+      <DiffEngine_ToolOrder>Neovim</DiffEngine_ToolOrder>
+      <DiffEngine_Disabled>false</DiffEngine_Disabled>
+      <DiffEngine_TargetOnLeft>false</DiffEngine_TargetOnLeft>
+      <DiffEngine_MaxInstances>5</DiffEngine_MaxInstances>
+    </EnvironmentVariables>
+  </RunConfiguration>
+</RunSettings>

src/SharpSchema.Annotations.Source/SharpSchema.Annotations.Source.csproj

@@ -14,4 +14,10 @@
   <ItemGroup>
     <Compile Include="..\SharpSchema.Annotations\**\*.cs" Pack="true" PackagePath="content\SharpSchema\;contentFiles\cs\netstandard2.0\SharpSchema\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="PolySharp">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>

src/SharpSchema.Generator/Accessibilities.cs → src/SharpSchema.Annotations/AccessibilityMode.cs

@@ -1,10 +1,17 @@
-namespace SharpSchema.Generator;
+using System;
+
+namespace SharpSchema.Annotations;
 
 /// <summary>
 /// Specifies the allowed accessibilities.
 /// </summary>
 [Flags]
-public enum Accessibilities
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+enum AccessibilityMode
 {
     /// <summary>
     /// Indicates public accessibility.

src/SharpSchema.Generator/DictionaryKeyMode.cs → src/SharpSchema.Annotations/DictionaryKeyMode.cs

@@ -1,11 +1,16 @@
-using Json.Schema;
-
-namespace SharpSchema.Generator;
+
+namespace SharpSchema.Annotations;
 
 /// <summary>
 /// Specifies the mode for dictionary keys.
 /// </summary>
-public enum DictionaryKeyMode
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+enum DictionaryKeyMode
+
 {
     /// <summary>
     /// Loose mode allows any type of dictionary key,

src/SharpSchema.Generator/EnumHandling.cs → src/SharpSchema.Annotations/EnumMode.cs

@@ -1,9 +1,14 @@
-namespace SharpSchema.Generator;
+namespace SharpSchema.Annotations;
 
 /// <summary>
 /// Specifies how enums are handled in the generated code.
 /// </summary>
-public enum EnumHandling
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+enum EnumMode
 {
     /// <summary>
     /// Enum values are represented as strings.

src/SharpSchema.Annotations/GeneratorOptions.cs

@@ -0,0 +1,42 @@
+using SharpSchema.Annotations;
+
+#pragma warning disable IDE0130 // Namespace does not match folder structure
+namespace SharpSchema.Generator;
+#pragma warning restore IDE0130 // Namespace does not match folder structure
+
+/// <summary>
+/// Represents the options for the generator.
+/// </summary>
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+record GeneratorOptions(
+    AccessibilityMode AccessibilityMode = AccessibilityMode.Public,
+    TraversalMode TraversalMode = TraversalMode.Bases,
+    DictionaryKeyMode DictionaryKeyMode = DictionaryKeyMode.Loose,
+    EnumMode EnumMode = EnumMode.String,
+    NumberMode NumberMode = NumberMode.StrictDefs)
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="GeneratorOptions"/> class by copying the values from another instance.
+    /// </summary>
+    /// <param name="options">The <see cref="GeneratorOptions"/> instance to copy values from.</param>
+    public GeneratorOptions(GeneratorOptions options)
+    {
+        if (options is null)
+            throw new System.ArgumentNullException(nameof(options));
+
+        AccessibilityMode = options.AccessibilityMode;
+        TraversalMode = options.TraversalMode;
+        DictionaryKeyMode = options.DictionaryKeyMode;
+        EnumMode = options.EnumMode;
+        NumberMode = options.NumberMode;
+    }
+
+    /// <summary>
+    /// Gets the default generator options.
+    /// </summary>
+    public static GeneratorOptions Default { get; } = new GeneratorOptions();
+}

src/SharpSchema.Annotations/NumberMode.cs

@@ -0,0 +1,29 @@
+namespace SharpSchema.Annotations;
+
+/// <summary>
+/// Specifies the mode for handling numeric types in the schema generation.
+/// </summary>
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+enum NumberMode
+{
+    /// <summary>
+    /// Uses the best matching type for numbers, adding range validation based on .NET type.
+    /// Numeric subschema placed in $defs, and referenced inline.
+    /// </summary>
+    StrictDefs,
+
+    /// <summary>
+    /// Uses the best matching type for numbers, adding range validation based on .NET type.
+    /// Numeric subschema are always placed inline.
+    /// </summary>
+    StrictInline,
+
+    /// <summary>
+    /// Uses the best matching json type for numbers, without adding range validation.
+    /// </summary>
+    JsonNative,
+}

src/SharpSchema.Annotations/SchemaAccessibilityModeAttribute.cs

@@ -0,0 +1,22 @@
+using System;
+
+#nullable enable
+
+namespace SharpSchema.Annotations;
+
+/// <summary>
+/// Overrides the default traversal option for a given type.
+/// </summary>
+[AttributeUsage(SchemaAttribute.SupportedTypes)]
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+class SchemaAccessibilityModeAttribute(AccessibilityMode value) : SchemaAttribute
+{
+    /// <summary>
+    /// Gets the accessibility option for the type.
+    /// </summary>
+    public AccessibilityMode Value { get; } = value;
+}

src/SharpSchema.Annotations/SchemaConstAttribute.cs

@@ -9,10 +9,11 @@
 /// </summary>
 [AttributeUsage(SupportedMembers)]
 #if SHARPSCHEMA_ASSEMBLY
-public class SchemaConstAttribute(object value) : SchemaAttribute
+public
 #else
-internal class SchemaConstAttribute(object value) : SchemaAttribute
+internal
 #endif
+class SchemaConstAttribute(object value) : SchemaAttribute
 {
     /// <summary>
     /// Gets the constant value.

src/SharpSchema.Annotations/SchemaDictionaryKeyModeAttribute.cs

@@ -0,0 +1,22 @@
+using System;
+
+#nullable enable
+
+namespace SharpSchema.Annotations;
+
+/// <summary>
+/// Overrides the default dictionary key mode for a given type.
+/// </summary>
+[AttributeUsage(SchemaAttribute.SupportedMembers)]
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+class SchemaDictionaryKeyModeAttribute(DictionaryKeyMode value) : SchemaAttribute
+{
+    /// <summary>
+    /// Gets the dictionary key mode.
+    /// </summary>
+    public DictionaryKeyMode Value { get; } = value;
+}

src/SharpSchema.Annotations/SchemaEnumModeAttribute.cs

@@ -0,0 +1,22 @@
+using System;
+
+#nullable enable
+
+namespace SharpSchema.Annotations;
+
+/// <summary>
+/// Overrides the default enum mode for a given type.
+/// </summary>
+[AttributeUsage(AttributeTargets.Enum)]
+#if SHARPSCHEMA_ASSEMBLY
+public
+#else
+internal
+#endif
+class SchemaEnumModeAttribute(EnumMode value) : SchemaAttribute
+{
+    /// <summary>
+    /// Gets the enum mode.
+    /// </summary>
+    public EnumMode Value { get; } = value;
+}

src/SharpSchema.Annotations/SchemaEnumValueAttribute.cs

@@ -9,10 +9,11 @@
 /// </summary>
 [AttributeUsage(AttributeTargets.Field)]
 #if SHARPSCHEMA_ASSEMBLY
-public class SchemaEnumValueAttribute(string value) : SchemaAttribute
+public
 #else
-internal class SchemaEnumValueAttribute(string value) : SchemaAttribute
+internal
 #endif
+class SchemaEnumValueAttribute(string value) : SchemaAttribute
 {
     /// <summary>
     /// Gets the value of the enum member.

src/SharpSchema.Annotations/SchemaFormatAttribute.cs

@@ -12,10 +12,11 @@
 /// </remarks>
 [AttributeUsage(SupportedMembers)]
 #if SHARPSCHEMA_ASSEMBLY
-public class SchemaFormatAttribute(string format) : SchemaAttribute
+public
 #else
-internal class SchemaFormatAttribute(string format) : SchemaAttribute
+internal
 #endif
+class SchemaFormatAttribute(string format) : SchemaAttribute
 {
     /// <summary>
     /// Gets the format of the schema.

src/SharpSchema.Annotations/SchemaIgnoreAttribute.cs

@@ -9,9 +9,10 @@ namespace SharpSchema.Annotations;
 /// </summary>
 [AttributeUsage(SupportedTypes | SupportedMembers)]
 #if SHARPSCHEMA_ASSEMBLY
-public class SchemaIgnoreAttribute : SchemaAttribute
+public
 #else
-internal class SchemaIgnoreAttribute : SchemaAttribute
+internal
 #endif
+class SchemaIgnoreAttribute : SchemaAttribute
 {
 }

src/SharpSchema.Annotations/SchemaItemsRangeAttribute.cs

@@ -12,10 +12,11 @@ namespace SharpSchema.Annotations;
 /// </remarks>
 [AttributeUsage(SupportedMembers)]
 #if SHARPSCHEMA_ASSEMBLY
-public class SchemaItemsRangeAttribute : SchemaAttribute
+public
 #else
-internal class SchemaItemsRangeAttribute : SchemaAttribute
+internal
 #endif
+class SchemaItemsRangeAttribute : SchemaAttribute
 {
     /// <summary>
     /// Gets or sets the minimum items allowed for the array.

src/SharpSchema.Annotations/SchemaLengthRangeAttribute.cs

@@ -12,10 +12,11 @@ namespace SharpSchema.Annotations;
 /// </remarks>
 [AttributeUsage(SupportedMembers)]
 #if SHARPSCHEMA_ASSEMBLY
-public class SchemaLengthRangeAttribute : SchemaAttribute
+public
 #else
-internal class SchemaLengthRangeAttribute : SchemaAttribute
+internal
 #endif
+class SchemaLengthRangeAttribute : SchemaAttribute
 {
     /// <summary>
     /// Gets or sets the minimum length allowed for the schema.