fix: only allow init args to be set at construction (and respect explicit default values)

Joanna May · Joanna May · commit 2a92fc6a0929 · 2024-08-23T00:18:42.000-05:00
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/A_ChildBaseFullyQualified58F37FBE84.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/A_ChildBaseFullyQualified58F37FBE84.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
       public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
         args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");
         return new ChildBaseFullyQualified() {
-          Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+          Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
         };
       }
       [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/AliasedStuff_Nested_Child.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/AliasedStuff_Nested_Child.g.cs
@@ -43,7 +43,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing Child requires init args.");
       return new Child() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/AliasedStuff_Nested_Child2.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/AliasedStuff_Nested_Child2.g.cs
@@ -43,7 +43,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing Child2 requires init args.");
       return new Child2() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/B_ChildBaseFullyQualifiedF9E7B51DD8.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/B_ChildBaseFullyQualifiedF9E7B51DD8.g.cs
@@ -43,7 +43,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
           args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");
           return new ChildBaseFullyQualified() {
-            Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+            Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
           };
         }
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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
@@ -57,7 +57,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing BaseClass requires init args.");
       return new BaseClass() {
-        Name = args.ContainsKey("Name") ? (string)args["Name"] : default!
+        Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/BaseClasses_B_Child.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/BaseClasses_B_Child.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing Child requires init args.");
       return new Child() {
-        Name = args.ContainsKey("Name") ? (string)args["Name"] : default!
+        Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/C_ChildBaseFullyQualifiedD92201992B.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/C_ChildBaseFullyQualifiedD92201992B.g.cs
@@ -44,7 +44,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
             args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");
             return new ChildBaseFullyQualified() {
-              Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+              Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
             };
           }
           [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/StaticUsings_ChildWithStaticBaseRef.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/StaticUsings_ChildWithStaticBaseRef.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildWithStaticBaseRef requires init args.");
       return new ChildWithStaticBaseRef() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/_ChildBaseFullyQualified2447EE53E80.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/_ChildBaseFullyQualified2447EE53E80.g.cs
@@ -41,7 +41,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified2 requires init args.");
       return new ChildBaseFullyQualified2() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/e_ChildBaseFullyQualifiedF82AB94D12.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/e_ChildBaseFullyQualifiedF82AB94D12.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");
       return new ChildBaseFullyQualified() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/eeplyNamespaced_SomeChild7E3B519F42.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/eeplyNamespaced_SomeChild7E3B519F42.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing SomeChild requires init args.");
       return new SomeChild() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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
@@ -59,7 +59,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
           args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing DeeplyNestedBaseClass requires init args.");
           return new DeeplyNestedBaseClass() {
-            DeepName = args.ContainsKey("DeepName") ? (string)args["DeepName"] : default!
+            DeepName = args.ContainsKey("DeepName") ? (string)args["DeepName"] : default(string)!
           };
         }
         [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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
@@ -61,7 +61,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
             public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
               args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing SomeBaseClass requires init args.");
               return new SomeBaseClass() {
-                Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+                Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
               };
             }
             [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/hildBaseNotFullyQualified96BFFBDF77.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/hildBaseNotFullyQualified96BFFBDF77.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseNotFullyQualified requires init args.");
       return new ChildBaseNotFullyQualified() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/ingDeeplyNamespaced_ChildB31D784D2E.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/ingDeeplyNamespaced_ChildB31D784D2E.g.cs
@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing Child requires init args.");
       return new Child() {
-        DeepName = args.ContainsKey("DeepName") ? (string)args["DeepName"] : default!
+        DeepName = args.ContainsKey("DeepName") ? (string)args["DeepName"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/r_ChildBaseFullyQualified695F3233EA.g.cs b/Chickensoft.Introspection.Generator.Tests/.generated/Chickensoft.Introspection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/r_ChildBaseFullyQualified695F3233EA.g.cs
@@ -41,7 +41,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");
       return new ChildBaseFullyQualified() {
-        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!
+        Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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
@@ -64,7 +64,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing AttributesWithNamedArgs requires init args.");
       return new AttributesWithNamedArgs() {
-        Name = args.ContainsKey("Name") ? (string)args["Name"] : default!
+        Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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
@@ -77,6 +77,44 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           }
         }
       ), 
+      new Chickensoft.Introspection.PropertyMetadata(
+        Name: "HasAttended",
+        IsInit: true,
+        IsRequired: false,
+        Getter: (object obj) => ((InitArgsModel)obj).HasAttended,
+        Setter: null,
+        GenericType: new GenericType(
+          OpenType: typeof(InitArgsEnum),
+          ClosedType: typeof(InitArgsEnum),
+          Arguments: System.Array.Empty<GenericType>(),
+          GenericTypeGetter: receiver => receiver.Receive<InitArgsEnum>(),
+          GenericTypeGetter2: default
+        ),
+        Attributes: new System.Collections.Generic.Dictionary<System.Type, System.Attribute[]>() {
+          [typeof(TagAttribute)] = new System.Attribute[] {
+            new TagAttribute("has_attended")
+          }
+        }
+      ), 
+      new Chickensoft.Introspection.PropertyMetadata(
+        Name: "IsAttending",
+        IsInit: false,
+        IsRequired: false,
+        Getter: (object obj) => ((InitArgsModel)obj).IsAttending,
+        Setter: (object obj, object? value) => ((InitArgsModel)obj).IsAttending = (InitArgsEnum)value!,
+        GenericType: new GenericType(
+          OpenType: typeof(InitArgsEnum),
+          ClosedType: typeof(InitArgsEnum),
+          Arguments: System.Array.Empty<GenericType>(),
+          GenericTypeGetter: receiver => receiver.Receive<InitArgsEnum>(),
+          GenericTypeGetter2: default
+        ),
+        Attributes: new System.Collections.Generic.Dictionary<System.Type, System.Attribute[]>() {
+          [typeof(TagAttribute)] = new System.Attribute[] {
+            new TagAttribute("is_attending")
+          }
+        }
+      ), 
       new Chickensoft.Introspection.PropertyMetadata(
         Name: "Name",
         IsInit: true,
@@ -121,10 +159,10 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing InitArgsModel requires init args.");
       return new InitArgsModel() {
-        Address = args.ContainsKey("Address") ? (string)args["Address"] : default!, 
-        Age = args.ContainsKey("Age") ? (int)args["Age"] : default!, 
-        Description = args.ContainsKey("Description") ? (string)args["Description"] : default!, 
-        Name = args.ContainsKey("Name") ? (string)args["Name"] : default!
+        Age = args.ContainsKey("Age") ? (int)args["Age"] : default(int)!, 
+        Description = args.ContainsKey("Description") ? (string)args["Description"] : default(string)!, 
+        HasAttended = args.ContainsKey("HasAttended") ? (InitArgsEnum)args["HasAttended"] : InitArgsEnum.No, 
+        Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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
@@ -83,8 +83,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
     public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
       args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing PartialModel requires init args.");
       return new PartialModel() {
-        Age = args.ContainsKey("Age") ? (int)args["Age"] : default!, 
-        Name = args.ContainsKey("Name") ? (string)args["Name"] : default!
+        Age = args.ContainsKey("Age") ? (int)args["Age"] : default(int)!, 
+        Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!
       };
     }
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
diff --git a/Chickensoft.Introspection.Generator.Tests/test/src/models/DeclaredPropertyTest.cs b/Chickensoft.Introspection.Generator.Tests/test/src/models/DeclaredPropertyTest.cs
@@ -15,6 +15,7 @@ public void Equality() {
       IsInit: false,
       IsRequired: false,
       IsNullable: false,
+      DefaultValueExpression: null,
       GenericType: new GenericTypeNode(
         "System.String", Children: ImmutableArray<GenericTypeNode>.Empty
       ),
@@ -33,6 +34,7 @@ public void Equality() {
         IsInit: false,
         IsRequired: false,
         IsNullable: false,
+        DefaultValueExpression: null,
         GenericType: new GenericTypeNode(
           "System.String", Children: ImmutableArray<GenericTypeNode>.Empty
         ),
@@ -47,6 +49,7 @@ public void Equality() {
       IsInit: false,
       IsRequired: false,
       IsNullable: false,
+      DefaultValueExpression: null,
       GenericType: new GenericTypeNode(
         "System.String", Children: ImmutableArray<GenericTypeNode>.Empty
       ),
@@ -61,6 +64,7 @@ public void Equality() {
         IsInit: false,
         IsRequired: false,
         IsNullable: false,
+        DefaultValueExpression: null,
         GenericType: new GenericTypeNode(
           "System.String", Children: ImmutableArray<GenericTypeNode>.Empty
         ),
diff --git a/Chickensoft.Introspection.Generator.Tests/test_cases/InitArgs.cs b/Chickensoft.Introspection.Generator.Tests/test_cases/InitArgs.cs
@@ -3,8 +3,16 @@ namespace Chickensoft.Introspection.Generator.Tests.TestCases;
 using Chickensoft.Introspection;
 using Chickensoft.Introspection.Generator.Tests.TestUtils;
 
+
+
 [Meta, Id("init_args_model")]
 public partial class InitArgsModel {
+  public enum InitArgsEnum {
+    No = -1,
+    Undecided = 0,
+    Yes = 1,
+  }
+
   [Tag("name")]
   public required string Name { get; init; }
 
@@ -16,4 +24,12 @@ public partial class InitArgsModel {
 
   [Tag("address")]
   public string? Address { get; set; } // not init
+
+  // Init/set enum with default value
+  [Tag("is_attending")]
+  public InitArgsEnum IsAttending { get; set; } = InitArgsEnum.Yes;
+
+  // Init enum with default value
+  [Tag("has_attended")]
+  public InitArgsEnum HasAttended { get; init; } = InitArgsEnum.No;
 }
diff --git a/Chickensoft.Introspection.Generator/src/TypeGenerator.cs b/Chickensoft.Introspection.Generator/src/TypeGenerator.cs
@@ -529,6 +529,9 @@ property.Type is GenericNameSyntax generic &&
           generic.Identifier.ValueText == "Nullable"
         );
 
+      var defaultValueExpression =
+        property.Initializer?.Value.NormalizeWhitespace().ToString();
+
       var propType = property.Type;
 
       if (property.Type is NullableTypeSyntax nullableType) {
@@ -550,6 +553,7 @@ property.Type is GenericNameSyntax generic &&
           IsInit: isInit,
           IsRequired: isRequired,
           IsNullable: isNullable,
+          DefaultValueExpression: defaultValueExpression,
           GenericType: genericType,
           Attributes: propertyAttributes
         )
diff --git a/Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs b/Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs
@@ -12,6 +12,8 @@ namespace Chickensoft.Introspection.Generator.Models;
 /// <param name="HasGetter">True if the property has a getter.</param>
 /// <param name="HasSetter">True if the property has a setter.</param>
 /// <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="Attributes">Attributes applied to the </param>
 public sealed record DeclaredProperty(
@@ -21,6 +23,7 @@ public sealed record DeclaredProperty(
   bool IsInit,
   bool IsRequired,
   bool IsNullable,
+  string? DefaultValueExpression,
   GenericTypeNode GenericType,
   ImmutableArray<DeclaredAttribute> Attributes
 ) {
@@ -72,6 +75,7 @@ other is not null &&
     HasSetter == other.HasSetter &&
     IsInit == other.IsInit &&
     IsNullable == other.IsNullable &&
+    DefaultValueExpression == other.DefaultValueExpression &&
     GenericType.Equals(other.GenericType) &&
     Attributes.SequenceEqual(other.Attributes);
 
@@ -81,6 +85,7 @@ public override int GetHashCode() => HashCode.Combine(
     HasSetter,
     IsInit,
     IsNullable,
+    DefaultValueExpression,
     GenericType,
     Attributes
   );
diff --git a/Chickensoft.Introspection.Generator/src/models/DeclaredType.cs b/Chickensoft.Introspection.Generator/src/models/DeclaredType.cs
@@ -529,11 +529,12 @@ IEnumerable<DeclaredType> baseTypes
     writer.WriteLine($"return new {Reference.SimpleNameClosed}() {{");
 
     var propStrings = allProperties
-      .Where(prop => prop.HasSetter)
+      .Where(prop => prop.IsInit || prop.IsRequired)
       .Select(
         (prop) =>
           $"{prop.Name} = args.ContainsKey(\"{prop.Name}\") " +
-          $"? ({prop.GenericType.ClosedType})args[\"{prop.Name}\"] : default!"
+          $"? ({prop.GenericType.ClosedType})args[\"{prop.Name}\"] : " +
+          $"{(prop.DefaultValueExpression is { } value ? value : $"default({prop.GenericType.ClosedType})!")}"
       );
 
     writer.WriteCommaSeparatedList(
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
@@ -68,9 +68,9 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
       public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {
         args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildModel requires init args.");
         return new ChildModel() {
-          Age = args.ContainsKey("Age") ? (int)args["Age"] : default!, 
-          ChildName = args.ContainsKey("ChildName") ? (string)args["ChildName"] : default!, 
-          Name = args.ContainsKey("Name") ? (string)args["Name"] : default!
+          Age = args.ContainsKey("Age") ? (int)args["Age"] : default(int)!, 
+          ChildName = args.ContainsKey("ChildName") ? (string)args["ChildName"] : default(string)!, 
+          Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!
         };
       }
       [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
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

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {`
`42`	`42`	`public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {`
`43`	`43`	`args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");`
`44`	`44`	`return new ChildBaseFullyQualified() {`
`45`		`- Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!`
	`45`	`+ Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!`
`46`	`46`	`};`
`47`	`47`	`}`
`48`	`48`	`[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {`
`43`	`43`	`public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {`
`44`	`44`	`args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing Child requires init args.");`
`45`	`45`	`return new Child() {`
`46`		`- Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!`
	`46`	`+ Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!`
`47`	`47`	`};`
`48`	`48`	`}`
`49`	`49`	`[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {`
`57`	`57`	`public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {`
`58`	`58`	`args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing BaseClass requires init args.");`
`59`	`59`	`return new BaseClass() {`
`60`		`- Name = args.ContainsKey("Name") ? (string)args["Name"] : default!`
	`60`	`+ Name = args.ContainsKey("Name") ? (string)args["Name"] : default(string)!`
`61`	`61`	`};`
`62`	`62`	`}`
`63`	`63`	`[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {`
`44`	`44`	`public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {`
`45`	`45`	`args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified requires init args.");`
`46`	`46`	`return new ChildBaseFullyQualified() {`
`47`		`- Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!`
	`47`	`+ Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!`
`48`	`48`	`};`
`49`	`49`	`}`
`50`	`50`	`[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {`
`41`	`41`	`public object Construct(System.Collections.Generic.IReadOnlyDictionary<string, object?>? args = null) {`
`42`	`42`	`args = args ?? throw new System.ArgumentNullException(nameof(args), "Constructing ChildBaseFullyQualified2 requires init args.");`
`43`	`43`	`return new ChildBaseFullyQualified2() {`
`44`		`- Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default!`
	`44`	`+ Identifier = args.ContainsKey("Identifier") ? (string)args["Identifier"] : default(string)!`
`45`	`45`	`};`
`46`	`46`	`}`
`47`	`47`	`[System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]`