Add support for serialize_nulls build config option

codegen/end_to_end_test/test/operation/variables_test.dart

@@ -1,8 +1,7 @@
-import "package:test/test.dart";
-
 import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart';
-import 'package:end_to_end_test/variables/__generated__/human_with_args.var.gql.dart';
 import 'package:end_to_end_test/variables/__generated__/create_review.var.gql.dart';
+import 'package:end_to_end_test/variables/__generated__/human_with_args.var.gql.dart';
+import "package:test/test.dart";
 
 void main() {
   group("Basic Args", () {

codegen/end_to_end_test/test/schema/input_test.dart

@@ -1,6 +1,5 @@
-import "package:test/test.dart";
-
 import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart';
+import "package:test/test.dart";
 
 void main() {
   group("Inputs", () {

codegen/end_to_end_test/test/schema/scalars_test.dart

@@ -1,11 +1,10 @@
-import "package:test/test.dart";
-
+import 'package:end_to_end_test/custom_field.dart';
+import 'package:end_to_end_test/custom_field_serializer.dart';
 import 'package:end_to_end_test/graphql/__generated__/schema.schema.gql.dart';
 import 'package:end_to_end_test/graphql/__generated__/serializers.gql.dart';
 import 'package:end_to_end_test/scalars/__generated__/review_with_date.data.gql.dart';
 import 'package:end_to_end_test/scalars/__generated__/review_with_date.var.gql.dart';
-import 'package:end_to_end_test/custom_field.dart';
-import 'package:end_to_end_test/custom_field_serializer.dart';
+import "package:test/test.dart";
 
 void main() {
   group("Custom scalars from non-standard dart types", () {

codegen/gql_build/README.md

@@ -63,6 +63,20 @@ new enum values are added to the schema and the client has not updated to the ne
 `global_enum_fallbacks`: \[bool\] Add a generated fallback value for each enum value (except for ones that have a custom fallback value specified in the enum_fallbacks map).
 Defaults to false.
 
+`when_extensions`: [Map\] whether to enable the `when`/`maybeWhen` extension on the generated data classes
+from inline fragment spreads with type conditions. 
+Supported keys are `when` and `maybeWhen`, and the values are booleans indicating whether to enable 
+generation of the extension method not.
+
+
+Example:
+
+```yaml
+when_extensions:
+  when: true # enable the `when` extension method
+  maybeWhen: true  # enable the `maybeWhen` extension method
+```
+
 Example:
 
 ```yaml

codegen/gql_build/lib/src/schema_builder.dart

@@ -2,6 +2,7 @@ import "dart:async";
 
 import "package:build/build.dart";
 import "package:code_builder/code_builder.dart";
+import "package:gql_build/src/allocators/gql_allocator.dart";
 import "package:gql_code_builder/schema.dart";
 import "package:path/path.dart";
 
@@ -14,11 +15,8 @@ class SchemaBuilder implements Builder {
   final EnumFallbackConfig enumFallbackConfig;
   final bool generatePossibleTypesMap;
 
-  SchemaBuilder(
-    this.typeOverrides,
-    this.enumFallbackConfig,
-    this.generatePossibleTypesMap,
-  );
+  SchemaBuilder(this.typeOverrides, this.enumFallbackConfig,
+      this.generatePossibleTypesMap);
 
   @override
   Map<String, List<String>> get buildExtensions => {
@@ -34,19 +32,20 @@ class SchemaBuilder implements Builder {
         .uri
         .path;
 
-    final library = buildSchemaLibrary(
-      doc,
-      basename(generatedPartUrl),
-      typeOverrides,
-      enumFallbackConfig,
-      generatePossibleTypesMap: generatePossibleTypesMap,
+    final schemaUrl =
+        outputAssetId(buildStep.inputId, schemaExtension).uri.toString();
+    final allocator = GqlAllocator(
+      buildStep.inputId.uri.toString(),
+      outputAssetId(buildStep.inputId, schemaExtension).uri.toString(),
+      schemaUrl,
     );
 
+    final library = buildSchemaLibrary(
+        doc, basename(generatedPartUrl), typeOverrides, enumFallbackConfig,
+        generatePossibleTypesMap: generatePossibleTypesMap,
+        allocator: allocator);
+
     return writeDocument(
-      library,
-      buildStep,
-      schemaExtension,
-      outputAssetId(buildStep.inputId, schemaExtension).uri.toString(),
-    );
+        library, buildStep, schemaExtension, schemaUrl, allocator);
   }
 }

codegen/gql_build/lib/src/serializer_builder.dart

@@ -42,6 +42,14 @@ class SerializerBuilder implements Builder {
 
   @override
   FutureOr<void> build(BuildStep buildStep) async {
+    final allocator = PickAllocator(
+      doNotPick: ["package:built_value/serializer.dart"],
+      include: [
+        "package:built_collection/built_collection.dart",
+        ...typeOverrides.values.map((ref) => ref.url).whereType<String>()
+      ],
+    );
+
     /// BuiltValue classes with serializers. These will be added automatically
     /// using `@SerializersFor`.
     final builtClasses =
@@ -102,13 +110,7 @@ class SerializerBuilder implements Builder {
     );
 
     final _emitter = DartEmitter(
-      allocator: PickAllocator(
-        doNotPick: ["package:built_value/serializer.dart"],
-        include: [
-          "package:built_collection/built_collection.dart",
-          ...typeOverrides.values.map((ref) => ref.url).whereType<String>()
-        ],
-      ),
+      allocator: allocator,
       orderDirectives: true,
       useNullSafetySyntax: true,
     );

codegen/gql_build/lib/src/utils/writer.dart

@@ -14,18 +14,21 @@ Future<void> writeDocument(
   BuildStep buildStep,
   String extension, [
   String? schemaUrl,
+  Allocator? allocator,
 ]) {
   if (library.body.isEmpty) return Future.value(null);
 
+  allocator ??= GqlAllocator(
+    buildStep.inputId.uri.toString(),
+    outputAssetId(buildStep.inputId, extension).uri.toString(),
+    schemaUrl,
+  );
+
   final generatedAsset = outputAssetId(buildStep.inputId, extension);
 
   final genSrc = _dartfmt.format("${library.accept(
     DartEmitter(
-      allocator: GqlAllocator(
-        buildStep.inputId.uri.toString(),
-        generatedAsset.uri.toString(),
-        schemaUrl,
-      ),
+      allocator: allocator,
       orderDirectives: true,
       useNullSafetySyntax: true,
     ),

codegen/gql_build/lib/src/var_builder.dart

@@ -2,6 +2,7 @@ import "dart:async";
 
 import "package:build/build.dart";
 import "package:code_builder/code_builder.dart";
+import "package:gql_build/src/allocators/gql_allocator.dart";
 import "package:gql_code_builder/var.dart";
 import "package:path/path.dart";
 
@@ -34,18 +35,22 @@ class VarBuilder implements Builder {
         .uri
         .path;
 
-    final library = buildVarLibrary(
-      doc,
-      addTypenames(schema),
-      basename(generatedPartUrl),
-      typeOverrides,
+    final schemaUrl = outputAssetId(schemaId, schemaExtension).uri.toString();
+    final allocator = GqlAllocator(
+      buildStep.inputId.uri.toString(),
+      outputAssetId(buildStep.inputId, schemaExtension).uri.toString(),
+      schemaUrl,
     );
 
+    final library = buildVarLibrary(doc, addTypenames(schema),
+        basename(generatedPartUrl), typeOverrides, allocator);
+
     return writeDocument(
       library,
       buildStep,
       varExtension,
-      outputAssetId(schemaId, schemaExtension).uri.toString(),
+      schemaUrl,
+      allocator,
     );
   }
 }

codegen/gql_code_builder/lib/schema.dart

@@ -7,17 +7,14 @@ import "package:gql_code_builder/src/utils/possible_types.dart";
 
 export "package:gql_code_builder/src/config/enum_fallback_config.dart";
 
-Library buildSchemaLibrary(
-  SourceNode schemaSource,
-  String partUrl,
-  Map<String, Reference> typeOverrides,
-  EnumFallbackConfig enumFallbackConfig, {
-  bool generatePossibleTypesMap = false,
-}) {
+Library buildSchemaLibrary(SourceNode schemaSource, String partUrl,
+    Map<String, Reference> typeOverrides, EnumFallbackConfig enumFallbackConfig,
+    {bool generatePossibleTypesMap = false, Allocator? allocator}) {
   final lib = buildSchema(
     schemaSource,
     typeOverrides,
     enumFallbackConfig,
+    allocator ?? Allocator(),
   ) as Library;
 
   final Code? possibleTypes;

codegen/gql_code_builder/lib/src/built_class.dart

@@ -11,6 +11,7 @@ Class builtClass({
   Map<String, Expression>? initializers,
   Map<String, SourceSelections> superclassSelections = const {},
   List<Method> methods = const [],
+  bool hasCustomSerializer = false,
 }) {
   final className = builtClassName(name);
   return Class(
@@ -76,10 +77,11 @@ Class builtClass({
               ).code,
           ),
         if (getters != null) ...getters,
-        // Serlialization methods
-        buildSerializerGetter(className).rebuild(
-          (b) => b..body = Code("_\$${toCamelCase(className)}Serializer"),
-        ),
+        // Serialization methods
+        if (!hasCustomSerializer)
+          buildSerializerGetter(className).rebuild(
+            (b) => b..body = Code("_\$${toCamelCase(className)}Serializer"),
+          ),
         buildToJsonGetter(
           className,
           isOverride: superclassSelections.isNotEmpty,

codegen/gql_code_builder/lib/src/common.dart

@@ -93,9 +93,6 @@ Reference _typeRef(TypeNode type, Map<String, Reference> typeMap) {
       (b) => b
         ..url = ref.url
         ..symbol = ref.symbol
-
-        /// TODO: remove `inList` check
-        /// https://github.com/google/built_value.dart/issues/1011#issuecomment-804843573
         ..isNullable = !type.isNonNull,
     );
   } else if (type is ListTypeNode) {

codegen/gql_code_builder/lib/src/schema.dart

@@ -1,5 +1,6 @@
 import "package:code_builder/code_builder.dart";
 import "package:gql/ast.dart";
+import "package:gql_code_builder/var.dart";
 
 import "./schema/enum.dart";
 import "./schema/input.dart";
@@ -12,69 +13,67 @@ Spec? buildSchema(
   SourceNode schemaSource,
   Map<String, Reference> typeOverrides,
   EnumFallbackConfig enumFallbackConfig,
+  Allocator allocator,
 ) =>
-    schemaSource.document.accept(
-      _SchemaBuilderVisitor(
-        schemaSource,
-        typeOverrides,
-        enumFallbackConfig,
-      ),
-    );
+    schemaSource.document
+        .accept(
+          _SchemaBuilderVisitor(
+            schemaSource,
+            typeOverrides,
+            enumFallbackConfig,
+            allocator,
+          ),
+        )
+        ?.first;
 
-class _SchemaBuilderVisitor extends SimpleVisitor<Spec?> {
+class _SchemaBuilderVisitor extends SimpleVisitor<List<Spec>?> {
   final SourceNode schemaSource;
   final Map<String, Reference> typeOverrides;
   final EnumFallbackConfig enumFallbackConfig;
+  final Allocator allocator;
 
-  _SchemaBuilderVisitor(
-    this.schemaSource,
-    this.typeOverrides,
-    this.enumFallbackConfig,
-  );
-
-  Spec? _acceptOne(
-    Node? node,
-  ) =>
-      node != null ? node.accept(this) : literalNull;
-
-  List<Spec?> _acceptMany(
-    List<Node> nodes,
-  ) =>
-      nodes.map(_acceptOne).toList(
-            growable: false,
-          );
+  _SchemaBuilderVisitor(this.schemaSource, this.typeOverrides,
+      this.enumFallbackConfig, this.allocator);
 
   @override
-  Spec visitDocumentNode(
+  List<Spec> visitDocumentNode(
     DocumentNode node,
   ) =>
-      Library(
-        (b) => b.body.addAll(
-          _acceptMany(node.definitions).whereType<Spec>(),
-        ),
-      );
+      [
+        Library(
+          (b) => b.body.addAll(
+            node.definitions.expand(
+              (node) => node.accept(this) ?? [],
+            ),
+          ),
+        )
+      ];
 
   @override
-  Spec visitInputObjectTypeDefinitionNode(
+  List<Spec> visitInputObjectTypeDefinitionNode(
     InputObjectTypeDefinitionNode node,
-  ) =>
-      buildInputClass(
-        node,
-        schemaSource,
-        typeOverrides,
-      );
+  ) {
+    final inputClass = buildInputClass(
+      node,
+      schemaSource,
+      typeOverrides,
+    );
+    final serializer = nullAwareJsonSerializerClass(
+        inputClass, allocator, schemaSource, typeOverrides);
+    return [inputClass, serializer];
+  }
 
   @override
-  Spec? visitScalarTypeDefinitionNode(
+  List<Spec> visitScalarTypeDefinitionNode(
     ScalarTypeDefinitionNode node,
   ) =>
       typeOverrides.containsKey(node.name.value)
-          ? null
-          : buildScalarClass(node);
+          ? []
+          : [buildScalarClass(node)];
 
   @override
-  Spec visitEnumTypeDefinitionNode(
+  List<Spec> visitEnumTypeDefinitionNode(
     EnumTypeDefinitionNode node,
   ) =>
-      buildEnumClass(node, enumFallbackConfig);
+      [buildEnumClass(node, enumFallbackConfig)];
 }