Use same key-value pair logic for readSnippet(x).toCodeString([]) !…

…= "x" cases
stephenh · Nov 9, 2024 · 844da41 · 844da41
1 parent 999346e
commit 844da41
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/integration/map-long-optional/test.ts b/integration/map-long-optional/test.ts
diff --git a/src/main.ts b/src/main.ts
@@ -2759,23 +2759,24 @@ function generateFromPartial(ctx: Context, fullName: string, messageDesc: Descri
           ${oneofNameWithMessage} = { $case: '${fieldName}', ${valueName}: ${v} };
         }
       `);
-    } else if (readSnippet(`x`).toCodeString([]) == "x") {
-      let fallback 
+    } else {
+      let fallback;
 
       if (keyValuePair) {
-        fallback = defaultValue(ctx, { ...field, label: FieldDescriptorProto_Label.LABEL_REQUIRED })
+        fallback = defaultValue(ctx, { ...field, label: FieldDescriptorProto_Label.LABEL_REQUIRED });
       } else {
         fallback = isWithinOneOf(field) || noDefaultValue ? "undefined" : defaultValue(ctx, field);
       }
 
-      chunks.push(code`${messageProperty} = ${objectProperty} ?? ${fallback};`);
-    } else {
-      const fallback = isWithinOneOf(field) || noDefaultValue ? "undefined" : defaultValue(ctx, field);
-      chunks.push(code`
-        ${messageProperty} = (${objectProperty} !== undefined && ${objectProperty} !== null)
-          ? ${readSnippet(`${objectProperty}`)}
-          : ${fallback};
-      `);
+      if (readSnippet(`x`).toCodeString([]) == "x") {
+        chunks.push(code`${messageProperty} = ${objectProperty} ?? ${fallback};`);
+      } else {
+        chunks.push(code`
+          ${messageProperty} = (${objectProperty} !== undefined && ${objectProperty} !== null)
+            ? ${readSnippet(`${objectProperty}`)}
+            : ${fallback};
+        `);
+      }
     }
   });