pkg/dev_compiler/lib/js/amd/dart_sdk.js - Issue 2456803004: fixes #27586, prefer context type in generic inference

Unified Diff: pkg/dev_compiler/lib/js/amd/dart_sdk.js

Issue 2456803004: fixes #27586, prefer context type in generic inference (Closed)

Patch Set: fix Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« pkg/analyzer/test/generated/strong_mode_test.dart ('K') | « pkg/analyzer/test/src/task/strong/inferred_type_test.dart ('k') | pkg/dev_compiler/lib/js/common/dart_sdk.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: pkg/dev_compiler/lib/js/amd/dart_sdk.js

diff --git a/pkg/dev_compiler/lib/js/amd/dart_sdk.js b/pkg/dev_compiler/lib/js/amd/dart_sdk.js

index 199c35be8f51a076d4667d3ac3b7ead9f007b5eb..858bde50dbf0346cb06aa954bf5ead28eb0677d5 100644

--- a/pkg/dev_compiler/lib/js/amd/dart_sdk.js

+++ b/pkg/dev_compiler/lib/js/amd/dart_sdk.js

@@ -167,8 +167,6 @@ define([], function() {

let _AsyncBroadcastStreamController = () => (_AsyncBroadcastStreamController = dart.constFn(async._AsyncBroadcastStreamController$()))();

let _AsBroadcastStreamController = () => (_AsBroadcastStreamController = dart.constFn(async._AsBroadcastStreamController$()))();

let _DoneSubscription = () => (_DoneSubscription = dart.constFn(async._DoneSubscription$()))();

- let FutureOr = () => (FutureOr = dart.constFn(async.FutureOr$()))();

- let dynamicToFutureOr = () => (dynamicToFutureOr = dart.constFn(dart.functionType(async.FutureOr, [dart.dynamic])))();

let VoidTodynamic = () => (VoidTodynamic = dart.constFn(dart.functionType(dart.dynamic, [])))();

let Future = () => (Future = dart.constFn(async.Future$()))();

let Completer = () => (Completer = dart.constFn(async.Completer$()))();

@@ -389,20 +387,14 @@ define([], function() {

let ListOfListOfint = () => (ListOfListOfint = dart.constFn(core.List$(ListOfint())))();

let FutureOfint = () => (FutureOfint = dart.constFn(async.Future$(core.int)))();

let FutureOfDirectory = () => (FutureOfDirectory = dart.constFn(async.Future$(io.Directory)))();

- let FutureOrOfDirectory = () => (FutureOrOfDirectory = dart.constFn(async.FutureOr$(io.Directory)))();

let StreamOfFileSystemEntity = () => (StreamOfFileSystemEntity = dart.constFn(async.Stream$(io.FileSystemEntity)))();

let JSArrayOfFileSystemEntity = () => (JSArrayOfFileSystemEntity = dart.constFn(_interceptors.JSArray$(io.FileSystemEntity)))();

- let FutureOrOfString = () => (FutureOrOfString = dart.constFn(async.FutureOr$(core.String)))();

- let FutureOrOfbool = () => (FutureOrOfbool = dart.constFn(async.FutureOr$(core.bool)))();

- let FutureOrOfint = () => (FutureOrOfint = dart.constFn(async.FutureOr$(core.int)))();

let ListOfFileSystemEntity = () => (ListOfFileSystemEntity = dart.constFn(core.List$(io.FileSystemEntity)))();

let StreamControllerOfListOfint = () => (StreamControllerOfListOfint = dart.constFn(async.StreamController$(ListOfint())))();

let FutureOfRandomAccessFile = () => (FutureOfRandomAccessFile = dart.constFn(async.Future$(io.RandomAccessFile)))();

let CompleterOfFile = () => (CompleterOfFile = dart.constFn(async.Completer$(io.File)))();

let FutureOfListOfint = () => (FutureOfListOfint = dart.constFn(async.Future$(ListOfint())))();

- let FutureOrOfFile = () => (FutureOrOfFile = dart.constFn(async.FutureOr$(io.File)))();

let FutureOfFile = () => (FutureOfFile = dart.constFn(async.Future$(io.File)))();

- let FutureOrOfListOfint = () => (FutureOrOfListOfint = dart.constFn(async.FutureOr$(ListOfint())))();

let ListOfFileSystemEntityType = () => (ListOfFileSystemEntityType = dart.constFn(core.List$(io.FileSystemEntityType)))();

let StreamOfHttpRequest = () => (StreamOfHttpRequest = dart.constFn(async.Stream$(io.HttpRequest)))();

let ListOfRedirectInfo = () => (ListOfRedirectInfo = dart.constFn(core.List$(io.RedirectInfo)))();

@@ -411,7 +403,6 @@ define([], function() {

let StringAndListOfStringTovoid = () => (StringAndListOfStringTovoid = dart.constFn(dart.functionType(dart.void, [core.String, ListOfString()])))();

let FutureOfHttpClientResponse = () => (FutureOfHttpClientResponse = dart.constFn(async.Future$(io.HttpClientResponse)))();

let StreamSubscriptionOfListOfint = () => (StreamSubscriptionOfListOfint = dart.constFn(async.StreamSubscription$(ListOfint())))();

- let FutureOrOfHttpClientResponse = () => (FutureOrOfHttpClientResponse = dart.constFn(async.FutureOr$(io.HttpClientResponse)))();

let _StreamSinkImpl = () => (_StreamSinkImpl = dart.constFn(io._StreamSinkImpl$()))();

let StreamConsumerOfListOfint = () => (StreamConsumerOfListOfint = dart.constFn(async.StreamConsumer$(ListOfint())))();

let _HttpOutboundMessage = () => (_HttpOutboundMessage = dart.constFn(io._HttpOutboundMessage$()))();

@@ -423,13 +414,11 @@ define([], function() {

let FutureOfSecureSocket = () => (FutureOfSecureSocket = dart.constFn(async.Future$(io.SecureSocket)))();

let HashSetOf_HttpClientConnection = () => (HashSetOf_HttpClientConnection = dart.constFn(collection.HashSet$(io._HttpClientConnection)))();

let FutureOf_ConnectionInfo = () => (FutureOf_ConnectionInfo = dart.constFn(async.Future$(io._ConnectionInfo)))();

- let FutureOrOf_ConnectionInfo = () => (FutureOrOf_ConnectionInfo = dart.constFn(async.FutureOr$(io._ConnectionInfo)))();

let SetOf_HttpClientConnection = () => (SetOf_HttpClientConnection = dart.constFn(core.Set$(io._HttpClientConnection)))();

let HashMapOfString$_ConnectionTarget = () => (HashMapOfString$_ConnectionTarget = dart.constFn(collection.HashMap$(core.String, io._ConnectionTarget)))();

let JSArrayOf_Credentials = () => (JSArrayOf_Credentials = dart.constFn(_interceptors.JSArray$(io._Credentials)))();

let JSArrayOf_ProxyCredentials = () => (JSArrayOf_ProxyCredentials = dart.constFn(_interceptors.JSArray$(io._ProxyCredentials)))();

let FutureOf_HttpClientRequest = () => (FutureOf_HttpClientRequest = dart.constFn(async.Future$(io._HttpClientRequest)))();

- let FutureOrOf_HttpClientRequest = () => (FutureOrOf_HttpClientRequest = dart.constFn(async.FutureOr$(io._HttpClientRequest)))();

let X509CertificateAndStringAndintTobool = () => (X509CertificateAndStringAndintTobool = dart.constFn(dart.functionType(core.bool, [io.X509Certificate, core.String, core.int])))();

let FutureOfbool = () => (FutureOfbool = dart.constFn(async.Future$(core.bool)))();

let UriAndStringAndStringToFutureOfbool = () => (UriAndStringAndStringToFutureOfbool = dart.constFn(dart.functionType(FutureOfbool(), [core.Uri, core.String, core.String])))();

@@ -480,7 +469,6 @@ define([], function() {

let StreamControllerOfWebSocket = () => (StreamControllerOfWebSocket = dart.constFn(async.StreamController$(io.WebSocket)))();

let FutureOfWebSocket = () => (FutureOfWebSocket = dart.constFn(async.Future$(io.WebSocket)))();

let EventSinkOfListOfint = () => (EventSinkOfListOfint = dart.constFn(async.EventSink$(ListOfint())))();

- let JSArrayOfUint8List = () => (JSArrayOfUint8List = dart.constFn(_interceptors.JSArray$(typed_data.Uint8List)))();

let StreamTransformerOfdynamic$ListOfint = () => (StreamTransformerOfdynamic$ListOfint = dart.constFn(async.StreamTransformer$(dart.dynamic, ListOfint())))();

let MapOfint$_WebSocketImpl = () => (MapOfint$_WebSocketImpl = dart.constFn(core.Map$(core.int, io._WebSocketImpl)))();

let FutureOfIsolate = () => (FutureOfIsolate = dart.constFn(async.Future$(isolate.Isolate)))();

@@ -501,7 +489,6 @@ define([], function() {

let EventTovoid = () => (EventTovoid = dart.constFn(dart.functionType(dart.void, [html$.Event])))();

let CompleterOfDatabase = () => (CompleterOfDatabase = dart.constFn(async.Completer$(indexed_db.Database)))();

let ListOfEventTarget = () => (ListOfEventTarget = dart.constFn(core.List$(html$.EventTarget)))();

- let RectangleOfint = () => (RectangleOfint = dart.constFn(math.Rectangle$(core.int)))();

let IterableOfNode = () => (IterableOfNode = dart.constFn(core.Iterable$(html$.Node)))();

let ListOfNode = () => (ListOfNode = dart.constFn(core.List$(html$.Node)))();

let ListOfElement = () => (ListOfElement = dart.constFn(core.List$(html$.Element)))();

@@ -557,7 +544,7 @@ define([], function() {

let EventStreamProviderOfMidiMessageEvent = () => (EventStreamProviderOfMidiMessageEvent = dart.constFn(html$.EventStreamProvider$(html$.MidiMessageEvent)))();

let ListOfMimeType = () => (ListOfMimeType = dart.constFn(core.List$(html$.MimeType)))();

let ListOfMutationRecord = () => (ListOfMutationRecord = dart.constFn(core.List$(html$.MutationRecord)))();

- let _wrapZoneBinaryCallbackOfListOfMutationRecord$MutationObserver$void = () => (_wrapZoneBinaryCallbackOfListOfMutationRecord$MutationObserver$void = dart.constFn(html$._wrapZoneBinaryCallback$(ListOfMutationRecord(), html$.MutationObserver, dart.void)))();

+ let ListOfMutationRecordAndMutationObserverTovoid = () => (ListOfMutationRecordAndMutationObserverTovoid = dart.constFn(dart.functionType(dart.void, [ListOfMutationRecord(), html$.MutationObserver])))();

let MapOfString$bool = () => (MapOfString$bool = dart.constFn(core.Map$(core.String, core.bool)))();

let CompleterOfMediaStream = () => (CompleterOfMediaStream = dart.constFn(async.Completer$(html$.MediaStream)))();

let NodeTobool = () => (NodeTobool = dart.constFn(dart.functionType(core.bool, [html$.Node])))();

@@ -570,7 +557,6 @@ define([], function() {

let EventStreamProviderOfMediaStreamEvent = () => (EventStreamProviderOfMediaStreamEvent = dart.constFn(html$.EventStreamProvider$(html$.MediaStreamEvent)))();

let EventStreamProviderOfRtcDataChannelEvent = () => (EventStreamProviderOfRtcDataChannelEvent = dart.constFn(html$.EventStreamProvider$(html$.RtcDataChannelEvent)))();

let EventStreamProviderOfRtcIceCandidateEvent = () => (EventStreamProviderOfRtcIceCandidateEvent = dart.constFn(html$.EventStreamProvider$(html$.RtcIceCandidateEvent)))();

- let ListOfOptionElement = () => (ListOfOptionElement = dart.constFn(core.List$(html$.OptionElement)))();

let UnmodifiableListViewOfOptionElement = () => (UnmodifiableListViewOfOptionElement = dart.constFn(collection.UnmodifiableListView$(html$.OptionElement)))();

let JSArrayOfOptionElement = () => (JSArrayOfOptionElement = dart.constFn(_interceptors.JSArray$(html$.OptionElement)))();

let ListOfSourceBuffer = () => (ListOfSourceBuffer = dart.constFn(core.List$(html$.SourceBuffer)))();

@@ -681,9 +667,8 @@ define([], function() {

let VoidTobool = () => (VoidTobool = dart.constFn(dart.definiteFunctionType(core.bool, [])))();

let VoidTo_IsolateContext = () => (VoidTo_IsolateContext = dart.constFn(dart.definiteFunctionType(_isolate_helper._IsolateContext, [])))();

let VoidTovoid$ = () => (VoidTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [])))();

- let ListToFutureOr = () => (ListToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [core.List])))();

+ let ListTodynamic = () => (ListTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [core.List])))();

let StringTodynamic = () => (StringTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [core.String])))();

- let dynamicToFutureOr$ = () => (dynamicToFutureOr$ = dart.constFn(dart.definiteFunctionType(async.FutureOr, [dart.dynamic])))();

let TimerTovoid$ = () => (TimerTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [async.Timer])))();

let dynamicToFuture = () => (dynamicToFuture = dart.constFn(dart.definiteFunctionType(async.Future, [dart.dynamic])))();

let boolTodynamic = () => (boolTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [core.bool])))();

@@ -775,6 +760,7 @@ define([], function() {

let IterableAndListTovoid = () => (IterableAndListTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [core.Iterable, core.List])))();

let _SplayTreeMapNodeTobool = () => (_SplayTreeMapNodeTobool = dart.constFn(dart.definiteFunctionType(core.bool, [collection._SplayTreeMapNode])))();

let dynamicAndFnTodynamic = () => (dynamicAndFnTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [dart.dynamic, dynamicAnddynamicTodynamic()])))();

+ let EventSinkTo_ConverterStreamEventSink = () => (EventSinkTo_ConverterStreamEventSink = dart.constFn(dart.definiteFunctionType(convert._ConverterStreamEventSink, [async.EventSink])))();

let Uint8ListAndintAndintTovoid$ = () => (Uint8ListAndintAndintTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [typed_data.Uint8List, core.int, core.int])))();

let StringAndFnTodynamic = () => (StringAndFnTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [core.String, dynamicAnddynamicTodynamic()])))();

