fix: expose default value, make generic type receiver closures static

Joanna May · Joanna May · commit 893efe5f71f2 · 2024-08-23T18:35:48.000-05:00
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/BaseClasses_A_BaseClass.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/BaseClasses_A_BaseClass.g.cs
@@ -23,6 +23,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((BaseClass)obj).Name,
         Setter: null,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/TestCases_SetOnlyPropertyE303C8557E.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/TestCases_SetOnlyPropertyE303C8557E.g.cs
@@ -21,6 +21,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Value",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: false,
         Getter: null,
         Setter: static (object obj, object? value) => ((SetOnlyProperty)obj).Value = (string)value!,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/Tests_TestCases_BaseModel6634CD33B5.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/Tests_TestCases_BaseModel6634CD33B5.g.cs
@@ -24,6 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((BaseModel)obj).Name,
         Setter: static (object obj, object? value) => ((BaseModel)obj).Name = (string)value!,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/_MyContainerClass_MyModel67E837FC39.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/_MyContainerClass_MyModel67E837FC39.g.cs
@@ -25,6 +25,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Age",
           IsInit: false,
           IsRequired: false,
+          HasDefaultValue: true,
           Getter: static (object obj) => ((MyModel)obj).Age,
           Setter: static (object obj, object? value) => ((MyModel)obj).Age = (int)value,
           GenericType: new GenericType(
@@ -44,6 +45,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Name",
           IsInit: false,
           IsRequired: false,
+          HasDefaultValue: true,
           Getter: static (object obj) => ((MyModel)obj).Name,
           Setter: static (object obj, object? value) => ((MyModel)obj).Name = (string)value!,
           GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/er2_DeeplyNestedBaseClassAC795ED913.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/er2_DeeplyNestedBaseClassAC795ED913.g.cs
@@ -25,6 +25,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
             Name: "DeepName",
             IsInit: true,
             IsRequired: true,
+            HasDefaultValue: false,
             Getter: static (object obj) => ((DeeplyNestedBaseClass)obj).DeepName,
             Setter: null,
             GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/her_A_B_C_D_SomeBaseClassECA01F390E.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/her_A_B_C_D_SomeBaseClassECA01F390E.g.cs
@@ -27,6 +27,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "Identifier",
                 IsInit: true,
                 IsRequired: true,
+                HasDefaultValue: false,
                 Getter: static (object obj) => ((SomeBaseClass)obj).Identifier,
                 Setter: null,
                 GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/or_Tests_TestCases_MyType1CDCCD6086.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/or_Tests_TestCases_MyType1CDCCD6086.g.cs
@@ -28,6 +28,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "MyProperty",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((MyType)obj).MyProperty,
         Setter: static (object obj, object? value) => ((MyType)obj).MyProperty = (string)value!,
         GenericType: new GenericType(
@@ -51,6 +52,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "NoAttributeSoNoMetadata",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((MyType)obj).NoAttributeSoNoMetadata,
         Setter: null,
         GenericType: new GenericType(
@@ -67,6 +69,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "OptionalFloat",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((MyType)obj).OptionalFloat,
         Setter: static (object obj, object? value) => ((MyType)obj).OptionalFloat = (Nullable<float>)value,
         GenericType: new GenericType(
@@ -94,6 +97,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "OptionalInt",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((MyType)obj).OptionalInt,
         Setter: static (object obj, object? value) => ((MyType)obj).OptionalInt = (int)value,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/s_AttributesWithNamedArgs21E465F742.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/s_AttributesWithNamedArgs21E465F742.g.cs
@@ -24,6 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((AttributesWithNamedArgs)obj).Name,
         Setter: null,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/s_TestCases_InitArgsModel651DDFA4A7.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/s_TestCases_InitArgsModel651DDFA4A7.g.cs
@@ -24,6 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Address",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((InitArgsModel)obj).Address,
         Setter: static (object obj, object? value) => ((InitArgsModel)obj).Address = (string)value,
         GenericType: new GenericType(
@@ -43,6 +44,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Age",
         IsInit: true,
         IsRequired: true,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((InitArgsModel)obj).Age,
         Setter: null,
         GenericType: new GenericType(
@@ -62,6 +64,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Description",
         IsInit: true,
         IsRequired: false,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((InitArgsModel)obj).Description,
         Setter: null,
         GenericType: new GenericType(
@@ -81,6 +84,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "HasAttended",
         IsInit: true,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((InitArgsModel)obj).HasAttended,
         Setter: null,
         GenericType: new GenericType(
@@ -100,6 +104,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "IsAttending",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((InitArgsModel)obj).IsAttending,
         Setter: static (object obj, object? value) => ((InitArgsModel)obj).IsAttending = (InitArgsEnum)value!,
         GenericType: new GenericType(
@@ -119,6 +124,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((InitArgsModel)obj).Name,
         Setter: null,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/s_TestCases_PropertyModel4D221791B1.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/s_TestCases_PropertyModel4D221791B1.g.cs
@@ -21,6 +21,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Value",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((PropertyModel)obj).Value,
         Setter: null,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/sts_TestCases_Collections23D60571D5.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/sts_TestCases_Collections23D60571D5.g.cs
@@ -24,6 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "NestedCollections",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: true,
         Getter: static (object obj) => ((Collections)obj).NestedCollections,
         Setter: null,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_DerivedModel2583598D69.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_DerivedModel2583598D69.g.cs
@@ -24,6 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Age",
         IsInit: false,
         IsRequired: false,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((DerivedModel)obj).Age,
         Setter: static (object obj, object? value) => ((DerivedModel)obj).Age = (int)value!,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_PartialModelED2F9C08D8.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_PartialModelED2F9C08D8.g.cs
@@ -24,6 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Age",
         IsInit: true,
         IsRequired: true,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((PartialModel)obj).Age,
         Setter: null,
         GenericType: new GenericType(
@@ -43,6 +44,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
+        HasDefaultValue: false,
         Getter: static (object obj) => ((PartialModel)obj).Name,
         Setter: null,
         GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/wo_IThree_Four_NestedType7FDE758058.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/wo_IThree_Four_NestedType7FDE758058.g.cs
@@ -32,6 +32,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "MyProperty",
                 IsInit: false,
                 IsRequired: false,
+                HasDefaultValue: true,
                 Getter: static (object obj) => ((NestedType)obj).MyProperty,
                 Setter: static (object obj, object? value) => ((NestedType)obj).MyProperty = (string)value!,
                 GenericType: new GenericType(
@@ -55,6 +56,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "OptionalFloat",
                 IsInit: false,
                 IsRequired: false,
+                HasDefaultValue: true,
                 Getter: static (object obj) => ((NestedType)obj).OptionalFloat,
                 Setter: static (object obj, object? value) => ((NestedType)obj).OptionalFloat = (float)value,
                 GenericType: new GenericType(
@@ -74,6 +76,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "OptionalInt",
                 IsInit: false,
                 IsRequired: false,
+                HasDefaultValue: true,
                 Getter: static (object obj) => ((NestedType)obj).OptionalInt,
                 Setter: static (object obj, object? value) => ((NestedType)obj).OptionalInt = (int)value,
                 GenericType: new GenericType(
diff --git a/Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs b/Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs
@@ -50,6 +50,9 @@ public void Write(IndentedTextWriter writer, string typeSimpleNameClosed) {
     writer.WriteLine($"Name: \"{Name}\",");
     writer.WriteLine($"IsInit: {(IsInit ? "true" : "false")},");
     writer.WriteLine($"IsRequired: {(IsRequired ? "true" : "false")},");
+    writer.WriteLine(
+      $"HasDefaultValue: {(DefaultValueExpression is not null ? "true" : "false")},"
+    );
     writer.WriteLine($"Getter: {getter},");
     writer.WriteLine($"Setter: {setter},");
     writer.Write("GenericType: ");
@@ -75,6 +78,7 @@ other is not null &&
     HasGetter == other.HasGetter &&
     HasSetter == other.HasSetter &&
     IsInit == other.IsInit &&
+    IsRequired == other.IsRequired &&
     IsNullable == other.IsNullable &&
     DefaultValueExpression == other.DefaultValueExpression &&
     GenericType.Equals(other.GenericType) &&
@@ -85,6 +89,7 @@ public override int GetHashCode() => HashCode.Combine(
     HasGetter,
     HasSetter,
     IsInit,
+    IsRequired,
     IsNullable,
     DefaultValueExpression,
     GenericType,
diff --git a/Chickensoft.Introspection.Generator/src/models/GenericTypeNode.cs b/Chickensoft.Introspection.Generator/src/models/GenericTypeNode.cs
@@ -75,12 +75,12 @@ public void Write(IndentedTextWriter writer) {
     }
 
     writer.WriteLine(
-      "GenericTypeGetter: receiver => " +
+      "GenericTypeGetter: static receiver => " +
       $"receiver.Receive<{closedType}>(),"
     );
     if (Children.Length >= 2) {
       writer.WriteLine(
-        "GenericTypeGetter2: receiver => " +
+        "GenericTypeGetter2: static receiver => " +
         $"receiver.Receive<{Children[0].ClosedType}, {Children[1].ClosedType}>()"
       );
     }
diff --git a/Chickensoft.Introspection.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/Tests_TypeGraphTest_Model4FF6A4782E.g.cs b/Chickensoft.Introspection.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/Tests_TypeGraphTest_Model4FF6A4782E.g.cs
@@ -31,13 +31,14 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Name",
           IsInit: false,
           IsRequired: false,
+          HasDefaultValue: true,
           Getter: static (object obj) => ((Model)obj).Name,
           Setter: null,
           GenericType: new GenericType(
             OpenType: typeof(string),
             ClosedType: typeof(string),
             Arguments: System.Array.Empty<GenericType>(),
-            GenericTypeGetter: receiver => receiver.Receive<string>(),
+            GenericTypeGetter: static receiver => receiver.Receive<string>(),
             GenericTypeGetter2: default
           ),
           Attributes: new System.Collections.Generic.Dictionary<System.Type, System.Attribute[]>() {
diff --git a/Chickensoft.Introspection.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/erMetadataTest_ChildModelD70FB8BF24.g.cs b/Chickensoft.Introspection.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/erMetadataTest_ChildModelD70FB8BF24.g.cs
@@ -31,13 +31,14 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "ChildName",
           IsInit: true,
           IsRequired: false,
+          HasDefaultValue: false,
           Getter: static (object obj) => ((ChildModel)obj).ChildName,
           Setter: null,
           GenericType: new GenericType(
             OpenType: typeof(string),
             ClosedType: typeof(string),
             Arguments: System.Array.Empty<GenericType>(),
-            GenericTypeGetter: receiver => receiver.Receive<string>(),
+            GenericTypeGetter: static receiver => receiver.Receive<string>(),
             GenericTypeGetter2: default
           ),
           Attributes: new System.Collections.Generic.Dictionary<System.Type, System.Attribute[]>() {
diff --git a/Chickensoft.Introspection.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/hMemberMetadataTest_Model8D28D57DDD.g.cs b/Chickensoft.Introspection.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/hMemberMetadataTest_Model8D28D57DDD.g.cs
@@ -31,13 +31,14 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Age",
           IsInit: true,
           IsRequired: true,
+          HasDefaultValue: false,
           Getter: static (object obj) => ((Model)obj).Age,
           Setter: null,
           GenericType: new GenericType(
             OpenType: typeof(int),
             ClosedType: typeof(int),
             Arguments: System.Array.Empty<GenericType>(),
-            GenericTypeGetter: receiver => receiver.Receive<int>(),
+            GenericTypeGetter: static receiver => receiver.Receive<int>(),
             GenericTypeGetter2: default
           ),
           Attributes: new System.Collections.Generic.Dictionary<System.Type, System.Attribute[]>() {
@@ -50,13 +51,14 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Name",
           IsInit: true,
           IsRequired: false,
+          HasDefaultValue: false,
           Getter: static (object obj) => ((Model)obj).Name,
           Setter: null,
           GenericType: new GenericType(
             OpenType: typeof(string),
             ClosedType: typeof(string),
             Arguments: System.Array.Empty<GenericType>(),
-            GenericTypeGetter: receiver => receiver.Receive<string>(),
+            GenericTypeGetter: static receiver => receiver.Receive<string>(),
             GenericTypeGetter2: default
           ),
           Attributes: new System.Collections.Generic.Dictionary<System.Type, System.Attribute[]>() {
diff --git a/Chickensoft.Introspection.Tests/test/models/PropertyMetadataTest.cs b/Chickensoft.Introspection.Tests/test/models/PropertyMetadataTest.cs
@@ -10,6 +10,7 @@ public void Initializes() {
       Name: "Name",
       IsInit: false,
       IsRequired: false,
+      HasDefaultValue: false,
       Getter: _ => "Value",
       Setter: (_, _) => { },
       GenericType: new GenericType(typeof(string), typeof(string), [], _ => { }, _ => { }),
diff --git a/Chickensoft.Introspection/src/models/PropertyMetadata.cs b/Chickensoft.Introspection/src/models/PropertyMetadata.cs
@@ -9,6 +9,8 @@ namespace Chickensoft.Introspection;
 /// <param name="Name">Property name.</param>
 /// <param name="IsInit">True if the property is init-only.</param>
 /// <param name="IsRequired">True if the property is required.</param>
+/// <param name="HasDefaultValue">True if the property has a default value.
+/// </param>
 /// <param name="Getter">Getter function.</param>
 /// <param name="Setter">Setter function.</param>
 /// <param name="GenericType">If the property's type is a closed constructed
@@ -21,6 +23,7 @@ public sealed record PropertyMetadata(
   string Name,
   bool IsInit,
   bool IsRequired,
+  bool HasDefaultValue,
   Func<object, object?>? Getter,
   Action<object, object?>? Setter,
   GenericType GenericType,
