Use built_value 8.10.1 with MapSerializer and SetSerializer. (#4022)

Author: davidmorgan

build_runner_core/lib/src/asset_graph/serializers.dart

@@ -37,8 +37,6 @@ final Serializers serializers =
     (_$serializers.toBuilder()
           ..add(identityAssetIdSerializer)
           ..add(DigestSerializer())
-          ..add(MapSerializer())
-          ..add(SetSerializer())
           ..addBuilderFactory(
             const FullType(Set, [FullType(AssetId)]),
             () => <AssetId>{},
@@ -119,141 +117,3 @@ class DigestSerializer implements PrimitiveSerializer<Digest> {
     FullType specifiedType = FullType.unspecified,
   }) => base64.encode(object.bytes);
 }
-
-// TODO(davidmorgan): this is a fork of `BuiltMapSerializer` from `built_value`
-// adapted for SDK maps, upstream it.
-class MapSerializer implements StructuredSerializer<Map> {
-  final bool structured = true;
-  @override
-  final Iterable<Type> types = BuiltList<Type>([
-    Map,
-    <Object, Object>{}.runtimeType,
-  ]);
-  @override
-  final String wireName = 'map';
-
-  @override
-  Iterable<Object?> serialize(
-    Serializers serializers,
-    Map builtMap, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    var isUnderspecified =
-        specifiedType.isUnspecified || specifiedType.parameters.isEmpty;
-    if (!isUnderspecified) serializers.expectBuilder(specifiedType);
-
-    var keyType =
-        specifiedType.parameters.isEmpty
-            ? FullType.unspecified
-            : specifiedType.parameters[0];
-    var valueType =
-        specifiedType.parameters.isEmpty
-            ? FullType.unspecified
-            : specifiedType.parameters[1];
-
-    var result = <Object?>[];
-    for (var key in builtMap.keys) {
-      result.add(serializers.serialize(key, specifiedType: keyType));
-      final value = builtMap[key];
-      result.add(serializers.serialize(value, specifiedType: valueType));
-    }
-    return result;
-  }
-
-  @override
-  Map deserialize(
-    Serializers serializers,
-    Iterable serialized, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    var isUnderspecified =
-        specifiedType.isUnspecified || specifiedType.parameters.isEmpty;
-
-    var keyType =
-        specifiedType.parameters.isEmpty
-            ? FullType.unspecified
-            : specifiedType.parameters[0];
-    var valueType =
-        specifiedType.parameters.isEmpty
-            ? FullType.unspecified
-            : specifiedType.parameters[1];
-
-    var result =
-        isUnderspecified
-            ? <Object, Object>{}
-            : serializers.newBuilder(specifiedType) as Map;
-
-    if (serialized.length.isOdd) {
-      throw ArgumentError('odd length');
-    }
-
-    for (var i = 0; i != serialized.length; i += 2) {
-      final key = serializers.deserialize(
-        serialized.elementAt(i),
-        specifiedType: keyType,
-      );
-      final value = serializers.deserialize(
-        serialized.elementAt(i + 1),
-        specifiedType: valueType,
-      );
-      result[key] = value;
-    }
-
-    return result;
-  }
-}
-
-// TODO(davidmorgan): this is a fork of `BuiltSetSerializer` from `built_value`
-// adapted for SDK sets, upstream it.
-class SetSerializer implements StructuredSerializer<Set> {
-  final bool structured = true;
-  @override
-  final Iterable<Type> types = BuiltList<Type>([Set, <Object>{}.runtimeType]);
-  @override
-  final String wireName = 'set';
-
-  @override
-  Iterable<Object?> serialize(
-    Serializers serializers,
-    Set builtSet, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    var isUnderspecified =
-        specifiedType.isUnspecified || specifiedType.parameters.isEmpty;
-    if (!isUnderspecified) serializers.expectBuilder(specifiedType);
-
-    var elementType =
-        specifiedType.parameters.isEmpty
-            ? FullType.unspecified
-            : specifiedType.parameters[0];
-
-    return builtSet.map(
-      (item) => serializers.serialize(item, specifiedType: elementType),
-    );
-  }
-
-  @override
-  Set deserialize(
-    Serializers serializers,
-    Iterable serialized, {
-    FullType specifiedType = FullType.unspecified,
-  }) {
-    var isUnderspecified =
-        specifiedType.isUnspecified || specifiedType.parameters.isEmpty;
-
-    var elementType =
-        specifiedType.parameters.isEmpty
-            ? FullType.unspecified
-            : specifiedType.parameters[0];
-    var result =
-        isUnderspecified
-            ? <Object>{}
-            : serializers.newBuilder(specifiedType) as Set;
-
-    for (final item in serialized) {
-      result.add(serializers.deserialize(item, specifiedType: elementType));
-    }
-
-    return result;
-  }
-}

build_runner_core/pubspec.yaml

@@ -19,7 +19,7 @@ dependencies:
   build_config: ^1.0.0
   build_resolvers: ^2.4.0
   built_collection: ^5.1.1
-  built_value: ^8.9.5
+  built_value: ^8.10.1
   collection: ^1.15.0
   convert: ^3.0.0
   crypto: ^3.0.0
@@ -40,7 +40,7 @@ dev_dependencies:
     path: ../_test_common
   build_runner: ^2.0.0
   build_test: ^3.0.0-wip
-  built_value_generator: ^8.9.5
+  built_value_generator: ^8.10.1
   dart_flutter_team_lints: ^3.1.0
   json_serializable: ^6.0.0
   test: ^1.16.0