let EventSinkOfStringTo_LineSplitterEventSink = () => (EventSinkOfStringTo_LineSplitterEventSink = dart.constFn(dart.definiteFunctionType(convert._LineSplitterEventSink, [EventSinkOfString()])))();

@@ -809,15 +795,12 @@ define([], function() {

let ListAndintAndintTo_BufferAndStart = () => (ListAndintAndintTo_BufferAndStart = dart.constFn(dart.definiteFunctionType(io._BufferAndStart, [core.List, core.int, core.int])))();

let intTovoid = () => (intTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [core.int])))();

let DirectoryToFutureOfDirectory = () => (DirectoryToFutureOfDirectory = dart.constFn(dart.definiteFunctionType(FutureOfDirectory(), [io.Directory])))();

- let boolToFutureOrOfDirectory = () => (boolToFutureOrOfDirectory = dart.constFn(dart.definiteFunctionType(FutureOrOfDirectory(), [core.bool])))();

+ let boolToObject = () => (boolToObject = dart.constFn(dart.definiteFunctionType(core.Object, [core.bool])))();

let dynamicTo_Directory = () => (dynamicTo_Directory = dart.constFn(dart.definiteFunctionType(io._Directory, [dart.dynamic])))();

let dynamicToDirectory = () => (dynamicToDirectory = dart.constFn(dart.definiteFunctionType(io.Directory, [dart.dynamic])))();

- let dynamicToFutureOrOfString = () => (dynamicToFutureOrOfString = dart.constFn(dart.definiteFunctionType(FutureOrOfString(), [dart.dynamic])))();

- let dynamicToFutureOrOfbool = () => (dynamicToFutureOrOfbool = dart.constFn(dart.definiteFunctionType(FutureOrOfbool(), [dart.dynamic])))();

- let dynamicToFutureOrOfint = () => (dynamicToFutureOrOfint = dart.constFn(dart.definiteFunctionType(FutureOrOfint(), [dart.dynamic])))();

- let ListOfintToFutureOr = () => (ListOfintToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [ListOfint()])))();

+ let ListOfintTodynamic = () => (ListOfintTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [ListOfint()])))();

let RandomAccessFileTovoid = () => (RandomAccessFileTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [io.RandomAccessFile])))();

- let RandomAccessFileToFutureOr = () => (RandomAccessFileToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [io.RandomAccessFile])))();

+ let RandomAccessFileTodynamic = () => (RandomAccessFileTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [io.RandomAccessFile])))();

let ListOfintTovoid$ = () => (ListOfintTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [ListOfint()])))();

let RandomAccessFileToFutureOfRandomAccessFile = () => (RandomAccessFileToFutureOfRandomAccessFile = dart.constFn(dart.definiteFunctionType(FutureOfRandomAccessFile(), [io.RandomAccessFile])))();

let dynamicTo_File = () => (dynamicTo_File = dart.constFn(dart.definiteFunctionType(io._File, [dart.dynamic])))();

@@ -827,43 +810,38 @@ define([], function() {

let dynamicToDateTime = () => (dynamicToDateTime = dart.constFn(dart.definiteFunctionType(core.DateTime, [dart.dynamic])))();

let dynamicToFutureOfListOfint = () => (dynamicToFutureOfListOfint = dart.constFn(dart.definiteFunctionType(FutureOfListOfint(), [dart.dynamic])))();

let intToFutureOfListOfint = () => (intToFutureOfListOfint = dart.constFn(dart.definiteFunctionType(FutureOfListOfint(), [core.int])))();

- let RandomAccessFileToFutureOfListOfint = () => (RandomAccessFileToFutureOfListOfint = dart.constFn(dart.definiteFunctionType(FutureOfListOfint(), [io.RandomAccessFile])))();

+ let RandomAccessFileToFuture = () => (RandomAccessFileToFuture = dart.constFn(dart.definiteFunctionType(async.Future, [io.RandomAccessFile])))();

let ListOfintToString = () => (ListOfintToString = dart.constFn(dart.definiteFunctionType(core.String, [ListOfint()])))();

let RandomAccessFileTo_File = () => (RandomAccessFileTo_File = dart.constFn(dart.definiteFunctionType(io._File, [io.RandomAccessFile])))();

let RandomAccessFileToObject = () => (RandomAccessFileToObject = dart.constFn(dart.definiteFunctionType(core.Object, [io.RandomAccessFile])))();

- let RandomAccessFileToFutureOrOfFile = () => (RandomAccessFileToFutureOrOfFile = dart.constFn(dart.definiteFunctionType(FutureOrOfFile(), [io.RandomAccessFile])))();

- let dynamicToFutureOrOfListOfint = () => (dynamicToFutureOrOfListOfint = dart.constFn(dart.definiteFunctionType(FutureOrOfListOfint(), [dart.dynamic])))();

let dynamicToFileStat = () => (dynamicToFileStat = dart.constFn(dart.definiteFunctionType(io.FileStat, [dart.dynamic])))();

let StringAndListOfStringToListOfString = () => (StringAndListOfStringToListOfString = dart.constFn(dart.definiteFunctionType(ListOfString(), [core.String, ListOfString()])))();

let StringAndListOfStringTovoid$ = () => (StringAndListOfStringTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [core.String, ListOfString()])))();

let CookieToString = () => (CookieToString = dart.constFn(dart.definiteFunctionType(core.String, [io.Cookie])))();

let CookieTobool = () => (CookieTobool = dart.constFn(dart.definiteFunctionType(core.bool, [io.Cookie])))();

let _HttpClientRequestToFutureOfHttpClientResponse = () => (_HttpClientRequestToFutureOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOfHttpClientResponse(), [io._HttpClientRequest])))();

- let dynamicToFutureOfHttpClientResponse = () => (dynamicToFutureOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOfHttpClientResponse(), [dart.dynamic])))();

let VoidToFutureOfHttpClientResponse = () => (VoidToFutureOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOfHttpClientResponse(), [])))();

let VoidToListOfString = () => (VoidToListOfString = dart.constFn(dart.definiteFunctionType(ListOfString(), [])))();

let _AuthenticationSchemeTo_Credentials = () => (_AuthenticationSchemeTo_Credentials = dart.constFn(dart.definiteFunctionType(io._Credentials, [io._AuthenticationScheme])))();

let _CredentialsTovoid = () => (_CredentialsTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [io._Credentials])))();

let _AuthenticationSchemeAndStringToFuture = () => (_AuthenticationSchemeAndStringToFuture = dart.constFn(dart.definiteFunctionType(async.Future, [io._AuthenticationScheme, core.String])))();

- let dynamicToFutureOrOfHttpClientResponse = () => (dynamicToFutureOrOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOrOfHttpClientResponse(), [dart.dynamic])))();

let CookieTovoid = () => (CookieTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [io.Cookie])))();

- let ListToFutureOrOfHttpClientResponse = () => (ListToFutureOrOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOrOfHttpClientResponse(), [core.List])))();

+ let dynamicToFutureOfHttpClientResponse = () => (dynamicToFutureOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOfHttpClientResponse(), [dart.dynamic])))();

let HttpClientResponseTovoid = () => (HttpClientResponseTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [io.HttpClientResponse])))();

let dynamicToIterable = () => (dynamicToIterable = dart.constFn(dart.definiteFunctionType(core.Iterable, [dart.dynamic])))();

let dynamicTo_HttpOutboundMessage = () => (dynamicTo_HttpOutboundMessage = dart.constFn(dart.definiteFunctionType(io._HttpOutboundMessage, [dart.dynamic])))();

let dynamicAnddynamicTo_HttpOutboundMessage = () => (dynamicAnddynamicTo_HttpOutboundMessage = dart.constFn(dart.definiteFunctionType(io._HttpOutboundMessage, [dart.dynamic, dart.dynamic])))();

let dynamic__Todynamic$ = () => (dynamic__Todynamic$ = dart.constFn(dart.definiteFunctionType(dart.dynamic, [dart.dynamic], [core.StackTrace])))();

let _HttpIncomingTovoid$ = () => (_HttpIncomingTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [io._HttpIncoming])))();

- let _HttpIncomingToFutureOr = () => (_HttpIncomingToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [io._HttpIncoming])))();

+ let _HttpIncomingTodynamic = () => (_HttpIncomingTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [io._HttpIncoming])))();

let dynamicTo_DetachedSocket = () => (dynamicTo_DetachedSocket = dart.constFn(dart.definiteFunctionType(io._DetachedSocket, [dart.dynamic])))();

- let SecureSocketTo_HttpClientConnection = () => (SecureSocketTo_HttpClientConnection = dart.constFn(dart.definiteFunctionType(io._HttpClientConnection, [io.SecureSocket])))();

+ let dynamicTo_HttpClientConnection = () => (dynamicTo_HttpClientConnection = dart.constFn(dart.definiteFunctionType(io._HttpClientConnection, [dart.dynamic])))();

let HttpClientResponseToFutureOfSecureSocket = () => (HttpClientResponseToFutureOfSecureSocket = dart.constFn(dart.definiteFunctionType(FutureOfSecureSocket(), [io.HttpClientResponse])))();

let X509CertificateTobool$ = () => (X509CertificateTobool$ = dart.constFn(dart.definiteFunctionType(core.bool, [io.X509Certificate])))();

let _HttpClientConnectionTo_ConnectionInfo = () => (_HttpClientConnectionTo_ConnectionInfo = dart.constFn(dart.definiteFunctionType(io._ConnectionInfo, [io._HttpClientConnection])))();

- let dynamicToFutureOrOf_ConnectionInfo = () => (dynamicToFutureOrOf_ConnectionInfo = dart.constFn(dart.definiteFunctionType(FutureOrOf_ConnectionInfo(), [dart.dynamic])))();

let _ConnectionTargetTobool = () => (_ConnectionTargetTobool = dart.constFn(dart.definiteFunctionType(core.bool, [io._ConnectionTarget])))();

let _ConnectionInfoTo_HttpClientRequest = () => (_ConnectionInfoTo_HttpClientRequest = dart.constFn(dart.definiteFunctionType(io._HttpClientRequest, [io._ConnectionInfo])))();

- let _ConnectionInfoToFutureOrOf_HttpClientRequest = () => (_ConnectionInfoToFutureOrOf_HttpClientRequest = dart.constFn(dart.definiteFunctionType(FutureOrOf_HttpClientRequest(), [io._ConnectionInfo])))();

+ let _ConnectionInfoToObject = () => (_ConnectionInfoToObject = dart.constFn(dart.definiteFunctionType(core.Object, [io._ConnectionInfo])))();

let _HttpClientRequestTo_HttpClientRequest = () => (_HttpClientRequestTo_HttpClientRequest = dart.constFn(dart.definiteFunctionType(io._HttpClientRequest, [io._HttpClientRequest])))();

let VoidTo_ConnectionTarget = () => (VoidTo_ConnectionTarget = dart.constFn(dart.definiteFunctionType(io._ConnectionTarget, [])))();

let dynamicToFutureOf_ConnectionInfo = () => (dynamicToFutureOf_ConnectionInfo = dart.constFn(dart.definiteFunctionType(FutureOf_ConnectionInfo(), [dart.dynamic])))();

@@ -886,9 +864,9 @@ define([], function() {

let RawSecureSocketToSecureSocket = () => (RawSecureSocketToSecureSocket = dart.constFn(dart.definiteFunctionType(io.SecureSocket, [io.RawSecureSocket])))();

let dynamicToFutureOfRawSecureSocket = () => (dynamicToFutureOfRawSecureSocket = dart.constFn(dart.definiteFunctionType(FutureOfRawSecureSocket(), [dart.dynamic])))();

let RawServerSocketToRawSecureServerSocket = () => (RawServerSocketToRawSecureServerSocket = dart.constFn(dart.definiteFunctionType(io.RawSecureServerSocket, [io.RawServerSocket])))();

- let RawSecureSocketToFutureOr = () => (RawSecureSocketToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [io.RawSecureSocket])))();

+ let RawSecureSocketTodynamic = () => (RawSecureSocketTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [io.RawSecureSocket])))();

let RawSocketToFutureOfRawSecureSocket = () => (RawSocketToFutureOfRawSecureSocket = dart.constFn(dart.definiteFunctionType(FutureOfRawSecureSocket(), [io.RawSocket])))();

- let _FilterStatusToFutureOr = () => (_FilterStatusToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [io._FilterStatus])))();

+ let _FilterStatusTodynamic = () => (_FilterStatusTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [io._FilterStatus])))();

let intToint = () => (intToint = dart.constFn(dart.definiteFunctionType(core.int, [core.int])))();

let dynamicTo_FilterStatus = () => (dynamicTo_FilterStatus = dart.constFn(dart.definiteFunctionType(io._FilterStatus, [dart.dynamic])))();

let ListOfintAndStringTovoid = () => (ListOfintAndStringTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [ListOfint(), core.String])))();

@@ -900,8 +878,6 @@ define([], function() {

let StringToFuture = () => (StringToFuture = dart.constFn(dart.definiteFunctionType(async.Future, [core.String])))();

let EventSinkOfListOfintTo_WebSocketOutgoingTransformer = () => (EventSinkOfListOfintTo_WebSocketOutgoingTransformer = dart.constFn(dart.definiteFunctionType(io._WebSocketOutgoingTransformer, [EventSinkOfListOfint()])))();

let dynamicTo_WebSocketImpl = () => (dynamicTo_WebSocketImpl = dart.constFn(dart.definiteFunctionType(io._WebSocketImpl, [dart.dynamic])))();

- let SocketToFutureOr = () => (SocketToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [io.Socket])))();

- let HttpClientResponseToFutureOfWebSocket = () => (HttpClientResponseToFutureOfWebSocket = dart.constFn(dart.definiteFunctionType(FutureOfWebSocket(), [io.HttpClientResponse])))();

