Remove extra if and fix dynamic check

petercinibulk · Oct 30, 2023 · 93371e4 · 93371e4
1 parent 31ae895
commit 93371e4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/packages/envied_generator/lib/src/generate_field.dart b/packages/envied_generator/lib/src/generate_field.dart
@@ -19,7 +19,7 @@ Iterable<Field> generateFields(
 
   late final Expression result;
 
-  if (optional && value == null) {
+  if (value == null) {
     // Early return if null, so need to check for allowed types
     if (!field.type.isDartCoreInt &&
         !field.type.isDartCoreDouble &&
@@ -46,11 +46,6 @@ Iterable<Field> generateFields(
           ..assignment = Code('null'),
       ),
     ];
-  } else if (value == null) {
-    throw InvalidGenerationSourceError(
-      'Environment variable not found for field `${field.name}`.',
-      element: field,
-    );
   }
 
   if (field.type.isDartCoreInt ||

diff --git a/packages/envied_generator/lib/src/generate_field_encrypted.dart b/packages/envied_generator/lib/src/generate_field_encrypted.dart
@@ -26,7 +26,7 @@ Iterable<Field> generateFieldsEncrypted(
           ? '?'
           : '';
 
-  if (optional && value == null) {
+  if (value == null) {
     // Early return if null, so need to check for allowed types
     if (!field.type.isDartCoreInt &&
         !field.type.isDartCoreBool &&
@@ -51,11 +51,6 @@ Iterable<Field> generateFieldsEncrypted(
           ..assignment = Code('null'),
       ),
     ];
-  } else if (value == null) {
-    throw InvalidGenerationSourceError(
-      'Environment variable not found for field `${field.name}`.',
-      element: field,
-    );
   }
 
   if (field.type.isDartCoreInt) {

diff --git a/packages/envied_generator/lib/src/generator.dart b/packages/envied_generator/lib/src/generator.dart
@@ -114,10 +114,9 @@ final class EnviedGenerator extends GeneratorForAnnotation<Envied> {
         config.allowOptionalFields;
 
     // Throw if value is null but the field is not nullable
-    if (varValue == null &&
-        field.type is! DynamicType &&
-        !(optional &&
-            field.type.nullabilitySuffix == NullabilitySuffix.question)) {
+    bool isNullable = field.type is DynamicType ||
+        field.type.nullabilitySuffix == NullabilitySuffix.question;
+    if (varValue == null && !(optional && isNullable)) {
       throw InvalidGenerationSourceError(
         'Environment variable not found for field `${field.name}`.',
         element: field,