Remove DioMixin

dio/lib/browser.dart

@@ -1,2 +1,4 @@
 export 'src/adapters/browser_adapter.dart' show BrowserHttpClientAdapter;
-export 'src/dio/dio_for_browser.dart' show DioForBrowser;
+export 'src/adapters/download/browser_download_adapter.dart'
+    show BrowserDownloadAdapter;
+export 'src/dio.dart' show Dio;

dio/lib/dio.dart

@@ -5,11 +5,11 @@
 /// {@category Plugins}
 library dio;
 
-export 'src/adapter.dart';
+export 'src/adapters/adapter.dart';
+export 'src/adapters/download/download_adapter.dart';
 export 'src/cancel_token.dart';
-export 'src/dio.dart';
+export 'src/dio.dart' hide InterceptorState, InterceptorResultType;
 export 'src/dio_exception.dart';
-export 'src/dio_mixin.dart' hide InterceptorState, InterceptorResultType;
 export 'src/form_data.dart';
 export 'src/headers.dart';
 export 'src/interceptors/log.dart';

dio/lib/io.dart

@@ -1,2 +1,3 @@
 export 'src/adapters/io_adapter.dart' hide createAdapter;
-export 'src/dio/dio_for_native.dart' show DioForNative;
+export 'src/adapters/download/io_download_adapter.dart' hide createAdapter;
+export 'src/dio.dart' show Dio;

dio/lib/src/adapter.dart → dio/lib/src/adapters/adapter.dart

@@ -1,11 +1,11 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'options.dart';
-import 'redirect_record.dart';
+import '../options.dart';
+import '../redirect_record.dart';
 
-import 'adapters/io_adapter.dart'
-    if (dart.library.html) 'adapters/browser_adapter.dart' as adapter;
+import 'io_adapter.dart' if (dart.library.html) 'browser_adapter.dart'
+    as adapter;
 
 /// [HttpAdapter] is a bridge between [Dio] and [HttpClient].
 ///

dio/lib/src/adapters/browser_adapter.dart

@@ -5,7 +5,7 @@ import 'dart:typed_data';
 
 import 'package:meta/meta.dart';
 
-import '../adapter.dart';
+import 'adapter.dart';
 import '../dio_exception.dart';
 import '../headers.dart';
 import '../options.dart';

dio/lib/src/adapters/download/browser_download_adapter.dart

@@ -0,0 +1,29 @@
+import '../../cancel_token.dart';
+import '../../headers.dart';
+import '../../options.dart';
+import '../../response.dart';
+import '../../transformer.dart';
+import 'download_adapter.dart';
+
+DownloadAdapter createAdapter() => BrowserDownloadAdapter();
+
+class BrowserDownloadAdapter implements DownloadAdapter {
+  @override
+  Future<Response> download(
+    String urlPath,
+    dynamic savePath, {
+    required RequestCallback request,
+    required Transformer transformer,
+    ProgressCallback? onReceiveProgress,
+    Map<String, dynamic>? queryParameters,
+    CancelToken? cancelToken,
+    bool deleteOnError = true,
+    String lengthHeader = Headers.contentLengthHeader,
+    Object? data,
+    Options? options,
+  }) {
+    throw UnsupportedError(
+      'The download method is not available in the Web environment.',
+    );
+  }
+}

dio/lib/src/adapters/download/download_adapter.dart

@@ -0,0 +1,36 @@
+import '../../cancel_token.dart';
+import '../../headers.dart';
+import '../../options.dart';
+import '../../response.dart';
+import '../../transformer.dart';
+
+import 'io_download_adapter.dart'
+    if (dart.library.html) 'browser_download_adapter.dart' as adapter;
+
+typedef RequestCallback = Future<Response<T>> Function<T>(
+  String url, {
+  Object? data,
+  Map<String, dynamic>? queryParameters,
+  CancelToken? cancelToken,
+  Options? options,
+  ProgressCallback? onSendProgress,
+  ProgressCallback? onReceiveProgress,
+});
+
+abstract class DownloadAdapter {
+  factory DownloadAdapter() => adapter.createAdapter();
+
+  Future<Response> download(
+    String urlPath,
+    dynamic savePath, {
+    required RequestCallback request,
+    required Transformer transformer,
+    ProgressCallback? onReceiveProgress,
+    Map<String, dynamic>? queryParameters,
+    CancelToken? cancelToken,
+    bool deleteOnError = true,
+    String lengthHeader = Headers.contentLengthHeader,
+    Object? data,
+    Options? options,
+  });
+}

dio/lib/src/dio/dio_for_native.dart → dio/lib/src/adapters/download/io_download_adapter.dart

@@ -1,33 +1,25 @@
 import 'dart:async';
 import 'dart:io';
 
+import '../../dio.dart';
 import '../adapter.dart';
-import '../cancel_token.dart';
-import '../dio_exception.dart';
-import '../dio_mixin.dart';
-import '../response.dart';
-import '../dio.dart';
-import '../headers.dart';
-import '../options.dart';
-import '../adapters/io_adapter.dart';
+import '../../cancel_token.dart';
+import '../../dio_exception.dart';
+import '../../headers.dart';
+import '../../options.dart';
+import '../../response.dart';
+import '../../transformer.dart';
+import 'download_adapter.dart';
 
-/// Create the [Dio] instance for native platforms.
-Dio createDio([BaseOptions? baseOptions]) => DioForNative(baseOptions);
+DownloadAdapter createAdapter() => IODownloadAdapter();
 
-/// Implements features for [Dio] on native platforms.
-class DioForNative extends DioMixin implements Dio {
-  /// Create Dio instance with default [BaseOptions].
-  /// It is recommended that an application use only the same DIO singleton.
-  DioForNative([BaseOptions? baseOptions]) {
-    options = baseOptions ?? BaseOptions();
-    httpClientAdapter = IOHttpClientAdapter();
-  }
-
-  /// {@macro dio.Dio.download}
+class IODownloadAdapter implements DownloadAdapter {
   @override
   Future<Response> download(
     String urlPath,
     dynamic savePath, {
+    required RequestCallback request,
+    required Transformer transformer,
     ProgressCallback? onReceiveProgress,
     Map<String, dynamic>? queryParameters,
     CancelToken? cancelToken,
@@ -36,14 +28,14 @@ class DioForNative extends DioMixin implements Dio {
     Object? data,
     Options? options,
   }) async {
-    options ??= DioMixin.checkOptions('GET', options);
+    options ??= Dio.checkOptions('GET', options);
     // Manually set the `responseType` to [ResponseType.stream]
     // to retrieve the response stream.
     // Do not modify previous options.
     options = options.copyWith(responseType: ResponseType.stream);
     final Response<ResponseBody> response;
     try {
-      response = await request<ResponseBody>(
+      response = await request(
         urlPath,
         data: data,
         options: options,
@@ -153,7 +145,7 @@ class DioForNative extends DioMixin implements Dio {
             }
           } finally {
             completer.completeError(
-              DioMixin.assureDioException(e, response.requestOptions),
+              Dio.assureDioException(e, response.requestOptions),
             );
           }
         });
@@ -166,7 +158,7 @@ class DioForNative extends DioMixin implements Dio {
           completer.complete(response);
         } catch (e) {
           completer.completeError(
-            DioMixin.assureDioException(e, response.requestOptions),
+            Dio.assureDioException(e, response.requestOptions),
           );
         }
       },
@@ -175,7 +167,7 @@ class DioForNative extends DioMixin implements Dio {
           await closeAndDelete();
         } finally {
           completer.completeError(
-            DioMixin.assureDioException(e, response.requestOptions),
+            Dio.assureDioException(e, response.requestOptions),
           );
         }
       },
@@ -185,6 +177,6 @@ class DioForNative extends DioMixin implements Dio {
       await subscription.cancel();
       await closeAndDelete();
     });
-    return DioMixin.listenCancelForAsyncTask(cancelToken, completer.future);
+    return Dio.listenCancelForAsyncTask(cancelToken, completer.future);
   }
 }

dio/lib/src/adapters/io_adapter.dart

@@ -4,7 +4,7 @@ import 'dart:typed_data';
 
 import 'package:async/async.dart';
 
-import '../adapter.dart';
+import 'adapter.dart';
 import '../dio_exception.dart';
 import '../options.dart';
 import '../redirect_record.dart';