From 679c6fe8e37939c194c51122ac157cfa6ca61353 Mon Sep 17 00:00:00 2001
From: Dan Cojocaru <dancojocaru2010@hotmail.com>
Date: Wed, 15 Dec 2021 14:36:23 +0200
Subject: [PATCH] Added null check for primitives

---
 bin/tdlib_gen.dart | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/bin/tdlib_gen.dart b/bin/tdlib_gen.dart
index 630f098..4bb1d01 100644
--- a/bin/tdlib_gen.dart
+++ b/bin/tdlib_gen.dart
@@ -198,11 +198,19 @@ String findFromJsonHandling(
     'int53': 'int',
     'Bool': 'bool',
   };
+  final predefinedDefault = {
+    'double': '0',
+    'string': "''",
+    'int32': '0',
+    'int53': '0',
+    'Bool': 'false',
+  };
+
   if (predefined.containsKey(type)) {
-    return '$varAccess as ${predefined[type]}';
+    return '($varAccess as ${predefined[type]}?) ?? ${predefinedDefault[type]}';
   }
   else if (type == 'int64') {
-    return 'int.parse($varAccess)';
+    return "int.parse($varAccess ?? '0')";
   }
   else if (type == 'bytes') {
     return 'base64.decode($varAccess)';