Removed type_methods/utils.

Author: simphotonics

lib/generic_reader.dart

@@ -1,6 +1,5 @@
 export 'src/decoder/core_decoder.dart';
 export 'src/decoder/decoder.dart';
 export 'src/reader.dart';
-export 'src/extension/type_methods.dart';
 export 'src/type/decoder_not_found.dart';
 export 'src/type/invalid_type_argument.dart';

lib/src/decoder/core_decoder.dart

@@ -1,8 +1,6 @@
 import 'package:analyzer/dart/constant/value.dart' show DartObject;
-import 'package:analyzer/dart/element/type.dart';
 import 'package:exception_templates/exception_templates.dart' show ErrorOf;
 
-import '../extension/type_methods.dart';
 import 'decoder.dart';
 
 class BoolDecoder extends Decoder<bool> {
@@ -40,9 +38,9 @@ class NumDecoder extends Decoder<num> {
   const NumDecoder();
   @override
   num read(DartObject obj) {
-    if (obj.isInt) {
+    if (obj.type?.isDartCoreInt ?? false) {
       return intDecoder.read(obj);
-    } else if (obj.isDouble) {
+    } else if (obj.type?.isDartCoreDouble ?? false) {
       return doubleDecoder.read(obj);
     } else {
       throw readError(obj);
@@ -106,35 +104,42 @@ class EnumDecoder<E extends Enum> extends Decoder<E> {
   };
 }
 
-/// A callback which returns a [Record] given the [positional] and [named]
-/// record fields.
-typedef RecordFactory<T extends Record> =
-    T Function({
+/// A callback which returns a [Record] of shape/type [R]
+/// given the [positional] and [named]
+/// record fields as [DartObject]s.
+typedef RecordFactory<R extends Record> =
+    R Function({
       required List<DartObject> positional,
       required Map<String, DartObject> named,
     });
 
-class RecordDecoder<T extends Record> extends Decoder<T> {
+/// Typedef representing the [Record] shape returned by
+/// the method [DartObject.toRecordValue].
+typedef RecordObj = ({
+  Map<String, DartObject> named,
+  List<DartObject> positional,
+});
+
+/// A decoder that can decode a record of shape/type [R].
+class RecordDecoder<R extends Record> extends Decoder<R> {
   const RecordDecoder(this.recordFactory);
 
   /// A callback which returns a [Record] given the positional and named
   /// record fields.
-  final RecordFactory<T> recordFactory;
+  final RecordFactory<R> recordFactory;
 
   @override
-  /// Override this method and return a [Record] with shape [T]. <br/>
+  /// Override this method and return a [Record] with shape [R]. <br/>
   /// Tip: Use the
   /// helper methods [positionalFields] and [namedFields].
-  T read(DartObject obj) {
-    if (obj.type is RecordType) {
-      final recordObject = obj.toRecordValue();
-      return recordFactory(
-        positional: recordObject?.positional ?? [],
-        named: recordObject?.named ?? {},
-      );
-    } else {
-      throw readError(obj);
-    }
+  R read(DartObject obj) {
+    return switch (obj.toRecordValue()) {
+      RecordObj recordObj => recordFactory(
+        positional: recordObj.positional,
+        named: recordObj.named,
+      ),
+      _ => throw readError(obj),
+    };
   }
 
   static ErrorOf<RecordDecoder<T>> readRecordError<T extends Record>() =>

lib/src/decoder/decoder.dart

@@ -1,4 +1,4 @@
-import 'package:analyzer/dart/constant/value.dart';
+import 'package:analyzer/dart/constant/value.dart' show DartObject;
 import 'package:exception_templates/exception_templates.dart' show ErrorOf;
 
 abstract class Decoder<T> {

lib/src/extension/type_methods.dart

@@ -8,7 +8,7 @@ import 'decoder/core_decoder.dart';
 import 'decoder/decoder.dart';
 import 'type/decoder_not_found.dart';
 import 'type/invalid_field_name.dart';
-import 'type/invalid_type_argument.dart' show InvalidTypeArgument;
+import 'type/invalid_type_argument.dart';
 
 part 'decoder/collection_decoder.dart';
 
@@ -262,12 +262,12 @@ extension Reader on DartObject {
   /// [ErrorOfType] with type argument [InvalidFieldName] if the field does
   /// not exist.
   /// * Throws [ErrorOf] with type argument [Decoder] with type argument
-  /// [List] with type argument [T] if a list can not be constructed.
-  List<T> readList<T>({String fieldName = ''}) {
-    if (isNotCoreType<List<T>>()) {
-      addDecoder<List<T>>(ListDecoder<T>());
+  /// [List] with type argument [E] if a list can not be constructed.
+  List<E> readList<E>({String fieldName = ''}) {
+    if (isNotCoreType<List<E>>()) {
+      addDecoder<List<E>>(ListDecoder<E>());
     }
-    return read<List<T>>(fieldName: fieldName);
+    return read<List<E>>(fieldName: fieldName);
   }
 
   /// Reads the [DartObject] instance and returns an instance of `List<T>`.
@@ -276,12 +276,12 @@ extension Reader on DartObject {
   /// [ErrorOfType] with type argument [InvalidFieldName] if the field does
   /// not exist.
   /// * Throws [ErrorOf] with type argument [Decoder] with type argument
-  /// [Iterable] with type argument [T] if an iterable can not be constructed.
-  Iterable<T> readIterable<T>({String fieldName = ''}) {
-    if (isNotCoreType<Iterable<T>>()) {
-      addDecoder<Iterable<T>>(IterableDecoder<T>());
+  /// [Iterable] with type argument [E] if an iterable can not be constructed.
+  Iterable<E> readIterable<E>({String fieldName = ''}) {
+    if (isNotCoreType<Iterable<E>>()) {
+      addDecoder<Iterable<E>>(IterableDecoder<E>());
     }
-    return read<Iterable<T>>(fieldName: fieldName);
+    return read<Iterable<E>>(fieldName: fieldName);
   }
 
   /// Reads the `dartObject` instance and returns an object of type `Set<T>`.
@@ -290,12 +290,12 @@ extension Reader on DartObject {
   /// [ErrorOfType] with type argument [InvalidFieldName] if the field does
   /// not exist.
   /// * Throws [ErrorOf] with type argument [Decoder] with type argument
-  /// [Iterable] with type argument [T] if an iterable can not be constructed.
-  Set<T> readSet<T>({String fieldName = ''}) {
-    if (isNotCoreType<Set<T>>()) {
-      addDecoder<Set<T>>(SetDecoder<T>());
+  /// [Iterable] with type argument [E] if an iterable can not be constructed.
+  Set<E> readSet<E>({String fieldName = ''}) {
+    if (isNotCoreType<Set<E>>()) {
+      addDecoder<Set<E>>(SetDecoder<E>());
     }
-    return read<Set<T>>(fieldName: fieldName);
+    return read<Set<E>>(fieldName: fieldName);
   }
 
   /// Reads the [DartObject] and returns an object of type `Map<K, V>`.

lib/src/reader.dart

@@ -3,7 +3,7 @@ name: generic_reader
 description: Methods for the systematic reading of
              compile-time constant expressions.
 
-version: 0.5.1
+version: 0.5.2
 
 homepage: https://github.com/simphotonics/generic_reader