Mark messages as optional

AdrienVannson · AdrienVannson · commit f5a5c8c42ef7 · 2024-11-12T18:01:26.000+01:00
diff --git a/src/betterproto/__init__.py b/src/betterproto/__init__.py
@@ -204,12 +204,12 @@ def dataclass_field(
     repeated: bool = False,
 ) -> dataclasses.Field:
     """Creates a dataclass field with attached protobuf metadata."""
-    if optional or group:
-        def default_factory():
-            return None
-    elif repeated:
+    if repeated:
         def default_factory():
             return []
+    elif optional or group:
+        def default_factory():
+            return None
 
     return dataclasses.field(
         default_factory=default_factory,
diff --git a/src/betterproto/plugin/models.py b/src/betterproto/plugin/models.py
@@ -504,7 +504,7 @@ def repeated(self) -> bool:
 
     @property
     def optional(self) -> bool:
-        return self.proto_obj.proto3_optional
+        return self.proto_obj.proto3_optional or self.field_type == "message"
 
     @property
     def field_type(self) -> str:
