Stop using dart:mirrors. (#55)

Author: nex3

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.3+10
+
+* Stop using `dart:mirrors`.
+
 ## 0.11.3+9
 
 * Remove an extra newline in multipart chunks.

lib/browser_client.dart

@@ -15,9 +15,7 @@ import 'src/exception.dart';
 import 'src/streamed_response.dart';
 
 // TODO(nweiz): Move this under src/, re-export from lib/http.dart, and use this
-// automatically from [new Client] once we can create an HttpRequest using
-// mirrors on dart2js (issue 18541) and dart2js doesn't crash on pkg/collection
-// (issue 18535).
+// automatically from [new Client] once sdk#24581 is fixed.
 
 /// A `dart:html`-based HTTP client that runs in the browser and is backed by
 /// XMLHttpRequests.

lib/src/client.dart

@@ -8,7 +8,6 @@ import 'dart:typed_data';
 
 import 'base_client.dart';
 import 'base_request.dart';
-import 'io.dart' as io;
 import 'io_client.dart';
 import 'response.dart';
 import 'streamed_response.dart';
@@ -28,10 +27,7 @@ abstract class Client {
   /// Currently this will create an [IOClient] if `dart:io` is available and
   /// throw an [UnsupportedError] otherwise. In the future, it will create a
   /// [BrowserClient] if `dart:html` is available.
-  factory Client() {
-    io.assertSupported("IOClient");
-    return new IOClient();
-  }
+  factory Client() => new IOClient();
 
   /// Sends an HTTP HEAD request with the given headers to the given URL, which
   /// can be a [Uri] or a [String].

lib/src/io.dart

@@ -3,37 +3,24 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:io';
 
 import 'package:async/async.dart';
 
 import 'base_client.dart';
 import 'base_request.dart';
 import 'exception.dart';
-import 'io.dart' as io;
 import 'streamed_response.dart';
 
 /// A `dart:io`-based HTTP client.
 ///
 /// This is the default client when running on the command line.
 class IOClient extends BaseClient {
   /// The underlying `dart:io` HTTP client.
-  var _inner;
+  HttpClient _inner;
 
   /// Creates a new HTTP client.
-  ///
-  /// [innerClient] must be a `dart:io` HTTP client. If it's not passed, a
-  /// default one will be instantiated.
-  IOClient([innerClient]) {
-    io.assertSupported("IOClient");
-    if (innerClient != null) {
-      // TODO(nweiz): remove this assert when we can type [innerClient]
-      // properly.
-      assert(io.isHttpClient(innerClient));
-      _inner = innerClient;
-    } else {
-      _inner = io.newHttpClient();
-    }
-  }
+  IOClient([HttpClient inner]) : _inner = inner ?? new HttpClient();
 
   /// Sends an HTTP request and asynchronously returns the response.
   Future<StreamedResponse> send(BaseRequest request) async {
@@ -63,7 +50,7 @@ class IOClient extends BaseClient {
       return new StreamedResponse(
           DelegatingStream.typed/*<List<int>>*/(response).handleError((error) =>
               throw new ClientException(error.message, error.uri),
-              test: (error) => io.isHttpException(error)),
+              test: (error) => error is HttpException),
           response.statusCode,
           contentLength: response.contentLength == -1
               ? null
@@ -73,8 +60,7 @@ class IOClient extends BaseClient {
           isRedirect: response.isRedirect,
           persistentConnection: response.persistentConnection,
           reasonPhrase: response.reasonPhrase);
-    } catch (error) {
-      if (!io.isHttpException(error)) rethrow;
+    } on HttpException catch (error) {
       throw new ClientException(error.message, error.uri);
     }
   }

lib/src/io_client.dart

@@ -4,13 +4,13 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
 import 'package:async/async.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:path/path.dart' as path;
 
 import 'byte_stream.dart';
-import 'io.dart' as io;
 import 'utils.dart';
 
 /// A file to be uploaded as part of a [MultipartRequest]. This doesn't need to
@@ -85,12 +85,12 @@ class MultipartFile {
   /// defaults to `application/octet-stream`, but in the future may be inferred
   /// from [filename].
   ///
-  /// This can only be used in an environment that supports "dart:io".
+  /// Throws an [UnsupportedError] if `dart:io` isn't supported in this
+  /// environment.
   static Future<MultipartFile> fromPath(String field, String filePath,
       {String filename, MediaType contentType}) async {
-    io.assertSupported("MultipartFile.fromPath");
     if (filename == null) filename = path.basename(filePath);
-    var file = io.newFile(filePath);
+    var file = new File(filePath);
     var length = await file.length();
     var stream = new ByteStream(DelegatingStream.typed(file.openRead()));
     return new MultipartFile(field, stream, length,

lib/src/multipart_file.dart

@@ -1,5 +1,5 @@
 name: http
-version: 0.11.3+9
+version: 0.11.3+10
 author: "Dart Team <[email protected]>"
 homepage: https://github.com/dart-lang/http
 description: A composable, Future-based API for making HTTP requests.
@@ -12,4 +12,4 @@ dependencies:
 dev_dependencies:
   unittest: ">=0.9.0 <0.12.0"
 environment:
-  sdk: ">=1.9.0 <2.0.0"
+  sdk: ">=1.22.0 <2.0.0"