Refactor

natsuk4ze · Jan 23, 2024 · 162cbb2 · 162cbb2
1 parent 17e149f
commit 162cbb2
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/lib/features/package_details/package_details.dart b/lib/features/package_details/package_details.dart
@@ -1,5 +1,6 @@
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:npm/util/dio.dart';
+import 'package:npm/util/typedefs.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'package_details.g.dart';
@@ -8,9 +9,10 @@ part 'package_details.freezed.dart';
 @riverpod
 Future<PackageDetails> packageDetails(PackageDetailsRef ref,
     {required String id}) async {
-  final response =
-      await ref.watch(dioProvider).get('https://registry.npmjs.org/$id');
-  return PackageDetails.fromJson(response.data);
+  final response = await ref.watch(dioProvider).getUri<Json>(
+        Uri.parse('https://registry.npmjs.org/$id'),
+      );
+  return PackageDetails.fromJson(response.data!);
 }
 
 @freezed
@@ -26,8 +28,7 @@ class PackageDetails with _$PackageDetails {
     final String? homepage,
     @JsonKey(readValue: _toRepository) required final String? repository,
   }) = _PackageDetails;
-  factory PackageDetails.fromJson(Map<String, dynamic> json) =>
-      _$PackageDetailsFromJson(json);
+  factory PackageDetails.fromJson(Json json) => _$PackageDetailsFromJson(json);
 }
 
 String? _toRepository(Map json, String _) {

diff --git a/lib/features/package_details/package_details.g.dart b/lib/features/package_details/package_details.g.dart
diff --git a/lib/features/packages/packages.dart b/lib/features/packages/packages.dart
@@ -3,6 +3,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:npm/util/dio.dart';
 import 'package:npm/util/extensions.dart';
 import 'package:npm/features/score/score.dart';
+import 'package:npm/util/typedefs.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'packages.g.dart';
@@ -20,14 +21,12 @@ Future<List<Package>> packages(
     await Future.delayed(const Duration(milliseconds: 500));
     if (cancelToken.isCancelled) throw Exception('Cancelled');
   }
-  final response = await ref.watch(dioProvider).get(
-        'https://registry.npmjs.org/-/v1/search?text=$search',
+  final response = await ref.watch(dioProvider).getUri<Json>(
+        Uri.parse('https://registry.npmjs.org/-/v1/search?text=$search'),
         cancelToken: cancelToken,
       );
-  final List packages = response.data['objects'];
-  return packages
-      .map((package) => Package.fromJson(package as Map<String, dynamic>))
-      .toList();
+  final packages = response.data!['objects'] as List;
+  return packages.map((package) => Package.fromJson(package)).toList();
 }
 
 @freezed
@@ -41,7 +40,7 @@ class Package with _$Package {
     final List<String>? keywords,
   }) = _Package;
 
-  factory Package.fromJson(Map<String, dynamic> json) {
+  factory Package.fromJson(Json json) {
     final package = json['package'];
     final score = json['score']['detail'];
 

diff --git a/lib/features/packages/packages.g.dart b/lib/features/packages/packages.g.dart
diff --git a/lib/features/score/score.dart b/lib/features/score/score.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:freezed_annotation/freezed_annotation.dart';
 import 'package:npm/l10n/strings.g.dart';
+import 'package:npm/util/typedefs.dart';
 
 part 'score.freezed.dart';
 part 'score.g.dart';
@@ -12,7 +13,7 @@ class Score with _$Score {
     required final double quality,
     required final double maintenance,
   }) = _Score;
-  factory Score.fromJson(Map<String, dynamic> json) => _$ScoreFromJson(json);
+  factory Score.fromJson(Json json) => _$ScoreFromJson(json);
 }
 
 enum ScoreType {

diff --git a/lib/util/typedefs.dart b/lib/util/typedefs.dart
@@ -0,0 +1 @@
+typedef Json = Map<String, dynamic>;