feat: Initialize lists with map (#387)

* Move undefined/null check in main loop * Move list initializers * Reduce code size of undefined/null check for lists * Use map to intitialize lists * Add missing semicolon
stephenh · Nov 15, 2021 · 200e674 · 200e674
1 parent b2499a7
commit 200e674
Show file tree

Hide file tree

Showing 28 changed files with 162 additions and 642 deletions.
diff --git a/integration/batching-with-context/batching.ts b/integration/batching-with-context/batching.ts
@@ -77,12 +77,7 @@ export const BatchQueryRequest = {
 
   fromJSON(object: any): BatchQueryRequest {
     const message = { ...baseBatchQueryRequest } as BatchQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(String(e));
-      }
-    }
+    message.ids = (object.ids ?? []).map((e: any) => String(e));
     return message;
   },
 
@@ -98,12 +93,7 @@ export const BatchQueryRequest = {
 
   fromPartial(object: DeepPartial<BatchQueryRequest>): BatchQueryRequest {
     const message = { ...baseBatchQueryRequest } as BatchQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(e);
-      }
-    }
+    message.ids = (object.ids ?? []).map((e) => e);
     return message;
   },
 };
@@ -139,12 +129,7 @@ export const BatchQueryResponse = {
 
   fromJSON(object: any): BatchQueryResponse {
     const message = { ...baseBatchQueryResponse } as BatchQueryResponse;
-    message.entities = [];
-    if (object.entities !== undefined && object.entities !== null) {
-      for (const e of object.entities) {
-        message.entities.push(Entity.fromJSON(e));
-      }
-    }
+    message.entities = (object.entities ?? []).map((e: any) => Entity.fromJSON(e));
     return message;
   },
 
@@ -160,12 +145,7 @@ export const BatchQueryResponse = {
 
   fromPartial(object: DeepPartial<BatchQueryResponse>): BatchQueryResponse {
     const message = { ...baseBatchQueryResponse } as BatchQueryResponse;
-    message.entities = [];
-    if (object.entities !== undefined && object.entities !== null) {
-      for (const e of object.entities) {
-        message.entities.push(Entity.fromPartial(e));
-      }
-    }
+    message.entities = (object.entities ?? []).map((e) => Entity.fromPartial(e));
     return message;
   },
 };
@@ -201,12 +181,7 @@ export const BatchMapQueryRequest = {
 
   fromJSON(object: any): BatchMapQueryRequest {
     const message = { ...baseBatchMapQueryRequest } as BatchMapQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(String(e));
-      }
-    }
+    message.ids = (object.ids ?? []).map((e: any) => String(e));
     return message;
   },
 
@@ -222,12 +197,7 @@ export const BatchMapQueryRequest = {
 
   fromPartial(object: DeepPartial<BatchMapQueryRequest>): BatchMapQueryRequest {
     const message = { ...baseBatchMapQueryRequest } as BatchMapQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(e);
-      }
-    }
+    message.ids = (object.ids ?? []).map((e) => e);
     return message;
   },
 };

diff --git a/integration/batching/batching.ts b/integration/batching/batching.ts
@@ -75,12 +75,7 @@ export const BatchQueryRequest = {
 
   fromJSON(object: any): BatchQueryRequest {
     const message = { ...baseBatchQueryRequest } as BatchQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(String(e));
-      }
-    }
+    message.ids = (object.ids ?? []).map((e: any) => String(e));
     return message;
   },
 
@@ -96,12 +91,7 @@ export const BatchQueryRequest = {
 
   fromPartial(object: DeepPartial<BatchQueryRequest>): BatchQueryRequest {
     const message = { ...baseBatchQueryRequest } as BatchQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(e);
-      }
-    }
+    message.ids = (object.ids ?? []).map((e) => e);
     return message;
   },
 };
