refactor: introduce codeFrom

Author: felangel

lib/src/copyable_macro.dart

@@ -121,14 +121,10 @@ macro class Copyable implements ClassDeclarationsMacro, ClassDefinitionMacro {
     // Ensure all constructor params have a type.
     if (params.any((p) => p.type == null)) return null;
 
-    final (objectIdentifier, undefinedIdentifier) = await (
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dartCore, 'Object'),
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dataClassMacro, 'undefined'),
+    final (object, undefined) = await (
+      builder.codeFrom(dartCore, 'Object'),
+      builder.codeFrom(dataClassMacro, 'undefined'),
     ).wait;
-    final object = NamedTypeAnnotationCode(name: objectIdentifier);
-    final undefined = NamedTypeAnnotationCode(name: undefinedIdentifier);
 
     final body = FunctionBodyCode.fromParts(
       [

lib/src/equatable_macro.dart

@@ -50,20 +50,12 @@ macro class Equatable implements ClassDeclarationsMacro, ClassDefinitionMacro {
     MemberDeclarationBuilder builder,
   ) async {
     final (object, boolean) = await (
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dartCore, 'Object'),
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dartCore, 'bool'),      
+      builder.codeFrom(dartCore, 'Object'),
+      builder.codeFrom(dartCore, 'bool'),      
     ).wait;
     return builder.declareInType(
       DeclarationCode.fromParts(
-        [
-          'external ',
-          NamedTypeAnnotationCode(name: boolean),
-          ' operator==(',
-          NamedTypeAnnotationCode(name: object),
-          ' other);',
-        ],
+        ['external ', boolean, ' operator==(', object, ' other);'],
       ),
     );
   }
@@ -72,16 +64,9 @@ macro class Equatable implements ClassDeclarationsMacro, ClassDefinitionMacro {
     ClassDeclaration clazz,
     MemberDeclarationBuilder builder,
   ) async {
-    // ignore: deprecated_member_use
-    final integer = await builder.resolveIdentifier(dartCore, 'int');
+    final integer = await builder.codeFrom(dartCore, 'int');
     return builder.declareInType(
-      DeclarationCode.fromParts(
-        [
-          'external ',
-          NamedTypeAnnotationCode(name: integer),
-          ' get hashCode;',
-        ],
-      ),
+      DeclarationCode.fromParts(['external ', integer, ' get hashCode;']),
     );
   }
 
@@ -95,24 +80,22 @@ macro class Equatable implements ClassDeclarationsMacro, ClassDefinitionMacro {
     );
     if (equality == null) return;
 
-    final (equalsMethod, deepEquals, fields, identical) = await (
+    final (equalsMethod, deepEquals, identical, fields) = await (
       builder.buildMethod(equality.identifier),
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dataClassMacro, 'deepEquals'),
+      builder.codeFrom(dataClassMacro, 'deepEquals'),
+      builder.codeFrom(dartCore, 'identical'),
       builder.allFieldsOf(clazz),
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dartCore, 'identical'),
     ).wait;
-    
+
     if (fields.isEmpty) {
       return equalsMethod.augment(
         FunctionBodyCode.fromParts(
           [
             '{',
-            'if (', NamedTypeAnnotationCode(name: identical),' (this, other)',')', 'return true;',
+            'if (', identical,' (this, other)',')', 'return true;',
             'return other is ${clazz.identifier.name} && ',
-            'other.runtimeType == runtimeType;',            
-            '}',          
+            'other.runtimeType == runtimeType;',
+            '}',
           ],
         ),      
       );
@@ -124,13 +107,13 @@ macro class Equatable implements ClassDeclarationsMacro, ClassDefinitionMacro {
       FunctionBodyCode.fromParts(
         [
           '{',
-          'if (', NamedTypeAnnotationCode(name: identical),' (this, other)',')', 'return true;',
+          'if (', identical,' (this, other)',')', 'return true;',
           'return other is ${clazz.identifier.name} && ',
-          'other.runtimeType == runtimeType && ',          
+          'other.runtimeType == runtimeType && ',
           for (final field in fieldNames)
-            ...[NamedTypeAnnotationCode(name: deepEquals), '(${field}, other.$field)', if (field != lastField) ' && '],
+            ...[deepEquals, '(${field}, other.$field)', if (field != lastField) ' && '],
           ';',
-          '}',          
+          '}',
         ],
       ),      
     );
@@ -148,8 +131,7 @@ macro class Equatable implements ClassDeclarationsMacro, ClassDefinitionMacro {
 
     final (hashCodeMethod, object, fields) = await (
       builder.buildMethod(hashCode.identifier),
-      // ignore: deprecated_member_use
-      builder.resolveIdentifier(dartCore, 'Object'),
+      builder.codeFrom(dartCore, 'Object'),
       builder.allFieldsOf(clazz),
     ).wait;
 
@@ -159,7 +141,7 @@ macro class Equatable implements ClassDeclarationsMacro, ClassDefinitionMacro {
       FunctionBodyCode.fromParts(
         [
           '=> ',
-          NamedTypeAnnotationCode(name: object),
+          object,
           '.hashAll([',
           fieldNames.join(', '),
           ']);',

lib/src/macro_extensions.dart

@@ -8,6 +8,11 @@ typedef ConstructorParams = ({
 });
 
 extension DefinitionBuilderX on DefinitionBuilder {
+  Future<NamedTypeAnnotationCode> codeFrom(Uri library, String name) async {
+    // ignore: deprecated_member_use
+    return _codeFrom(library, name, resolveIdentifier);
+  }
+
   Future<TypeAnnotation?> resolveType(
     FormalParameterDeclaration declaration,
     ClassDeclaration clazz,
@@ -36,6 +41,11 @@ extension DefinitionBuilderX on DefinitionBuilder {
 }
 
 extension DeclarationBuilderX on DeclarationBuilder {
+  Future<NamedTypeAnnotationCode> codeFrom(Uri library, String name) async {
+    // ignore: deprecated_member_use
+    return _codeFrom(library, name, resolveIdentifier);
+  }
+
   Future<TypeAnnotation?> resolveType(
     FormalParameterDeclaration declaration,
     ClassDeclaration clazz,
@@ -63,6 +73,15 @@ extension DeclarationBuilderX on DeclarationBuilder {
   }
 }
 
+Future<NamedTypeAnnotationCode> _codeFrom(
+  Uri library,
+  String name,
+  Future<Identifier> resolveIdentifier(Uri library, String name),
+) async {
+  final identifier = await resolveIdentifier(library, name);
+  return NamedTypeAnnotationCode(name: identifier);
+}
+
 Future<List<FieldDeclaration>> _allFieldsOf(
   ClassDeclaration clazz,
   Future<List<FieldDeclaration>> fieldsOf(TypeDeclaration type),

lib/src/stringable_macro.dart

@@ -44,16 +44,9 @@ macro class Stringable implements ClassDeclarationsMacro, ClassDefinitionMacro {
     ClassDeclaration clazz,
     MemberDeclarationBuilder builder,
   ) async {
-    // ignore: deprecated_member_use
-    final string = await builder.resolveIdentifier(dartCore, 'String');
+    final string = await builder.codeFrom(dartCore, 'String');
     return builder.declareInType(
-      DeclarationCode.fromParts(
-        [
-          'external ',
-          NamedTypeAnnotationCode(name: string),
-          ' toString();',
-        ],
-      ),
+      DeclarationCode.fromParts(['external ', string, ' toString();']),
     );
   }