TypeCodec[Context] in separate file. (#351)

lib/src/messages/client_messages.dart

@@ -2,12 +2,12 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:charcode/ascii.dart';
-import 'package:postgres/src/types/generic_type.dart';
 
 import '../buffer.dart';
 import '../replication.dart';
 import '../time_converters.dart';
 import '../types.dart';
+import '../types/type_codec.dart';
 import 'shared_messages.dart';
 
 abstract class ClientMessageFormat {

lib/src/types/binary_codec.dart

@@ -2,12 +2,12 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:buffer/buffer.dart';
-import 'package:postgres/src/types/generic_type.dart';
 
 import '../buffer.dart';
 import '../types.dart';
 import 'geo_types.dart';
 import 'range_types.dart';
+import 'type_codec.dart';
 import 'type_registry.dart';
 
 final _bool0 = Uint8List(1)..[0] = 0;

lib/src/types/generic_type.dart

@@ -1,44 +1,7 @@
-import 'dart:convert';
-import 'dart:typed_data';
-
-import 'package:postgres/src/buffer.dart';
-
 import '../types.dart';
 import 'binary_codec.dart';
 import 'text_codec.dart';
-import 'type_registry.dart';
-
-class EncodedValue {
-  final Uint8List? bytes;
-  final bool isBinary;
-
-  EncodedValue({
-    required this.bytes,
-    required this.isBinary,
-  });
-}
-
-class TypeCodecContext {
-  final Encoding encoding;
-  final TypeRegistry typeRegistry;
-
-  TypeCodecContext({
-    required this.encoding,
-    required this.typeRegistry,
-  });
-
-  PgByteDataReader newPgByteDataReader([Uint8List? bytes]) {
-    final reader = PgByteDataReader(encoding: encoding);
-    if (bytes != null) {
-      reader.add(bytes);
-    }
-    return reader;
-  }
-
-  PgByteDataWriter newPgByteDataWriter() {
-    return PgByteDataWriter(encoding: encoding);
-  }
-}
+import 'type_codec.dart';
 
 class UnknownType extends Type<Object> {
   const UnknownType(super.oid);

lib/src/types/text_codec.dart

@@ -1,11 +1,10 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:postgres/src/types/generic_type.dart';
-
 import '../exceptions.dart';
 import '../types.dart';
 import 'geo_types.dart';
+import 'type_codec.dart';
 import 'type_registry.dart';
 
 class PostgresTextEncoder {

lib/src/types/text_search.dart

@@ -1,8 +1,7 @@
-import 'package:postgres/src/exceptions.dart';
-
 import '../buffer.dart';
+import '../exceptions.dart';
 import '../types.dart';
-import 'generic_type.dart';
+import 'type_codec.dart';
 import 'type_registry.dart';
 
 /// The `tsvector` data type stores a list of [TsWord]s, lexemes with

lib/src/types/type_codec.dart

@@ -0,0 +1,80 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:typed_data';
+
+import '../buffer.dart';
+import 'type_registry.dart';
+
+/// Encodes the [input] value and returns an [EncodedValue] object.
+///
+/// May return `null` if the codec is not able to encode the [input].
+typedef TypeEncoderFn = FutureOr<EncodedValue?> Function(
+    TypeCodecContext context, Object? input);
+
+/// Encoder and decoder for a given type (OID).
+abstract class TypeCodec {
+  /// Whether the `null` value is handled as a special case by this codec.
+  ///
+  /// By default Dart `null` values are encoded as SQL `NULL` values, and
+  /// [TypeCodec] will not recieve the `null` value on its [encode] method.
+  ///
+  /// When the flag is set (`true`) the [TypeCodec.encode] will recieve `null`
+  /// as `input` value.
+  final bool encodesNull;
+
+  /// Whether the SQL `NULL` value is handled as a special case by this codec.
+  ///
+  /// By default SQL `NULL` values are decoded as Dart `null` values, and
+  /// [TypeCodec] will not recieve the `null` value on its [decode] method.
+  ///
+  /// When the flag is set (`true`) the [TypeCodec.decode] will recieve `null`
+  /// as `input` value ([EncodedValue.bytes] will be `null`).
+  final bool decodesNull;
+
+  TypeCodec({
+    this.encodesNull = false,
+    this.decodesNull = false,
+  });
+
+  /// Encodes the [input] value and returns an [EncodedValue] object.
+  ///
+  /// May return `null` if the codec is not able to encode the [input].
+  FutureOr<EncodedValue?> encode(TypeCodecContext context, Object? input);
+
+  /// Decodes the [input] value and returns a Dart value object.
+  ///
+  /// May return [UndecodedBytes] if the codec is not able to decode the [input].
+  FutureOr<Object?> decode(TypeCodecContext context, EncodedValue input);
+}
+
+class TypeCodecContext {
+  final Encoding encoding;
+  final TypeRegistry typeRegistry;
+
+  TypeCodecContext({
+    required this.encoding,
+    required this.typeRegistry,
+  });
+
+  PgByteDataReader newPgByteDataReader([Uint8List? bytes]) {
+    final reader = PgByteDataReader(encoding: encoding);
+    if (bytes != null) {
+      reader.add(bytes);
+    }
+    return reader;
+  }
+
+  PgByteDataWriter newPgByteDataWriter() {
+    return PgByteDataWriter(encoding: encoding);
+  }
+}
+
+class EncodedValue {
+  final Uint8List? bytes;
+  final bool isBinary;
+
+  EncodedValue({
+    required this.bytes,
+    required this.isBinary,
+  });
+}

lib/src/types/type_registry.dart

@@ -2,12 +2,13 @@ import 'dart:async';
 import 'dart:typed_data';
 
 import 'package:buffer/buffer.dart';
-import 'package:postgres/src/types/text_search.dart';
 
 import '../exceptions.dart';
 import '../types.dart';
 import 'generic_type.dart';
 import 'text_codec.dart';
+import 'text_search.dart';
+import 'type_codec.dart';
 
 /// See: https://github.com/postgres/postgres/blob/master/src/include/catalog/pg_type.dat
 class TypeOid {
@@ -240,48 +241,6 @@ final _builtInTypeNames = <String, Type>{
   '_varchar': Type.varCharArray,
 };
 
-/// Encoder and decoder for a given type (OID).
-abstract class TypeCodec {
-  /// Whether the `null` value is handled as a special case by this codec.
-  ///
-  /// By default Dart `null` values are encoded as SQL `NULL` values, and
-  /// [TypeCodec] will not recieve the `null` value on its [encode] method.
-  ///
-  /// When the flag is set (`true`) the [TypeCodec.encode] will recieve `null`
-  /// as `input` value.
-  final bool encodesNull;
-
-  /// Whether the SQL `NULL` value is handled as a special case by this codec.
-  ///
-  /// By default SQL `NULL` values are decoded as Dart `null` values, and
-  /// [TypeCodec] will not recieve the `null` value on its [decode] method.
-  ///
-  /// When the flag is set (`true`) the [TypeCodec.decode] will recieve `null`
-  /// as `input` value ([EncodedValue.bytes] will be `null`).
-  final bool decodesNull;
-
-  TypeCodec({
-    this.encodesNull = false,
-    this.decodesNull = false,
-  });
-
-  /// Encodes the [input] value and returns an [EncodedValue] object.
-  ///
-  /// May return `null` if the codec is not able to encode the [input].
-  FutureOr<EncodedValue?> encode(TypeCodecContext context, Object? input);
-
-  /// Decodes the [input] value and returns a Dart value object.
-  ///
-  /// May return [UndecodedBytes] if the codec is not able to decode the [input].
-  FutureOr<Object?> decode(TypeCodecContext context, EncodedValue input);
-}
-
-/// Encodes the [input] value and returns an [EncodedValue] object.
-///
-/// May return `null` if the codec is not able to encode the [input].
-typedef TypeEncoderFn = FutureOr<EncodedValue?> Function(
-    TypeCodecContext context, Object? input);
-
 class TypeRegistry {
   final _byTypeOid = <int, Type>{};
   final _bySubstitutionName = <String, Type>{};

lib/src/v3/connection.dart

@@ -7,12 +7,12 @@ import 'package:async/async.dart' as async;
 import 'package:charcode/ascii.dart';
 import 'package:meta/meta.dart';
 import 'package:pool/pool.dart' as pool;
-import 'package:postgres/src/types/generic_type.dart';
-import 'package:postgres/src/types/type_registry.dart';
 import 'package:stream_channel/stream_channel.dart';
 
 import '../../postgres.dart';
 import '../auth/auth.dart';
+import '../types/type_codec.dart';
+import '../types/type_registry.dart';
 import 'protocol.dart';
 import 'query_description.dart';
 import 'resolved_settings.dart';