@@ -137,12 +127,7 @@ export const BatchQueryResponse = {
 
   fromJSON(object: any): BatchQueryResponse {
     const message = { ...baseBatchQueryResponse } as BatchQueryResponse;
-    message.entities = [];
-    if (object.entities !== undefined && object.entities !== null) {
-      for (const e of object.entities) {
-        message.entities.push(Entity.fromJSON(e));
-      }
-    }
+    message.entities = (object.entities ?? []).map((e: any) => Entity.fromJSON(e));
     return message;
   },
 
@@ -158,12 +143,7 @@ export const BatchQueryResponse = {
 
   fromPartial(object: DeepPartial<BatchQueryResponse>): BatchQueryResponse {
     const message = { ...baseBatchQueryResponse } as BatchQueryResponse;
-    message.entities = [];
-    if (object.entities !== undefined && object.entities !== null) {
-      for (const e of object.entities) {
-        message.entities.push(Entity.fromPartial(e));
-      }
-    }
+    message.entities = (object.entities ?? []).map((e) => Entity.fromPartial(e));
     return message;
   },
 };
@@ -199,12 +179,7 @@ export const BatchMapQueryRequest = {
 
   fromJSON(object: any): BatchMapQueryRequest {
     const message = { ...baseBatchMapQueryRequest } as BatchMapQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(String(e));
-      }
-    }
+    message.ids = (object.ids ?? []).map((e: any) => String(e));
     return message;
   },
 
@@ -220,12 +195,7 @@ export const BatchMapQueryRequest = {
 
   fromPartial(object: DeepPartial<BatchMapQueryRequest>): BatchMapQueryRequest {
     const message = { ...baseBatchMapQueryRequest } as BatchMapQueryRequest;
-    message.ids = [];
-    if (object.ids !== undefined && object.ids !== null) {
-      for (const e of object.ids) {
-        message.ids.push(e);
-      }
-    }
+    message.ids = (object.ids ?? []).map((e) => e);
     return message;
   },
 };

diff --git a/integration/bytes-as-base64/message.ts b/integration/bytes-as-base64/message.ts
@@ -13,9 +13,10 @@ const baseMessage: object = {};
 export const Message = {
   fromJSON(object: any): Message {
     const message = { ...baseMessage } as Message;
-    message.data = new Uint8Array();
     if (object.data !== undefined && object.data !== null) {
       message.data = bytesFromBase64(object.data);
+    } else {
+      message.data = new Uint8Array();
     }
     return message;
   },

diff --git a/integration/bytes-node/point.ts b/integration/bytes-node/point.ts
@@ -39,9 +39,10 @@ export const Point = {
 
   fromJSON(object: any): Point {
     const message = { ...basePoint } as Point;
-    message.data = Buffer.alloc(0);
     if (object.data !== undefined && object.data !== null) {
       message.data = Buffer.from(bytesFromBase64(object.data));
+    } else {
+      message.data = Buffer.alloc(0);
     }
     return message;
   },

diff --git a/integration/grpc-js/google/protobuf/wrappers.ts b/integration/grpc-js/google/protobuf/wrappers.ts
@@ -533,9 +533,10 @@ export const BytesValue = {
 
   fromJSON(object: any): BytesValue {
     const message = { ...baseBytesValue } as BytesValue;
-    message.value = new Uint8Array();
     if (object.value !== undefined && object.value !== null) {
       message.value = bytesFromBase64(object.value);
+    } else {
+      message.value = new Uint8Array();
     }
     return message;
   },

diff --git a/integration/grpc-web-go-server/example.ts b/integration/grpc-web-go-server/example.ts
@@ -199,7 +199,6 @@ export const DashUserSettingsState = {
 
   fromJSON(object: any): DashUserSettingsState {
     const message = { ...baseDashUserSettingsState } as DashUserSettingsState;
-    message.flashes = [];
     if (object.email !== undefined && object.email !== null) {
       message.email = String(object.email);
     } else {
@@ -210,11 +209,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromJSON(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e: any) => DashFlash.fromJSON(e));
     return message;
   },
 
@@ -239,12 +234,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    message.flashes = [];
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromPartial(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e) => DashFlash.fromPartial(e));
     return message;
   },
 };

diff --git a/integration/grpc-web-no-streaming-observable/example.ts b/integration/grpc-web-no-streaming-observable/example.ts
@@ -177,7 +177,6 @@ export const DashUserSettingsState = {
 
   fromJSON(object: any): DashUserSettingsState {
     const message = { ...baseDashUserSettingsState } as DashUserSettingsState;
-    message.flashes = [];
     if (object.email !== undefined && object.email !== null) {
       message.email = String(object.email);
     } else {
@@ -188,11 +187,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromJSON(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e: any) => DashFlash.fromJSON(e));
     return message;
   },
 
@@ -217,12 +212,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    message.flashes = [];
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromPartial(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e) => DashFlash.fromPartial(e));
     return message;
   },
 };

