Use proto3's default values in proto2 when disableProto2Optionals=true

stephenh · Nov 9, 2024 · a475c9b · a475c9b
1 parent c9fc51a
commit a475c9b
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 57 deletions.
diff --git a/integration/proto2-no-optionals/simple.ts b/integration/proto2-no-optionals/simple.ts
diff --git a/src/types.ts b/src/types.ts
@@ -216,7 +216,12 @@ export function defaultValue(ctx: Context, field: FieldDescriptorProto): any {
 
   if (
     options.noDefaultsForOptionals ||
-    (!ctx.currentFile.isProto3Syntax && field.label === FieldDescriptorProto_Label.LABEL_OPTIONAL))
+    (
+      !ctx.currentFile.isProto3Syntax &&
+      field.label === FieldDescriptorProto_Label.LABEL_OPTIONAL &&
+      !ctx.options.disableProto2Optionals
+    )
+  )
   {
     return options.useNullAsOptional ? null : undefined;
   }