fix: value should be non-null (#428)

* fix: value should be non-null
gql-dart · Nov 12, 2023 · add6474 · add6474
1 parent 0c94411
commit add6474
Show file tree

Hide file tree

Showing 15 changed files with 112 additions and 41 deletions.
diff --git a/...nd_to_end_test_tristate/lib/fragments/__generated__/fragment_with_scalar_var.var.gql.dart b/...nd_to_end_test_tristate/lib/fragments/__generated__/fragment_with_scalar_var.var.gql.dart
diff --git a/..._to_end_test_tristate/lib/fragments/__generated__/fragment_with_scalar_var.var.gql.g.dart b/..._to_end_test_tristate/lib/fragments/__generated__/fragment_with_scalar_var.var.gql.g.dart
diff --git a/...gen/end_to_end_test_tristate/lib/fragments/__generated__/hero_with_fragments.var.gql.dart b/...gen/end_to_end_test_tristate/lib/fragments/__generated__/hero_with_fragments.var.gql.dart
diff --git a/...n/end_to_end_test_tristate/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart b/...n/end_to_end_test_tristate/lib/fragments/__generated__/hero_with_fragments.var.gql.g.dart
diff --git a/codegen/end_to_end_test_tristate/lib/fragments/__generated__/multiple_fragments.var.gql.dart b/codegen/end_to_end_test_tristate/lib/fragments/__generated__/multiple_fragments.var.gql.dart
diff --git a/...en/end_to_end_test_tristate/lib/fragments/__generated__/multiple_fragments.var.gql.g.dart b/...en/end_to_end_test_tristate/lib/fragments/__generated__/multiple_fragments.var.gql.g.dart
diff --git a/codegen/end_to_end_test_tristate/lib/graphql/__generated__/schema.schema.gql.dart b/codegen/end_to_end_test_tristate/lib/graphql/__generated__/schema.schema.gql.dart
diff --git a/codegen/end_to_end_test_tristate/lib/graphql/__generated__/schema.schema.gql.g.dart b/codegen/end_to_end_test_tristate/lib/graphql/__generated__/schema.schema.gql.g.dart
diff --git a/codegen/end_to_end_test_tristate/lib/scalars/__generated__/review_with_date.var.gql.dart b/codegen/end_to_end_test_tristate/lib/scalars/__generated__/review_with_date.var.gql.dart
diff --git a/codegen/end_to_end_test_tristate/lib/scalars/__generated__/review_with_date.var.gql.g.dart b/codegen/end_to_end_test_tristate/lib/scalars/__generated__/review_with_date.var.gql.g.dart
diff --git a/codegen/end_to_end_test_tristate/lib/variables/__generated__/create_review.var.gql.dart b/codegen/end_to_end_test_tristate/lib/variables/__generated__/create_review.var.gql.dart
diff --git a/codegen/end_to_end_test_tristate/lib/variables/__generated__/create_review.var.gql.g.dart b/codegen/end_to_end_test_tristate/lib/variables/__generated__/create_review.var.gql.g.dart
diff --git a/codegen/end_to_end_test_tristate/test/schema/scalars_test.dart b/codegen/end_to_end_test_tristate/test/schema/scalars_test.dart
@@ -63,7 +63,7 @@ void main() {
         BuiltList([DateTime.fromMillisecondsSinceEpoch(1591892597000)]),
       ));
     test('correctly overrides scalars in input types', () {
-      expect((input.seenOn! as PresentValue<BuiltList>).value!.first,
+      expect((input.seenOn as PresentValue<BuiltList>).value!.first,
           TypeMatcher<DateTime>());
     });
 
@@ -86,7 +86,7 @@ void main() {
     );
 
     test('correctly overrides scalars in variable types', () {
-      expect((vars.createdAt! as PresentValue).value, TypeMatcher<DateTime>());
+      expect((vars.createdAt as PresentValue).value, TypeMatcher<DateTime>());
     });
 
     test('can be serialized and deserialized with custom serializer', () {

diff --git a/codegen/gql_code_builder/lib/src/common.dart b/codegen/gql_code_builder/lib/src/common.dart
@@ -213,7 +213,7 @@ Method buildOptionalGetter({
 
   final optionalGetter = baseGetter.rebuild((b) => b
     ..returns = TypeReference((b2) => b2
-      ..isNullable = true
+      ..isNullable = false
       ..url = valueTypeUrl
       ..symbol = valueTypeSymbol
       ..types.add((baseGetter.returns as TypeReference)

diff --git a/codegen/gql_code_builder/lib/src/schema/input.dart b/codegen/gql_code_builder/lib/src/schema/input.dart
@@ -46,8 +46,19 @@ Class buildInputClass(
       ),
       hasCustomSerializer:
           triStateValueConfig == TriStateValueConfig.onAllNullableFields,
+      initializers: {
+        if (triStateValueConfig == TriStateValueConfig.onAllNullableFields)
+          ..._inputClassValueInitializers(node)
+      },
       methods: [
         if (triStateValueConfig == TriStateValueConfig.onAllNullableFields)
           nullAwareJsonSerializerField(node, "G${node.name.value}"),
       ],
     );
+
+Map<String, Expression> _inputClassValueInitializers(
+        InputObjectTypeDefinitionNode op) =>
+    {
+      for (final node in op.fields.where((element) => !element.type.isNonNull))
+        identifier(node.name.value): absentValueConstructorInvocation()
+    };