diff --git a/integration/grpc-web-no-streaming/example.ts b/integration/grpc-web-no-streaming/example.ts
@@ -175,7 +175,6 @@ export const DashUserSettingsState = {
 
   fromJSON(object: any): DashUserSettingsState {
     const message = { ...baseDashUserSettingsState } as DashUserSettingsState;
-    message.flashes = [];
     if (object.email !== undefined && object.email !== null) {
       message.email = String(object.email);
     } else {
@@ -186,11 +185,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromJSON(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e: any) => DashFlash.fromJSON(e));
     return message;
   },
 
@@ -215,12 +210,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    message.flashes = [];
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromPartial(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e) => DashFlash.fromPartial(e));
     return message;
   },
 };

diff --git a/integration/grpc-web/example.ts b/integration/grpc-web/example.ts
@@ -201,7 +201,6 @@ export const DashUserSettingsState = {
 
   fromJSON(object: any): DashUserSettingsState {
     const message = { ...baseDashUserSettingsState } as DashUserSettingsState;
-    message.flashes = [];
     if (object.email !== undefined && object.email !== null) {
       message.email = String(object.email);
     } else {
@@ -212,11 +211,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromJSON(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e: any) => DashFlash.fromJSON(e));
     return message;
   },
 
@@ -241,12 +236,7 @@ export const DashUserSettingsState = {
     } else {
       message.urls = undefined;
     }
-    message.flashes = [];
-    if (object.flashes !== undefined && object.flashes !== null) {
-      for (const e of object.flashes) {
-        message.flashes.push(DashFlash.fromPartial(e));
-      }
-    }
+    message.flashes = (object.flashes ?? []).map((e) => DashFlash.fromPartial(e));
     return message;
   },
 };

diff --git a/integration/lower-case-svc-methods/math.ts b/integration/lower-case-svc-methods/math.ts
@@ -174,12 +174,7 @@ export const Numbers = {
 
   fromJSON(object: any): Numbers {
     const message = { ...baseNumbers } as Numbers;
-    message.num = [];
-    if (object.num !== undefined && object.num !== null) {
-      for (const e of object.num) {
-        message.num.push(Number(e));
-      }
-    }
+    message.num = (object.num ?? []).map((e: any) => Number(e));
     return message;
   },
 
@@ -195,12 +190,7 @@ export const Numbers = {
 
   fromPartial(object: DeepPartial<Numbers>): Numbers {
     const message = { ...baseNumbers } as Numbers;
-    message.num = [];
-    if (object.num !== undefined && object.num !== null) {
-      for (const e of object.num) {
-        message.num.push(e);
-      }
-    }
+    message.num = (object.num ?? []).map((e) => e);
     return message;
   },
 };

diff --git a/integration/oneof-properties/oneof.ts b/integration/oneof-properties/oneof.ts
@@ -189,6 +189,8 @@ export const PleaseChoose = {
     }
     if (object.bunchaBytes !== undefined && object.bunchaBytes !== null) {
       message.bunchaBytes = bytesFromBase64(object.bunchaBytes);
+    } else {
+      message.bunchaBytes = undefined;
     }
     if (object.anEnum !== undefined && object.anEnum !== null) {
       message.anEnum = pleaseChoose_StateEnumFromJSON(object.anEnum);