Merge branch 'master' into release

.github/dependabot.yaml

@@ -5,7 +5,7 @@
 
 version: 2
 updates:
-  - package-ecosystem: "" # See documentation for possible values
+  - package-ecosystem: "pub" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "weekly"

.github/workflows/dart.yml

@@ -8,9 +8,10 @@ jobs:
       matrix:
         package:
           - gql
+          - gql_exec
+          - gql_code_builder_serializers
           - gql_build
           - gql_code_builder
-          - gql_exec
           - gql_link
           - gql_dedupe_link
           - gql_dio_link

.github/workflows/publish_alpha.yml

@@ -10,7 +10,7 @@ jobs:
       image: dart:latest
     if: github.ref == 'refs/heads/master'
     env:
-      PACKAGES: 'gql,gql_build,gql_code_builder,gql_dedupe_link,gql_dio_link,gql_exec,gql_http_link,gql_link,gql_pedantic,gql_transform_link,gql_error_link,gql_websocket_link'
+      PACKAGES: 'gql,gql_code_builder_serializers,gql_build,gql_code_builder,gql_dedupe_link,gql_dio_link,gql_exec,gql_http_link,gql_link,gql_pedantic,gql_transform_link,gql_error_link,gql_websocket_link'
     steps:
       - name: Clone repository
         uses: actions/checkout@v2

codegen/end_to_end_test/pubspec.yaml

@@ -9,9 +9,10 @@ dependencies:
   built_collection: ^5.0.0
   built_value: ^8.0.6
   gql_exec: ^1.0.0
-  gql_build: ^0.8.0
-  gql_code_builder: ^0.7.1
+  gql_code_builder_serializers: ^0.1.0
 dev_dependencies: 
   build: ^2.0.0
   build_runner: ^2.0.0
   test: ^1.16.8
+  gql_code_builder: ^0.7.1
+  gql_build: ^0.8.0

codegen/end_to_end_test_tristate/pubspec.yaml

@@ -9,10 +9,11 @@ dependencies:
   built_collection: ^5.0.0
   built_value: ^8.0.6
   gql_exec: ^1.0.0
-  gql_build: ^0.8.0
-  gql_code_builder: ^0.7.1
+  gql_code_builder_serializers: ^0.1.0
 dev_dependencies: 
   build: ^2.0.0
   build_runner: ^2.0.0
   test: ^1.16.8
   gql_tristate_value: ^1.0.0
+  gql_build: ^0.8.0
+  gql_code_builder: ^0.7.1

codegen/gql_build/lib/src/serializer_builder.dart