let HttpClientRequestToFutureOfHttpClientResponse = () => (HttpClientRequestToFutureOfHttpClientResponse = dart.constFn(dart.definiteFunctionType(FutureOfHttpClientResponse(), [io.HttpClientRequest])))();

let dynamicToMap = () => (dynamicToMap = dart.constFn(dart.definiteFunctionType(core.Map, [dart.dynamic])))();

let ListToIsolate = () => (ListToIsolate = dart.constFn(dart.definiteFunctionType(isolate.Isolate, [core.List])))();

@@ -923,7 +899,7 @@ define([], function() {

let EventTovoid$ = () => (EventTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [html$.Event])))();

let RequestToFutureOfT = () => (RequestToFutureOfT = dart.constFn(dart.definiteFunctionType(T => [async.Future$(T), [indexed_db.Request]])))();

let dynamicToTo = () => (dynamicToTo = dart.constFn(dart.definiteFunctionType(To => [To, [dart.dynamic]])))();

- let EventToFutureOr = () => (EventToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [html$.Event])))();

+ let EventTodynamic = () => (EventTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [html$.Event])))();

let NodeTobool$ = () => (NodeTobool$ = dart.constFn(dart.definiteFunctionType(core.bool, [html$.Node])))();

let MapOfString$dynamicTobool = () => (MapOfString$dynamicTobool = dart.constFn(dart.definiteFunctionType(core.bool, [MapOfString$dynamic()])))();

let UriAndListOfStringAnddynamicToFutureOfIsolate = () => (UriAndListOfStringAnddynamicToFutureOfIsolate = dart.constFn(dart.definiteFunctionType(FutureOfIsolate(), [core.Uri, ListOfString(), dart.dynamic])))();

