fix: rename options and add missing export

trevorwang · Aug 12, 2024 · 68cbc8c · 68cbc8c
1 parent 2a8b570
commit 68cbc8c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/example/lib/auth_client.dart b/example/lib/auth_client.dart
@@ -5,7 +5,7 @@ part 'auth_client.g.dart';
 
 @RestApi()
 abstract class AuthClient {
-  factory AuthClient(Dio dio, {String? baseUrl}) = RestClientYmlp;
+  factory AuthClient(Dio dio, {String? baseUrl, ParseErrorLogger errorLogger}) = RestClientYmlp;
 
   @POST('/api/auth/mqttClient/authentication')
   Future<Object?> authenticationUsingPost({

diff --git a/example/lib/example.dart b/example/lib/example.dart
@@ -11,7 +11,7 @@ part 'example.g.dart';
 
 @RestApi(baseUrl: 'https://5d42a6e2bc64f90014a56ca0.mockapi.io/api/v1/')
 abstract class RestClient {
-  factory RestClient(Dio dio, {String baseUrl}) = RestClientYmlp;
+  factory RestClient(Dio dio, {String baseUrl, ParseErrorLogger errorLogger}) = RestClientYmlp;
 
   @GET('/tasks/{id}')
   Future<ApiResult<Task?>> getNestApiResultGenericsInnerTypeNullable();

diff --git a/example_dartmapper/lib/example.dart b/example_dartmapper/lib/example.dart
@@ -10,7 +10,7 @@ part 'example.g.dart';
 
 @RestApi(baseUrl: "https://5d42a6e2bc64f90014a56ca0.mockapi.io/api/v1/")
 abstract class RestClient {
-  factory RestClient(Dio dio, {String baseUrl}) = _RestClient;
+  factory RestClient(Dio dio, {String baseUrl, ParseErrorLogger errorLogger}) = _RestClient;
 
   @GET("/tags")
   Future<List<String>> getTags();

diff --git a/example_dartmapper/lib/json_mapper_example.dart b/example_dartmapper/lib/json_mapper_example.dart
@@ -10,7 +10,7 @@ part 'json_mapper_example.g.dart';
   parser: Parser.DartJsonMapper,
 )
 abstract class ApiService {
-  factory ApiService(Dio dio, {String baseUrl}) = _ApiService;
+  factory ApiService(Dio dio, {String baseUrl, ParseErrorLogger errorLogger}) = _ApiService;
 
   @GET("/tasks")
   Future<List<Task>> getTasks(@Query("dateTime") DateTime dateTime);

diff --git a/example_protobuf/lib/example.dart b/example_protobuf/lib/example.dart
@@ -9,7 +9,7 @@ part 'example.g.dart';
 
 @RestApi(baseUrl: "https://5d42a6e2bc64f90014a56ca0.mockapi.io/api/v1/")
 abstract class RestClient {
-  factory RestClient(Dio dio, {String baseUrl}) = _RestClient;
+  factory RestClient(Dio dio, {String baseUrl, ParseErrorLogger errorLogger}) = _RestClient;
 
   @POST("/tags")
   Future<Result> getProtoBufInt(@Body() Params message);

diff --git a/example_relative_base_url/lib/example.dart b/example_relative_base_url/lib/example.dart
@@ -11,7 +11,7 @@ part 'example.g.dart';
 
 @RestApi(baseUrl: 'tasks')
 abstract class TasksRestClient {
-  factory TasksRestClient(Dio dio, {String baseUrl}) = _TasksRestClient;
+  factory TasksRestClient(Dio dio, {String baseUrl, ParseErrorLogger errorLogger}) = _TasksRestClient;
 
   @GET('/tasks/{id}')
   Future<List<Task?>> getTaskById();

diff --git a/generator/lib/src/generator.dart b/generator/lib/src/generator.dart
@@ -51,7 +51,7 @@ class RetrofitGenerator extends GeneratorForAnnotation<retrofit.RestApi> {
   static const String _baseUrlVar = 'baseUrl';
   static const String _errorLoggerVar = 'errorLogger';
   static const _queryParamsVar = 'queryParameters';
-  static const _optionsVar = 'options';
+  static const _optionsVar = '_options';
   static const _localHeadersVar = '_headers';
   static const _headersVar = 'headers';
   static const _dataVar = 'data';
@@ -2397,7 +2397,7 @@ ${bodyName.displayName} == null
         Code('try {'),
         child,
         Code('} on Object catch (e, s) {'),
-        Code('$_errorLoggerVar?.logError(e, s, options);'),
+        Code('$_errorLoggerVar?.logError(e, s, $_optionsVar);'),
         Code('rethrow;'),
         Code('}'),
       ],

diff --git a/retrofit/lib/retrofit.dart b/retrofit/lib/retrofit.dart
@@ -1,2 +1,3 @@
 export 'dio.dart';
 export 'http.dart';
+export 'error_logger.dart';