@@ -93,7 +93,7 @@ class SerializerBuilder implements Builder {
       // GraphQL Operation serializer
       refer(
         "OperationSerializer",
-        "package:gql_code_builder/src/serializers/operation_serializer.dart",
+        "package:gql_code_builder_serializers/gql_code_builder_serializers.dart",
       ).call([]),
       // User-defined custom serializers
       ...customSerializers.map((ref) => ref.call([])),

codegen/gql_build/pubspec.yaml

@@ -14,7 +14,8 @@ dependencies:
   dart_style: ^2.2.4
   glob: ^2.0.0
   gql: ^1.0.0
-  gql_code_builder: ^0.10.0
+  gql_code_builder: ^0.11.0
+  gql_code_builder_serializers: ^0.1.0
   path: ^1.8.0
   yaml: ^3.1.0
   gql_tristate_value: ^1.0.0

codegen/gql_code_builder/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.12.0
+
+- Moving built-in Serializers to gql_code_builder_serializers package, so
+  so don't have to depend on gql_code_builder in dependencies, and can keep
+  it as dev-dependency (#456)
+
 ## 0.11.0
 
 - Adding option to create factory initializers with required parameters also for inputs (#585)

codegen/gql_code_builder/lib/src/inline_fragment_classes.dart

@@ -131,7 +131,7 @@ List<Method> _inlineFragmentRootSerializationMethods({
           ..body = TypeReference((b) => b
             ..symbol = "InlineFragmentSerializer"
             ..url =
-                "package:gql_code_builder/src/serializers/inline_fragment_serializer.dart"
+                "package:gql_code_builder_serializers/gql_code_builder_serializers.dart"
             ..types.add(refer(name))).call([
             literalString(name),
             refer("${name}__base"),

codegen/gql_code_builder/lib/src/schema/scalar.dart

@@ -97,7 +97,7 @@ ListBuilder<Method> _buildMethods(
             ..body = TypeReference((b) => b
               ..symbol = "DefaultScalarSerializer"
               ..url =
-                  "package:gql_code_builder/src/serializers/default_scalar_serializer.dart"
+                  "package:gql_code_builder_serializers/gql_code_builder_serializers.dart"
               ..types.add(refer(scalarName))).call([
               Method(
                 (b) => b

codegen/gql_code_builder/lib/src/serializers/default_scalar_serializer.dart

@@ -1,22 +1,7 @@
-import "package:built_value/serializer.dart";
-
-class DefaultScalarSerializer<T> implements PrimitiveSerializer<T> {
-  final T Function(Object serialized) _deserialize;
-
-  DefaultScalarSerializer(this._deserialize);
-
-  @override
-  final types = <Type>[T];
-  @override
-  final wireName = T.toString();
-
-  @override
-  Object serialize(Serializers serializers, T scalar,
-          {FullType specifiedType = FullType.unspecified}) =>
-      (scalar as dynamic).value as Object;
-
-  @override
-  T deserialize(Serializers serializers, Object serialized,
-          {FullType specifiedType = FullType.unspecified}) =>
-      _deserialize(serialized);
-}
+// serializers have been implemented in this files originally,
+// but moved to a separate package later to avoid
+// direct dependencies on gql_code_builder in application code.
+// This file is kept for backwards compatibility and should be removed in
+// the next major version of gql_code_builder.
+export "package:gql_code_builder_serializers/gql_code_builder_serializers.dart"
+    show DefaultScalarSerializer;

codegen/gql_code_builder/lib/src/serializers/inline_fragment_serializer.dart

@@ -1,66 +1,7 @@
-import "package:built_value/serializer.dart";
-import "package:built_value/standard_json_plugin.dart";
-
-/// Deserializes a GraphQL selection with inline fragments into it's
-/// appropriate concrete data class based on its  `__typename` field.
-///
-/// If no `__typename` is found, it will simply return a base data class that
-/// only includes the common fields.
-class InlineFragmentSerializer<T> implements StructuredSerializer<T> {
-  final String rootName;
-  final Type baseClass;
-  final Map<String, Type> asTypeClasses;
-
-  InlineFragmentSerializer(
-    this.rootName,
-    this.baseClass,
-    this.asTypeClasses,
-  );
-
-  Type _typeForTypename(String name) => asTypeClasses[name] ?? baseClass;
-
-  @override
-  T deserialize(
-    Serializers serializers,
-    Iterable serialized, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    try {
-      // Get JSON representation of object
-      final json = StandardJsonPlugin()
-          .afterSerialize(serialized, specifiedType) as Map<String, dynamic>;
-      final typeName = (json["__typename"] ?? "") as String;
-      final type = _typeForTypename(typeName);
-      final serializer =
-          serializers.serializerForType(type) as StructuredSerializer;
-      return serializer.deserialize(serializers, serialized,
-          specifiedType: specifiedType) as T;
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  @override
-  Iterable<Object?> serialize(
-    Serializers serializers,
-    T object, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    try {
-      final typeName = (object as dynamic).G__typename as String;
-      final type = _typeForTypename(typeName);
-      final serializer =
-          serializers.serializerForType(type) as StructuredSerializer;
-      return serializer.serialize(serializers, object,
-          specifiedType: specifiedType);
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  @override
-  Iterable<Type> get types => [T];
-
-  @override
-  String get wireName => rootName;
-}
+// serializers have been implemented in this files originally,
+// but moved to a separate package later to avoid
+// direct dependencies on gql_code_builder in application code.
+// This file is kept for backwards compatibility and should be removed in
+// the next major version of gql_code_builder.
+export "package:gql_code_builder_serializers/gql_code_builder_serializers.dart"
+    show InlineFragmentSerializer;

codegen/gql_code_builder/lib/src/serializers/json_serializer.dart

@@ -1,39 +1,7 @@
-import "package:built_value/serializer.dart";
-import "package:built_value/standard_json_plugin.dart";
-
-/// A serializer which can be implemented to easily build a Json Serializer
-abstract class JsonSerializer<T> implements StructuredSerializer<T> {
-  final _jsonPlugin = StandardJsonPlugin();
-
-  T fromJson(Map<String, dynamic> json);
-
-  Map<String, dynamic> toJson(T object);
-
-  @override
-  T deserialize(
-    Serializers serializers,
-    Iterable serialized, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    final json = _jsonPlugin.afterSerialize(serialized, specifiedType)
-        as Map<String, dynamic>;
-    return fromJson(json);
-  }
-
-  @override
-  Iterable<Object?> serialize(
-    Serializers serializers,
-    T object, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    final json = toJson(object);
-    final serialized = _jsonPlugin.beforeDeserialize(json, FullType(T));
-    return serialized is Iterable ? serialized : [serialized];
-  }
-
-  @override
-  Iterable<Type> get types => [T];
-
-  @override
-  String get wireName => T.toString();
-}
+// serializers have been implemented in this files originally,
+// but moved to a separate package later to avoid
+// direct dependencies on gql_code_builder in application code.
+// This file is kept for backwards compatibility and should be removed in
+// the next major version of gql_code_builder.
+export "package:gql_code_builder_serializers/gql_code_builder_serializers.dart"
+    show JsonSerializer;

codegen/gql_code_builder/lib/src/serializers/operation_serializer.dart

@@ -1,19 +1,7 @@
-import "package:gql/language.dart";
-import "package:gql_exec/gql_exec.dart";
-
-import "./json_serializer.dart";
-
-class OperationSerializer extends JsonSerializer<Operation> {
-  @override
-  Operation fromJson(Map<String, dynamic> json) => Operation(
-        document: parseString(json["document"] as String),
-        operationName: json["operationName"] as String?,
-      );
-
-  @override
-  Map<String, dynamic> toJson(Operation operation) => <String, dynamic>{
-        "document": printNode(operation.document),
-        if (operation.operationName != null)
-          "operationName": operation.operationName,
-      };
-}
+// serializers have been implemented in this files originally,
+// but moved to a separate package later to avoid
+// direct dependencies on gql_code_builder in application code.
+// This file is kept for backwards compatibility and should be removed in
+// the next major version of gql_code_builder.
+export "package:gql_code_builder_serializers/gql_code_builder_serializers.dart"
+    show OperationSerializer;

codegen/gql_code_builder/pubspec.yaml

@@ -1,5 +1,5 @@
 name: gql_code_builder
-version: 0.11.0
+version: 0.12.0
 description: Dart code builders taking *.graphql documents and SDL to build useful classes.
 repository: https://github.com/gql-dart/gql
 environment: 
@@ -14,6 +14,7 @@ dependencies:
   gql_exec: ^1.0.0
   path: ^1.8.0
   gql_tristate_value: ^1.0.0
+  gql_code_builder_serializers: ^0.1.0
 dev_dependencies: 
   build_runner: ^2.1.0
   gql_pedantic: ^1.0.2

codegen/gql_code_builder_serializers/.gitignore

@@ -0,0 +1,3 @@
+# https://dart.dev/guides/libraries/private-files
+# Created by `dart pub`
+.dart_tool/

codegen/gql_code_builder_serializers/CHANGELOG.md

@@ -0,0 +1,3 @@
+## 0.1.0
+
+- Initial version

codegen/gql_code_builder_serializers/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018-present, GQL Dart
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.