fix: remove redundant check for undefined

stephenh · Apr 1, 2021 · 997eba0 · 997eba0
1 parent c4977a2
commit 997eba0
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 32 deletions.
diff --git a/integration/simple-optionals/import_dir/thing.ts b/integration/simple-optionals/import_dir/thing.ts
@@ -48,8 +48,7 @@ export const ImportedThing = {
 
   toJSON(message: ImportedThing): unknown {
     const obj: any = {};
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     return obj;
   },
 

diff --git a/integration/simple-optionals/simple.ts b/integration/simple-optionals/simple.ts
@@ -410,8 +410,7 @@ export const Simple = {
     const obj: any = {};
     message.name !== undefined && (obj.name = message.name);
     message.age !== undefined && (obj.age = message.age);
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     message.child !== undefined && (obj.child = message.child ? Child.toJSON(message.child) : undefined);
     message.state !== undefined && (obj.state = stateEnumToJSON(message.state));
     if (message.grandChildren) {

diff --git a/integration/simple-optionals/thing.ts b/integration/simple-optionals/thing.ts
@@ -48,8 +48,7 @@ export const ImportedThing = {
 
   toJSON(message: ImportedThing): unknown {
     const obj: any = {};
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     return obj;
   },
 

diff --git a/integration/simple-snake/import_dir/thing.ts b/integration/simple-snake/import_dir/thing.ts
@@ -48,8 +48,7 @@ export const ImportedThing = {
 
   toJSON(message: ImportedThing): unknown {
     const obj: any = {};
-    message.created_at !== undefined &&
-      (obj.created_at = message.created_at !== undefined ? message.created_at.toISOString() : null);
+    message.created_at !== undefined && (obj.created_at = message.created_at.toISOString());
     return obj;
   },
 

diff --git a/integration/simple-snake/simple.ts b/integration/simple-snake/simple.ts
@@ -402,8 +402,7 @@ export const Simple = {
     const obj: any = {};
     message.name !== undefined && (obj.name = message.name);
     message.age !== undefined && (obj.age = message.age);
-    message.created_at !== undefined &&
-      (obj.created_at = message.created_at !== undefined ? message.created_at.toISOString() : null);
+    message.created_at !== undefined && (obj.created_at = message.created_at.toISOString());
     message.child !== undefined && (obj.child = message.child ? Child.toJSON(message.child) : undefined);
     message.state !== undefined && (obj.state = stateEnumToJSON(message.state));
     if (message.grand_children) {

diff --git a/integration/simple-unrecognized-enum/import_dir/thing.ts b/integration/simple-unrecognized-enum/import_dir/thing.ts
@@ -48,8 +48,7 @@ export const ImportedThing = {
 
   toJSON(message: ImportedThing): unknown {
     const obj: any = {};
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     return obj;
   },
 

diff --git a/integration/simple-unrecognized-enum/simple.ts b/integration/simple-unrecognized-enum/simple.ts
@@ -393,8 +393,7 @@ export const Simple = {
     const obj: any = {};
     message.name !== undefined && (obj.name = message.name);
     message.age !== undefined && (obj.age = message.age);
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     message.child !== undefined && (obj.child = message.child ? Child.toJSON(message.child) : undefined);
     message.state !== undefined && (obj.state = stateEnumToJSON(message.state));
     if (message.grandChildren) {

diff --git a/integration/simple/import_dir/thing.ts b/integration/simple/import_dir/thing.ts
@@ -48,8 +48,7 @@ export const ImportedThing = {
 
   toJSON(message: ImportedThing): unknown {
     const obj: any = {};
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     return obj;
   },
 

diff --git a/integration/simple/simple.ts b/integration/simple/simple.ts
@@ -478,8 +478,7 @@ export const Simple = {
     const obj: any = {};
     message.name !== undefined && (obj.name = message.name);
     message.age !== undefined && (obj.age = message.age);
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     message.child !== undefined && (obj.child = message.child ? Child.toJSON(message.child) : undefined);
     message.state !== undefined && (obj.state = stateEnumToJSON(message.state));
     if (message.grandChildren) {
@@ -1618,7 +1617,7 @@ export const SimpleWithMap_MapOfTimestampsEntry = {
   toJSON(message: SimpleWithMap_MapOfTimestampsEntry): unknown {
     const obj: any = {};
     message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value !== undefined ? message.value.toISOString() : null);
+    message.value !== undefined && (obj.value = message.value.toISOString());
     return obj;
   },
 
@@ -2462,8 +2461,7 @@ export const SimpleButOptional = {
     const obj: any = {};
     message.name !== undefined && (obj.name = message.name);
     message.age !== undefined && (obj.age = message.age);
-    message.createdAt !== undefined &&
-      (obj.createdAt = message.createdAt !== undefined ? message.createdAt.toISOString() : null);
+    message.createdAt !== undefined && (obj.createdAt = message.createdAt.toISOString());
     message.child !== undefined && (obj.child = message.child ? Child.toJSON(message.child) : undefined);
     message.state !== undefined &&
       (obj.state = message.state !== undefined ? stateEnumToJSON(message.state) : undefined);

diff --git a/integration/use-date-false/metadata.ts b/integration/use-date-false/metadata.ts
@@ -48,8 +48,7 @@ export const Metadata = {
 
   toJSON(message: Metadata): unknown {
     const obj: any = {};
-    message.lastEdited !== undefined &&
-      (obj.lastEdited = message.lastEdited !== undefined ? fromTimestamp(message.lastEdited).toISOString() : null);
+    message.lastEdited !== undefined && (obj.lastEdited = fromTimestamp(message.lastEdited).toISOString());
     return obj;
   },
 

diff --git a/integration/use-date-true/use-date-true.ts b/integration/use-date-true/use-date-true.ts
@@ -109,16 +109,13 @@ export const Todo = {
   toJSON(message: Todo): unknown {
     const obj: any = {};
     message.id !== undefined && (obj.id = message.id);
-    message.timestamp !== undefined &&
-      (obj.timestamp = message.timestamp !== undefined ? message.timestamp.toISOString() : null);
+    message.timestamp !== undefined && (obj.timestamp = message.timestamp.toISOString());
     if (message.repeatedTimestamp) {
-      obj.repeatedTimestamp = message.repeatedTimestamp.map((e) => (e !== undefined ? e.toISOString() : null));
+      obj.repeatedTimestamp = message.repeatedTimestamp.map((e) => e.toISOString());
     } else {
       obj.repeatedTimestamp = [];
     }
-    message.optionalTimestamp !== undefined &&
-      (obj.optionalTimestamp =
-        message.optionalTimestamp !== undefined ? message.optionalTimestamp.toISOString() : null);
+    message.optionalTimestamp !== undefined && (obj.optionalTimestamp = message.optionalTimestamp.toISOString());
     obj.mapOfTimestamps = {};
     if (message.mapOfTimestamps) {
       Object.entries(message.mapOfTimestamps).forEach(([k, v]) => {
@@ -215,7 +212,7 @@ export const Todo_MapOfTimestampsEntry = {
   toJSON(message: Todo_MapOfTimestampsEntry): unknown {
     const obj: any = {};
     message.key !== undefined && (obj.key = message.key);
-    message.value !== undefined && (obj.value = message.value !== undefined ? message.value.toISOString() : null);
+    message.value !== undefined && (obj.value = message.value.toISOString());
     return obj;
   },
 

diff --git a/src/main.ts b/src/main.ts
@@ -938,11 +938,11 @@ function generateToJson(ctx: Context, fullName: string, messageDesc: DescriptorP
           ? code`${from} !== undefined ? ${toJson}(${from}) : undefined`
           : code`${toJson}(${from})`;
       } else if (isTimestamp(field) && options.useDate === DateOption.DATE) {
-        return code`${from} !== undefined ? ${from}.toISOString() : null`;
+        return code`${from}.toISOString()`;
       } else if (isTimestamp(field) && options.useDate === DateOption.STRING) {
         return code`${from}`;
       } else if (isTimestamp(field) && options.useDate === DateOption.TIMESTAMP) {
-        return code`${from} !== undefined ? ${utils.fromTimestamp}(${from}).toISOString() : null`;
+        return code`${utils.fromTimestamp}(${from}).toISOString()`;
       } else if (isMapType(ctx, messageDesc, field)) {
         // For map types, drill-in and then admittedly re-hard-code our per-value-type logic
         const valueType = (typeMap.get(field.typeName)![2] as DescriptorProto).field[1];