refactor: rename to type node

Author: Joanna May

Chickensoft.Introspection.Generator.Tests/test/src/models/DeclaredPropertyTest.cs

@@ -16,8 +16,8 @@ public void Equality() {
       IsRequired: false,
       IsNullable: false,
       DefaultValueExpression: null,
-      GenericType: new GenericTypeNode(
-        "System.String", false, Children: ImmutableArray<GenericTypeNode>.Empty
+      TypeNode: new TypeNode(
+        "System.String", false, Children: ImmutableArray<TypeNode>.Empty
       ),
       Attributes: ImmutableArray<DeclaredAttribute>.Empty
     );
@@ -35,8 +35,8 @@ public void Equality() {
         IsRequired: false,
         IsNullable: false,
         DefaultValueExpression: null,
-        GenericType: new GenericTypeNode(
-          "System.String", false, Children: ImmutableArray<GenericTypeNode>.Empty
+        TypeNode: new TypeNode(
+          "System.String", false, Children: ImmutableArray<TypeNode>.Empty
         ),
         Attributes: ImmutableArray<DeclaredAttribute>.Empty
       )
@@ -50,8 +50,8 @@ public void Equality() {
       IsRequired: false,
       IsNullable: false,
       DefaultValueExpression: null,
-      GenericType: new GenericTypeNode(
-        "System.String", false, Children: ImmutableArray<GenericTypeNode>.Empty
+      TypeNode: new TypeNode(
+        "System.String", false, Children: ImmutableArray<TypeNode>.Empty
       ),
       Attributes: new DeclaredAttribute[] {
         new("", ImmutableArray<string>.Empty, ImmutableArray<string>.Empty)
@@ -65,8 +65,8 @@ public void Equality() {
         IsRequired: false,
         IsNullable: false,
         DefaultValueExpression: null,
-        GenericType: new GenericTypeNode(
-          "System.String", false, Children: ImmutableArray<GenericTypeNode>.Empty
+        TypeNode: new TypeNode(
+          "System.String", false, Children: ImmutableArray<TypeNode>.Empty
         ),
         Attributes: ImmutableArray<DeclaredAttribute>.Empty
       )

Chickensoft.Introspection.Generator.Tests/test/src/models/GenericTypeNodeTest.cs

@@ -5,11 +5,11 @@ namespace Chickensoft.Introspection.Generator.Tests.Models;
 using Shouldly;
 using Xunit;
 
-public class GenericTypeNodeTest {
+public class TypeNodeTest {
   [Fact]
   public void Equality() {
-    var node = new GenericTypeNode(
-      "Type", false, ImmutableArray<GenericTypeNode>.Empty
+    var node = new TypeNode(
+      "Type", false, ImmutableArray<TypeNode>.Empty
     );
 
     node.Equals(null).ShouldBeFalse();

Chickensoft.Introspection.Generator/src/TypeGenerator.cs

@@ -539,7 +539,7 @@ TypeDeclarationSyntax type
       var defaultValueExpression =
         property.Initializer?.Value.NormalizeWhitespace().ToString();
 
-      var genericType = GenericTypeNode.Create(propType, isNullable);
+      var genericType = TypeNode.Create(propType, isNullable);
 
       properties.Add(
         new DeclaredProperty(
@@ -550,7 +550,7 @@ TypeDeclarationSyntax type
           IsRequired: isRequired,
           IsNullable: isNullable,
           DefaultValueExpression: defaultValueExpression,
-          GenericType: genericType,
+          TypeNode: genericType,
           Attributes: propertyAttributes
         )
       );

Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs

@@ -14,7 +14,7 @@ namespace Chickensoft.Introspection.Generator.Models;
 /// <param name="IsNullable">True if the property is nullable.</param>
 /// <param name="DefaultValueExpression">Expression to use as the default
 /// value.</param>
-/// <param name="GenericType">Type of the </param>
+/// <param name="TypeNode">Type of the </param>
 /// <param name="Attributes">Attributes applied to the </param>
 public sealed record DeclaredProperty(
   string Name,
@@ -24,7 +24,7 @@ public sealed record DeclaredProperty(
   bool IsRequired,
   bool IsNullable,
   string? DefaultValueExpression,
-  GenericTypeNode GenericType,
+  TypeNode TypeNode,
   ImmutableArray<DeclaredAttribute> Attributes
 ) {
   public void Write(IndentedTextWriter writer, string typeSimpleNameClosed) {
@@ -37,7 +37,7 @@ public void Write(IndentedTextWriter writer, string typeSimpleNameClosed) {
       ? $"static (object obj) => (({typeSimpleNameClosed})obj).{Name}"
       : "null";
 
-    var type = GenericType.ClosedType;
+    var type = TypeNode.ClosedType;
 
     var setter = HasSetter
       ? (
@@ -58,7 +58,7 @@ public void Write(IndentedTextWriter writer, string typeSimpleNameClosed) {
     writer.WriteLine($"Getter: {getter},");
     writer.WriteLine($"Setter: {setter},");
     writer.Write("GenericType: ");
-    GenericType.Write(writer);
+    TypeNode.Write(writer);
     writer.WriteLine(",");
     writer.WriteLine(
       "Attributes: new System.Collections.Generic.Dictionary" +
@@ -83,7 +83,7 @@ other is not null &&
     IsRequired == other.IsRequired &&
     IsNullable == other.IsNullable &&
     DefaultValueExpression == other.DefaultValueExpression &&
-    GenericType.Equals(other.GenericType) &&
+    TypeNode.Equals(other.TypeNode) &&
     Attributes.SequenceEqual(other.Attributes);
 
   public override int GetHashCode() => HashCode.Combine(
@@ -94,7 +94,7 @@ public override int GetHashCode() => HashCode.Combine(
     IsRequired,
     IsNullable,
     DefaultValueExpression,
-    GenericType,
+    TypeNode,
     Attributes
   );
 }

Chickensoft.Introspection.Generator/src/models/DeclaredType.cs

@@ -558,14 +558,14 @@ IEnumerable<DeclaredType> baseTypes
       .Where(prop => prop.IsInit || prop.IsRequired)
       .Select(
         (prop) => {
-          var bang = prop.GenericType.IsNullable ? "" : "!";
+          var bang = prop.TypeNode.IsNullable ? "" : "!";
           return
             $"{prop.Name} = args.ContainsKey(\"{prop.Name}\") " +
-            $"? ({prop.GenericType.ClosedType})args[\"{prop.Name}\"] : " +
+            $"? ({prop.TypeNode.ClosedType})args[\"{prop.Name}\"] : " +
             $"{(
             prop.DefaultValueExpression is { } value
               ? value
-              : $"default({prop.GenericType.ClosedType}){bang}"
+              : $"default({prop.TypeNode.ClosedType}){bang}"
             )}";
         }
       );

Chickensoft.Introspection.Generator/src/models/GenericTypeNode.cs renamed to Chickensoft.Introspection.Generator/src/models/TypeNode.cs

@@ -13,10 +13,10 @@ namespace Chickensoft.Introspection.Generator.Models;
 // Not to be confused with the type resolution tree node, which has to do with
 // where types are. This represents a generic type as a hierarchy of all the
 // types that comprise it.
-public sealed record GenericTypeNode(
+public sealed record TypeNode(
   string Type,
   bool IsNullable,
-  ImmutableArray<GenericTypeNode> Children
+  ImmutableArray<TypeNode> Children
 ) {
   /// <summary>
   /// Name of the type, including any generic type arguments — i.e., the closed
@@ -36,17 +36,17 @@ ImmutableArray<GenericTypeNode> Children
   /// </summary>
   /// <param name="typeSyntax">Generic name syntax.</param>
   /// <returns>Generic type node tree.</returns>
-  public static GenericTypeNode Create(
+  public static TypeNode Create(
     TypeSyntax typeSyntax, bool isNullable
   ) {
     isNullable = isNullable || typeSyntax.IsNullable();
     typeSyntax = typeSyntax.UnwrapNullable();
 
     if (typeSyntax is not GenericNameSyntax genericNameSyntax) {
-      return new GenericTypeNode(
+      return new TypeNode(
         typeSyntax.NormalizeWhitespace().ToString(),
         IsNullable: isNullable,
-        Children: ImmutableArray<GenericTypeNode>.Empty
+        Children: ImmutableArray<TypeNode>.Empty
       );
     }
 
@@ -61,7 +61,7 @@ public static GenericTypeNode Create(
       })
       .ToImmutableArray();
 
-    return new GenericTypeNode(type, isNullable, children);
+    return new TypeNode(type, isNullable, children);
   }
 
   public void Write(IndentedTextWriter writer) {
@@ -105,13 +105,15 @@ public void Write(IndentedTextWriter writer) {
     writer.Write(")");
   }
 
-  public bool Equals(GenericTypeNode? other) =>
+  public bool Equals(TypeNode? other) =>
     other is not null &&
     Type == other.Type &&
+    IsNullable == other.IsNullable &&
     Children.SequenceEqual(other.Children);
 
   public override int GetHashCode() => HashCode.Combine(
     Type,
+    IsNullable,
     Children
   );
 }