@@ -957,7 +933,6 @@ define([], function() {

let SetOfStringTobool = () => (SetOfStringTobool = dart.constFn(dart.definiteFunctionType(core.bool, [SetOfString()])))();

let SetOfStringTovoid = () => (SetOfStringTovoid = dart.constFn(dart.definiteFunctionType(dart.void, [SetOfString()])))();

let EventAndStringTobool = () => (EventAndStringTobool = dart.constFn(dart.definiteFunctionType(core.bool, [html$.Event, core.String])))();

- let EventTodynamic = () => (EventTodynamic = dart.constFn(dart.definiteFunctionType(dart.dynamic, [html$.Event])))();

let KeyEventTobool = () => (KeyEventTobool = dart.constFn(dart.definiteFunctionType(core.bool, [html$.KeyEvent])))();

let NodeValidatorTobool = () => (NodeValidatorTobool = dart.constFn(dart.definiteFunctionType(core.bool, [html$.NodeValidator])))();

let NodeAndNodeToint = () => (NodeAndNodeToint = dart.constFn(dart.definiteFunctionType(core.int, [html$.Node, html$.Node])))();

@@ -1715,9 +1690,7 @@ define([], function() {

}

if (ret2 === dart.void) return true;

- if (ret1 === dart.void) {

- return ret2 === dart.dynamic || ret2 === async.FutureOr;

- }

+ if (ret1 === dart.void) return ret2 === dart.dynamic;

if (!dart._isSubtype(ret1, ret2, isCovariant)) return null;

return true;

};

@@ -1741,9 +1714,6 @@ define([], function() {

return type == dart.bottom;

};

dart._isTop = function(type) {

- if (dart.getGenericClass(type) === dart.getGenericClass(async.FutureOr)) {

- return dart._isTop(dart.getGenericArgs(type)[0]);

- }

return type == core.Object || type == dart.dynamic;

};

dart._isSubtype = function(t1, t2, isCovariant) {

@@ -1795,15 +1765,6 @@ define([], function() {

}

return true;

}

- if (raw1 === dart.getGenericClass(async.FutureOr)) {

- let t1TypeArg = dart.getGenericArgs(t1)[0];

- let t1Future = dart.getGenericClass(async.Future)(t1TypeArg);

- return dart.isSubtype(t1Future, t2) && dart.isSubtype(t1TypeArg, t2);

- } else if (raw2 === dart.getGenericClass(async.FutureOr)) {

- let t2TypeArg = dart.getGenericArgs(t2)[0];

- let t2Future = dart.getGenericClass(async.Future)(t2TypeArg);

- return dart.isSubtype(t1, t2Future) || dart.isSubtype(t1, t2TypeArg);

- }

let indefinite = false;

function definitive(t1, t2) {

let result = dart.isClassSubType(t1, t2, isCovariant);

@@ -9895,7 +9856,7 @@ define([], function() {

let replyPort = dart.dindex(msg, 'replyPort');

_isolate_helper.IsolateNatives.spawn(core.String._check(dart.dindex(msg, 'functionName')), core.String._check(dart.dindex(msg, 'uri')), ListOfString()._check(dart.dindex(msg, 'args')), dart.dindex(msg, 'msg'), false, core.bool._check(dart.dindex(msg, 'isSpawnUri')), core.bool._check(dart.dindex(msg, 'startPaused'))).then(dart.dynamic)(dart.fn(msg => {

dart.dsend(replyPort, 'send', msg);

- }, ListToFutureOr()), {onError: dart.fn(errorMessage => {

+ }, ListTodynamic()), {onError: dart.fn(errorMessage => {

dart.dsend(replyPort, 'send', JSArrayOfString().of([_isolate_helper._SPAWN_FAILED_SIGNAL, errorMessage]));

}, StringTodynamic())});

}

@@ -9954,7 +9915,7 @@ define([], function() {

dart.assert(dart.equals(dart.dindex(msg, 0), _isolate_helper._SPAWN_FAILED_SIGNAL));

completer.completeError(dart.dindex(msg, 1));

}

- }, dynamicToFutureOr$()));

+ }, dynamicTodynamic$()));

let signalReply = port.sendPort;

if (dart.test(_isolate_helper._globalState.useWorkers) && !dart.test(isLight)) {

_isolate_helper.IsolateNatives._startWorker(functionName, uri, args, message, isSpawnUri, startPaused, signalReply, dart.fn(message => completer.completeError(message), StringTovoid$()));

@@ -10293,7 +10254,6 @@ define([], function() {

let IterableOfT = () => (IterableOfT = dart.constFn(core.Iterable$(T)))();

let intToT = () => (intToT = dart.constFn(dart.functionType(T, [core.int])))();

let EventSinkOfTToEventSink = () => (EventSinkOfTToEventSink = dart.constFn(dart.functionType(async.EventSink, [EventSinkOfT()])))();

- let TToFutureOr = () => (TToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [T])))();

let TTodynamic$ = () => (TTodynamic$ = dart.constFn(dart.definiteFunctionType(dart.dynamic, [T])))();

let VoidTo_IterablePendingEventsOfT = () => (VoidTo_IterablePendingEventsOfT = dart.constFn(dart.definiteFunctionType(_IterablePendingEventsOfT(), [])))();

let TTovoid$ = () => (TTovoid$ = dart.constFn(dart.definiteFunctionType(dart.void, [T])))();

@@ -10311,7 +10271,7 @@ define([], function() {

future.then(dart.dynamic)(dart.fn(value => {

controller[_add$](value);

controller[_closeUnchecked]();

- }, TToFutureOr()), {onError: dart.fn((error, stackTrace) => {

+ }, TTodynamic$()), {onError: dart.fn((error, stackTrace) => {

controller[_addError](error, core.StackTrace._check(stackTrace));

controller[_closeUnchecked]();

}, dynamicAnddynamicTodynamic$())});

@@ -10433,7 +10393,7 @@ define([], function() {

if (async.Future.is(newValue)) {

subscription.pause();

- newValue.then(dart.void)(add, {onError: addError}).whenComplete(dart.bind(subscription, 'resume'));

+ newValue.then(dart.dynamic)(add, {onError: addError}).whenComplete(dart.bind(subscription, 'resume'));

} else {

controller.add(E.as(newValue));

}

@@ -10920,7 +10880,7 @@ define([], function() {

let wrapper = new async._ControllerEventSinkWrapper(null);

timeout = dart.fn(() => {

wrapper[_sink] = controller;

- zone.runUnaryGuarded(dart.dynamic, EventSinkOfT())(registeredOnTimeout, wrapper);

+ zone.runUnaryGuarded(dart.dynamic, async._ControllerEventSinkWrapper)(registeredOnTimeout, wrapper);

wrapper[_sink] = null;

}, VoidTovoid$());

}

@@ -14299,7 +14259,7 @@ define([], function() {

this[_symbol] = symbol;

this[_name$0] = _js_mirrors.getName(symbol);

this.type = _js_mirrors.reflectType(t);

- this.metadata = ListOfInstanceMirror().unmodifiable(annotations[dartx.map](mirrors.InstanceMirror)(dart.fn(a => _js_mirrors.reflect(a), dynamicToInstanceMirror())));

+ this.metadata = ListOfInstanceMirror().unmodifiable(annotations[dartx.map](dart.dynamic)(dart.fn(a => _js_mirrors.reflect(a), dynamicToInstanceMirror())));

this.isStatic = false;

this.isFinal = false;

}

@@ -18839,7 +18799,7 @@ define([], function() {

onDone(handleDone) {}

pause(resumeSignal) {

if (resumeSignal === void 0) resumeSignal = null;

- if (resumeSignal != null) resumeSignal.then(dart.void)(dart.bind(this, _resume));

+ if (resumeSignal != null) resumeSignal.then(dart.dynamic)(dart.bind(this, _resume));

this[_pauseCount] = dart.notNull(this[_pauseCount]) + 1;

}

resume() {

@@ -18914,20 +18874,6 @@ define([], function() {

constructors: () => ({new: dart.definiteFunctionType(async.DeferredLoadException, [core.String])}),

fields: () => ({[_s]: core.String})

});

- async.FutureOr$ = dart.generic(T => {

- class FutureOr extends core.Object {

- _() {

- dart.throw(new core.UnsupportedError("FutureOr can't be instantiated"));

- }

- dart.addTypeTests(FutureOr);

- dart.defineNamedConstructor(FutureOr, '_');

- dart.setSignature(FutureOr, {

- constructors: () => ({_: dart.definiteFunctionType(async.FutureOr$(T), [])})

- });

- return FutureOr;

- });

- async.FutureOr = FutureOr();

const _completeWithValue = Symbol('_completeWithValue');

let const$8;

async.Future$ = dart.flattenFutures(dart.generic(T => {

@@ -18991,7 +18937,7 @@ define([], function() {

let result = new (_FutureOfT())();

async.Timer.new(duration, dart.fn(() => {

try {

- result[_complete](dart.nullSafe(computation, _ => _()));

+ result[_complete](computation == null ? null : computation());

} catch (e) {

let s = dart.stackTrace(e);

async._completeWithErrorCallback(result, e, s);

@@ -19033,43 +18979,31 @@ define([], function() {

}

dart.fn(handleError, dynamicAnddynamicTovoid$());

- try {

- for (let future of futures) {

- let pos = remaining;

- future.then(dart.dynamic)(dart.fn(value => {

- remaining--;

- if (values != null) {

- values[dartx._set](pos, value);

- if (remaining == 0) {

- result[_completeWithValue](values);

- }

- } else {

- if (cleanUp != null && value != null) {

- async.Future.sync(dart.fn(() => {

- cleanUp(value);

- }, VoidTodynamic$()));

- }

- if (remaining == 0 && !dart.test(eagerError)) {

- result[_completeError](error, stackTrace);

- }

+ for (let future of futures) {

+ let pos = remaining++;

+ future.then(dart.dynamic)(dart.fn(value => {

+ remaining--;

+ if (values != null) {

+ values[dartx._set](pos, value);

+ if (remaining == 0) {

+ result[_completeWithValue](values);

}

- }, dart.definiteFunctionType(async.FutureOr, [T])), {onError: handleError});

- remaining++;

- }

- if (remaining == 0) {

- return async.Future$(core.List$(T)).value(const$8 || (const$8 = dart.constList([], dart.dynamic)));

- }

- values = core.List$(T).new(remaining);

- } catch (e) {

- let st = dart.stackTrace(e);

- if (remaining == 0 || dart.test(eagerError)) {

- return async.Future$(core.List$(T)).error(e, st);

- } else {

- error = e;

- stackTrace = st;

- }

+ } else {

+ if (cleanUp != null && value != null) {

+ async.Future.sync(dart.fn(() => {

+ cleanUp(value);

+ }, VoidTodynamic$()));

+ }

+ if (remaining == 0 && !dart.test(eagerError)) {

+ result[_completeError](error, stackTrace);

+ }

+ }, dart.definiteFunctionType(dart.dynamic, [T])), {onError: handleError});

}

+ if (remaining == 0) {

+ return async.Future$(core.List$(T)).value(const$8 || (const$8 = dart.constList([], dart.dynamic)));

+ }

+ values = core.List$(T).new(remaining);

return result;

};

}

@@ -19092,7 +19026,7 @@ define([], function() {

let iterator = input[dartx.iterator];

return async.Future.doWhile(dart.fn(() => {

if (!dart.test(iterator.moveNext())) return false;

- return async.Future.sync(dart.fn(() => dart.dcall(f, iterator.current), VoidTodynamic$())).then(core.bool)(dart.fn(_ => true, dynamicTobool$()));

+ return async.Future.sync(dart.fn(() => dart.dcall(f, iterator.current), VoidTodynamic$())).then(dart.dynamic)(dart.fn(_ => true, dynamicTobool$()));

}, VoidToObject$()));

}

static doWhile(f) {

@@ -19100,7 +19034,7 @@ define([], function() {

let nextIteration = null;

nextIteration = async.Zone.current.bindUnaryCallback(dart.dynamic, core.bool)(dart.fn(keepGoing => {

if (dart.test(keepGoing)) {

- async.Future.sync(f).then(dart.dynamic)(dynamicToFutureOr()._check(nextIteration), {onError: dart.bind(doneSignal, _completeError)});

+ async.Future.sync(f).then(dart.dynamic)(dynamicTodynamic()._check(nextIteration), {onError: dart.bind(doneSignal, _completeError)});

} else {

doneSignal[_complete](null);

}

@@ -19441,7 +19375,6 @@ define([], function() {

const _setChained = Symbol('_setChained');

const _thenNoZoneRegistration = Symbol('_thenNoZoneRegistration');

const _setPendingComplete = Symbol('_setPendingComplete');

- const _clearPendingComplete = Symbol('_clearPendingComplete');

const _error = Symbol('_error');

const _chainSource = Symbol('_chainSource');

const _setValue = Symbol('_setValue');

@@ -19457,7 +19390,7 @@ define([], function() {

let StreamOfT = () => (StreamOfT = dart.constFn(async.Stream$(T)))();

let FutureOfT = () => (FutureOfT = dart.constFn(async.Future$(T)))();

let TTodynamic = () => (TTodynamic = dart.constFn(dart.functionType(dart.dynamic, [T])))();

- let TToFutureOr = () => (TToFutureOr = dart.constFn(dart.definiteFunctionType(async.FutureOr, [T])))();

+ let TTodynamic$ = () => (TTodynamic$ = dart.constFn(dart.definiteFunctionType(dart.dynamic, [T])))();

class _Future extends core.Object {

new() {

this[_zone] = async.Zone.current;

@@ -19506,7 +19439,7 @@ define([], function() {

let currentZone = async.Zone.current;

let registered = null;

if (!core.identical(currentZone, async._ROOT_ZONE)) {

- f = currentZone.registerUnaryCallback(async.FutureOr$(E), T)(f);

+ f = currentZone.registerUnaryCallback(dart.dynamic, T)(f);

if (onError != null) {

onError = async._registerErrorHandler(T)(onError, currentZone);

}

@@ -19546,10 +19479,6 @@ define([], function() {

dart.assert(this[_mayComplete]);

this[_state] = async._Future._PENDING_COMPLETE;

}

- [_clearPendingComplete]() {

- dart.assert(this[_isPendingComplete]);

- this[_state] = async._Future._INCOMPLETE;

- }

get [_error]() {

dart.assert(this[_hasError]);

return async.AsyncError._check(this[_resultOrListeners]);

@@ -19650,9 +19579,8 @@ define([], function() {

try {

source.then(dart.dynamic)(dart.fn(value => {

dart.assert(target[_isPendingComplete]);

- target[_clearPendingComplete]();

- target[_complete](value);

- }, dynamicToFutureOr$()), {onError: dart.fn((error, stackTrace) => {

+ target[_completeWithValue](value);

+ }, dynamicTodynamic$()), {onError: dart.fn((error, stackTrace) => {

if (stackTrace === void 0) stackTrace = null;

dart.assert(target[_isPendingComplete]);

target[_completeError](error, core.StackTrace._check(stackTrace));

@@ -19902,7 +19830,7 @@ define([], function() {

timer.cancel();

result[_completeWithValue](v);

}

- }, TToFutureOr()), {onError: dart.fn((e, s) => {

+ }, TTodynamic$()), {onError: dart.fn((e, s) => {

if (dart.test(timer.isActive)) {

timer.cancel();

result[_completeError](e, core.StackTrace._check(s));

@@ -19938,13 +19866,12 @@ define([], function() {

}),

methods: () => ({

[_setChained]: dart.definiteFunctionType(dart.void, [async._Future]),

- then: dart.definiteFunctionType(E => [async.Future$(E), [dart.functionType(async.FutureOr$(E), [T])], {onError: core.Function}]),

+ then: dart.definiteFunctionType(E => [async.Future$(E), [TTodynamic()], {onError: core.Function}]),

[_thenNoZoneRegistration]: dart.definiteFunctionType(E => [async.Future$(E), [TTodynamic(), core.Function]]),

catchError: dart.definiteFunctionType(async.Future$(T), [core.Function], {test: dynamicTobool()}),

whenComplete: dart.definiteFunctionType(async.Future$(T), [VoidTodynamic()]),

asStream: dart.definiteFunctionType(async.Stream$(T), []),

[_setPendingComplete]: dart.definiteFunctionType(dart.void, []),

- [_clearPendingComplete]: dart.definiteFunctionType(dart.void, []),

[_setValue]: dart.definiteFunctionType(dart.void, [T]),

[_setErrorObject]: dart.definiteFunctionType(dart.void, [async.AsyncError]),

[_setError]: dart.definiteFunctionType(dart.void, [core.Object, core.StackTrace]),

@@ -20065,7 +19992,7 @@ define([], function() {

}

let implementation = currentZone[_scheduleMicrotask];

if (core.identical(async._ROOT_ZONE, implementation.zone) && dart.test(async._ROOT_ZONE.inSameErrorZone(currentZone))) {

- async._rootScheduleMicrotask(null, null, currentZone, currentZone.registerCallback(dart.void)(callback));

+ async._rootScheduleMicrotask(null, null, currentZone, currentZone.registerCallback(dart.dynamic)(callback));

return;

}

async.Zone.current.scheduleMicrotask(async.Zone.current.bindCallback(dart.void)(callback, {runGuarded: true}));

@@ -29622,11 +29549,9 @@ define([], function() {

const _subsetMask = Symbol('_subsetMask');

convert.Converter$ = dart.generic((S, T) => {

let StreamOfS = () => (StreamOfS = dart.constFn(async.Stream$(S)))();

- let _ConverterStreamEventSinkOfS$dynamic = () => (_ConverterStreamEventSinkOfS$dynamic = dart.constFn(convert._ConverterStreamEventSink$(S, dart.dynamic)))();

let StreamTransformerOfS$T = () => (StreamTransformerOfS$T = dart.constFn(async.StreamTransformer$(S, T)))();

let SinkOfT = () => (SinkOfT = dart.constFn(core.Sink$(T)))();

let StreamOfT = () => (StreamOfT = dart.constFn(async.Stream$(T)))();

- let EventSinkTo_ConverterStreamEventSinkOfS$dynamic = () => (EventSinkTo_ConverterStreamEventSinkOfS$dynamic = dart.constFn(dart.definiteFunctionType(_ConverterStreamEventSinkOfS$dynamic(), [async.EventSink])))();

class Converter extends core.Object {

new() {

}

@@ -29642,7 +29567,7 @@ define([], function() {

}

bind(stream) {

StreamOfS()._check(stream);

- return StreamOfT().eventTransformed(stream, dart.fn(sink => new (_ConverterStreamEventSinkOfS$dynamic())(this, sink), EventSinkTo_ConverterStreamEventSinkOfS$dynamic()));

+ return StreamOfT().eventTransformed(stream, dart.fn(sink => new convert._ConverterStreamEventSink(this, sink), EventSinkTo_ConverterStreamEventSink()));

}

dart.addTypeTests(Converter);

@@ -35353,7 +35278,7 @@ define([], function() {

if (dart.test(pathToSplit[dartx.isNotEmpty]) && pathToSplit[dartx.codeUnitAt](0) == core.Uri._SLASH) {

pathToSplit = pathToSplit[dartx.substring](1);

}

- result = pathToSplit == "" ? const$51 || (const$51 = dart.constList([], core.String)) : ListOfString().unmodifiable(pathToSplit[dartx.split]("/")[dartx.map](core.String)(core.Uri.decodeComponent));

+ result = pathToSplit == "" ? const$51 || (const$51 = dart.constList([], core.String)) : ListOfString().unmodifiable(pathToSplit[dartx.split]("/")[dartx.map](dart.dynamic)(core.Uri.decodeComponent));

this[_pathSegments] = result;

return result;

}

@@ -36870,7 +36795,7 @@ define([], function() {

} else {

dart.assert(this[_errorCode] != null);

dart.assert(this[_errorDetail] != null);

- return convert.JSON.encode(dart.map({code: this[_errorCode], message: developer.ServiceExtensionResponse._errorCodeMessage(this[_errorCode]), data: dart.map({details: this[_errorDetail]}, core.String, core.String)}, core.String, core.Object));

+ return convert.JSON.encode(dart.map({code: this[_errorCode], message: developer.ServiceExtensionResponse._errorCodeMessage(this[_errorCode]), data: dart.map({details: this[_errorDetail]}, core.String, core.String)}));

}

};

@@ -38644,12 +38569,12 @@ define([], function() {

return core.Uri.file(this.path);

}

resolveSymbolicLinks() {

- return io._IOService._dispatch(io._FILE_RESOLVE_SYMBOLIC_LINKS, JSArrayOfString().of([this.path])).then(core.String)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_RESOLVE_SYMBOLIC_LINKS, [this.path]).then(core.String)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot resolve symbolic links", this.path));

}

- return FutureOrOfString()._check(response);

- }, dynamicToFutureOrOfString()));

+ return response;

+ }, dynamicTodynamic$()));

}

resolveSymbolicLinksSync() {

let result = io.FileSystemEntity._resolveSymbolicLinks(this.path);

@@ -38670,12 +38595,12 @@ define([], function() {

return io._FileSystemWatcher._watch(io.FileSystemEntity._trimTrailingPathSeparators(this.path), events, recursive);

}

static identical(path1, path2) {

- return io._IOService._dispatch(io._FILE_IDENTICAL, JSArrayOfString().of([path1, path2])).then(core.bool)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_IDENTICAL, [path1, path2]).then(core.bool)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, dart.str`Error in FileSystemEntity.identical(${path1}, ${path2})`, ""));

}

- return FutureOrOfbool()._check(response);

- }, dynamicToFutureOrOfbool()));

+ return response;

+ }, dynamicTodynamic$()));

}

get isAbsolute() {

if (dart.test(io.Platform.isWindows)) {

@@ -38766,12 +38691,12 @@ define([], function() {

return core.int._check(result);

}

static _getTypeAsync(path, followLinks) {

- return io._IOService._dispatch(io._FILE_TYPE, JSArrayOfObject().of([path, followLinks])).then(core.int)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_TYPE, [path, followLinks]).then(core.int)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Error getting type", path));

}

- return FutureOrOfint()._check(response);

- }, dynamicToFutureOrOfint()));

+ return response;

+ }, dynamicTodynamic$()));

}

static _throwIfError(result, msg, path) {

if (path === void 0) path = null;

@@ -38912,7 +38837,7 @@ define([], function() {

return core.Uri.directory(this.path);

}

exists() {

- return io._IOService._dispatch(io._DIRECTORY_EXISTS, JSArrayOfString().of([this.path])).then(core.bool)(dart.fn(response => {

+ return io._IOService._dispatch(io._DIRECTORY_EXISTS, [this.path]).then(core.bool)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionOrErrorFromResponse](response, "Exists failed"));

}

@@ -38962,13 +38887,13 @@ define([], function() {

return this.exists().then(io.Directory)(dart.fn(exists => {

if (dart.test(exists)) return this;

if (this.path != this.parent.path) {

- return this.parent.create({recursive: true}).then(io.Directory)(dart.fn(_ => this.create(), DirectoryToFutureOfDirectory()));

+ return this.parent.create({recursive: true}).then(dart.dynamic)(dart.fn(_ => this.create(), DirectoryToFutureOfDirectory()));

} else {

return this.create();

}

- }, boolToFutureOrOfDirectory()));

+ }, boolToObject()));

} else {

- return io._IOService._dispatch(io._DIRECTORY_CREATE, JSArrayOfString().of([this.path])).then(io._Directory)(dart.fn(response => {

+ return io._IOService._dispatch(io._DIRECTORY_CREATE, [this.path]).then(io.Directory)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionOrErrorFromResponse](response, "Creation failed"));

}

@@ -39004,7 +38929,7 @@ define([], function() {

} else {

fullPrefix = dart.str`${this.path}${io.Platform.pathSeparator}${prefix}`;

}

- return io._IOService._dispatch(io._DIRECTORY_CREATE_TEMP, JSArrayOfString().of([fullPrefix])).then(io.Directory)(dart.fn(response => {

+ return io._IOService._dispatch(io._DIRECTORY_CREATE_TEMP, [fullPrefix]).then(io.Directory)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionOrErrorFromResponse](response, "Creation of temporary directory failed"));

}

@@ -39031,7 +38956,7 @@ define([], function() {

}

[_delete](opts) {

let recursive = opts && 'recursive' in opts ? opts.recursive : false;

- return io._IOService._dispatch(io._DIRECTORY_DELETE, JSArrayOfObject().of([this.path, recursive])).then(io._Directory)(dart.fn(response => {

+ return io._IOService._dispatch(io._DIRECTORY_DELETE, [this.path, recursive]).then(io.Directory)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionOrErrorFromResponse](response, "Deletion failed"));

}

@@ -39046,7 +38971,7 @@ define([], function() {

}

rename(newPath) {

- return io._IOService._dispatch(io._DIRECTORY_RENAME, JSArrayOfString().of([this.path, newPath])).then(io.Directory)(dart.fn(response => {

+ return io._IOService._dispatch(io._DIRECTORY_RENAME, [this.path, newPath]).then(io.Directory)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionOrErrorFromResponse](response, "Rename failed"));

}

@@ -39176,7 +39101,7 @@ define([], function() {

return this.controller.stream;

}

onListen() {

- io._IOService._dispatch(io._DIRECTORY_LIST_START, JSArrayOfObject().of([this.path, this.recursive, this.followLinks])).then(dart.dynamic)(dart.fn(response => {

+ io._IOService._dispatch(io._DIRECTORY_LIST_START, [this.path, this.recursive, this.followLinks]).then(dart.dynamic)(dart.fn(response => {

if (typeof response == 'number') {

this[_ops] = io._AsyncDirectoryListerOps.new(response);

this.next();

@@ -39187,7 +39112,7 @@ define([], function() {

this.error(response);

this.close();

}

- }, dynamicToFutureOr$()));

+ }, dynamicTodynamic$()));

}

onResume() {

if (!dart.test(this.nextRunning)) {

@@ -39214,7 +39139,7 @@ define([], function() {

return;

}

this.nextRunning = true;

- io._IOService._dispatch(io._DIRECTORY_LIST_NEXT, JSArrayOfint().of([pointer])).then(dart.dynamic)(dart.fn(result => {

+ io._IOService._dispatch(io._DIRECTORY_LIST_NEXT, [pointer]).then(dart.dynamic)(dart.fn(result => {

this.nextRunning = false;

if (core.List.is(result)) {

this.next();

@@ -39252,7 +39177,7 @@ define([], function() {

} else {

this.controller.addError(new io.FileSystemException("Internal error"));

}

- }, dynamicToFutureOr$()));

+ }, dynamicTodynamic$()));

}

[_cleanup]() {

this.controller.close();

@@ -39271,7 +39196,7 @@ define([], function() {

if (pointer == null) {

this[_cleanup]();

} else {

- io._IOService._dispatch(io._DIRECTORY_LIST_STOP, JSArrayOfint().of([pointer])).whenComplete(dart.bind(this, _cleanup));

+ io._IOService._dispatch(io._DIRECTORY_LIST_STOP, [pointer]).whenComplete(dart.bind(this, _cleanup));

}

error(message) {

@@ -39562,7 +39487,7 @@ define([], function() {

if (dart.test(this[_atEnd])) {

this[_closeFile]();

}

- }, ListOfintToFutureOr())).catchError(dart.fn((e, s) => {

+ }, ListOfintTodynamic())).catchError(dart.fn((e, s) => {

if (!dart.test(this[_unsubscribed])) {

this[_controller$0].addError(e, core.StackTrace._check(s));

this[_closeFile]();

@@ -39585,7 +39510,7 @@ define([], function() {

dart.fn(onReady, RandomAccessFileTovoid());

const onOpenFile = (function(file) {

if (dart.notNull(this[_position$0]) > 0) {

- file.setPosition(this[_position$0]).then(dart.void)(onReady, {onError: dart.fn((e, s) => {

+ file.setPosition(this[_position$0]).then(dart.dynamic)(onReady, {onError: dart.fn((e, s) => {

this[_controller$0].addError(e, core.StackTrace._check(s));

this[_readInProgress] = false;

this[_closeFile]();

@@ -39602,7 +39527,7 @@ define([], function() {

}).bind(this);

dart.fn(openFailed, dynamicAnddynamicTovoid$());

if (this[_path$] != null) {

- io.File.new(this[_path$]).open({mode: io.FileMode.READ}).then(dart.void)(onOpenFile, {onError: openFailed});

+ io.File.new(this[_path$]).open({mode: io.FileMode.READ}).then(dart.dynamic)(onOpenFile, {onError: openFailed});

} else {

try {

onOpenFile(io._File._openStdioSync(0));

@@ -39669,7 +39594,7 @@ define([], function() {

_subscription = stream.listen(dart.fn(d => {

dart.dsend(_subscription, 'pause');

try {

- openedFile.writeFrom(d, 0, d[dartx.length]).then(dart.dynamic)(dart.fn(_ => dart.dsend(_subscription, 'resume'), RandomAccessFileToFutureOr()), {onError: error});

+ openedFile.writeFrom(d, 0, d[dartx.length]).then(dart.dynamic)(dart.fn(_ => dart.dsend(_subscription, 'resume'), RandomAccessFileTodynamic()), {onError: error});

} catch (e) {

let stackTrace = dart.stackTrace(e);

error(e, stackTrace);

@@ -39678,11 +39603,11 @@ define([], function() {

}, ListOfintTovoid$()), {onDone: dart.fn(() => {

completer.complete(this[_file]);

}, VoidTovoid$()), onError: error, cancelOnError: true});

- }, RandomAccessFileToFutureOr())).catchError(dart.bind(completer, 'completeError'));

+ }, RandomAccessFileTodynamic())).catchError(dart.bind(completer, 'completeError'));

return completer.future;

}

close() {

- return this[_openFuture].then(io.File)(dart.fn(openedFile => openedFile.close(), RandomAccessFileToFutureOfRandomAccessFile()));

+ return this[_openFuture].then(io.RandomAccessFile)(dart.fn(openedFile => openedFile.close(), RandomAccessFileToFutureOfRandomAccessFile()));

}

};

dart.addSimpleTypeTests(io._FileStreamConsumer);

@@ -39698,7 +39623,7 @@ define([], function() {

}),

methods: () => ({

addStream: dart.definiteFunctionType(async.Future$(io.File), [StreamOfListOfint()]),

- close: dart.definiteFunctionType(async.Future$(io.File), [])

+ close: dart.definiteFunctionType(async.Future$(io.RandomAccessFile), [])

})

});

const _tryDecode = Symbol('_tryDecode');

@@ -39712,12 +39637,12 @@ define([], function() {

}

exists() {

- return io._IOService._dispatch(io._FILE_EXISTS, JSArrayOfString().of([this.path])).then(core.bool)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_EXISTS, [this.path]).then(core.bool)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot check existence", this.path));

}

- return FutureOrOfbool()._check(response);

- }, dynamicToFutureOrOfbool()));

+ return response;

+ }, dynamicTodynamic$()));

}

static _exists(path) {

dart.throw(new core.UnsupportedError("File._exists"));

@@ -39739,7 +39664,7 @@ define([], function() {

create(opts) {

let recursive = opts && 'recursive' in opts ? opts.recursive : false;

let result = dart.test(recursive) ? this.parent.create({recursive: true}) : async.Future.value(null);

- return result.then(dart.dynamic)(dart.fn(_ => io._IOService._dispatch(io._FILE_CREATE, JSArrayOfString().of([this.path])), dynamicToFuture())).then(io._File)(dart.fn(response => {

+ return result.then(dart.dynamic)(dart.fn(_ => io._IOService._dispatch(io._FILE_CREATE, [this.path]), dynamicToFuture())).then(io.File)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot create file", this.path));

}

@@ -39766,9 +39691,9 @@ define([], function() {

[_delete](opts) {

let recursive = opts && 'recursive' in opts ? opts.recursive : false;

if (dart.test(recursive)) {

- return io.Directory.new(this.path).delete({recursive: true}).then(io._File)(dart.fn(_ => this, FileSystemEntityTo_File()));

+ return io.Directory.new(this.path).delete({recursive: true}).then(io.File)(dart.fn(_ => this, FileSystemEntityTo_File()));

}

- return io._IOService._dispatch(io._FILE_DELETE, JSArrayOfString().of([this.path])).then(io._File)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_DELETE, [this.path]).then(io.File)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot delete file", this.path));

}

@@ -39790,7 +39715,7 @@ define([], function() {

io._File.throwIfError(result, "Cannot delete file", this.path);

}

rename(newPath) {

- return io._IOService._dispatch(io._FILE_RENAME, JSArrayOfString().of([this.path, newPath])).then(io.File)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_RENAME, [this.path, newPath]).then(io.File)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, dart.str`Cannot rename file to '${newPath}'`, this.path));

}

@@ -39809,7 +39734,7 @@ define([], function() {

return io.File.new(newPath);

}

copy(newPath) {

- return io._IOService._dispatch(io._FILE_COPY, JSArrayOfString().of([this.path, newPath])).then(io.File)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_COPY, [this.path, newPath]).then(io.File)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, dart.str`Cannot copy file to '${newPath}'`, this.path));

}

@@ -39829,7 +39754,7 @@ define([], function() {

if (!dart.equals(mode, io.FileMode.READ) && !dart.equals(mode, io.FileMode.WRITE) && !dart.equals(mode, io.FileMode.APPEND) && !dart.equals(mode, io.FileMode.WRITE_ONLY) && !dart.equals(mode, io.FileMode.WRITE_ONLY_APPEND)) {

return FutureOfRandomAccessFile().error(new core.ArgumentError('Invalid file mode for this operation'));

}

- return io._IOService._dispatch(io._FILE_OPEN, JSArrayOfObject().of([this.path, mode[_mode]])).then(io._RandomAccessFile)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_OPEN, [this.path, mode[_mode]]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot open file", this.path));

}

@@ -39837,12 +39762,12 @@ define([], function() {

}, dynamicTo_RandomAccessFile()));

}

length() {

- return io._IOService._dispatch(io._FILE_LENGTH_FROM_PATH, JSArrayOfString().of([this.path])).then(core.int)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_LENGTH_FROM_PATH, [this.path]).then(core.int)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot retrieve length of file", this.path));

}

- return FutureOrOfint()._check(response);

- }, dynamicToFutureOrOfint()));

+ return response;

+ }, dynamicTodynamic$()));

}

static _lengthFromPath(path) {

dart.throw(new core.UnsupportedError("File._lengthFromPath"));

@@ -39853,7 +39778,7 @@ define([], function() {

return core.int._check(result);

}

lastModified() {

- return io._IOService._dispatch(io._FILE_LAST_MODIFIED, JSArrayOfString().of([this.path])).then(core.DateTime)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_LAST_MODIFIED, [this.path]).then(core.DateTime)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "Cannot retrieve modification time", this.path));

}

@@ -39923,12 +39848,12 @@ define([], function() {

return FutureOfListOfint()._check(completer.future);

}

dart.fn(readDataChunked, dynamicToFutureOfListOfint());

- return this.open().then(ListOfint())(dart.fn(file => file.length().then(ListOfint())(dart.fn(length => {

+ return this.open().then(ListOfint())(dart.fn(file => file.length().then(dart.dynamic)(dart.fn(length => {

if (length == 0) {

return readDataChunked(file);

}

return file.read(length);

- }, intToFutureOfListOfint())).whenComplete(dart.bind(file, 'close')), RandomAccessFileToFutureOfListOfint()));

+ }, intToFutureOfListOfint())).whenComplete(dart.bind(file, 'close')), RandomAccessFileToFuture()));

}

readAsBytesSync() {

let opened = this.openSync();

@@ -39978,9 +39903,9 @@ define([], function() {

let mode = opts && 'mode' in opts ? opts.mode : io.FileMode.WRITE;

let flush = opts && 'flush' in opts ? opts.flush : false;

return this.open({mode: mode}).then(io.File)(dart.fn(file => file.writeFrom(bytes, 0, bytes[dartx.length]).then(dart.dynamic)(dart.fn(_ => {

- if (dart.test(flush)) return file.flush().then(io._File)(dart.fn(_ => this, RandomAccessFileTo_File()));

+ if (dart.test(flush)) return file.flush().then(dart.dynamic)(dart.fn(_ => this, RandomAccessFileTo_File()));

return this;

- }, RandomAccessFileToObject())).whenComplete(dart.bind(file, 'close')), RandomAccessFileToFutureOrOfFile()));

+ }, RandomAccessFileToObject())).whenComplete(dart.bind(file, 'close')), RandomAccessFileToFuture()));

}

writeAsBytesSync(bytes, opts) {

let mode = opts && 'mode' in opts ? opts.mode : io.FileMode.WRITE;

@@ -40116,7 +40041,7 @@ define([], function() {

}

close() {

- return this[_dispatch](io._FILE_CLOSE, [null], {markClosed: true}).then(io._RandomAccessFile)(dart.fn(result => {

+ return this[_dispatch](io._FILE_CLOSE, [null], {markClosed: true}).then(io.RandomAccessFile)(dart.fn(result => {

if (!dart.equals(result, -1)) {

this.closed = dart.test(this.closed) || dart.equals(result, 0);

this[_maybePerformCleanup]();

@@ -40141,8 +40066,8 @@ define([], function() {

dart.throw(io._exceptionFromResponse(response, "readByte failed", this.path));

}

this[_resourceInfo].addRead(1);

- return FutureOrOfint()._check(response);

- }, dynamicToFutureOrOfint()));

+ return response;

+ }, dynamicTodynamic$()));

}

readByteSync() {

this[_checkAvailable]();

@@ -40157,13 +40082,13 @@ define([], function() {

if (!(typeof bytes == 'number')) {

dart.throw(new core.ArgumentError(bytes));

}

- return this[_dispatch](io._FILE_READ, JSArrayOfint().of([null, bytes])).then(ListOfint())(dart.fn(response => {

+ return this[_dispatch](io._FILE_READ, [null, bytes]).then(ListOfint())(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "read failed", this.path));

}

this[_resourceInfo].addRead(core.int._check(dart.dload(dart.dindex(response, 1), 'length')));

- return FutureOrOfListOfint()._check(dart.dindex(response, 1));

- }, dynamicToFutureOrOfListOfint()));

+ return dart.dindex(response, 1);

+ }, dynamicTodynamic$()));

}

readSync(bytes) {

this[_checkAvailable]();

@@ -40188,7 +40113,7 @@ define([], function() {

return FutureOfint().value(0);

}

let length = dart.notNull(end) - dart.notNull(start);

- return this[_dispatch](io._FILE_READ_INTO, JSArrayOfint().of([null, length])).then(core.int)(dart.fn(response => {

+ return this[_dispatch](io._FILE_READ_INTO, [null, length]).then(core.int)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "readInto failed", this.path));

}

@@ -40196,8 +40121,8 @@ define([], function() {

let data = dart.dindex(response, 2);

buffer[dartx.setRange](start, dart.asInt(dart.notNull(start) + dart.notNull(core.num._check(read))), IterableOfint()._check(data));

this[_resourceInfo].addRead(core.int._check(read));

- return FutureOrOfint()._check(read);

- }, dynamicToFutureOrOfint()));

+ return read;

+ }, dynamicTodynamic$()));

}

readIntoSync(buffer, start, end) {

if (start === void 0) start = 0;

@@ -40221,7 +40146,7 @@ define([], function() {

if (!(typeof value == 'number')) {

dart.throw(new core.ArgumentError(value));

}

- return this[_dispatch](io._FILE_WRITE_BYTE, JSArrayOfint().of([null, value])).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_WRITE_BYTE, [null, value]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "writeByte failed", this.path));

}

@@ -40263,7 +40188,7 @@ define([], function() {

request[dartx._set](1, result.buffer);

request[dartx._set](2, result.start);

request[dartx._set](3, dart.notNull(end) - (dart.notNull(start) - dart.notNull(result.start)));

- return this[_dispatch](io._FILE_WRITE_FROM, request).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_WRITE_FROM, request).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "writeFrom failed", this.path));

}

@@ -40310,8 +40235,8 @@ define([], function() {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "position failed", this.path));

}

- return FutureOrOfint()._check(response);

- }, dynamicToFutureOrOfint()));

+ return response;

+ }, dynamicTodynamic$()));

}

positionSync() {

this[_checkAvailable]();

@@ -40322,7 +40247,7 @@ define([], function() {

return core.int._check(result);

}

setPosition(position) {

- return this[_dispatch](io._FILE_SET_POSITION, JSArrayOfint().of([null, position])).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_SET_POSITION, [null, position]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "setPosition failed", this.path));

}

@@ -40337,7 +40262,7 @@ define([], function() {

}

truncate(length) {

- return this[_dispatch](io._FILE_TRUNCATE, JSArrayOfint().of([null, length])).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_TRUNCATE, [null, length]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "truncate failed", this.path));

}

@@ -40356,8 +40281,8 @@ define([], function() {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "length failed", this.path));

}

- return FutureOrOfint()._check(response);

- }, dynamicToFutureOrOfint()));

+ return response;

+ }, dynamicTodynamic$()));

}

lengthSync() {

this[_checkAvailable]();

@@ -40368,7 +40293,7 @@ define([], function() {

return core.int._check(result);

}

flush() {

- return this[_dispatch](io._FILE_FLUSH, [null]).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_FLUSH, [null]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, "flush failed", this.path));

}

@@ -40393,7 +40318,7 @@ define([], function() {

dart.throw(new core.ArgumentError());

}

let lock = dart.equals(mode, io.FileLock.EXCLUSIVE) ? io._RandomAccessFile.LOCK_EXCLUSIVE : io._RandomAccessFile.LOCK_SHARED;

- return this[_dispatch](io._FILE_LOCK, JSArrayOfint().of([null, lock, start, end])).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_LOCK, [null, lock, start, end]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, 'lock failed', this.path));

}

@@ -40409,7 +40334,7 @@ define([], function() {

if (start == end) {

dart.throw(new core.ArgumentError());

}

- return this[_dispatch](io._FILE_LOCK, JSArrayOfint().of([null, io._RandomAccessFile.LOCK_UNLOCK, start, end])).then(io._RandomAccessFile)(dart.fn(response => {

+ return this[_dispatch](io._FILE_LOCK, [null, io._RandomAccessFile.LOCK_UNLOCK, start, end]).then(io.RandomAccessFile)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

dart.throw(io._exceptionFromResponse(response, 'unlock failed', this.path));

}

@@ -40611,7 +40536,7 @@ define([], function() {

if (dart.test(io.Platform.isWindows)) {

path = io.FileSystemEntity._trimTrailingPathSeparators(path);

}

- return io._IOService._dispatch(io._FILE_STAT, JSArrayOfString().of([path])).then(io.FileStat)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_STAT, [path]).then(io.FileStat)(dart.fn(response => {

if (dart.test(io._isErrorResponse(response))) {

return io.FileStat._notFound;

}

@@ -41295,8 +41220,8 @@ define([], function() {

let const$66;

io.HttpDate = class HttpDate extends core.Object {

static format(date) {

- let wkday = const$58 || (const$58 = dart.constList(["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], core.String));

- let month = const$59 || (const$59 = dart.constList(["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], core.String));

+ let wkday = const$58 || (const$58 = dart.constList(["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], dart.dynamic));

+ let month = const$59 || (const$59 = dart.constList(["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], dart.dynamic));

let d = date.toUtc();

let sb = new core.StringBuffer();

sb.write(wkday[dartx._get](dart.notNull(d.weekday) - 1));

@@ -41318,12 +41243,12 @@ define([], function() {

}

static parse(date) {

let SP = 32;

- let wkdays = const$60 || (const$60 = dart.constList(["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], core.String));

- let weekdays = const$61 || (const$61 = dart.constList(["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], core.String));

- let months = const$62 || (const$62 = dart.constList(["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], core.String));

- let wkdaysLowerCase = const$63 || (const$63 = dart.constList(["mon", "tue", "wed", "thu", "fri", "sat", "sun"], core.String));

- let weekdaysLowerCase = const$64 || (const$64 = dart.constList(["monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"], core.String));

- let monthsLowerCase = const$65 || (const$65 = dart.constList(["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"], core.String));

+ let wkdays = const$60 || (const$60 = dart.constList(["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"], dart.dynamic));

+ let weekdays = const$61 || (const$61 = dart.constList(["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"], dart.dynamic));

+ let months = const$62 || (const$62 = dart.constList(["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], dart.dynamic));

+ let wkdaysLowerCase = const$63 || (const$63 = dart.constList(["mon", "tue", "wed", "thu", "fri", "sat", "sun"], dart.dynamic));

+ let weekdaysLowerCase = const$64 || (const$64 = dart.constList(["monday", "tuesday", "wednesday", "thursday", "friday", "saturday", "sunday"], dart.dynamic));

+ let monthsLowerCase = const$65 || (const$65 = dart.constList(["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"], dart.dynamic));

let formatRfc1123 = 0;

let formatRfc850 = 1;

let formatAsctime = 2;

@@ -41439,7 +41364,7 @@ define([], function() {

return new core.DateTime.utc(year, dart.notNull(month) + 1, day, hours, minutes, seconds, 0);

}

static _parseCookieDate(date) {

- let monthsLowerCase = const$66 || (const$66 = dart.constList(["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"], core.String));

+ let monthsLowerCase = const$66 || (const$66 = dart.constList(["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"], dart.dynamic));

let position = 0;

function error() {

dart.throw(new io.HttpException(dart.str`Invalid cookie date ${date}`));

@@ -43027,7 +42952,7 @@ define([], function() {

}

[_authenticate](proxyAuth) {

const retry = (function() {

- return this.drain(dart.dynamic)().then(io.HttpClientResponse)(dart.fn(_ => this[_httpClient][_openUrlFromRequest](this[_httpRequest].method, this[_httpRequest].uri, this[_httpRequest]).then(io.HttpClientResponse)(dart.fn(request => request.close(), _HttpClientRequestToFutureOfHttpClientResponse())), dynamicToFutureOfHttpClientResponse()));

+ return this.drain(dart.dynamic)().then(io.HttpClientResponse)(dart.fn(_ => this[_httpClient][_openUrlFromRequest](this[_httpRequest].method, this[_httpRequest].uri, this[_httpRequest]).then(dart.dynamic)(dart.fn(request => request.close(), _HttpClientRequestToFutureOfHttpClientResponse())), dynamicToFuture()));

}).bind(this);

dart.fn(retry, VoidToFutureOfHttpClientResponse());

const authChallenge = (function() {

@@ -43098,7 +43023,7 @@ define([], function() {

} else {

return this;

}

- }, dynamicToFutureOrOfHttpClientResponse()));

+ }, dynamicToObject()));

}

};

io._HttpClientResponse[dart.implements] = () => [io.HttpClientResponse];

@@ -43211,7 +43136,7 @@ define([], function() {

return this.done;

}

[_closeTarget]() {

- this[_target$].close().then(dart.void)(dart.bind(this, _completeDoneValue), {onError: dart.bind(this, _completeDoneError)});

+ this[_target$].close().then(dart.dynamic)(dart.bind(this, _completeDoneValue), {onError: dart.bind(this, _completeDoneError)});

}

get done() {

return this[_doneCompleter].future;

@@ -43245,7 +43170,7 @@ define([], function() {

} else {

this[_closeTarget]();

}

- }, dynamicToFutureOr$()), {onError: dart.fn((error, stackTrace) => {

+ }, dynamicTodynamic$()), {onError: dart.fn((error, stackTrace) => {

if (dart.test(this[_isBound])) {

this[_controllerCompleter].completeError(error, core.StackTrace._check(stackTrace));

this[_controllerCompleter] = null;

@@ -43827,7 +43752,7 @@ define([], function() {

}

get done() {

if (this[_response] == null) {

- this[_response] = async.Future.wait(dart.dynamic)(JSArrayOfFuture().of([this[_responseCompleter].future, super.done]), {eagerError: true}).then(io.HttpClientResponse)(dart.fn(list => FutureOrOfHttpClientResponse()._check(list[dartx._get](0)), ListToFutureOrOfHttpClientResponse()));

+ this[_response] = async.Future.wait(dart.dynamic)(JSArrayOfFuture().of([this[_responseCompleter].future, super.done]), {eagerError: true}).then(io.HttpClientResponse)(dart.fn(list => list[dartx._get](0), ListTodynamic()));

}

return this[_response];

}

@@ -43859,7 +43784,7 @@ define([], function() {

if (dart.notNull(response.redirects[dartx.length]) < dart.notNull(this.maxRedirects)) {

future = response.drain(dart.dynamic)().then(io.HttpClientResponse)(dart.fn(_ => response.redirect(), dynamicToFutureOfHttpClientResponse()));

} else {

- future = response.drain(dart.dynamic)().then(io.HttpClientResponse)(dart.fn(_ => FutureOfHttpClientResponse().error(new io.RedirectException("Redirect limit exceeded", response.redirects)), dynamicToFutureOfHttpClientResponse()));

+ future = response.drain(dart.dynamic)().then(io.HttpClientResponse)(dart.fn(_ => async.Future.error(new io.RedirectException("Redirect limit exceeded", response.redirects)), dynamicToFuture()));

}

} else if (dart.test(response[_shouldAuthenticateProxy])) {

future = response[_authenticate](true);

@@ -43868,7 +43793,7 @@ define([], function() {

} else {

future = FutureOfHttpClientResponse().value(response);

}

- future.then(dart.void)(dart.fn(v => this[_responseCompleter].complete(v), HttpClientResponseTovoid()), {onError: dart.bind(this[_responseCompleter], 'completeError')});

+ future.then(dart.dynamic)(dart.fn(v => this[_responseCompleter].complete(v), HttpClientResponseTovoid()), {onError: dart.bind(this[_responseCompleter], 'completeError')});

}

[_onError$](error, stackTrace) {

this[_responseCompleter].completeError(error, stackTrace);

@@ -44151,7 +44076,7 @@ define([], function() {

dart.dsend(sub, 'pause', future);

}

- return this.socket.addStream(StreamOfListOfint()._check(controller.stream)).then(io._HttpOutboundMessage)(dart.fn(_ => this.outbound, dynamicTo_HttpOutboundMessage()), {onError: dart.fn((error, stackTrace) => {

+ return this.socket.addStream(StreamOfListOfint()._check(controller.stream)).then(dart.dynamic)(dart.fn(_ => this.outbound, dynamicTo_HttpOutboundMessage()), {onError: dart.fn((error, stackTrace) => {

if (dart.test(this[_gzip])) this[_gzipSink].close();

this[_socketError] = true;

this[_doneCompleter].completeError(error, core.StackTrace._check(stackTrace));

@@ -44200,7 +44125,7 @@ define([], function() {

this.socket.add(typed_data.Uint8List.view(this[_buffer$][dartx.buffer], 0, this[_length$2]));

}

this[_buffer$] = null;

- return this.socket.flush().then(io._HttpOutboundMessage)(dart.fn(_ => {

+ return this.socket.flush().then(dart.dynamic)(dart.fn(_ => {

this[_doneCompleter].complete(this.socket);

return this.outbound;

}, dynamicTo_HttpOutboundMessage()), {onError: dart.fn((error, stackTrace) => {

@@ -44394,7 +44319,7 @@ define([], function() {

if (incoming.statusCode == 100) {

incoming.drain(dart.dynamic)().then(dart.dynamic)(dart.fn(_ => {

this[_subscription$].resume();

- }, dynamicToFutureOr$())).catchError(dart.fn((error, stackTrace) => {

+ }, dynamicTodynamic$())).catchError(dart.fn((error, stackTrace) => {

if (stackTrace === void 0) stackTrace = null;

this[_nextResponseCompleter].completeError(new io.HttpException(core.String._check(dart.dload(error, 'message')), {uri: this[_currentUri]}), stackTrace);

this[_nextResponseCompleter] = null;

@@ -44471,7 +44396,7 @@ define([], function() {

} else {

this.destroy();

}

- }, dynamicToFutureOr$()));

+ }, dynamicTodynamic$()));

if (proxyCreds != null && dart.equals(proxyCreds.scheme, io._AuthenticationScheme.DIGEST)) {

let authInfo = incoming.headers._get("proxy-authentication-info");

if (authInfo != null && authInfo[dartx.length] == 1) {

@@ -44489,7 +44414,7 @@ define([], function() {

}

request[_onIncoming](incoming);

- }, _HttpIncomingToFutureOr())).catchError(dart.fn(error => {

+ }, _HttpIncomingTodynamic())).catchError(dart.fn(error => {

dart.throw(new io.HttpException("Connection closed before data was received", {uri: uri}));

}, dynamicTodynamic$()), {test: dart.fn(error => core.StateError.is(error), ObjectTobool())}).catchError(dart.fn((error, stackTrace) => {

this.destroy();

@@ -44503,7 +44428,7 @@ define([], function() {

return request;

}

detachSocket() {

- return this[_streamFuture].then(io._DetachedSocket)(dart.fn(_ => new io._DetachedSocket(this[_socket], this[_httpParser].detachIncoming()), dynamicTo_DetachedSocket()));

+ return this[_streamFuture].then(io.Socket)(dart.fn(_ => new io._DetachedSocket(this[_socket], this[_httpParser].detachIncoming()), dynamicTo_DetachedSocket()));

}

destroy() {

this.closed = true;

@@ -44513,7 +44438,7 @@ define([], function() {

close() {

this.closed = true;

this[_httpClient][_connectionClosed](this);

- this[_streamFuture].then(dart.void)(dart.fn(_ => this[_socket].destroy(), dynamicTovoid$()));

+ this[_streamFuture].then(dart.dynamic)(dart.fn(_ => this[_socket].destroy(), dynamicTovoid$()));

}

createProxyTunnel(host, port, proxy, callback) {

let request = this.send(core.Uri.new({host: core.String._check(host), port: core.int._check(port)}), core.int._check(port), "CONNECT", io._Proxy._check(proxy));

@@ -44521,7 +44446,7 @@ define([], function() {

let auth = io._CryptoUtils.bytesToBase64(convert.UTF8.encode(dart.str`${dart.dload(proxy, 'username')}:${dart.dload(proxy, 'password')}`));

request.headers.set(io.HttpHeaders.PROXY_AUTHORIZATION, dart.str`Basic ${auth}`);

}

- return request.close().then(io.SecureSocket)(dart.fn(response => {

+ return request.close().then(dart.dynamic)(dart.fn(response => {

if (response.statusCode != io.HttpStatus.OK) {

dart.throw("Proxy failed to establish tunnel " + dart.str`(${response.statusCode} ${response.reasonPhrase})`);

}

@@ -44529,8 +44454,8 @@ define([], function() {

return io.SecureSocket.secure(socket, {host: host, context: this[_context], onBadCertificate: X509CertificateTobool()._check(callback)});

}, HttpClientResponseToFutureOfSecureSocket())).then(io._HttpClientConnection)(dart.fn(secureSocket => {

let key = core.String._check(io._HttpClientConnection.makeKey(true, core.String._check(host), core.int._check(port)));

- return new io._HttpClientConnection(key, secureSocket, request[_httpClient], true);

- }, SecureSocketTo_HttpClientConnection()));

+ return new io._HttpClientConnection(key, io.Socket._check(secureSocket), request[_httpClient], true);

+ }, dynamicTo_HttpClientConnection()));

}

get connectionInfo() {

return io._HttpConnectionInfo.create(this[_socket]);

@@ -44672,7 +44597,7 @@ define([], function() {

if (client.maxConnectionsPerHost != null && dart.notNull(this[_active].length) + dart.notNull(this[_connecting]) >= dart.notNull(client.maxConnectionsPerHost)) {

let completer = async.Completer.new();

this[_pending$].add(dart.fn(() => {

- this.connect(uriHost, uriPort, proxy, client).then(dart.void)(dart.bind(completer, 'complete'), {onError: dart.bind(completer, 'completeError')});

+ this.connect(uriHost, uriPort, proxy, client).then(dart.dynamic)(dart.bind(completer, 'complete'), {onError: dart.bind(completer, 'completeError')});

}, VoidTodynamic$()));

return FutureOf_ConnectionInfo()._check(completer.future);

}

@@ -44690,7 +44615,7 @@ define([], function() {

let connection = new io._HttpClientConnection(this.key, io.Socket._check(socket), client, false, this.context);

if (dart.test(this.isSecure) && !dart.test(proxy.isDirect)) {

connection[_dispose] = true;

- return connection.createProxyTunnel(uriHost, uriPort, proxy, callback).then(io._ConnectionInfo)(dart.fn(tunnel => {

+ return connection.createProxyTunnel(uriHost, uriPort, proxy, callback).then(dart.dynamic)(dart.fn(tunnel => {

client[_getConnectionTarget](uriHost, uriPort, true).addNewActive(tunnel);

return new io._ConnectionInfo(tunnel, proxy);

}, _HttpClientConnectionTo_ConnectionInfo()));

@@ -44698,7 +44623,7 @@ define([], function() {

this.addNewActive(connection);

return new io._ConnectionInfo(connection, proxy);

}

- }, dynamicToFutureOrOf_ConnectionInfo()), {onError: dart.fn(error => {

+ }, dynamicToObject()), {onError: dart.fn(error => {

this[_connecting] = dart.notNull(this[_connecting]) - 1;

this[_checkPending]();

dart.throw(error);

@@ -44894,10 +44819,10 @@ define([], function() {

}

dart.fn(send, _ConnectionInfoTo_HttpClientRequest());

if (dart.test(info.connection.closed)) {

- return this[_getConnection](uri.host, port, proxyConf, isSecure).then(io._HttpClientRequest)(send);

+ return this[_getConnection](uri.host, port, proxyConf, isSecure).then(dart.dynamic)(send);

}

return send(info);

- }, _ConnectionInfoToFutureOrOf_HttpClientRequest()));

+ }, _ConnectionInfoToObject()));

}

[_openUrlFromRequest](method, uri, previous) {

let resolved = previous.uri.resolveUri(uri);

@@ -45181,7 +45106,7 @@ define([], function() {

this[_httpServer][_markActive](this);

incoming.dataDone.then(dart.dynamic)(dart.fn(closing => {

if (dart.test(closing)) this.destroy();

- }, dynamicToFutureOr$()));

+ }, dynamicTodynamic$()));

this[_subscription$].pause();

this[_state$1] = io._HttpConnection._ACTIVE;

let outgoing = new io._HttpOutgoing(io.Socket._check(this[_socket]));

@@ -45198,7 +45123,7 @@ define([], function() {

} else {

this.destroy();

}

- }, dynamicToFutureOr$()), {onError: dart.fn(_ => {

+ }, dynamicTodynamic$()), {onError: dart.fn(_ => {

this.destroy();

}, dynamicTodynamic$())});

outgoing.ignoreBody = request.method == "HEAD";

@@ -45227,7 +45152,7 @@ define([], function() {

this[_state$1] = io._HttpConnection._DETACHED;

this[_httpServer][_connectionClosed](this);

let detachedIncoming = this[_httpParser].detachIncoming();

- return this[_streamFuture].then(io._DetachedSocket)(dart.fn(_ => {

+ return this[_streamFuture].then(io.Socket)(dart.fn(_ => {

io._HttpConnection._connections[dartx.remove](this[_serviceId]);

return new io._DetachedSocket(this[_socket], detachedIncoming);

}, dynamicTo_DetachedSocket()));

@@ -45351,10 +45276,10 @@ define([], function() {

let const$72;

io._HttpServer = class _HttpServer extends dart.mixin(async.Stream$(io.HttpRequest), io._ServiceObject) {

static bind(address, port, backlog, v6Only, shared) {

- return io.ServerSocket.bind(address, port, {backlog: backlog, v6Only: v6Only, shared: shared}).then(io._HttpServer)(dart.fn(socket => new io._HttpServer._(socket, true), ServerSocketTo_HttpServer()));

+ return io.ServerSocket.bind(address, port, {backlog: backlog, v6Only: v6Only, shared: shared}).then(io.HttpServer)(dart.fn(socket => new io._HttpServer._(socket, true), ServerSocketTo_HttpServer()));

}

static bindSecure(address, port, context, backlog, v6Only, requestClientCertificate, shared) {

- return io.SecureServerSocket.bind(address, port, context, {backlog: backlog, v6Only: v6Only, requestClientCertificate: requestClientCertificate, shared: shared}).then(io._HttpServer)(dart.fn(socket => new io._HttpServer._(socket, true), SecureServerSocketTo_HttpServer()));

+ return io.SecureServerSocket.bind(address, port, context, {backlog: backlog, v6Only: v6Only, requestClientCertificate: requestClientCertificate, shared: shared}).then(io.HttpServer)(dart.fn(socket => new io._HttpServer._(socket, true), SecureServerSocketTo_HttpServer()));

}

_(serverSocket, closeServer) {

this.defaultResponseHeaders = io._HttpServer._initDefaultResponseHeaders();

@@ -47602,7 +47527,7 @@ define([], function() {

io._FileResourceInfo.openFiles[dartx.remove](info.id);

}

static getOpenFilesList() {

- return ListOfMapOfString$String().from(io._FileResourceInfo.openFiles[dartx.values][dartx.map](MapOfString$String())(dart.fn(e => e.referenceValueMap, _FileResourceInfoToMapOfString$String())));

+ return ListOfMapOfString$String().from(io._FileResourceInfo.openFiles[dartx.values][dartx.map](dart.dynamic)(dart.fn(e => e.referenceValueMap, _FileResourceInfoToMapOfString$String())));

}

static getOpenFiles(func, params) {

dart.assert(dart.equals(func, 'ext.dart.io.getOpenFiles'));

@@ -47677,7 +47602,7 @@ define([], function() {

io._ProcessResourceInfo.startedProcesses[dartx.remove](info.id);

}

static getStartedProcessesList() {

- return ListOfMapOfString$String().from(io._ProcessResourceInfo.startedProcesses[dartx.values][dartx.map](MapOfString$String())(dart.fn(e => e.referenceValueMap, _ProcessResourceInfoToMapOfString$String())));

+ return ListOfMapOfString$String().from(io._ProcessResourceInfo.startedProcesses[dartx.values][dartx.map](dart.dynamic)(dart.fn(e => e.referenceValueMap, _ProcessResourceInfoToMapOfString$String())));

}

static getStartedProcesses(func, params) {

dart.assert(func == 'ext.dart.io.getProcesses');

@@ -47744,7 +47669,7 @@ define([], function() {

return dart.str`${dart.dload(dart.dload(this.socket, 'address'), 'host')}:${dart.dload(this.socket, 'port')}${remote}`;

}

static getOpenSocketsList() {

- return ListOfMapOfString$String().from(io._SocketResourceInfo.openSockets[dartx.values][dartx.map](MapOfString$String())(dart.fn(e => e.referenceValueMap, _SocketResourceInfoToMapOfString$String())));

+ return ListOfMapOfString$String().from(io._SocketResourceInfo.openSockets[dartx.values][dartx.map](dart.dynamic)(dart.fn(e => e.referenceValueMap, _SocketResourceInfoToMapOfString$String())));

}

getSocketInfoMap() {

let result = this.fullValueMap;

@@ -47927,7 +47852,7 @@ define([], function() {

target = this[_makeWindowsLinkTarget](target);

}

let result = dart.test(recursive) ? this.parent.create({recursive: true}) : async.Future.value(null);

- return result.then(dart.dynamic)(dart.fn(_ => io._IOService._dispatch(io._FILE_CREATE_LINK, JSArrayOfString().of([this.path, target])), dynamicToFuture())).then(io._Link)(dart.fn(response => {

+ return result.then(dart.dynamic)(dart.fn(_ => io._IOService._dispatch(io._FILE_CREATE_LINK, [this.path, target]), dynamicToFuture())).then(io.Link)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionFromResponse](response, dart.str`Cannot create link to target '${target}'`, this.path));

}

@@ -47966,9 +47891,9 @@ define([], function() {

[_delete](opts) {

let recursive = opts && 'recursive' in opts ? opts.recursive : false;

if (dart.test(recursive)) {

- return io.Directory.new(this.path).delete({recursive: true}).then(io._Link)(dart.fn(_ => this, FileSystemEntityTo_Link()));

+ return io.Directory.new(this.path).delete({recursive: true}).then(io.Link)(dart.fn(_ => this, FileSystemEntityTo_Link()));

}

- return io._IOService._dispatch(io._FILE_DELETE_LINK, JSArrayOfString().of([this.path])).then(io._Link)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_DELETE_LINK, [this.path]).then(io.Link)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionFromResponse](response, "Cannot delete link", this.path));

}

@@ -47984,7 +47909,7 @@ define([], function() {

io._Link.throwIfError(result, "Cannot delete link", this.path);

}

rename(newPath) {

- return io._IOService._dispatch(io._FILE_RENAME_LINK, JSArrayOfString().of([this.path, newPath])).then(io.Link)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_RENAME_LINK, [this.path, newPath]).then(io.Link)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionFromResponse](response, dart.str`Cannot rename link to '${newPath}'`, this.path));

}

@@ -47997,12 +47922,12 @@ define([], function() {

return io.Link.new(newPath);

}

target() {

- return io._IOService._dispatch(io._FILE_LINK_TARGET, JSArrayOfString().of([this.path])).then(core.String)(dart.fn(response => {

+ return io._IOService._dispatch(io._FILE_LINK_TARGET, [this.path]).then(core.String)(dart.fn(response => {

if (dart.test(this[_isErrorResponse](response))) {

dart.throw(this[_exceptionFromResponse](response, "Cannot get target of link", this.path));

}

- return FutureOrOfString()._check(response);

- }, dynamicToFutureOrOfString()));

+ return response;

+ }, dynamicTodynamic$()));

}

targetSync() {

let result = io._File._linkTarget(this.path);

@@ -48915,7 +48840,7 @@ define([], function() {

} else {

this[_controller$0].add(secureConnection);

}

- }, RawSecureSocketToFutureOr())).catchError(dart.fn((e, s) => {

+ }, RawSecureSocketTodynamic())).catchError(dart.fn((e, s) => {

if (!dart.test(this[_closed])) {

this[_controller$0].addError(e, core.StackTrace._check(s));

}

@@ -49214,7 +49139,7 @@ define([], function() {

this[_closedWrite] = true;

this[_closedRead] = true;

if (this[_socket] != null) {

- this[_socket].close().then(dart.void)(dart.bind(this, _completeCloseCompleter));

+ this[_socket].close().then(dart.dynamic)(dart.bind(this, _completeCloseCompleter));

} else {

this[_completeCloseCompleter]();

}

@@ -49499,7 +49424,7 @@ define([], function() {

}

this[_tryFilter]();

- }, _FilterStatusToFutureOr())).catchError(dart.bind(this, _reportError));

+ }, _FilterStatusTodynamic())).catchError(dart.bind(this, _reportError));

}

[_readSocketOrBufferedData](bytes) {

@@ -51575,7 +51500,7 @@ define([], function() {

}

bind(stream) {

stream.listen(dart.fn(request => {

- io._WebSocketTransformerImpl._upgrade(request, this[_protocolSelector], this[_compression]).then(dart.void)(dart.fn(webSocket => this[_controller$0].add(webSocket), WebSocketTovoid())).catchError(dart.bind(this[_controller$0], 'addError'));

+ io._WebSocketTransformerImpl._upgrade(request, this[_protocolSelector], this[_compression]).then(dart.dynamic)(dart.fn(webSocket => this[_controller$0].add(webSocket), WebSocketTovoid())).catchError(dart.bind(this[_controller$0], 'addError'));

}, HttpRequestTovoid$()), {onDone: dart.fn(() => {

this[_controller$0].close();

}, VoidTovoid$())});

@@ -51602,7 +51527,7 @@ define([], function() {

}

let deflate = io._WebSocketTransformerImpl._negotiateCompression(request, response, compression);

response.headers.contentLength = 0;

- return response.detachSocket().then(io._WebSocketImpl)(dart.fn(socket => new io._WebSocketImpl._fromSocket(socket, protocol, compression, true, deflate), SocketTo_WebSocketImpl()));

+ return response.detachSocket().then(dart.dynamic)(dart.fn(socket => new io._WebSocketImpl._fromSocket(socket, protocol, compression, true, deflate), SocketTo_WebSocketImpl()));

}

dart.fn(upgrade, StringToFuture());

let protocols = request.headers._get('Sec-WebSocket-Protocol');

@@ -51712,7 +51637,7 @@ define([], function() {

this[_ensureDecoder]();

let data = [];

data[dartx.addAll](msg);

- data[dartx.addAll](const$80 || (const$80 = dart.constList([0, 0, 255, 255], core.int)));

+ data[dartx.addAll](const$80 || (const$80 = dart.constList([0, 0, 255, 255], dart.dynamic)));

this.decoder.process(ListOfint()._check(data), 0, data[dartx.length]);

let result = [];

let out = null;

@@ -51912,7 +51837,7 @@ define([], function() {

}

dart.assert(index == headerSize);

if (data == null) {

- return JSArrayOfUint8List().of([header]);

+ return JSArrayOfListOfint().of([header]);

} else {

return JSArrayOfListOfint().of([header, data]);

}

@@ -51988,7 +51913,7 @@ define([], function() {

this.socket.addStream(stream).then(dart.dynamic)(dart.fn(_ => {

this[_done$]();

this[_closeCompleter].complete(this.webSocket);

- }, dynamicToFutureOr$()), {onError: dart.fn((error, stackTrace) => {

+ }, dynamicTodynamic$()), {onError: dart.fn((error, stackTrace) => {

this[_closed] = true;

this[_cancel$]();

if (core.ArgumentError.is(error)) {

@@ -52033,7 +51958,7 @@ define([], function() {

this[_ensureController]();

const closeSocket = (function() {

return this.socket.close().catchError(dart.fn(_ => {

- }, dynamicTodynamic$())).then(io._WebSocketImpl)(dart.fn(_ => this.webSocket, dynamicTo_WebSocketImpl()));

+ }, dynamicTodynamic$())).then(dart.dynamic)(dart.fn(_ => this.webSocket, dynamicTo_WebSocketImpl()));

}).bind(this);

dart.fn(closeSocket, VoidToFuture());

this[_controller$0].close();

@@ -52099,7 +52024,7 @@ define([], function() {

}

let nonce = io._CryptoUtils.bytesToBase64(nonceData);

uri = core.Uri.new({scheme: uri.scheme == "wss" ? "https" : "http", userInfo: uri.userInfo, host: uri.host, port: uri.port, path: uri.path, query: uri.query, fragment: uri.fragment});

- return io._WebSocketImpl._httpClient.openUrl("GET", uri).then(io.HttpClientResponse)(dart.fn(request => {

+ return io._WebSocketImpl._httpClient.openUrl("GET", uri).then(dart.dynamic)(dart.fn(request => {

if (uri.userInfo != null && !dart.test(uri.userInfo[dartx.isEmpty])) {

let auth = io._CryptoUtils.bytesToBase64(convert.UTF8.encode(uri.userInfo));

request.headers.set(io.HttpHeaders.AUTHORIZATION, dart.str`Basic ${auth}`);

@@ -52122,16 +52047,16 @@ define([], function() {

return request.close();

}, HttpClientRequestToFutureOfHttpClientResponse())).then(io.WebSocket)(dart.fn(response => {

function error(message) {

- response.detachSocket().then(dart.dynamic)(dart.fn(socket => {

- socket.destroy();

- }, SocketToFutureOr()));

+ dart.dsend(dart.dsend(response, 'detachSocket'), 'then', dart.fn(socket => {

+ dart.dsend(socket, 'destroy');

+ }, dynamicTodynamic$()));

dart.throw(new io.WebSocketException(message));

}

dart.fn(error, StringTovoid$());

- if (response.statusCode != io.HttpStatus.SWITCHING_PROTOCOLS || response.headers._get(io.HttpHeaders.CONNECTION) == null || !dart.test(response.headers._get(io.HttpHeaders.CONNECTION)[dartx.any](dart.fn(value => value[dartx.toLowerCase]() == "upgrade", StringTobool$()))) || response.headers.value(io.HttpHeaders.UPGRADE)[dartx.toLowerCase]() != "websocket") {

+ if (!dart.equals(dart.dload(response, 'statusCode'), io.HttpStatus.SWITCHING_PROTOCOLS) || dart.dindex(dart.dload(response, 'headers'), io.HttpHeaders.CONNECTION) == null || !dart.test(dart.dsend(dart.dindex(dart.dload(response, 'headers'), io.HttpHeaders.CONNECTION), 'any', dart.fn(value => dart.equals(dart.dsend(value, 'toLowerCase'), "upgrade"), dynamicTobool$()))) || !dart.equals(dart.dsend(dart.dsend(dart.dload(response, 'headers'), 'value', io.HttpHeaders.UPGRADE), 'toLowerCase'), "websocket")) {

error(dart.str`Connection to '${uri}' was not upgraded to websocket`);

}

- let accept = response.headers.value("Sec-WebSocket-Accept");

+ let accept = core.String._check(dart.dsend(dart.dload(response, 'headers'), 'value', "Sec-WebSocket-Accept"));

if (accept == null) {

error("Response did not contain a 'Sec-WebSocket-Accept' header");

}

@@ -52147,10 +52072,10 @@ define([], function() {

error("Bad response 'Sec-WebSocket-Accept' header");

}

- let protocol = response.headers.value('Sec-WebSocket-Protocol');

- let deflate = io._WebSocketImpl.negotiateClientCompression(response, compression);

- return response.detachSocket().then(io.WebSocket)(dart.fn(socket => new io._WebSocketImpl._fromSocket(socket, protocol, compression, false, deflate), SocketTo_WebSocketImpl()));

- }, HttpClientResponseToFutureOfWebSocket()));

+ let protocol = dart.dsend(dart.dload(response, 'headers'), 'value', 'Sec-WebSocket-Protocol');

+ let deflate = io._WebSocketImpl.negotiateClientCompression(io.HttpClientResponse._check(response), compression);

+ return dart.dgsend(dart.dsend(response, 'detachSocket'), [io.WebSocket], 'then', dart.fn(socket => new io._WebSocketImpl._fromSocket(socket, core.String._check(protocol), compression, false, deflate), dynamicTo_WebSocketImpl()));

+ }, dynamicTodynamic$()));

}

static negotiateClientCompression(response, compression) {

let extensionHeader = response.headers.value('Sec-WebSocket-Extensions');

@@ -52852,10 +52777,8 @@ define([], function() {

const _checkIndex = Symbol('_checkIndex');

const _checkInsertIndex = Symbol('_checkInsertIndex');

js.JsArray$ = dart.generic(E => {

- let JSArrayOfE = () => (JSArrayOfE = dart.constFn(_interceptors.JSArray$(E)))();

let IterableOfE = () => (IterableOfE = dart.constFn(core.Iterable$(E)))();

let EAndEToint = () => (EAndEToint = dart.constFn(dart.functionType(core.int, [E, E])))();

- let JSArrayOfEAndEToint = () => (JSArrayOfEAndEToint = dart.constFn(_interceptors.JSArray$(EAndEToint())))();

class JsArray extends dart.mixin(js.JsObject, collection.ListMixin$(E)) {

new() {

super._fromJs([]);

@@ -52914,7 +52837,7 @@ define([], function() {

}

add(value) {

E._check(value);

- this.callMethod('push', JSArrayOfE().of([value]));

+ this.callMethod('push', [value]);

}

addAll(iterable) {

IterableOfE()._check(iterable);

@@ -52924,11 +52847,11 @@ define([], function() {

insert(index, element) {

E._check(element);

this[_checkInsertIndex](index);

- this.callMethod('splice', JSArrayOfObject().of([index, 0, element]));

+ this.callMethod('splice', [index, 0, element]);

}

removeAt(index) {

this[_checkIndex](index);

- return E.as(dart.dindex(this.callMethod('splice', JSArrayOfint().of([index, 1])), 0));

+ return E.as(dart.dindex(this.callMethod('splice', [index, 1]), 0));

}

removeLast() {

if (this.length == 0) dart.throw(new core.RangeError(-1));

@@ -52936,7 +52859,7 @@ define([], function() {

}

removeRange(start, end) {

js.JsArray._checkRange(start, end, this.length);

- this.callMethod('splice', JSArrayOfint().of([start, dart.notNull(end) - dart.notNull(start)]));

+ this.callMethod('splice', [start, dart.notNull(end) - dart.notNull(start)]);

}

setRange(start, end, iterable, skipCount) {

IterableOfE()._check(iterable);

@@ -52951,7 +52874,7 @@ define([], function() {

}

sort(compare) {

if (compare === void 0) compare = null;

- this.callMethod('sort', compare == null ? [] : JSArrayOfEAndEToint().of([compare]));

+ this.callMethod('sort', compare == null ? [] : [compare]);

}

dart.addTypeTests(JsArray);

@@ -55525,15 +55448,15 @@ define([], function() {

let completer = CompleterOfDatabase().new();

this[dartx.onComplete].first.then(dart.dynamic)(dart.fn(_ => {

completer.complete(this[dartx.db]);

- }, EventToFutureOr()));

+ }, EventTodynamic()));

this[dartx.onError].first.then(dart.dynamic)(dart.fn(e => {

completer.completeError(e);

- }, EventToFutureOr()));

+ }, EventTodynamic()));

this[dartx.onAbort].first.then(dart.dynamic)(dart.fn(e => {

if (!dart.test(completer.isCompleted)) {

completer.completeError(e);

}

- }, EventToFutureOr()));

+ }, EventTodynamic()));

return completer.future;

}

static _() {

@@ -56473,10 +56396,10 @@ define([], function() {

return html$.window[_getComputedStyle](this, pseudoElement);

}

get [dartx.client]() {

- return new (RectangleOfint())(this[dartx.clientLeft], this[dartx.clientTop], this[dartx.clientWidth], this[dartx.clientHeight]);

+ return new (RectangleOfnum())(this[dartx.clientLeft], this[dartx.clientTop], this[dartx.clientWidth], this[dartx.clientHeight]);

}

get [dartx.offset]() {

- return new (RectangleOfint())(this[dartx.offsetLeft], this[dartx.offsetTop], this[dartx.offsetWidth], this[dartx.offsetHeight]);

+ return new (RectangleOfnum())(this[dartx.offsetLeft], this[dartx.offsetTop], this[dartx.offsetWidth], this[dartx.offsetHeight]);

}

[dartx.appendText](text) {

this[dartx.append](html$.Text.new(text));

@@ -69965,14 +69888,14 @@ define([], function() {

html$.DirectoryEntry = class DirectoryEntry extends html$.Entry {

[dartx.createDirectory](path, opts) {

let exclusive = opts && 'exclusive' in opts ? opts.exclusive : false;

- return this[_getDirectory](path, {options: dart.map({create: true, exclusive: exclusive}, core.String, core.bool)});

+ return this[_getDirectory](path, {options: dart.map({create: true, exclusive: exclusive})});

}

[dartx.getDirectory](path) {

return this[_getDirectory](path);

}

[dartx.createFile](path, opts) {

let exclusive = opts && 'exclusive' in opts ? opts.exclusive : false;

- return this[_getFile](path, {options: dart.map({create: true, exclusive: exclusive}, core.String, core.bool)});

+ return this[_getFile](path, {options: dart.map({create: true, exclusive: exclusive})});

}

[dartx.getFile](path) {

return this[_getFile](path);

@@ -73188,7 +73111,7 @@ define([], function() {

dart.setSignature(html$.Events, {

constructors: () => ({new: dart.definiteFunctionType(html$.Events, [html$.EventTarget])}),

fields: () => ({[_ptr]: html$.EventTarget}),

- methods: () => ({_get: dart.definiteFunctionType(async.Stream, [core.String])})

+ methods: () => ({_get: dart.definiteFunctionType(async.Stream$(html$.Event), [core.String])})

});

html$.ElementEvents = class ElementEvents extends html$.Events {

new(ptr) {

@@ -81242,7 +81165,7 @@ define([], function() {

}

static new(callback) {

- return new (window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver)(_js_helper.convertDartClosureToJS(_wrapZoneBinaryCallbackOfListOfMutationRecord$MutationObserver$void())(html$._wrapBinaryZone(ListOfMutationRecord(), html$.MutationObserver, dart.void)(callback), 2));

+ return new (window.MutationObserver || window.WebKitMutationObserver || window.MozMutationObserver)(_js_helper.convertDartClosureToJS(ListOfMutationRecordAndMutationObserverTovoid())(html$._wrapBinaryZone(ListOfMutationRecord(), html$.MutationObserver, dart.void)(callback), 2));

}

};

dart.setSignature(html$.MutationObserver, {

@@ -85258,7 +85181,7 @@ define([], function() {

}

static get supported() {

try {

- html$.RtcPeerConnection.new(dart.map({iceServers: JSArrayOfMapOfString$String().of([dart.map({url: "stun:localhost"}, core.String, core.String)])}, core.String, ListOfMapOfString$String()));

+ html$.RtcPeerConnection.new(dart.map({iceServers: JSArrayOfMapOfString$String().of([dart.map({url: "stun:localhost"}, core.String, core.String)])}));

return true;

} catch (_) {

return false;

@@ -85680,7 +85603,7 @@ define([], function() {

]);

html$.Screen = class Screen extends _interceptors.Interceptor {

get [dartx.available]() {

- return new (RectangleOfint())(this[_availLeft], this[_availTop], this[_availWidth], this[_availHeight]);

+ return new (RectangleOfnum())(this[_availLeft], this[_availTop], this[_availWidth], this[_availHeight]);

}

static _() {

dart.throw(new core.UnsupportedError("Not supported"));

@@ -86245,8 +86168,8 @@ define([], function() {

return this.setCustomValidity.apply(this, args);

}

get [dartx.options]() {

- let options = ListOfOptionElement().from(this[dartx.querySelectorAll](html$.Element)('option'));

- return new (UnmodifiableListViewOfOptionElement())(options);

+ let options = this[dartx.querySelectorAll](html$.OptionElement)('option');

+ return new (UnmodifiableListViewOfOptionElement())(options.toList());

}

get [dartx.selectedOptions]() {

if (dart.test(this[dartx.multiple])) {