diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 7ff81f47c..f07b80784 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,7 +1,10 @@ -## 24.3.6-dev +## 24.3.6 - Bump minimum sdk version to 3.7.0 - use 'compile js-dev' instead of directly invoking the ddc snapshot. +- `FrontendServerDdcLibraryBundleStrategy` now takes a `hotReloadSourcesUri` + parameter in order to fetch the file that contains the changed sources and + libraries instead of assuming it exists in the global `window`. ## 24.3.5 - Allow clients to specify the `packageConfigPath` in `LoadStrategy` class and associated providers. diff --git a/dwds/lib/src/handlers/injector.dart b/dwds/lib/src/handlers/injector.dart index 88e7060c1..f8dc8aaf6 100644 --- a/dwds/lib/src/handlers/injector.dart +++ b/dwds/lib/src/handlers/injector.dart @@ -9,6 +9,7 @@ import 'dart:isolate'; import 'package:crypto/crypto.dart'; import 'package:dwds/src/config/tool_configuration.dart'; +import 'package:dwds/src/loaders/ddc_library_bundle.dart'; import 'package:dwds/src/version.dart'; import 'package:logging/logging.dart'; import 'package:shelf/shelf.dart'; @@ -203,6 +204,7 @@ Future _injectedClientSnippet( 'window.\$dartEmitDebugEvents = ${debugSettings.emitDebugEvents};\n' 'window.\$isInternalBuild = ${appMetadata.isInternalBuild};\n' 'window.\$isFlutterApp = ${buildSettings.isFlutterApp};\n' + '${loadStrategy is DdcLibraryBundleStrategy ? 'window.\$hotReloadSourcesPath = "${loadStrategy.hotReloadSourcesUri.toString()}";\n' : ''}' '${loadStrategy.loadClientSnippet(_clientScript)}'; if (extensionUri != null) { diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index ef1ece239..ec9487fb4 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.8.0-edge. +// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.8.0-110.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -386,22 +386,6 @@ return J.UnknownJavaScriptObject.prototype; return receiver; }, - getInterceptor$x(receiver) { - if (receiver == null) - return receiver; - if (typeof receiver != "object") { - if (typeof receiver == "function") - return J.JavaScriptFunction.prototype; - if (typeof receiver == "symbol") - return J.JavaScriptSymbol.prototype; - if (typeof receiver == "bigint") - return J.JavaScriptBigInt.prototype; - return receiver; - } - if (receiver instanceof A.Object) - return receiver; - return J.getNativeInterceptor(receiver); - }, set$length$asx(receiver, value) { return J.getInterceptor$asx(receiver).set$length(receiver, value); }, @@ -452,9 +436,6 @@ allMatches$2$s(receiver, a0, a1) { return J.getInterceptor$s(receiver).allMatches$2(receiver, a0, a1); }, - asUint8List$2$x(receiver, a0, a1) { - return J.getInterceptor$x(receiver).asUint8List$2(receiver, a0, a1); - }, cast$1$0$ax(receiver, $T1) { return J.getInterceptor$ax(receiver).cast$1$0(receiver, $T1); }, @@ -2239,9 +2220,6 @@ this._name = t0; this.__late_helper$_value = null; }, - _checkLength($length) { - return $length; - }, _ensureNativeList(list) { var t1, result, i; if (type$.JSIndexable_dynamic._is(list)) @@ -2284,9 +2262,6 @@ }, NativeTypedData: function NativeTypedData() { }, - _UnmodifiableNativeByteBufferView: function _UnmodifiableNativeByteBufferView(t0) { - this.__native_typed_data$_data = t0; - }, NativeByteData: function NativeByteData() { }, NativeTypedArray: function NativeTypedArray() { @@ -4013,78 +3988,6 @@ }($function, 1); return $.Zone__current.registerBinaryCallback$3$1(new A._wrapJsFunctionForAsync_closure($protected), type$.void, type$.int, type$.dynamic); }, - _asyncStarHelper(object, bodyFunctionOrErrorCode, controller) { - var t1, t2, t3, - _s10_ = "controller"; - if (bodyFunctionOrErrorCode === 0) { - t1 = controller.cancelationFuture; - if (t1 != null) - t1._completeWithValue$1(null); - else { - t1 = controller.___AsyncStarStreamController_controller_A; - t1 === $ && A.throwLateFieldNI(_s10_); - t1.close$0(); - } - return; - } else if (bodyFunctionOrErrorCode === 1) { - t1 = controller.cancelationFuture; - if (t1 != null) { - t2 = A.unwrapException(object); - t3 = A.getTraceFromException(object); - t1._completeErrorObject$1(new A.AsyncError(t2, t3)); - } else { - t1 = A.unwrapException(object); - t2 = A.getTraceFromException(object); - t3 = controller.___AsyncStarStreamController_controller_A; - t3 === $ && A.throwLateFieldNI(_s10_); - t3.addError$2(t1, t2); - controller.___AsyncStarStreamController_controller_A.close$0(); - } - return; - } - type$.void_Function_int_dynamic._as(bodyFunctionOrErrorCode); - if (object instanceof A._IterationMarker) { - if (controller.cancelationFuture != null) { - bodyFunctionOrErrorCode.call$2(2, null); - return; - } - t1 = object.state; - if (t1 === 0) { - t1 = object.value; - t2 = controller.___AsyncStarStreamController_controller_A; - t2 === $ && A.throwLateFieldNI(_s10_); - t2.add$1(0, controller.$ti._precomputed1._as(t1)); - A.scheduleMicrotask(new A._asyncStarHelper_closure(controller, bodyFunctionOrErrorCode)); - return; - } else if (t1 === 1) { - t1 = controller.$ti._eval$1("Stream<1>")._as(type$.Stream_dynamic._as(object.value)); - t2 = controller.___AsyncStarStreamController_controller_A; - t2 === $ && A.throwLateFieldNI(_s10_); - t2.addStream$2$cancelOnError(t1, false).then$1$1(new A._asyncStarHelper_closure0(controller, bodyFunctionOrErrorCode), type$.Null); - return; - } - } - A._awaitOnObject(object, bodyFunctionOrErrorCode); - }, - _streamOfController(controller) { - var t1 = controller.___AsyncStarStreamController_controller_A; - t1 === $ && A.throwLateFieldNI("controller"); - return new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")); - }, - _AsyncStarStreamController$(body, $T) { - var t1 = new A._AsyncStarStreamController($T._eval$1("_AsyncStarStreamController<0>")); - t1._AsyncStarStreamController$1(body, $T); - return t1; - }, - _makeAsyncStarStreamController(body, $T) { - return A._AsyncStarStreamController$(body, $T); - }, - _IterationMarker_yieldStar(values) { - return new A._IterationMarker(values, 1); - }, - _IterationMarker_yieldSingle(value) { - return new A._IterationMarker(value, 0); - }, AsyncError_defaultStackTrace(error) { var stackTrace; if (type$.Error._is(error)) { @@ -4385,12 +4288,21 @@ t1 = $.Zone__current; t1.scheduleMicrotask$1(t1.bindCallbackGuarded$1(callback)); }, + Stream_Stream$value(value, $T) { + var _null = null, + t1 = $T._eval$1("_AsyncStreamController<0>"), + t2 = new A._AsyncStreamController(_null, _null, _null, _null, t1); + t2._add$1(value); + t2._closeUnchecked$0(); + return new A._ControllerStream(t2, t1._eval$1("_ControllerStream<1>")); + }, StreamIterator_StreamIterator(stream, $T) { A.checkNotNullable(stream, "stream", type$.Object); return new A._StreamIterator($T._eval$1("_StreamIterator<0>")); }, - StreamController_StreamController(onCancel, onListen, onResume, sync, $T) { - return sync ? new A._SyncStreamController(onListen, null, onResume, onCancel, $T._eval$1("_SyncStreamController<0>")) : new A._AsyncStreamController(onListen, null, onResume, onCancel, $T._eval$1("_AsyncStreamController<0>")); + StreamController_StreamController(onCancel, onListen, sync, $T) { + var _null = null; + return sync ? new A._SyncStreamController(onListen, _null, _null, onCancel, $T._eval$1("_SyncStreamController<0>")) : new A._AsyncStreamController(onListen, _null, _null, onCancel, $T._eval$1("_AsyncStreamController<0>")); }, _runGuarded(notificationHandler) { var e, s, exception; @@ -4404,9 +4316,6 @@ $.Zone__current.handleUncaughtError$2(e, s); } }, - _AddStreamState_makeErrorHandler(controller) { - return new A._AddStreamState_makeErrorHandler_closure(controller); - }, _BufferingStreamSubscription__registerDataHandler(zone, handleData, $T) { var t1 = handleData == null ? A.async___nullDataHandler$closure() : handleData; return zone.registerUnaryCallback$2$1(t1, type$.void, $T); @@ -4626,45 +4535,6 @@ _wrapJsFunctionForAsync_closure: function _wrapJsFunctionForAsync_closure(t0) { this.$protected = t0; }, - _asyncStarHelper_closure: function _asyncStarHelper_closure(t0, t1) { - this.controller = t0; - this.bodyFunction = t1; - }, - _asyncStarHelper_closure0: function _asyncStarHelper_closure0(t0, t1) { - this.controller = t0; - this.bodyFunction = t1; - }, - _AsyncStarStreamController: function _AsyncStarStreamController(t0) { - var _ = this; - _.___AsyncStarStreamController_controller_A = $; - _.isSuspended = false; - _.cancelationFuture = null; - _.$ti = t0; - }, - _AsyncStarStreamController__resumeBody: function _AsyncStarStreamController__resumeBody(t0) { - this.body = t0; - }, - _AsyncStarStreamController__resumeBody_closure: function _AsyncStarStreamController__resumeBody_closure(t0) { - this.body = t0; - }, - _AsyncStarStreamController_closure0: function _AsyncStarStreamController_closure0(t0) { - this._resumeBody = t0; - }, - _AsyncStarStreamController_closure1: function _AsyncStarStreamController_closure1(t0, t1) { - this.$this = t0; - this._resumeBody = t1; - }, - _AsyncStarStreamController_closure: function _AsyncStarStreamController_closure(t0, t1) { - this.$this = t0; - this.body = t1; - }, - _AsyncStarStreamController__closure: function _AsyncStarStreamController__closure(t0) { - this.body = t0; - }, - _IterationMarker: function _IterationMarker(t0, t1) { - this.value = t0; - this.state = t1; - }, AsyncError: function AsyncError(t0, t1) { this.error = t0; this.stackTrace = t1; @@ -4834,21 +4704,6 @@ this._async$_target = t0; this.$ti = t1; }, - _AddStreamState: function _AddStreamState() { - }, - _AddStreamState_makeErrorHandler_closure: function _AddStreamState_makeErrorHandler_closure(t0) { - this.controller = t0; - }, - _AddStreamState_cancel_closure: function _AddStreamState_cancel_closure(t0) { - this.$this = t0; - }, - _StreamControllerAddStreamState: function _StreamControllerAddStreamState(t0, t1, t2, t3) { - var _ = this; - _._varData = t0; - _.addStreamFuture = t1; - _.addSubscription = t2; - _.$ti = t3; - }, _BufferingStreamSubscription: function _BufferingStreamSubscription() { }, _BufferingStreamSubscription_asFuture_closure: function _BufferingStreamSubscription_asFuture_closure(t0, t1) { @@ -5242,7 +5097,7 @@ }, _LinkedHashSetCell: function _LinkedHashSetCell(t0) { this._element = t0; - this._collection$_next = null; + this._collection$_previous = this._collection$_next = null; }, _LinkedHashSetIterator: function _LinkedHashSetIterator(t0, t1, t2) { var _ = this; @@ -7830,17 +7685,6 @@ return callback.call$1(arg1); return callback.call$0(); }, - _callDartFunctionFast3(callback, arg1, arg2, arg3, $length) { - type$.Function._as(callback); - A._asInt($length); - if ($length >= 3) - return callback.call$3(arg1, arg2, arg3); - if ($length === 2) - return callback.call$2(arg1, arg2); - if ($length === 1) - return callback.call$1(arg1); - return callback.call$0(); - }, _noJsifyRequired(o) { return o == null || A._isBool(o) || typeof o == "number" || typeof o == "string" || type$.Int8List._is(o) || type$.Uint8List._is(o) || type$.Uint8ClampedList._is(o) || type$.Int16List._is(o) || type$.Uint16List._is(o) || type$.Int32List._is(o) || type$.Uint32List._is(o) || type$.Float32List._is(o) || type$.Float64List._is(o) || type$.ByteBuffer._is(o) || type$.ByteData._is(o); }, @@ -7909,10 +7753,10 @@ A.checkTypeBound($T, type$.num, "T", "max"); return Math.max($T._as(a), $T._as(b)); }, - _JSRandom: function _JSRandom() { + Random_Random(seed) { + return B.C__JSRandom; }, - _JSSecureRandom: function _JSSecureRandom(t0) { - this._math$_buffer = t0; + _JSRandom: function _JSRandom() { }, AsyncMemoizer: function AsyncMemoizer(t0, t1) { this._async_memoizer$_completer = t0; @@ -8888,156 +8732,39 @@ }, BaseResponse: function BaseResponse() { }, - _rethrowAsClientException(e, st, request) { - var message; - if (!(e instanceof A.ClientException)) { - message = J.toString$0$(e); - if (B.JSString_methods.startsWith$1(message, "TypeError: ")) - message = B.JSString_methods.substring$1(message, 11); - e = new A.ClientException(message, request.url); + _extension_0_get_responseHeaders(_this) { + var _i, header, splitIdx, key, value, + t1 = type$.String, + headers = A.LinkedHashMap_LinkedHashMap$_empty(t1, t1), + headersList = A._asString(_this.getAllResponseHeaders()).split("\r\n"); + for (t1 = headersList.length, _i = 0; _i < t1; ++_i) { + header = headersList[_i]; + if (header.length === 0) + continue; + splitIdx = B.JSString_methods.indexOf$1(header, ": "); + if (splitIdx === -1) + continue; + key = B.JSString_methods.substring$2(header, 0, splitIdx).toLowerCase(); + value = B.JSString_methods.substring$1(header, splitIdx + 2); + if (headers.containsKey$1(key)) + headers.$indexSet(0, key, A.S(headers.$index(0, key)) + ", " + value); + else + headers.$indexSet(0, key, value); } - A.Error_throwWithStackTrace(e, st); - }, - _readBody(request, response) { - return A._readBody$body(request, response); - }, - _readBody$body(request, response) { - var $async$_readBody = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { - switch ($async$errorCode) { - case 2: - $async$next = $async$nextWhenCanceled; - $async$goto = $async$next.pop(); - break; - case 1: - $async$errorStack.push($async$result); - $async$goto = $async$handler; - } - while (true) - switch ($async$goto) { - case 0: - // Function start - _box_0 = {}; - t1 = type$.nullable_JSObject._as(response.body); - bodyStreamReader = t1 == null ? null : type$.JSObject._as(t1.getReader()); - if (bodyStreamReader == null) { - // goto return - $async$goto = 1; - break; - } - isDone = false; - _box_0.isError = false; - $async$handler = 4; - t1 = type$.NativeUint8List, t2 = type$.JSObject; - case 7: - // for condition - // trivial condition - $async$goto = 9; - return A._asyncStarHelper(A.promiseToFuture(t2._as(bodyStreamReader.read()), t2), $async$_readBody, $async$controller); - case 9: - // returning from await. - chunk = $async$result; - if (A._asBool(chunk.done)) { - isDone = true; - // goto after for - $async$goto = 8; - break; - } - t3 = chunk.value; - t3.toString; - $async$goto = 10; - $async$nextWhenCanceled = [1, 5]; - return A._asyncStarHelper(A._IterationMarker_yieldSingle(t1._as(t3)), $async$_readBody, $async$controller); - case 10: - // after yield - // goto for condition - $async$goto = 7; - break; - case 8: - // after for - $async$next.push(6); - // goto finally - $async$goto = 5; - break; - case 4: - // catch - $async$handler = 3; - $async$exception = $async$errorStack.pop(); - e = A.unwrapException($async$exception); - st = A.getTraceFromException($async$exception); - _box_0.isError = true; - A._rethrowAsClientException(e, st, request); - $async$next.push(6); - // goto finally - $async$goto = 5; - break; - case 3: - // uncaught - $async$next = [2]; - case 5: - // finally - $async$handler = 2; - $async$goto = !A.boolConversionCheck(isDone) ? 11 : 12; - break; - case 11: - // then - $async$handler = 14; - $async$goto = 17; - return A._asyncStarHelper(A.promiseToFuture(type$.JSObject._as(bodyStreamReader.cancel()), type$.nullable_Object).catchError$2$test(new A._readBody_closure(), new A._readBody_closure0(_box_0)), $async$_readBody, $async$controller); - case 17: - // returning from await. - $async$handler = 2; - // goto after finally - $async$goto = 16; - break; - case 14: - // catch - $async$handler = 13; - $async$exception1 = $async$errorStack.pop(); - e0 = A.unwrapException($async$exception1); - st0 = A.getTraceFromException($async$exception1); - if (!_box_0.isError) - A._rethrowAsClientException(e0, st0, request); - // goto after finally - $async$goto = 16; - break; - case 13: - // uncaught - // goto rethrow - $async$goto = 2; - break; - case 16: - // after finally - case 12: - // join - // goto the next finally handler - $async$goto = $async$next.pop(); - break; - case 6: - // after finally - case 1: - // return - return A._asyncStarHelper(null, 0, $async$controller); - case 2: - // rethrow - return A._asyncStarHelper($async$errorStack.at(-1), 1, $async$controller); - } - }); - var $async$goto = 0, - $async$controller = A._makeAsyncStarStreamController($async$_readBody, type$.List_int), - $async$nextWhenCanceled, $async$handler = 2, $async$errorStack = [], $async$next = [], isDone, chunk, e, st, e0, st0, t2, t3, exception, _box_0, t1, bodyStreamReader, $async$exception, $async$exception1; - return A._streamOfController($async$controller); + return headers; }, BrowserClient: function BrowserClient(t0) { - this._abortController = t0; + this._xhrs = t0; this.withCredentials = false; }, - BrowserClient_send_closure: function BrowserClient_send_closure(t0) { - this.headers = t0; - }, - _readBody_closure: function _readBody_closure() { + BrowserClient_send_closure: function BrowserClient_send_closure(t0, t1, t2) { + this.xhr = t0; + this.completer = t1; + this.request = t2; }, - _readBody_closure0: function _readBody_closure0(t0) { - this._box_0 = t0; + BrowserClient_send_closure0: function BrowserClient_send_closure0(t0, t1) { + this.completer = t0; + this.request = t1; }, ByteStream: function ByteStream(t0) { this._stream = t0; @@ -9045,9 +8772,6 @@ ByteStream_toBytes_closure: function ByteStream_toBytes_closure(t0) { this.completer = t0; }, - ClientException$(message, uri) { - return new A.ClientException(message, uri); - }, ClientException: function ClientException(t0, t1) { this.message = t0; this.uri = t1; @@ -9625,8 +9349,8 @@ SseClient$(serverUrl, debugKey) { var t3, t4, t5, _null = null, t1 = type$.String, - t2 = A.StreamController_StreamController(_null, _null, _null, false, t1); - t1 = A.StreamController_StreamController(_null, _null, _null, false, t1); + t2 = A.StreamController_StreamController(_null, _null, false, t1); + t1 = A.StreamController_StreamController(_null, _null, false, t1); t3 = A.Logger_Logger("SseClient"); t4 = $.Zone__current; t5 = A.generateUuidV4(); @@ -9732,7 +9456,8 @@ }, RNG: function RNG() { }, - CryptoRNG: function CryptoRNG() { + MathRNG: function MathRNG(t0) { + this._rnd = t0; }, UuidV1: function UuidV1(t0) { this.goptions = t0; @@ -9801,7 +9526,7 @@ t4 = type$.JSObject; webSocket = t4._as(new t2(t3, t1)); webSocket.binaryType = "arraybuffer"; - browserSocket = new A.BrowserWebSocket(webSocket, A.StreamController_StreamController(null, null, null, false, type$.WebSocketEvent)); + browserSocket = new A.BrowserWebSocket(webSocket, A.StreamController_StreamController(null, null, false, type$.WebSocketEvent)); t1 = new A._Future($.Zone__current, type$._Future_BrowserWebSocket); webSocketConnected = new A._AsyncCompleter(t1, type$._AsyncCompleter_BrowserWebSocket); if (A._asInt(webSocket.readyState) === 1) @@ -9870,8 +9595,8 @@ t1 = $.Zone__current, t2 = new A.StreamChannelController(type$.StreamChannelController_nullable_Object), t3 = type$.nullable_Object, - localToForeignController = A.StreamController_StreamController(_null, _null, _null, true, t3), - foreignToLocalController = A.StreamController_StreamController(_null, _null, _null, true, t3), + localToForeignController = A.StreamController_StreamController(_null, _null, true, t3), + foreignToLocalController = A.StreamController_StreamController(_null, _null, true, t3), t4 = A._instanceType(foreignToLocalController), t5 = A._instanceType(localToForeignController); t2.__StreamChannelController__local_F = A.GuaranteeChannel$(new A._ControllerStream(foreignToLocalController, t4._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(localToForeignController, t5._eval$1("_StreamSinkWrapper<1>")), true, t3); @@ -9962,7 +9687,7 @@ switch ($async$goto) { case 0: // Function start - client = new A.BrowserClient(type$.JSObject._as(new self.AbortController())); + client = new A.BrowserClient(A.LinkedHashSet_LinkedHashSet$_empty(type$.JSObject)); client.withCredentials = true; $async$goto = 3; return A._asyncAwait(client._sendUnstreamed$3("GET", A.Uri_parse(authUrl), null), $async$_authenticateUser); @@ -9980,6 +9705,12 @@ }); return A._asyncStartSync($async$_authenticateUser, $async$completer); }, + hotReloadSourcesPath() { + var path = A._asStringQ(self.$hotReloadSourcesPath); + if (path == null) + throw A.wrapException(A.StateError$("Expected 'hotReloadSourcePath' to not be null in a hot reload.")); + return path; + }, _isChromium() { var t1 = type$.JSObject; return B.JSString_methods.contains$1(A._asString(t1._as(t1._as(self.window).navigator).vendor), "Google"); @@ -10299,7 +10030,7 @@ return input; }, toByteStream(stream) { - return new A.ByteStream(stream); + return stream; }, wrapFormatException($name, value, body, $T) { var error, error0, t1, exception; @@ -11405,7 +11136,7 @@ call$0() { return A.Future_Future$value(null, type$.void); }, - $signature: 14 + $signature: 15 }; A.SentinelValue.prototype = {}; A.EfficientLengthIterable.prototype = {}; @@ -12273,7 +12004,7 @@ if (index < 0) return null; cell = bucket.splice(index, 1)[0]; - _this._unlinkCell$1(cell); + _this.__js_helper$_unlinkCell$1(cell); if (bucket.length === 0) delete rest[hash]; return cell.hashMapCellValue; @@ -12308,7 +12039,7 @@ cell = table[key]; if (cell == null) return null; - this._unlinkCell$1(cell); + this.__js_helper$_unlinkCell$1(cell); delete table[key]; return cell.hashMapCellValue; }, @@ -12331,7 +12062,7 @@ _this._modified$0(); return cell; }, - _unlinkCell$1(cell) { + __js_helper$_unlinkCell$1(cell) { var _this = this, previous = cell._previous, next = cell._next; @@ -12506,19 +12237,19 @@ call$1(o) { return this.getTag(o); }, - $signature: 6 + $signature: 4 }; A.initHooks_closure0.prototype = { call$2(o, tag) { return this.getUnknownTag(o, tag); }, - $signature: 67 + $signature: 36 }; A.initHooks_closure1.prototype = { call$1(tag) { return this.prototypeForTag(A._asString(tag)); }, - $signature: 57 + $signature: 34 }; A._Record.prototype = {}; A.JSSyntaxRegExp.prototype = { @@ -12741,20 +12472,11 @@ get$runtimeType(receiver) { return B.Type_ByteBuffer_rqD; }, - asUint8List$2(receiver, offsetInBytes, $length) { - return $length == null ? new Uint8Array(receiver, offsetInBytes) : new Uint8Array(receiver, offsetInBytes, $length); - }, $isTrustedGetRuntimeType: 1, $isNativeByteBuffer: 1, $isByteBuffer: 1 }; A.NativeTypedData.prototype = { - get$buffer(receiver) { - if (((receiver.$flags | 0) & 2) !== 0) - return new A._UnmodifiableNativeByteBufferView(receiver.buffer); - else - return receiver.buffer; - }, _invalidPosition$3(receiver, position, $length, $name) { var t1 = A.RangeError$range(position, 0, $length, $name, null); throw A.wrapException(t1); @@ -12764,14 +12486,6 @@ this._invalidPosition$3(receiver, position, $length, $name); } }; - A._UnmodifiableNativeByteBufferView.prototype = { - asUint8List$2(_, offsetInBytes, $length) { - var result = A.NativeUint8List_NativeUint8List$view(this.__native_typed_data$_data, offsetInBytes, $length); - result.$flags = 3; - return result; - }, - $isByteBuffer: 1 - }; A.NativeByteData.prototype = { get$runtimeType(receiver) { return B.Type_ByteData_9dB; @@ -13025,7 +12739,7 @@ t1.storedCallback = null; f.call$0(); }, - $signature: 3 + $signature: 6 }; A._AsyncRun__initializeScheduleImmediate_closure.prototype = { call$1(callback) { @@ -13035,7 +12749,7 @@ t2 = this.span; t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2); }, - $signature: 36 + $signature: 37 }; A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = { call$0() { @@ -13141,98 +12855,13 @@ call$2(error, stackTrace) { this.bodyFunction.call$2(1, new A.ExceptionAndStackTrace(error, type$.StackTrace._as(stackTrace))); }, - $signature: 37 + $signature: 55 }; A._wrapJsFunctionForAsync_closure.prototype = { call$2(errorCode, result) { this.$protected(A._asInt(errorCode), result); }, - $signature: 38 - }; - A._asyncStarHelper_closure.prototype = { - call$0() { - var t3, - t1 = this.controller, - t2 = t1.___AsyncStarStreamController_controller_A; - t2 === $ && A.throwLateFieldNI("controller"); - t3 = t2._state; - if ((t3 & 1) !== 0 ? (t2.get$_subscription()._state & 4) !== 0 : (t3 & 2) === 0) { - t1.isSuspended = true; - return; - } - t1 = t1.cancelationFuture != null ? 2 : 0; - this.bodyFunction.call$2(t1, null); - }, - $signature: 0 - }; - A._asyncStarHelper_closure0.prototype = { - call$1(__wc0_formal) { - var errorCode = this.controller.cancelationFuture != null ? 2 : 0; - this.bodyFunction.call$2(errorCode, null); - }, - $signature: 3 - }; - A._AsyncStarStreamController.prototype = { - _AsyncStarStreamController$1(body, $T) { - var _this = this, - t1 = new A._AsyncStarStreamController__resumeBody(body); - _this.___AsyncStarStreamController_controller_A = _this.$ti._eval$1("StreamController<1>")._as(A.StreamController_StreamController(new A._AsyncStarStreamController_closure(_this, body), new A._AsyncStarStreamController_closure0(t1), new A._AsyncStarStreamController_closure1(_this, t1), false, $T)); - } - }; - A._AsyncStarStreamController__resumeBody.prototype = { - call$0() { - A.scheduleMicrotask(new A._AsyncStarStreamController__resumeBody_closure(this.body)); - }, - $signature: 1 - }; - A._AsyncStarStreamController__resumeBody_closure.prototype = { - call$0() { - this.body.call$2(0, null); - }, - $signature: 0 - }; - A._AsyncStarStreamController_closure0.prototype = { - call$0() { - this._resumeBody.call$0(); - }, - $signature: 0 - }; - A._AsyncStarStreamController_closure1.prototype = { - call$0() { - var t1 = this.$this; - if (t1.isSuspended) { - t1.isSuspended = false; - this._resumeBody.call$0(); - } - }, - $signature: 0 - }; - A._AsyncStarStreamController_closure.prototype = { - call$0() { - var t1 = this.$this, - t2 = t1.___AsyncStarStreamController_controller_A; - t2 === $ && A.throwLateFieldNI("controller"); - if ((t2._state & 4) === 0) { - t1.cancelationFuture = new A._Future($.Zone__current, type$._Future_dynamic); - if (t1.isSuspended) { - t1.isSuspended = false; - A.scheduleMicrotask(new A._AsyncStarStreamController__closure(this.body)); - } - return t1.cancelationFuture; - } - }, - $signature: 39 - }; - A._AsyncStarStreamController__closure.prototype = { - call$0() { - this.body.call$2(2, null); - }, - $signature: 0 - }; - A._IterationMarker.prototype = { - toString$0(_) { - return "IterationMarker(" + this.state + ", " + A.S(this.value) + ")"; - } + $signature: 41 }; A.AsyncError.prototype = { toString$0(_) { @@ -13371,24 +13000,15 @@ this._addListener$1(new A._FutureListener(result, 19, f, onError, t1._eval$1("@<1>")._bind$1($E)._eval$1("_FutureListener<1,2>"))); return result; }, - catchError$2$test(onError, test) { - var t1, t2, result; - type$.nullable_bool_Function_Object._as(test); - t1 = this.$ti; - t2 = $.Zone__current; - result = new A._Future(t2, t1); - if (t2 !== B.C__RootZone) { + catchError$1(onError) { + var t1 = this.$ti, + t2 = $.Zone__current, + result = new A._Future(t2, t1); + if (t2 !== B.C__RootZone) onError = A._registerErrorHandler(onError, t2); - if (test != null) - test = t2.registerUnaryCallback$2$1(test, type$.bool, type$.Object); - } - t2 = test == null ? 2 : 6; - this._addListener$1(new A._FutureListener(result, t2, test, onError, t1._eval$1("_FutureListener<1,1>"))); + this._addListener$1(new A._FutureListener(result, 2, null, onError, t1._eval$1("_FutureListener<1,1>"))); return result; }, - catchError$1(onError) { - return this.catchError$2$test(onError, null); - }, whenComplete$1(action) { var t1, t2, result; type$.dynamic_Function._as(action); @@ -13631,7 +13251,7 @@ call$1(__wc0_formal) { this.joinedResult._completeWithResultOf$1(this.originalSource); }, - $signature: 3 + $signature: 6 }; A._Future__propagateToListeners_handleWhenCompleteCallback_closure0.prototype = { call$2(e, s) { @@ -13639,7 +13259,7 @@ type$.StackTrace._as(s); this.joinedResult._completeErrorObject$1(new A.AsyncError(e, s)); }, - $signature: 4 + $signature: 5 }; A._Future__propagateToListeners_handleValueCallback.prototype = { call$0() { @@ -13739,7 +13359,7 @@ this._future._completeErrorObject$1(new A.AsyncError(e, s)); } }, - $signature: 4 + $signature: 5 }; A._AsyncCallbackEntry.prototype = {}; A.Stream.prototype = { @@ -13813,10 +13433,10 @@ if ((_this._state & 8) === 0) return A._instanceType(_this)._eval$1("_PendingEvents<1>?")._as(_this._varData); t1 = A._instanceType(_this); - return t1._eval$1("_PendingEvents<1>?")._as(t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData)._varData); + return t1._eval$1("_PendingEvents<1>?")._as(t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData).get$_varData()); }, _ensurePendingEvents$0() { - var events, t1, state, _this = this; + var events, t1, _this = this; if ((_this._state & 8) === 0) { events = _this._varData; if (events == null) @@ -13824,16 +13444,13 @@ return A._instanceType(_this)._eval$1("_PendingEvents<1>")._as(events); } t1 = A._instanceType(_this); - state = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData); - events = state._varData; - if (events == null) - events = state._varData = new A._PendingEvents(t1._eval$1("_PendingEvents<1>")); + events = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData).get$_varData(); return t1._eval$1("_PendingEvents<1>")._as(events); }, get$_subscription() { var varData = this._varData; if ((this._state & 8) !== 0) - varData = type$._StreamControllerAddStreamState_nullable_Object._as(varData)._varData; + varData = type$._StreamControllerAddStreamState_nullable_Object._as(varData).get$_varData(); return A._instanceType(this)._eval$1("_ControllerSubscription<1>")._as(varData); }, _badEventState$0() { @@ -13841,31 +13458,6 @@ return new A.StateError("Cannot add event after closing"); return new A.StateError("Cannot add event while adding a stream"); }, - addStream$2$cancelOnError(source, cancelOnError) { - var t2, t3, t4, t5, t6, _this = this, - t1 = A._instanceType(_this); - t1._eval$1("Stream<1>")._as(source); - t2 = _this._state; - if (t2 >= 4) - throw A.wrapException(_this._badEventState$0()); - if ((t2 & 2) !== 0) { - t1 = new A._Future($.Zone__current, type$._Future_dynamic); - t1._asyncComplete$1(null); - return t1; - } - t2 = _this._varData; - t3 = cancelOnError === true; - t4 = new A._Future($.Zone__current, type$._Future_dynamic); - t5 = t1._eval$1("~(1)")._as(_this.get$_add()); - t6 = t3 ? A._AddStreamState_makeErrorHandler(_this) : _this.get$_addError(); - t6 = source.listen$4$cancelOnError$onDone$onError(t5, t3, _this.get$_close(), t6); - t3 = _this._state; - if ((t3 & 1) !== 0 ? (_this.get$_subscription()._state & 4) !== 0 : (t3 & 2) === 0) - t6.pause$0(); - _this._varData = new A._StreamControllerAddStreamState(t2, t4, t6, t1._eval$1("_StreamControllerAddStreamState<1>")); - _this._state |= 8; - return t4; - }, _ensureDoneFuture$0() { var t1 = this._doneFuture; if (t1 == null) @@ -13880,13 +13472,19 @@ _this._add$1(value); }, addError$2(error, stackTrace) { - var _0_0; + var _0_0, t1, _this = this; type$.Object._as(error); type$.nullable_StackTrace._as(stackTrace); - if (this._state >= 4) - throw A.wrapException(this._badEventState$0()); + if (_this._state >= 4) + throw A.wrapException(_this._badEventState$0()); _0_0 = A._interceptUserError(error, stackTrace); - this._addError$2(_0_0.error, _0_0.stackTrace); + error = _0_0.error; + stackTrace = _0_0.stackTrace; + t1 = _this._state; + if ((t1 & 1) !== 0) + _this._sendError$2(error, stackTrace); + else if ((t1 & 3) === 0) + _this._ensurePendingEvents$0().add$1(0, new A._DelayedError(error, stackTrace)); }, addError$1(error) { return this.addError$2(error, null); @@ -13918,23 +13516,6 @@ else if ((t2 & 3) === 0) _this._ensurePendingEvents$0().add$1(0, new A._DelayedData(value, t1._eval$1("_DelayedData<1>"))); }, - _addError$2(error, stackTrace) { - var t1; - type$.Object._as(error); - type$.StackTrace._as(stackTrace); - t1 = this._state; - if ((t1 & 1) !== 0) - this._sendError$2(error, stackTrace); - else if ((t1 & 3) === 0) - this._ensurePendingEvents$0().add$1(0, new A._DelayedError(error, stackTrace)); - }, - _close$0() { - var _this = this, - addState = A._instanceType(_this)._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData); - _this._varData = addState._varData; - _this._state &= 4294967287; - addState.addStreamFuture._asyncComplete$1(null); - }, _subscribe$4(onData, onError, onDone, cancelOnError) { var t2, t3, t4, t5, t6, t7, subscription, pendingEvents, addState, _this = this, t1 = A._instanceType(_this); @@ -13952,8 +13533,8 @@ pendingEvents = _this.get$_pendingEvents(); if (((_this._state |= 1) & 8) !== 0) { addState = t1._eval$1("_StreamControllerAddStreamState<1>")._as(_this._varData); - addState._varData = subscription; - addState.addSubscription.resume$0(); + addState.set$_varData(subscription); + addState.resume$0(); } else _this._varData = subscription; subscription._setPendingEvents$1(pendingEvents); @@ -14062,7 +13643,7 @@ t2 = A._instanceType(t1); t2._eval$1("StreamSubscription<1>")._as(this); if ((t1._state & 8) !== 0) - t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).addSubscription.pause$0(); + t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).pause$0(); A._runGuarded(t1.onPause); }, _onResume$0() { @@ -14070,7 +13651,7 @@ t2 = A._instanceType(t1); t2._eval$1("StreamSubscription<1>")._as(this); if ((t1._state & 8) !== 0) - t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).addSubscription.resume$0(); + t2._eval$1("_StreamControllerAddStreamState<1>")._as(t1._varData).resume$0(); A._runGuarded(t1.onResume); } }; @@ -14080,27 +13661,6 @@ }, $isStreamSink: 1 }; - A._AddStreamState.prototype = { - cancel$0() { - var cancel = this.addSubscription.cancel$0(); - return cancel.whenComplete$1(new A._AddStreamState_cancel_closure(this)); - } - }; - A._AddStreamState_makeErrorHandler_closure.prototype = { - call$2(e, s) { - var t1 = this.controller; - t1._addError$2(type$.Object._as(e), type$.StackTrace._as(s)); - t1._close$0(); - }, - $signature: 4 - }; - A._AddStreamState_cancel_closure.prototype = { - call$0() { - this.$this.addStreamFuture._asyncComplete$1(null); - }, - $signature: 1 - }; - A._StreamControllerAddStreamState.prototype = {}; A._BufferingStreamSubscription.prototype = { _setPendingEvents$1(pendingEvents) { var _this = this; @@ -14347,7 +13907,7 @@ else t1._completeErrorObject$1(new A.AsyncError(error, stackTrace)); }, - $signature: 4 + $signature: 5 }; A._BufferingStreamSubscription_asFuture__closure.prototype = { call$0() { @@ -15110,7 +14670,7 @@ t2._processUncaughtError$3(zone, type$.Object._as(e), t1._as(s)); } }, - $signature: 53 + $signature: 45 }; A._HashMap.prototype = { get$length(_) { @@ -15332,7 +14892,7 @@ call$1(v) { return this.K._is(v); }, - $signature: 11 + $signature: 12 }; A._HashMapKeyIterable.prototype = { get$length(_) { @@ -15413,7 +14973,7 @@ call$1(v) { return this.K._is(v); }, - $signature: 11 + $signature: 12 }; A._HashSet.prototype = { get$iterator(_) { @@ -15669,6 +15229,26 @@ } return true; }, + remove$1(_, object) { + var t1 = this._remove$1(object); + return t1; + }, + _remove$1(object) { + var hash, bucket, index, cell, _this = this, + rest = _this._collection$_rest; + if (rest == null) + return false; + hash = _this._computeHashCode$1(object); + bucket = rest[hash]; + index = _this._findBucketIndex$2(bucket, object); + if (index < 0) + return false; + cell = bucket.splice(index, 1)[0]; + if (0 === bucket.length) + delete rest[hash]; + _this._unlinkCell$1(cell); + return true; + }, _collection$_addHashTableEntry$2(table, element) { A._instanceType(this)._precomputed1._as(element); if (type$.nullable__LinkedHashSetCell._as(table[element]) != null) @@ -15676,17 +15256,39 @@ table[element] = this._collection$_newLinkedCell$1(element); return true; }, + _collection$_modified$0() { + this._collection$_modifications = this._collection$_modifications + 1 & 1073741823; + }, _collection$_newLinkedCell$1(element) { - var _this = this, + var t1, _this = this, cell = new A._LinkedHashSetCell(A._instanceType(_this)._precomputed1._as(element)); if (_this._collection$_first == null) _this._collection$_first = _this._collection$_last = cell; - else - _this._collection$_last = _this._collection$_last._collection$_next = cell; + else { + t1 = _this._collection$_last; + t1.toString; + cell._collection$_previous = t1; + _this._collection$_last = t1._collection$_next = cell; + } ++_this._collection$_length; - _this._collection$_modifications = _this._collection$_modifications + 1 & 1073741823; + _this._collection$_modified$0(); return cell; }, + _unlinkCell$1(cell) { + var _this = this, + previous = cell._collection$_previous, + next = cell._collection$_next; + if (previous == null) + _this._collection$_first = next; + else + previous._collection$_next = next; + if (next == null) + _this._collection$_last = previous; + else + next._collection$_previous = previous; + --_this._collection$_length; + _this._collection$_modified$0(); + }, _computeHashCode$1(element) { return J.get$hashCode$(element) & 1073741823; }, @@ -15739,7 +15341,7 @@ call$2(k, v) { this.result.$indexSet(0, this.K._as(k), this.V._as(v)); }, - $signature: 23 + $signature: 29 }; A.ListBase.prototype = { get$iterator(receiver) { @@ -15929,7 +15531,7 @@ t2 = A.S(v); t1._contents += t2; }, - $signature: 24 + $signature: 31 }; A._UnmodifiableMapMixin.prototype = { $indexSet(_, key, value) { @@ -16580,7 +16182,7 @@ } return null; }, - $signature: 25 + $signature: 21 }; A._Utf8Decoder__decoderNonfatal_closure.prototype = { call$0() { @@ -16592,7 +16194,7 @@ } return null; }, - $signature: 25 + $signature: 21 }; A.AsciiCodec.prototype = { encode$1(source) { @@ -17095,7 +16697,7 @@ B.JSArray_methods.$indexSet(t1, t2.i++, key); B.JSArray_methods.$indexSet(t1, t2.i++, value); }, - $signature: 24 + $signature: 31 }; A._JsonStringStringifier.prototype = { get$_partialResult() { @@ -17785,7 +17387,7 @@ hash ^= hash >>> 11; return hash + ((hash & 16383) << 15) & 536870911; }, - $signature: 27 + $signature: 22 }; A.DateTime.prototype = { $eq(_, other) { @@ -18195,13 +17797,13 @@ call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv4 address, " + msg, this.host, position)); }, - $signature: 42 + $signature: 60 }; A.Uri_parseIPv6Address_error.prototype = { call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv6 address, " + msg, this.host, position)); }, - $signature: 51 + $signature: 38 }; A.Uri_parseIPv6Address_parseHex.prototype = { call$2(start, end) { @@ -18514,7 +18116,7 @@ call$1(s) { return A._Uri__uriEncode(64, A._asString(s), B.C_Utf8Codec, false); }, - $signature: 12 + $signature: 13 }; A.UriData.prototype = { get$uri() { @@ -18840,14 +18442,14 @@ var t1 = type$.JavaScriptFunction; this._this.then$1$2$onError(new A.FutureOfVoidToJSPromise_get_toJS__closure(t1._as(resolve)), new A.FutureOfVoidToJSPromise_get_toJS__closure0(t1._as(reject)), type$.nullable_Object); }, - $signature: 62 + $signature: 48 }; A.FutureOfVoidToJSPromise_get_toJS__closure.prototype = { call$1(__wc0_formal) { var t1 = this.resolve; return t1.call(t1); }, - $signature: 64 + $signature: 49 }; A.FutureOfVoidToJSPromise_get_toJS__closure0.prototype = { call$2(error, stackTrace) { @@ -18866,7 +18468,7 @@ t2 = this.reject; t2.call(t2, t1); }, - $signature: 4 + $signature: 5 }; A.jsify__convert.prototype = { call$1(o) { @@ -18892,7 +18494,7 @@ } else return o; }, - $signature: 13 + $signature: 14 }; A.promiseToFuture_closure.prototype = { call$1(r) { @@ -18958,7 +18560,7 @@ } return o; }, - $signature: 13 + $signature: 14 }; A.NullRejectionException.prototype = { toString$0(_) { @@ -18969,44 +18571,10 @@ A._JSRandom.prototype = { nextInt$1(max) { if (max <= 0 || max > 4294967296) - throw A.wrapException(A.RangeError$(string$.max_mu + max)); + throw A.wrapException(A.RangeError$("max must be in range 0 < max \u2264 2^32, was " + max)); return Math.random() * max >>> 0; - } - }; - A._JSSecureRandom.prototype = { - _JSSecureRandom$0() { - var $crypto = self.crypto; - if ($crypto != null) - if ($crypto.getRandomValues != null) - return; - throw A.wrapException(A.UnsupportedError$("No source of cryptographically secure random numbers available.")); }, - nextInt$1(max) { - var byteCount, t1, start, randomLimit, t2, t3, random, result; - if (max <= 0 || max > 4294967296) - throw A.wrapException(A.RangeError$(string$.max_mu + max)); - if (max > 255) - if (max > 65535) - byteCount = max > 16777215 ? 4 : 3; - else - byteCount = 2; - else - byteCount = 1; - t1 = this._math$_buffer; - t1.$flags & 2 && A.throwUnsupportedOperation(t1, 11); - t1.setUint32(0, 0, false); - start = 4 - byteCount; - randomLimit = A._asInt(Math.pow(256, byteCount)); - for (t2 = max - 1, t3 = (max & t2) >>> 0 === 0; true;) { - crypto.getRandomValues(J.asUint8List$2$x(B.NativeByteData_methods.get$buffer(t1), start, byteCount)); - random = t1.getUint32(0, false); - if (t3) - return (random & t2) >>> 0; - result = random % max; - if (random - result + max < randomLimit) - return result; - } - } + $isRandom: 1 }; A.AsyncMemoizer.prototype = {}; A.DelegatingStreamSink.prototype = { @@ -19115,7 +18683,7 @@ type$.StackTrace._as(stackTrace); this.$this._addResult$1(new A.ErrorResult(error, stackTrace)); }, - $signature: 4 + $signature: 5 }; A.StreamQueue__ensureListening_closure0.prototype = { call$0() { @@ -19169,7 +18737,7 @@ call$2(h, i) { return A._combine(A._asInt(h), J.get$hashCode$(i)); }, - $signature: 68 + $signature: 62 }; A.BuiltList.prototype = { toBuilder$0() { @@ -19378,7 +18946,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 6 + $signature: 4 }; A.BuiltListMultimap_hashCode_closure.prototype = { call$1(key) { @@ -19535,7 +19103,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 6 + $signature: 4 }; A.BuiltMap.prototype = { toBuilder$0() { @@ -19601,7 +19169,7 @@ call$1(k) { return this.map.$index(0, k); }, - $signature: 6 + $signature: 4 }; A.BuiltMap_hashCode_closure.prototype = { call$1(key) { @@ -19719,7 +19287,7 @@ var t1 = this.$this.$ti; this.replacement.$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value)); }, - $signature: 23 + $signature: 29 }; A.BuiltSet.prototype = { get$hashCode(_) { @@ -20081,7 +19649,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 6 + $signature: 4 }; A.EnumClass.prototype = { toString$0(_) { @@ -20097,7 +19665,7 @@ $._indentingBuiltValueToStringHelperIndent = $._indentingBuiltValueToStringHelperIndent + 2; return new A.IndentingBuiltValueToStringHelper(t1); }, - $signature: 72 + $signature: 65 }; A.IndentingBuiltValueToStringHelper.prototype = { add$2(_, field, value) { @@ -20230,34 +19798,34 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.Object); }, - $signature: 90 + $signature: 69 }; A.Serializers_Serializers_closure0.prototype = { call$0() { var t1 = type$.Object; return A.ListMultimapBuilder_ListMultimapBuilder(t1, t1); }, - $signature: 91 + $signature: 87 }; A.Serializers_Serializers_closure1.prototype = { call$0() { var t1 = type$.Object; return A.MapBuilder_MapBuilder(t1, t1); }, - $signature: 34 + $signature: 88 }; A.Serializers_Serializers_closure2.prototype = { call$0() { return A.SetBuilder_SetBuilder(type$.Object); }, - $signature: 35 + $signature: 51 }; A.Serializers_Serializers_closure3.prototype = { call$0() { var t1 = type$.Object; return A.SetMultimapBuilder_SetMultimapBuilder(t1, t1); }, - $signature: 33 + $signature: 35 }; A.FullType.prototype = { $eq(_, other) { @@ -20671,13 +20239,13 @@ call$1(value) { return this.serializers.serialize$2$specifiedType(value, this.valueType); }, - $signature: 5 + $signature: 3 }; A.BuiltListMultimapSerializer_deserialize_closure.prototype = { call$1(value) { return this.serializers.deserialize$2$specifiedType(value, this.valueType); }, - $signature: 13 + $signature: 14 }; A.BuiltListSerializer.prototype = { serialize$3$specifiedType(serializers, builtList, specifiedType) { @@ -20735,13 +20303,13 @@ call$1(item) { return this.serializers.serialize$2$specifiedType(item, this.elementType); }, - $signature: 5 + $signature: 3 }; A.BuiltListSerializer_deserialize_closure.prototype = { call$1(item) { return this.serializers.deserialize$2$specifiedType(item, this.elementType); }, - $signature: 5 + $signature: 3 }; A.BuiltMapSerializer.prototype = { serialize$3$specifiedType(serializers, builtMap, specifiedType) { @@ -20941,13 +20509,13 @@ call$1(value) { return this.serializers.serialize$2$specifiedType(value, this.valueType); }, - $signature: 5 + $signature: 3 }; A.BuiltSetMultimapSerializer_deserialize_closure.prototype = { call$1(value) { return this.serializers.deserialize$2$specifiedType(value, this.valueType); }, - $signature: 5 + $signature: 3 }; A.BuiltSetSerializer.prototype = { serialize$3$specifiedType(serializers, builtSet, specifiedType) { @@ -21005,13 +20573,13 @@ call$1(item) { return this.serializers.serialize$2$specifiedType(item, this.elementType); }, - $signature: 5 + $signature: 3 }; A.BuiltSetSerializer_deserialize_closure.prototype = { call$1(item) { return this.serializers.deserialize$2$specifiedType(item, this.elementType); }, - $signature: 5 + $signature: 3 }; A.DateTimeSerializer.prototype = { serialize$3$specifiedType(serializers, dateTime, specifiedType) { @@ -23531,13 +23099,13 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.DebugEvent); }, - $signature: 40 + $signature: 39 }; A._$serializers_closure0.prototype = { call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.ExtensionEvent); }, - $signature: 41 + $signature: 40 }; A.BatchedStreamController.prototype = { _batchAndSendEvents$0() { @@ -23644,13 +23212,13 @@ call$0() { return true; }, - $signature: 28 + $signature: 25 }; A.BatchedStreamController__hasEventDuring_closure.prototype = { call$0() { return false; }, - $signature: 28 + $signature: 25 }; A.SocketClient.prototype = {}; A.SseSocketClient.prototype = { @@ -23692,14 +23260,14 @@ call$1(o) { return J.toString$0$(o); }, - $signature: 43 + $signature: 42 }; A.safeUnawaited_closure.prototype = { call$2(error, stackTrace) { type$.StackTrace._as(stackTrace); return $.$get$_logger().log$4(B.Level_WARNING_900, "Error in unawaited Future:", error, stackTrace); }, - $signature: 21 + $signature: 24 }; A.Int32.prototype = { _toInt$1(val) { @@ -23868,34 +23436,26 @@ call$2(key1, key2) { return A._asString(key1).toLowerCase() === A._asString(key2).toLowerCase(); }, - $signature: 44 + $signature: 43 }; A.BaseRequest_closure0.prototype = { call$1(key) { return B.JSString_methods.get$hashCode(A._asString(key).toLowerCase()); }, - $signature: 45 + $signature: 44 }; A.BaseResponse.prototype = { BaseResponse$7$contentLength$headers$isRedirect$persistentConnection$reasonPhrase$request(statusCode, contentLength, headers, isRedirect, persistentConnection, reasonPhrase, request) { var t1 = this.statusCode; if (t1 < 100) throw A.wrapException(A.ArgumentError$("Invalid status code " + t1 + ".", null)); - else { - t1 = this.contentLength; - if (t1 != null && t1 < 0) - throw A.wrapException(A.ArgumentError$("Invalid content length " + A.S(t1) + ".", null)); - } } }; A.BrowserClient.prototype = { send$1(request) { - return this.send$body$BrowserClient(request); - }, - send$body$BrowserClient(request) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.StreamedResponse), - $async$returnValue, $async$handler = 2, $async$errorStack = [], $async$self = this, bodyBytes, t1, _0_0, contentLength, header, response, contentLengthHeader, contentLength0, headers, e, st, t2, t3, t4, _this, t5, t6, t7, t8, t9, result, exception, $async$exception; + $async$returnValue, $async$handler = 2, $async$errorStack = [], $async$next = [], $async$self = this, xhr, completer, bytes, t1, t2, header, t3; var $async$send$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) { $async$errorStack.push($async$result); @@ -23906,95 +23466,54 @@ case 0: // Function start request.super$BaseRequest$finalize(); - t2 = type$._AsyncStreamController_List_int; - t3 = new A._AsyncStreamController(null, null, null, null, t2); - t3._add$1(request._bodyBytes); - t3._closeUnchecked$0(); $async$goto = 3; - return A._asyncAwait(new A.ByteStream(new A._ControllerStream(t3, t2._eval$1("_ControllerStream<1>"))).toBytes$0(), $async$send$1); + return A._asyncAwait(new A.ByteStream(A.Stream_Stream$value(request._bodyBytes, type$.List_int)).toBytes$0(), $async$send$1); case 3: // returning from await. - bodyBytes = $async$result; - $async$handler = 5; - t2 = type$.JSObject; - t3 = t2._as(self.window); - t4 = request.url; - _this = t4.toString$0(0); - t5 = !J.get$isEmpty$asx(bodyBytes) ? bodyBytes : null; - t6 = $async$self.withCredentials ? "include" : "same-origin"; - t7 = type$.String; - t1 = A.LinkedHashMap_LinkedHashMap$_empty(t7, type$.Object); - _0_0 = request._bodyBytes.length; - contentLength = null; - if (_0_0 != null) { - contentLength = _0_0; - J.$indexSet$ax(t1, "content-length", contentLength); - } - for (t8 = request.headers, t8 = new A.LinkedHashMapEntriesIterable(t8, A._instanceType(t8)._eval$1("LinkedHashMapEntriesIterable<1,2>")).get$iterator(0); t8.moveNext$0();) { - t9 = t8.__js_helper$_current; - t9.toString; - header = t9; - J.$indexSet$ax(t1, header.key, header.value); + bytes = $async$result; + xhr = type$.JSObject._as(new self.XMLHttpRequest()); + t1 = $async$self._xhrs; + t1.add$1(0, xhr); + t2 = xhr; + t2.open(request.method, request.url.toString$0(0), true); + t2.responseType = "arraybuffer"; + t2.withCredentials = $async$self.withCredentials; + for (t2 = request.headers, t2 = new A.LinkedHashMapEntriesIterable(t2, A._instanceType(t2)._eval$1("LinkedHashMapEntriesIterable<1,2>")).get$iterator(0); t2.moveNext$0();) { + header = t2.__js_helper$_current; + xhr.setRequestHeader(header.key, header.value); } - t1 = A.jsify(t1); - t1.toString; - t2._as(t1); - t8 = t2._as($async$self._abortController.signal); - $async$goto = 8; - return A._asyncAwait(A.promiseToFuture(t2._as(t3.fetch(_this, {method: request.method, headers: t1, body: t5, credentials: t6, redirect: "follow", signal: t8})), t2), $async$send$1); - case 8: - // returning from await. - response = $async$result; - contentLengthHeader = A._asStringQ(t2._as(response.headers).get("content-length")); - contentLength0 = contentLengthHeader != null ? A.Primitives_parseInt(contentLengthHeader, null) : null; - if (contentLength0 == null && contentLengthHeader != null) { - t1 = A.ClientException$("Invalid content-length header [" + A.S(contentLengthHeader) + "].", t4); - throw A.wrapException(t1); - } - headers = A.LinkedHashMap_LinkedHashMap$_empty(t7, t7); - t1 = t2._as(response.headers); - t2 = new A.BrowserClient_send_closure(headers); - if (typeof t2 == "function") - A.throwExpression(A.ArgumentError$("Attempting to rewrap a JS function.", null)); - result = function(_call, f) { - return function(arg1, arg2, arg3) { - return _call(f, arg1, arg2, arg3, arguments.length); - }; - }(A._callDartFunctionFast3, t2); - result[$.$get$DART_CLOSURE_PROPERTY_NAME()] = t2; - t1.forEach(result); - t1 = A._readBody(request, response); - t2 = A._asInt(response.status); - t3 = headers; - t4 = contentLength0; - A.Uri_parse(A._asString(response.url)); - t5 = A._asString(response.statusText); - t1 = new A.StreamedResponseV2(A.toByteStream(t1), request, t2, t5, t4, t3, false, true); - t1.BaseResponse$7$contentLength$headers$isRedirect$persistentConnection$reasonPhrase$request(t2, t4, t3, false, true, t5, request); - $async$returnValue = t1; - // goto return - $async$goto = 1; - break; - $async$handler = 2; - // goto after finally - $async$goto = 7; - break; - case 5: - // catch + completer = new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_StreamedResponse), type$._AsyncCompleter_StreamedResponse); + t2 = type$._EventStream_JSObject; + t3 = type$.void; + new A._EventStream(xhr, "load", false, t2).get$first(0).then$1$1(new A.BrowserClient_send_closure(xhr, completer, request), t3); + new A._EventStream(xhr, "error", false, t2).get$first(0).then$1$1(new A.BrowserClient_send_closure0(completer, request), t3); + xhr.send(bytes); $async$handler = 4; - $async$exception = $async$errorStack.pop(); - e = A.unwrapException($async$exception); - st = A.getTraceFromException($async$exception); - A._rethrowAsClientException(e, st, request); - // goto after finally $async$goto = 7; + return A._asyncAwait(completer.future, $async$send$1); + case 7: + // returning from await. + t2 = $async$result; + $async$returnValue = t2; + $async$next = [1]; + // goto finally + $async$goto = 5; + break; + $async$next.push(6); + // goto finally + $async$goto = 5; break; case 4: // uncaught - // goto rethrow - $async$goto = 2; + $async$next = [2]; + case 5: + // finally + $async$handler = 2; + t1.remove$1(0, xhr); + // goto the next finally handler + $async$goto = $async$next.pop(); break; - case 7: + case 6: // after finally case 1: // return @@ -24008,27 +23527,42 @@ } }; A.BrowserClient_send_closure.prototype = { - call$3(value, header, _) { - A._asString(value); - this.headers.$indexSet(0, A._asString(header).toLowerCase(), value); - }, - call$2(value, header) { - return this.call$3(value, header, null); - }, - $signature: 46 - }; - A._readBody_closure.prototype = { call$1(_) { - return null; + var t1, _0_0, t2, body, responseUrl, t3, t4, t5, t6, _this = this; + type$.JSObject._as(_); + t1 = _this.xhr; + _0_0 = A._extension_0_get_responseHeaders(t1).$index(0, "content-length"); + t2 = false; + if (_0_0 != null) { + t2 = $.$get$_digitRegex(); + t2 = !t2._nativeRegExp.test(_0_0); + } + if (t2) { + _this.completer.completeError$1(new A.ClientException("Invalid content-length header [" + A.S(_0_0) + "].", _this.request.url)); + return; + } + body = A.NativeUint8List_NativeUint8List$view(type$.NativeByteBuffer._as(t1.response), 0, null); + responseUrl = A._asString(t1.responseURL); + if (responseUrl.length !== 0) + A.Uri_parse(responseUrl); + t2 = A.Stream_Stream$value(body, type$.List_int); + t3 = A._asInt(t1.status); + t4 = body.length; + t5 = _this.request; + t6 = A._extension_0_get_responseHeaders(t1); + t1 = A._asString(t1.statusText); + t2 = new A.StreamedResponseV2(A.toByteStream(new A.ByteStream(t2)), t5, t3, t1, t4, t6, false, true); + t2.BaseResponse$7$contentLength$headers$isRedirect$persistentConnection$reasonPhrase$request(t3, t4, t6, false, true, t1, t5); + _this.completer.complete$1(t2); }, - $signature: 3 + $signature: 7 }; - A._readBody_closure0.prototype = { + A.BrowserClient_send_closure0.prototype = { call$1(_) { - type$.Object._as(_); - return this._box_0.isError; + type$.JSObject._as(_); + this.completer.completeError$2(new A.ClientException("XMLHttpRequest error.", this.request.url), A.StackTrace_current()); }, - $signature: 47 + $signature: 7 }; A.ByteStream.prototype = { toBytes$0() { @@ -24043,7 +23577,7 @@ call$1(bytes) { return this.completer.complete$1(new Uint8Array(A._ensureNativeList(type$.List_int._as(bytes)))); }, - $signature: 48 + $signature: 46 }; A.ClientException.prototype = { toString$0(_) { @@ -24131,7 +23665,7 @@ scanner.expectDone$0(); return A.MediaType$(t4, t5, parameters); }, - $signature: 49 + $signature: 47 }; A.MediaType_toString_closure.prototype = { call$2(attribute, value) { @@ -24150,13 +23684,13 @@ } else t1._contents = t3 + value; }, - $signature: 50 + $signature: 33 }; A.MediaType_toString__closure.prototype = { call$1(match) { return "\\" + A.S(match.$index(0, 0)); }, - $signature: 29 + $signature: 27 }; A.expectQuotedString_closure.prototype = { call$1(match) { @@ -24164,7 +23698,7 @@ t1.toString; return t1; }, - $signature: 29 + $signature: 27 }; A.Level.prototype = { $eq(_, other) { @@ -24212,7 +23746,7 @@ var record, _this = this, t1 = logLevel.value; if (t1 >= _this.get$level().value) { - if ((stackTrace == null || stackTrace === B._StringStackTrace_OdL) && t1 >= 2000) { + if (stackTrace == null && t1 >= 2000) { A.StackTrace_current(); if (error == null) logLevel.toString$0(0); @@ -24253,7 +23787,7 @@ $parent._children.$indexSet(0, thisName, t1); return t1; }, - $signature: 52 + $signature: 50 }; A.Context.prototype = { absolute$15(part1, part2, part3, part4, part5, part6, part7, part8, part9, part10, part11, part12, part13, part14, part15) { @@ -24486,20 +24020,20 @@ call$1(part) { return A._asString(part) !== ""; }, - $signature: 22 + $signature: 20 }; A.Context_split_closure.prototype = { call$1(part) { return A._asString(part).length !== 0; }, - $signature: 22 + $signature: 20 }; A._validateArgList_closure.prototype = { call$1(arg) { A._asStringQ(arg); return arg == null ? "null" : '"' + arg + '"'; }, - $signature: 54 + $signature: 52 }; A.InternalStyle.prototype = { getRoot$1(path) { @@ -24955,7 +24489,7 @@ var t1 = this.$this; t1._onReleaseCompleters.removeFirst$0().complete$1(new A.PoolResource(t1)); }, - $signature: 3 + $signature: 6 }; A.Pool__runOnRelease_closure0.prototype = { call$2(error, stackTrace) { @@ -24963,7 +24497,7 @@ type$.StackTrace._as(stackTrace); this.$this._onReleaseCompleters.removeFirst$0().completeError$2(error, stackTrace); }, - $signature: 4 + $signature: 5 }; A.PoolResource.prototype = {}; A.SourceFile.prototype = { @@ -25396,7 +24930,7 @@ call$0() { return this.color; }, - $signature: 55 + $signature: 53 }; A.Highlighter$__closure.prototype = { call$1(line) { @@ -25404,34 +24938,34 @@ t2 = A._arrayInstanceType(t1); return new A.WhereIterable(t1, t2._eval$1("bool(1)")._as(new A.Highlighter$___closure()), t2._eval$1("WhereIterable<1>")).get$length(0); }, - $signature: 56 + $signature: 54 }; A.Highlighter$___closure.prototype = { call$1(highlight) { var t1 = type$._Highlight._as(highlight).span; return t1.get$start().get$line() !== t1.get$end().get$line(); }, - $signature: 17 + $signature: 18 }; A.Highlighter$__closure0.prototype = { call$1(line) { return type$._Line._as(line).url; }, - $signature: 58 + $signature: 56 }; A.Highlighter__collateLines_closure.prototype = { call$1(highlight) { var t1 = type$._Highlight._as(highlight).span.get$sourceUrl(); return t1 == null ? new A.Object() : t1; }, - $signature: 59 + $signature: 57 }; A.Highlighter__collateLines_closure0.prototype = { call$2(highlight1, highlight2) { var t1 = type$._Highlight; return t1._as(highlight1).span.compareTo$1(0, t1._as(highlight2).span); }, - $signature: 60 + $signature: 58 }; A.Highlighter__collateLines_closure1.prototype = { call$1(entry) { @@ -25474,20 +25008,20 @@ } return lines; }, - $signature: 61 + $signature: 59 }; A.Highlighter__collateLines__closure.prototype = { call$1(highlight) { return type$._Highlight._as(highlight).span.get$end().get$line() < this.line.number; }, - $signature: 17 + $signature: 18 }; A.Highlighter_highlight_closure.prototype = { call$1(highlight) { type$._Highlight._as(highlight); return true; }, - $signature: 17 + $signature: 18 }; A.Highlighter__writeFileStart_closure.prototype = { call$0() { @@ -25588,7 +25122,7 @@ t4 = B.JSString_methods.$mul("^", Math.max(endColumn + (tabsBefore + tabsInside) * 3 - startColumn, 1)); return (t2._contents += t4).length - t3.length; }, - $signature: 30 + $signature: 28 }; A.Highlighter__writeIndicator_closure0.prototype = { call$0() { @@ -25609,7 +25143,7 @@ t1._writeArrow$3$beginning(_this.line, Math.max(_this.highlight.span.get$end().get$column() - 1, 0), false); return t2._contents.length - t3.length; }, - $signature: 30 + $signature: 28 }; A.Highlighter__writeSidebar_closure.prototype = { call$0() { @@ -25645,7 +25179,7 @@ } return A._Highlight__normalizeEndOfLine(A._Highlight__normalizeTrailingNewline(A._Highlight__normalizeNewlines(t1))); }, - $signature: 63 + $signature: 61 }; A._Line.prototype = { toString$0(_) { @@ -26014,34 +25548,34 @@ }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 66 + $signature: 64 }; A.generateUuidV4_generateBits.prototype = { call$1(bitCount) { return this.random.nextInt$1(B.JSInt_methods._shlPositive$1(1, bitCount)); }, - $signature: 27 + $signature: 22 }; A.generateUuidV4_printDigits.prototype = { call$2(value, count) { return B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(value, 16), count, "0"); }, - $signature: 31 + $signature: 30 }; A.generateUuidV4_bitsDigits.prototype = { call$2(bitCount, digitCount) { return this.printDigits.call$2(this.generateBits.call$1(bitCount), digitCount); }, - $signature: 31 + $signature: 30 }; A.GuaranteeChannel.prototype = { GuaranteeChannel$3$allowSinkErrors(innerSink, allowSinkErrors, _box_0, $T) { var _this = this, t1 = _this.$ti, - t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_void), type$._AsyncCompleter_void), allowSinkErrors, $T._eval$1("_GuaranteeSink<0>"))); + t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_dynamic), type$._AsyncCompleter_dynamic), allowSinkErrors, $T._eval$1("_GuaranteeSink<0>"))); _this.__GuaranteeChannel__sink_F !== $ && A.throwLateFieldAI("_sink"); _this.__GuaranteeChannel__sink_F = t2; - t1 = t1._eval$1("StreamController<1>")._as(A.StreamController_StreamController(null, new A.GuaranteeChannel_closure(_box_0, _this, $T), null, true, $T)); + t1 = t1._eval$1("StreamController<1>")._as(A.StreamController_StreamController(null, new A.GuaranteeChannel_closure(_box_0, _this, $T), true, $T)); _this.__GuaranteeChannel__streamController_F !== $ && A.throwLateFieldAI("_streamController"); _this.__GuaranteeChannel__streamController_F = t1; }, @@ -26136,7 +25670,7 @@ A._GuaranteeSink__addError_closure.prototype = { call$1(_) { }, - $signature: 3 + $signature: 6 }; A.StreamChannelController.prototype = {}; A.StreamChannelMixin.prototype = {$isStreamChannel: 1}; @@ -26211,30 +25745,30 @@ } }; A.RNG.prototype = {}; - A.CryptoRNG.prototype = { + A.MathRNG.prototype = { _generateInternal$0() { - var i, k, t1, t2, + var t1, i, k, t2, t3, b = new Uint8Array(16); - for (i = 0; i < 16; i += 4) { - k = $.$get$CryptoRNG__secureRandom().nextInt$1(B.JSNumber_methods.toInt$0(Math.pow(2, 32))); + for (t1 = this._rnd, i = 0; i < 16; i += 4) { + k = t1.nextInt$1(B.JSNumber_methods.toInt$0(Math.pow(2, 32))); if (!(i < 16)) return A.ioore(b, i); b[i] = k; - t1 = i + 1; - t2 = B.JSInt_methods._shrOtherPositive$1(k, 8); - if (!(t1 < 16)) - return A.ioore(b, t1); - b[t1] = t2; - t2 = i + 2; - t1 = B.JSInt_methods._shrOtherPositive$1(k, 16); + t2 = i + 1; + t3 = B.JSInt_methods._shrOtherPositive$1(k, 8); if (!(t2 < 16)) return A.ioore(b, t2); - b[t2] = t1; - t1 = i + 3; - t2 = B.JSInt_methods._shrOtherPositive$1(k, 24); - if (!(t1 < 16)) - return A.ioore(b, t1); - b[t1] = t2; + b[t2] = t3; + t3 = i + 2; + t2 = B.JSInt_methods._shrOtherPositive$1(k, 16); + if (!(t3 < 16)) + return A.ioore(b, t3); + b[t3] = t2; + t2 = i + 3; + t3 = B.JSInt_methods._shrOtherPositive$1(k, 24); + if (!(t2 < 16)) + return A.ioore(b, t2); + b[t2] = t3; } return b; } @@ -26472,7 +26006,7 @@ type$.JSObject._as(_); this.webSocketConnected.complete$1(this.browserSocket); }, - $signature: 18 + $signature: 7 }; A.BrowserWebSocket_connect_closure0.prototype = { call$1(e) { @@ -26484,7 +26018,7 @@ else this.browserSocket._browser_web_socket$_closed$2(1006, "error"); }, - $signature: 18 + $signature: 7 }; A.BrowserWebSocket_connect_closure1.prototype = { call$1(e) { @@ -26514,7 +26048,7 @@ t1.complete$1(this.browserSocket); this.browserSocket._browser_web_socket$_closed$2(A._asInt($event.code), A._asString($event.reason)); }, - $signature: 18 + $signature: 7 }; A.WebSocketEvent.prototype = {}; A.TextDataReceived.prototype = { @@ -26586,7 +26120,7 @@ A._asString(webSocket._webSocket.protocol); t2._readyCompleter.complete$0(); }, - $signature: 69 + $signature: 66 }; A.AdapterWebSocketChannel__closure.prototype = { call$1($event) { @@ -26622,7 +26156,7 @@ } } }, - $signature: 106 + $signature: 67 }; A.AdapterWebSocketChannel__closure0.prototype = { call$1(obj) { @@ -26668,7 +26202,7 @@ throw exception; } }, - $signature: 7 + $signature: 9 }; A.AdapterWebSocketChannel__closure1.prototype = { call$0() { @@ -26719,7 +26253,7 @@ }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 14 + $signature: 15 }; A.AdapterWebSocketChannel_closure0.prototype = { call$1(e) { @@ -26737,7 +26271,7 @@ t1 === $ && A.throwLateFieldNI("_sink"); t1.close$0(); }, - $signature: 71 + $signature: 103 }; A._WebSocketSink.prototype = {$isWebSocketSink: 1}; A.WebSocketChannelException.prototype = { @@ -26811,8 +26345,8 @@ t1.$dartReadyToRunMain = A._functionToJS0(new A.main__closure1(_box_0)); t3 = $.Zone__current; t4 = Math.max(100, 1); - t5 = A.StreamController_StreamController(null, null, null, false, type$.DebugEvent); - t6 = A.StreamController_StreamController(null, null, null, false, type$.List_DebugEvent); + t5 = A.StreamController_StreamController(null, null, false, type$.DebugEvent); + t6 = A.StreamController_StreamController(null, null, false, type$.List_DebugEvent); debugEventController = new A.BatchedStreamController(t4, 1000, t5, t6, new A._AsyncCompleter(new A._Future(t3, type$._Future_bool), type$._AsyncCompleter_bool), type$.BatchedStreamController_DebugEvent); t3 = A.List_List$filled(A.QueueList__computeInitialCapacity(null), null, false, type$.nullable_Result_DebugEvent); t4 = A.ListQueue$(type$._EventRequest_dynamic); @@ -26841,11 +26375,11 @@ }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 14 + $signature: 15 }; A.main__closure.prototype = { call$0() { - return A.FutureOfVoidToJSPromise_get_toJS(this.manager.hotReload$0()); + return A.FutureOfVoidToJSPromise_get_toJS(this.manager.hotReload$1(A.hotReloadSourcesPath())); }, $signature: 19 }; @@ -26865,7 +26399,7 @@ call$1(runId) { return this.call$2(runId, null); }, - $signature: 73 + $signature: 70 }; A.main__closure1.prototype = { call$0() { @@ -26892,7 +26426,7 @@ A._trySendEvent(t1, B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(t3._debug_event$_build$0()), null), type$.dynamic); } }, - $signature: 74 + $signature: 71 }; A.main___closure2.prototype = { call$1(b) { @@ -26901,7 +26435,7 @@ b.get$_debug_event$_$this().set$_events(t1); return t1; }, - $signature: 75 + $signature: 72 }; A.main__closure3.prototype = { call$2(kind, eventData) { @@ -26915,7 +26449,7 @@ A._trySendEvent(new A._StreamSinkWrapper(t1, A._instanceType(t1)._eval$1("_StreamSinkWrapper<1>")), t2._debug_event$_build$0(), type$.DebugEvent); } }, - $signature: 76 + $signature: 73 }; A.main___closure1.prototype = { call$1(b) { @@ -26925,7 +26459,7 @@ b.get$_debug_event$_$this()._eventData = this.eventData; return b; }, - $signature: 77 + $signature: 102 }; A.main__closure4.prototype = { call$1(eventData) { @@ -26937,7 +26471,7 @@ type$.nullable_void_Function_RegisterEventBuilder._as(new A.main___closure0(eventData)).call$1(t3); A._trySendEvent(t1, B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(t3._register_event$_build$0()), null), type$.dynamic); }, - $signature: 78 + $signature: 75 }; A.main___closure0.prototype = { call$1(b) { @@ -26946,7 +26480,7 @@ b.get$_register_event$_$this()._register_event$_eventData = this.eventData; return b; }, - $signature: 79 + $signature: 76 }; A.main__closure5.prototype = { call$0() { @@ -26972,7 +26506,7 @@ b.get$_devtools_request$_$this()._devtools_request$_instanceId = t1; return b; }, - $signature: 80 + $signature: 77 }; A.main__closure6.prototype = { call$1(serialized) { @@ -27024,7 +26558,7 @@ case 12: // then $async$goto = 14; - return A._asyncAwait($async$self.manager.hotReload$0(), $async$call$1); + return A._asyncAwait($async$self.manager.hotReload$1(A.hotReloadSourcesPath()), $async$call$1); case 14: // returning from await. case 13: @@ -27060,12 +26594,12 @@ }); return A._asyncStartSync($async$call$1, $async$completer); }, - $signature: 81 + $signature: 78 }; A.main__closure7.prototype = { call$1(error) { }, - $signature: 3 + $signature: 6 }; A.main__closure8.prototype = { call$1(e) { @@ -27089,7 +26623,7 @@ b.get$_connect_request$_$this()._entrypointPath = t1; return b; }, - $signature: 82 + $signature: 79 }; A.main_closure0.prototype = { call$2(error, stackTrace) { @@ -27097,7 +26631,7 @@ type$.StackTrace._as(stackTrace); A.print("Unhandled error detected in the injected client.js script.\n\nYou can disable this script in webdev by passing --no-injected-client if it\nis preventing your app from loading, but note that this will also prevent\nall debugging and hot reload/restart functionality from working.\n\nThe original error is below, please file an issue at\nhttps://github.com/dart-lang/webdev/issues/new and attach this output:\n\n" + A.S(error) + "\n" + stackTrace.toString$0(0) + "\n"); }, - $signature: 9 + $signature: 11 }; A._launchCommunicationWithDebugExtension_closure.prototype = { call$1(b) { @@ -27127,13 +26661,13 @@ b.get$_$this()._workspaceName = t1; return b; }, - $signature: 83 + $signature: 80 }; A._handleAuthRequest_closure.prototype = { call$1(isAuthenticated) { return A._dispatchEvent("dart-auth-response", "" + A._asBool(isAuthenticated)); }, - $signature: 84 + $signature: 81 }; A.DdcLibraryBundleRestarter.prototype = { restart$2$readyToRunMain$runId(readyToRunMain, runId) { @@ -27168,11 +26702,11 @@ }); return A._asyncStartSync($async$restart$2$readyToRunMain$runId, $async$completer); }, - reload$0() { + reload$1(hotReloadSourcesPath) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), t4, srcLibraries, filesToLoad, librariesToReload, t5, t6, srcLibraryCast, t7, t1, t2, t3, xhr, $async$temp1, $async$temp2, $async$temp3; - var $async$reload$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { + var $async$reload$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); while (true) @@ -27185,14 +26719,14 @@ xhr = t3._as(new t2.XMLHttpRequest()); xhr.withCredentials = true; xhr.onreadystatechange = A._functionToJS0(new A.DdcLibraryBundleRestarter_reload_closure(xhr, new A._AsyncCompleter(t1, type$._AsyncCompleter_String))); - xhr.open("GET", A._asString(t2.$reloadScriptsPath), true); + xhr.open("GET", hotReloadSourcesPath, true); xhr.send(); t4 = type$.List_dynamic; $async$temp1 = J; $async$temp2 = t4; $async$temp3 = B.C_JsonCodec; $async$goto = 2; - return A._asyncAwait(t1, $async$reload$0); + return A._asyncAwait(t1, $async$reload$1); case 2: // returning from await. srcLibraries = $async$temp1.cast$1$0$ax($async$temp2._as($async$temp3.decode$1($async$result)), type$.Map_dynamic_dynamic); @@ -27206,18 +26740,18 @@ librariesToReload.push(t7.get$current()); } $async$goto = 3; - return A._asyncAwait(A.promiseToFuture(t3._as(t3._as(t2.dartDevEmbedder).hotReload(filesToLoad, librariesToReload)), type$.nullable_Object), $async$reload$0); + return A._asyncAwait(A.promiseToFuture(t3._as(t3._as(t2.dartDevEmbedder).hotReload(filesToLoad, librariesToReload)), type$.nullable_Object), $async$reload$1); case 3: // returning from await. $async$goto = 4; - return A._asyncAwait(A._Debugger_maybeInvokeFlutterReassemble(t3._as(t3._as(t2.dartDevEmbedder).debugger)), $async$reload$0); + return A._asyncAwait(A._Debugger_maybeInvokeFlutterReassemble(t3._as(t3._as(t2.dartDevEmbedder).debugger)), $async$reload$1); case 4: // returning from await. // implicit return return A._asyncReturn(null, $async$completer); } }); - return A._asyncStartSync($async$reload$0, $async$completer); + return A._asyncStartSync($async$reload$1, $async$completer); }, $isRestarter: 1 }; @@ -27258,7 +26792,7 @@ }); return A._asyncStartSync($async$restart$2$readyToRunMain$runId, $async$completer); }, - reload$0() { + reload$1(hotReloadSourcesPath) { return A.throwExpression(A.UnimplementedError$("Hot reload is not supported for the DDC module format.")); }, $isRestarter: 1 @@ -27278,7 +26812,7 @@ this.sub.cancel$0(); return value; }, - $signature: 85 + $signature: 82 }; A.ReloadingManager.prototype = { hotRestart$2$readyToRunMain$runId(readyToRunMain, runId) { @@ -27318,11 +26852,11 @@ hotRestart$1$runId(runId) { return this.hotRestart$2$readyToRunMain$runId(null, runId); }, - hotReload$0() { + hotReload$1(hotReloadSourcesPath) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), $async$self = this; - var $async$hotReload$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { + var $async$hotReload$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); while (true) @@ -27330,14 +26864,14 @@ case 0: // Function start $async$goto = 2; - return A._asyncAwait($async$self._restarter.reload$0(), $async$hotReload$0); + return A._asyncAwait($async$self._restarter.reload$1(hotReloadSourcesPath), $async$hotReload$1); case 2: // returning from await. // implicit return return A._asyncReturn(null, $async$completer); } }); - return A._asyncStartSync($async$hotReload$0, $async$completer); + return A._asyncStartSync($async$hotReload$1, $async$completer); }, _afterRestart$1(succeeded) { var t1, t2; @@ -27437,7 +26971,7 @@ }); return A._asyncStartSync($async$restart$2$readyToRunMain$runId, $async$completer); }, - reload$0() { + reload$1(hotReloadSourcesPath) { return A.throwExpression(A.UnimplementedError$("Hot reload is not supported for the AMD module format.")); }, _runMainWhenReady$1(readyToRunMain) { @@ -27470,7 +27004,7 @@ _getDigests$0() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.Map_String_String), - $async$returnValue, t1, response; + $async$returnValue, response, t1; var $async$_getDigests$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -27478,9 +27012,8 @@ switch ($async$goto) { case 0: // Function start - t1 = self; $async$goto = 3; - return A._asyncAwait(new A.BrowserClient(type$.JSObject._as(new t1.AbortController()))._sendUnstreamed$3("GET", A.Uri_parse(A._asString(type$.JavaScriptObject._as(t1.$requireLoader).digestsPath)), null), $async$_getDigests$0); + return A._asyncAwait(new A.BrowserClient(A.LinkedHashSet_LinkedHashSet$_empty(type$.JSObject))._sendUnstreamed$3("GET", A.Uri_parse(A._asString(type$.JavaScriptObject._as(self.$requireLoader).digestsPath)), null), $async$_getDigests$0); case 3: // returning from await. response = $async$result; @@ -27743,7 +27276,7 @@ call$1(e) { this.completer.completeError$2(new A.HotReloadFailedException(A._asString(type$.JavaScriptObject._as(e).message)), this.stackTrace); }, - $signature: 88 + $signature: 85 }; A._createScript_closure.prototype = { call$0() { @@ -27752,7 +27285,7 @@ return new A._createScript__closure(); return new A._createScript__closure0(nonce); }, - $signature: 89 + $signature: 86 }; A._createScript__closure.prototype = { call$0() { @@ -27815,51 +27348,48 @@ _instance = hunkHelpers.installInstanceTearOff, _instance_2_u = hunkHelpers._instance_2u, _instance_1_i = hunkHelpers._instance_1i, - _instance_1_u = hunkHelpers._instance_1u, - _instance_0_u = hunkHelpers._instance_0u; + _instance_0_u = hunkHelpers._instance_0u, + _instance_1_u = hunkHelpers._instance_1u; _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 32); _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 10); _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 10); _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 10); _static_0(A, "async___startMicrotaskLoop$closure", "_startMicrotaskLoop", 0); _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 8); - _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 9); + _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 11); _static_0(A, "async___nullDoneHandler$closure", "_nullDoneHandler", 0); - _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 92, 0); + _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 89, 0); _static(A, "async___rootRun$closure", 4, null, ["call$1$4", "call$4"], ["_rootRun", function($self, $parent, zone, f) { return A._rootRun($self, $parent, zone, f, type$.dynamic); - }], 93, 0); + }], 90, 0); _static(A, "async___rootRunUnary$closure", 5, null, ["call$2$5", "call$5"], ["_rootRunUnary", function($self, $parent, zone, f, arg) { var t1 = type$.dynamic; return A._rootRunUnary($self, $parent, zone, f, arg, t1, t1); - }], 94, 0); - _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 95, 0); + }], 91, 0); + _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 92, 0); _static(A, "async___rootRegisterCallback$closure", 4, null, ["call$1$4", "call$4"], ["_rootRegisterCallback", function($self, $parent, zone, f) { return A._rootRegisterCallback($self, $parent, zone, f, type$.dynamic); - }], 96, 0); + }], 93, 0); _static(A, "async___rootRegisterUnaryCallback$closure", 4, null, ["call$2$4", "call$4"], ["_rootRegisterUnaryCallback", function($self, $parent, zone, f) { var t1 = type$.dynamic; return A._rootRegisterUnaryCallback($self, $parent, zone, f, t1, t1); - }], 97, 0); + }], 94, 0); _static(A, "async___rootRegisterBinaryCallback$closure", 4, null, ["call$3$4", "call$4"], ["_rootRegisterBinaryCallback", function($self, $parent, zone, f) { var t1 = type$.dynamic; return A._rootRegisterBinaryCallback($self, $parent, zone, f, t1, t1, t1); - }], 98, 0); - _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 99, 0); - _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 100, 0); - _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 101, 0); - _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 102, 0); - _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 103, 0); - _static_1(A, "async___printToZone$closure", "_printToZone", 104); - _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 105, 0); - _instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 20, 0, 0); - _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 9); + }], 95, 0); + _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 96, 0); + _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 97, 0); + _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 98, 0); + _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 99, 0); + _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 100, 0); + _static_1(A, "async___printToZone$closure", "_printToZone", 101); + _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 74, 0); + _instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 23, 0, 0); + _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 11); var _; - _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 7); - _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 20, 0, 0); - _instance_1_u(_, "get$_add", "_add$1", 7); - _instance_2_u(_, "get$_addError", "_addError$2", 9); - _instance_0_u(_, "get$_close", "_close$0", 0); + _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 9); + _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 23, 0, 0); _instance_0_u(_ = A._ControllerSubscription.prototype, "get$_onPause", "_onPause$0", 0); _instance_0_u(_, "get$_onResume", "_onResume$0", 0); _instance_0_u(_ = A._BufferingStreamSubscription.prototype, "get$_onPause", "_onPause$0", 0); @@ -27867,39 +27397,39 @@ _instance_0_u(A._DoneStreamSubscription.prototype, "get$_onMicrotask", "_onMicrotask$0", 0); _instance_0_u(_ = A._ForwardingStreamSubscription.prototype, "get$_onPause", "_onPause$0", 0); _instance_0_u(_, "get$_onResume", "_onResume$0", 0); - _instance_1_u(_, "get$_handleData", "_handleData$1", 7); - _instance_2_u(_, "get$_handleError", "_handleError$2", 21); + _instance_1_u(_, "get$_handleData", "_handleData$1", 9); + _instance_2_u(_, "get$_handleError", "_handleError$2", 24); _instance_0_u(_, "get$_handleDone", "_handleDone$0", 0); - _static_2(A, "collection___defaultEquals$closure", "_defaultEquals0", 15); - _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 16); + _static_2(A, "collection___defaultEquals$closure", "_defaultEquals0", 16); + _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 17); _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 32); - _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 6); - _instance_1_i(_ = A._ByteCallbackSink.prototype, "get$add", "add$1", 7); + _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 4); + _instance_1_i(_ = A._ByteCallbackSink.prototype, "get$add", "add$1", 9); _instance_0_u(_, "get$close", "close$0", 0); - _static_1(A, "core__identityHashCode$closure", "identityHashCode", 16); - _static_2(A, "core__identical$closure", "identical", 15); - _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 12); + _static_1(A, "core__identityHashCode$closure", "identityHashCode", 17); + _static_2(A, "core__identical$closure", "identical", 16); + _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 13); _static(A, "math__max$closure", 2, null, ["call$1$2", "call$2"], ["max", function(a, b) { return A.max(a, b, type$.num); - }], 70, 0); - _instance_2_u(_ = A.DeepCollectionEquality.prototype, "get$equals", "equals$2", 15); - _instance_1_u(_, "get$hash", "hash$1", 16); - _instance_1_u(_, "get$isValidKey", "isValidKey$1", 11); - _static_1(A, "case_insensitive_map_CaseInsensitiveMap__canonicalizer$closure", "CaseInsensitiveMap__canonicalizer", 12); + }], 68, 0); + _instance_2_u(_ = A.DeepCollectionEquality.prototype, "get$equals", "equals$2", 16); + _instance_1_u(_, "get$hash", "hash$1", 17); + _instance_1_u(_, "get$isValidKey", "isValidKey$1", 12); + _static_1(A, "case_insensitive_map_CaseInsensitiveMap__canonicalizer$closure", "CaseInsensitiveMap__canonicalizer", 13); _instance_1_u(_ = A.SseClient.prototype, "get$_onIncomingControlMessage", "_onIncomingControlMessage$1", 2); _instance_1_u(_, "get$_onIncomingMessage", "_onIncomingMessage$1", 2); _instance_0_u(_, "get$_onOutgoingDone", "_onOutgoingDone$0", 0); - _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 65); + _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 63); _static_1(A, "client___handleAuthRequest$closure", "_handleAuthRequest", 2); - _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 86); - _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 87); + _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 83); + _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 84); })(); (function inheritance() { var _mixin = hunkHelpers.mixin, _inherit = hunkHelpers.inherit, _inheritMany = hunkHelpers.inheritMany; _inherit(A.Object, null); - _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.LinkedHashMapEntryIterator, A._Record, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A._UnmodifiableNativeByteBufferView, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A._AsyncStarStreamController, A._IterationMarker, A.AsyncError, A.TimeoutException, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.Stream, A._StreamController, A._SyncStreamControllerDispatch, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._AddStreamState, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._StreamIterator, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A.SetBase, A._HashSetIterator, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A._Base64Encoder, A._Base64Decoder, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A._JSSecureRandom, A.AsyncMemoizer, A.DelegatingStreamSink, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.BuiltList, A.ListBuilder, A.BuiltListMultimap, A.ListMultimapBuilder, A.BuiltMap, A.MapBuilder, A.BuiltSet, A.SetBuilder, A.BuiltSetMultimap, A.SetMultimapBuilder, A.EnumClass, A.IndentingBuiltValueToStringHelper, A.JsonObject, A.FullType, A.BigIntSerializer, A.BoolSerializer, A.BuiltJsonSerializers, A.BuiltJsonSerializersBuilder, A.BuiltListMultimapSerializer, A.BuiltListSerializer, A.BuiltMapSerializer, A.BuiltSetMultimapSerializer, A.BuiltSetSerializer, A.DateTimeSerializer, A.DoubleSerializer, A.DurationSerializer, A.Int32Serializer, A.Int64Serializer, A.IntSerializer, A.JsonObjectSerializer, A.NullSerializer, A.NumSerializer, A.RegExpSerializer, A.StringSerializer, A.Uint8ListSerializer, A.UriSerializer, A.CanonicalizedMap, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._UnorderedEquality, A._MapEntry, A.MapEquality, A.DeepCollectionEquality, A._QueueList_Object_ListMixin, A.BuildResult, A._$BuildStatusSerializer, A._$BuildResultSerializer, A.BuildResultBuilder, A.ConnectRequest, A._$ConnectRequestSerializer, A.ConnectRequestBuilder, A.DebugEvent, A.BatchedDebugEvents, A._$DebugEventSerializer, A._$BatchedDebugEventsSerializer, A.DebugEventBuilder, A.BatchedDebugEventsBuilder, A.DebugInfo, A._$DebugInfoSerializer, A.DebugInfoBuilder, A.DevToolsRequest, A.DevToolsResponse, A._$DevToolsRequestSerializer, A._$DevToolsResponseSerializer, A.DevToolsRequestBuilder, A.DevToolsResponseBuilder, A.ErrorResponse, A._$ErrorResponseSerializer, A.ErrorResponseBuilder, A.ExtensionRequest, A.ExtensionResponse, A.ExtensionEvent, A.BatchedEvents, A._$ExtensionRequestSerializer, A._$ExtensionResponseSerializer, A._$ExtensionEventSerializer, A._$BatchedEventsSerializer, A.ExtensionRequestBuilder, A.ExtensionResponseBuilder, A.ExtensionEventBuilder, A.BatchedEventsBuilder, A.IsolateExit, A.IsolateStart, A._$IsolateExitSerializer, A._$IsolateStartSerializer, A.IsolateExitBuilder, A.IsolateStartBuilder, A.RegisterEvent, A._$RegisterEventSerializer, A.RegisterEventBuilder, A.RunRequest, A._$RunRequestSerializer, A.BatchedStreamController, A.SocketClient, A.Int32, A.Int64, A._StackState, A.BaseClient, A.BaseRequest, A.BaseResponse, A.ClientException, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.StringScanner, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.WebSocketChannelException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); + _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.LinkedHashMapEntryIterator, A._Record, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A._Cell, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A.AsyncError, A.TimeoutException, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.Stream, A._StreamController, A._SyncStreamControllerDispatch, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._StreamIterator, A._ZoneFunction, A._ZoneSpecification, A._ZoneDelegate, A._Zone, A._HashMapKeyIterator, A.SetBase, A._HashSetIterator, A._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A._Base64Encoder, A._Base64Decoder, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A.AsyncMemoizer, A.DelegatingStreamSink, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.BuiltList, A.ListBuilder, A.BuiltListMultimap, A.ListMultimapBuilder, A.BuiltMap, A.MapBuilder, A.BuiltSet, A.SetBuilder, A.BuiltSetMultimap, A.SetMultimapBuilder, A.EnumClass, A.IndentingBuiltValueToStringHelper, A.JsonObject, A.FullType, A.BigIntSerializer, A.BoolSerializer, A.BuiltJsonSerializers, A.BuiltJsonSerializersBuilder, A.BuiltListMultimapSerializer, A.BuiltListSerializer, A.BuiltMapSerializer, A.BuiltSetMultimapSerializer, A.BuiltSetSerializer, A.DateTimeSerializer, A.DoubleSerializer, A.DurationSerializer, A.Int32Serializer, A.Int64Serializer, A.IntSerializer, A.JsonObjectSerializer, A.NullSerializer, A.NumSerializer, A.RegExpSerializer, A.StringSerializer, A.Uint8ListSerializer, A.UriSerializer, A.CanonicalizedMap, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._UnorderedEquality, A._MapEntry, A.MapEquality, A.DeepCollectionEquality, A._QueueList_Object_ListMixin, A.BuildResult, A._$BuildStatusSerializer, A._$BuildResultSerializer, A.BuildResultBuilder, A.ConnectRequest, A._$ConnectRequestSerializer, A.ConnectRequestBuilder, A.DebugEvent, A.BatchedDebugEvents, A._$DebugEventSerializer, A._$BatchedDebugEventsSerializer, A.DebugEventBuilder, A.BatchedDebugEventsBuilder, A.DebugInfo, A._$DebugInfoSerializer, A.DebugInfoBuilder, A.DevToolsRequest, A.DevToolsResponse, A._$DevToolsRequestSerializer, A._$DevToolsResponseSerializer, A.DevToolsRequestBuilder, A.DevToolsResponseBuilder, A.ErrorResponse, A._$ErrorResponseSerializer, A.ErrorResponseBuilder, A.ExtensionRequest, A.ExtensionResponse, A.ExtensionEvent, A.BatchedEvents, A._$ExtensionRequestSerializer, A._$ExtensionResponseSerializer, A._$ExtensionEventSerializer, A._$BatchedEventsSerializer, A.ExtensionRequestBuilder, A.ExtensionResponseBuilder, A.ExtensionEventBuilder, A.BatchedEventsBuilder, A.IsolateExit, A.IsolateStart, A._$IsolateExitSerializer, A._$IsolateStartSerializer, A.IsolateExitBuilder, A.IsolateStartBuilder, A.RegisterEvent, A._$RegisterEventSerializer, A.RegisterEventBuilder, A.RunRequest, A._$RunRequestSerializer, A.BatchedStreamController, A.SocketClient, A.Int32, A.Int64, A._StackState, A.BaseClient, A.BaseRequest, A.BaseResponse, A.ClientException, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.StringScanner, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.WebSocketChannelException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JavaScriptBigInt, J.JavaScriptSymbol, J.JSNumber, J.JSString]); _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]); _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]); @@ -27909,14 +27439,14 @@ _inheritMany(A._CastIterableBase, [A.CastIterable, A.__CastListBase__CastIterableBase_ListMixin]); _inherit(A._EfficientLengthCastIterable, A.CastIterable); _inherit(A._CastListBase, A.__CastListBase__CastIterableBase_ListMixin); - _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._asyncStarHelper_closure0, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A._LinkedCustomHashMap_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A.FutureOfVoidToJSPromise_get_toJS__closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.CanonicalizedMap_keys_closure, A.WebSocketClient_stream_closure, A.BaseRequest_closure0, A.BrowserClient_send_closure, A._readBody_closure, A._readBody_closure0, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A.generateUuidV4_generateBits, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.AdapterWebSocketChannel_closure, A.AdapterWebSocketChannel__closure, A.AdapterWebSocketChannel__closure0, A.AdapterWebSocketChannel_closure0, A.main__closure0, A.main__closure2, A.main___closure2, A.main___closure1, A.main__closure4, A.main___closure0, A.main___closure, A.main__closure6, A.main__closure7, A.main__closure8, A.main__closure9, A._launchCommunicationWithDebugExtension_closure, A._handleAuthRequest_closure, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.RequireRestarter__reloadModule_closure0, A.JSArrayExtension_toDartIterable_closure]); - _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A._Future_timeout_closure1, A._AddStreamState_makeErrorHandler_closure, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.CanonicalizedMap_addAll_closure, A.CanonicalizedMap_forEach_closure, A.CanonicalizedMap_map_closure, A.safeUnawaited_closure, A.BaseRequest_closure, A.MediaType_toString_closure, A.Pool__runOnRelease_closure0, A.Highlighter__collateLines_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure3, A.main_closure0]); + _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A._LinkedCustomHashMap_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A.FutureOfVoidToJSPromise_get_toJS__closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.CanonicalizedMap_keys_closure, A.WebSocketClient_stream_closure, A.BaseRequest_closure0, A.BrowserClient_send_closure, A.BrowserClient_send_closure0, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A.generateUuidV4_generateBits, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.AdapterWebSocketChannel_closure, A.AdapterWebSocketChannel__closure, A.AdapterWebSocketChannel__closure0, A.AdapterWebSocketChannel_closure0, A.main__closure0, A.main__closure2, A.main___closure2, A.main___closure1, A.main__closure4, A.main___closure0, A.main___closure, A.main__closure6, A.main__closure7, A.main__closure8, A.main__closure9, A._launchCommunicationWithDebugExtension_closure, A._handleAuthRequest_closure, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.RequireRestarter__reloadModule_closure0, A.JSArrayExtension_toDartIterable_closure]); + _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A._Future_timeout_closure1, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.CanonicalizedMap_addAll_closure, A.CanonicalizedMap_forEach_closure, A.CanonicalizedMap_map_closure, A.safeUnawaited_closure, A.BaseRequest_closure, A.MediaType_toString_closure, A.Pool__runOnRelease_closure0, A.Highlighter__collateLines_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure3, A.main_closure0]); _inherit(A.CastList, A._CastListBase); _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A._JsonMap]); _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A._CyclicInitializationError, A.RuntimeError, A.AssertionError, A._Error, A.JsonUnsupportedObjectError, A.ArgumentError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError, A.BuiltValueNullFieldError, A.BuiltValueNestedFieldError, A.DeserializationError]); _inherit(A.UnmodifiableListBase, A.ListBase); _inheritMany(A.UnmodifiableListBase, [A.CodeUnits, A.UnmodifiableListView]); - _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A._asyncStarHelper_closure, A._AsyncStarStreamController__resumeBody, A._AsyncStarStreamController__resumeBody_closure, A._AsyncStarStreamController_closure0, A._AsyncStarStreamController_closure1, A._AsyncStarStreamController_closure, A._AsyncStarStreamController__closure, A.Future_Future$microtask_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._Future_timeout_closure, A.Stream_length_closure0, A.Stream_first_closure, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._AddStreamState_cancel_closure, A._BufferingStreamSubscription_asFuture_closure, A._BufferingStreamSubscription_asFuture__closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._cancelAndValue_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.StreamQueue__ensureListening_closure0, A.Serializers_Serializers_closure, A.Serializers_Serializers_closure0, A.Serializers_Serializers_closure1, A.Serializers_Serializers_closure2, A.Serializers_Serializers_closure3, A._$serializers_closure, A._$serializers_closure0, A.BatchedStreamController__hasEventOrTimeOut_closure, A.BatchedStreamController__hasEventDuring_closure, A.MediaType_MediaType$parse_closure, A.Logger_Logger_closure, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A.AdapterWebSocketChannel__closure1, A.main_closure, A.main__closure, A.main__closure1, A.main__closure5, A.DdcLibraryBundleRestarter_reload_closure, A.RequireRestarter__reload_closure, A.RequireRestarter__reloadModule_closure, A._createScript_closure, A._createScript__closure, A._createScript__closure0, A.runMain_closure]); + _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._TimerImpl$periodic_closure, A.Future_Future$microtask_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._Future_timeout_closure, A.Stream_length_closure0, A.Stream_first_closure, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._BufferingStreamSubscription_asFuture_closure, A._BufferingStreamSubscription_asFuture__closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._cancelAndValue_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.StreamQueue__ensureListening_closure0, A.Serializers_Serializers_closure, A.Serializers_Serializers_closure0, A.Serializers_Serializers_closure1, A.Serializers_Serializers_closure2, A.Serializers_Serializers_closure3, A._$serializers_closure, A._$serializers_closure0, A.BatchedStreamController__hasEventOrTimeOut_closure, A.BatchedStreamController__hasEventDuring_closure, A.MediaType_MediaType$parse_closure, A.Logger_Logger_closure, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A.AdapterWebSocketChannel__closure1, A.main_closure, A.main__closure, A.main__closure1, A.main__closure5, A.DdcLibraryBundleRestarter_reload_closure, A.RequireRestarter__reload_closure, A.RequireRestarter__reloadModule_closure, A._createScript_closure, A._createScript__closure, A._createScript__closure0, A.runMain_closure]); _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.EmptyIterable, A.LinkedHashMapKeysIterable, A.LinkedHashMapValuesIterable, A.LinkedHashMapEntriesIterable, A._HashMapKeyIterable]); _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A.ListQueue, A._JsonMapKeyIterable]); _inherit(A.EfficientLengthMappedIterable, A.MappedIterable); @@ -27942,7 +27472,6 @@ _inheritMany(A._StreamController, [A._AsyncStreamController, A._SyncStreamController]); _inherit(A._ControllerStream, A._StreamImpl); _inheritMany(A._BufferingStreamSubscription, [A._ControllerSubscription, A._ForwardingStreamSubscription]); - _inherit(A._StreamControllerAddStreamState, A._AddStreamState); _inheritMany(A._DelayedEvent, [A._DelayedData, A._DelayedError]); _inherit(A._MapStream, A._ForwardingStream); _inheritMany(A._Zone, [A._CustomZone, A._RootZone]); @@ -28007,7 +27536,7 @@ _inherit(A.SourceSpanWithContext, A.SourceSpanBase); _inheritMany(A.StreamChannelMixin, [A.SseClient, A.GuaranteeChannel, A.AdapterWebSocketChannel]); _inherit(A.StringScannerException, A.SourceSpanFormatException); - _inherit(A.CryptoRNG, A.RNG); + _inherit(A.MathRNG, A.RNG); _inheritMany(A.WebSocketEvent, [A.TextDataReceived, A.BinaryDataReceived, A.CloseReceived]); _inherit(A.WebSocketConnectionClosed, A.WebSocketException); _inherit(A._WebSocketSink, A.DelegatingStreamSink); @@ -28028,13 +27557,13 @@ typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []}, mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map"}, mangledNames: {}, - types: ["~()", "Null()", "~(JSObject)", "Null(@)", "Null(Object,StackTrace)", "Object?(@)", "@(@)", "~(Object?)", "~(@)", "~(Object,StackTrace)", "~(~())", "bool(Object?)", "String(String)", "Object?(Object?)", "Future<~>()", "bool(Object?,Object?)", "int(Object?)", "bool(_Highlight)", "Null(JSObject)", "JSObject()", "~(Object[StackTrace?])", "~(@,StackTrace)", "bool(String)", "~(@,@)", "~(Object?,Object?)", "@()", "int(int,int)", "int(int)", "bool()", "String(Match)", "int()", "String(int,int)", "int(@,@)", "SetMultimapBuilder()", "MapBuilder()", "SetBuilder()", "Null(~())", "Null(@,StackTrace)", "~(int,@)", "_Future<@>?()", "ListBuilder()", "ListBuilder()", "~(String,int)", "String(@)", "bool(String,String)", "int(String)", "Null(String,String[Object?])", "bool(Object)", "~(List)", "MediaType()", "~(String,String)", "~(String,int?)", "Logger()", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "String(String?)", "String?()", "int(_Line)", "@(String)", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry>)", "Null(JavaScriptFunction,JavaScriptFunction)", "SourceSpanWithContext()", "Object?(~)", "~(String?)", "Future()", "@(@,String)", "int(int,@)", "Null(WebSocket)", "0^(0^,0^)", "Null(Object)", "IndentingBuiltValueToStringHelper(String)", "JSObject(String[bool?])", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "Null(String,String)", "DebugEventBuilder(DebugEventBuilder)", "Null(String)", "RegisterEventBuilder(RegisterEventBuilder)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "Future<~>(String)", "ConnectRequestBuilder(ConnectRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "~(bool)", "bool(bool)", "List(String)", "int(String,String)", "Null(JavaScriptObject)", "JSObject()()", "ListBuilder()", "ListMultimapBuilder()", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)", "0^()(Zone,ZoneDelegate,Zone,0^())", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "~(String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "~(WebSocketEvent)"], + types: ["~()", "Null()", "~(JSObject)", "Object?(@)", "@(@)", "Null(Object,StackTrace)", "Null(@)", "Null(JSObject)", "~(@)", "~(Object?)", "~(~())", "~(Object,StackTrace)", "bool(Object?)", "String(String)", "Object?(Object?)", "Future<~>()", "bool(Object?,Object?)", "int(Object?)", "bool(_Highlight)", "JSObject()", "bool(String)", "@()", "int(int)", "~(Object[StackTrace?])", "~(@,StackTrace)", "bool()", "int(int,int)", "String(Match)", "int()", "~(@,@)", "String(int,int)", "~(Object?,Object?)", "int(@,@)", "~(String,String)", "@(String)", "SetMultimapBuilder()", "@(@,String)", "Null(~())", "~(String,int?)", "ListBuilder()", "ListBuilder()", "~(int,@)", "String(@)", "bool(String,String)", "int(String)", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "~(List)", "MediaType()", "Null(JavaScriptFunction,JavaScriptFunction)", "Object?(~)", "Logger()", "SetBuilder()", "String(String?)", "String?()", "int(_Line)", "Null(@,StackTrace)", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry>)", "~(String,int)", "SourceSpanWithContext()", "int(int,@)", "~(String?)", "Future()", "IndentingBuiltValueToStringHelper(String)", "Null(WebSocket)", "~(WebSocketEvent)", "0^(0^,0^)", "ListBuilder()", "JSObject(String[bool?])", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "Null(String,String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "Null(String)", "RegisterEventBuilder(RegisterEventBuilder)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "Future<~>(String)", "ConnectRequestBuilder(ConnectRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "~(bool)", "bool(bool)", "List(String)", "int(String,String)", "Null(JavaScriptObject)", "JSObject()()", "ListMultimapBuilder()", "MapBuilder()", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)", "0^()(Zone,ZoneDelegate,Zone,0^())", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "~(String)", "DebugEventBuilder(DebugEventBuilder)", "Null(Object)"], interceptorsByTag: null, leafTags: null, arrayRti: Symbol("$ti"), rttc: {} }; - A._Universe_addRules(init.typeUniverse, JSON.parse('{"JavaScriptFunction":"LegacyJavaScriptObject","PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptObject":{"JSObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[],"Comparable":["num"]},"JSInt":{"double":[],"int":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Comparable":["String"],"Pattern":[],"JSIndexable":["@"],"TrustedGetRuntimeType":[]},"_CastIterableBase":{"Iterable":["2"]},"CastIterator":{"Iterator":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.K":"3","MapBase.V":"4"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int","Iterable.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"ExpandIterator":{"Iterator":["2"]},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"TakeIterator":{"Iterator":["1"]},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterator":{"Iterator":["1"]},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"EmptyIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"_KeysOrValuesOrElementsIterator":{"Iterator":["1"]},"Instantiation":{"Closure":[],"Function":[]},"Instantiation1":{"Closure":[],"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Closure":[],"Function":[]},"Closure2Args":{"Closure":[],"Function":[]},"TearOffClosure":{"Closure":[],"Function":[]},"StaticClosure":{"Closure":[],"Function":[]},"BoundClosure":{"Closure":[],"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeysIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"LinkedHashMapValuesIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapValueIterator":{"Iterator":["1"]},"LinkedHashMapEntriesIterable":{"EfficientLengthIterable":["MapEntry<1,2>"],"Iterable":["MapEntry<1,2>"],"Iterable.E":"MapEntry<1,2>"},"LinkedHashMapEntryIterator":{"Iterator":["MapEntry<1,2>"]},"JsIdentityLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"JSSyntaxRegExp":{"RegExp":[],"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeByteBuffer":{"JavaScriptObject":[],"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JavaScriptObject":[],"JSObject":[]},"_UnmodifiableNativeByteBufferView":{"ByteBuffer":[]},"NativeByteData":{"JavaScriptObject":[],"ByteData":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[],"JSObject":[],"JSIndexable":["1"]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeInt16List":{"NativeTypedArrayOfInt":[],"Int16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt32List":{"NativeTypedArrayOfInt":[],"Int32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt8List":{"NativeTypedArrayOfInt":[],"Int8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint16List":{"NativeTypedArrayOfInt":[],"Uint16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint32List":{"NativeTypedArrayOfInt":[],"Uint32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8ClampedList":{"NativeTypedArrayOfInt":[],"Uint8ClampedList":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8List":{"NativeTypedArrayOfInt":[],"Uint8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"_Type":{"Type":[]},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_TimerImpl":{"Timer":[]},"_AsyncAwaitCompleter":{"Completer":["1"]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"StreamView":{"Stream":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_AsyncStreamController":{"_AsyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_SyncStreamController":{"_SyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"]},"_StreamControllerAddStreamState":{"_AddStreamState":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_EventSink":["2"],"_EventDispatch":["2"],"_BufferingStreamSubscription.T":"2"},"_MapStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"_Zone":[],"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"_SplayTreeSetNode":{"_SplayTreeNode":["1","_SplayTreeSetNode<1>"],"_SplayTreeNode.K":"1","_SplayTreeNode.1":"_SplayTreeSetNode<1>"},"_HashMap":{"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_CustomHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashSetIterator":{"Iterator":["1"]},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedHashSetIterator":{"Iterator":["1"]},"UnmodifiableListView":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","Iterable.E":"1","UnmodifiableListMixin.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_ListQueueIterator":{"Iterator":["1"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SplayTreeIterator":{"Iterator":["3"]},"_SplayTreeKeyIterator":{"_SplayTreeIterator":["1","2","1"],"Iterator":["1"],"_SplayTreeIterator.K":"1","_SplayTreeIterator.T":"1","_SplayTreeIterator.1":"2"},"SplayTreeSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"_SplayTree":["1","_SplayTreeSetNode<1>"],"Iterable":["1"],"Iterable.E":"1","_SplayTree.1":"_SplayTreeSetNode<1>","_SplayTree.K":"1"},"Encoding":{"Codec":["String","List"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"_UnicodeSubsetEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"AsciiEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"_UnicodeSubsetDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"AsciiDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Codec":{"Codec":["List","String"],"Codec.S":"List"},"Base64Encoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Decoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Converter":{"StreamTransformer":["1","2"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"],"Codec.S":"Object?"},"JsonEncoder":{"Converter":["Object?","String"],"StreamTransformer":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"],"StreamTransformer":["String","Object?"]},"Latin1Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Latin1Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Latin1Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Utf8Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Utf8Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"BigInt":{"Comparable":["BigInt"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExp":{"Pattern":[]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"],"Pattern":[]},"_BigIntImpl":{"BigInt":[],"Comparable":["BigInt"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"IntegerDivisionByZeroException":{"Exception":[],"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"DelegatingStreamSink":{"StreamSink":["1"]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_NextRequest":{"_EventRequest":["1"]},"_HasNextRequest":{"_EventRequest":["1"]},"BuiltList":{"Iterable":["1"]},"_BuiltList":{"BuiltList":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltListMultimap":{"BuiltListMultimap":["1","2"]},"_BuiltMap":{"BuiltMap":["1","2"]},"BuiltSet":{"Iterable":["1"]},"_BuiltSet":{"BuiltSet":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltSetMultimap":{"BuiltSetMultimap":["1","2"]},"BuiltValueNullFieldError":{"Error":[]},"BuiltValueNestedFieldError":{"Error":[]},"BoolJsonObject":{"JsonObject":[]},"ListJsonObject":{"JsonObject":[]},"MapJsonObject":{"JsonObject":[]},"NumJsonObject":{"JsonObject":[]},"StringJsonObject":{"JsonObject":[]},"DeserializationError":{"Error":[]},"BigIntSerializer":{"PrimitiveSerializer":["BigInt"],"Serializer":["BigInt"]},"BoolSerializer":{"PrimitiveSerializer":["bool"],"Serializer":["bool"]},"BuiltJsonSerializers":{"Serializers":[]},"BuiltListMultimapSerializer":{"StructuredSerializer":["BuiltListMultimap<@,@>"],"Serializer":["BuiltListMultimap<@,@>"]},"BuiltListSerializer":{"StructuredSerializer":["BuiltList<@>"],"Serializer":["BuiltList<@>"]},"BuiltMapSerializer":{"StructuredSerializer":["BuiltMap<@,@>"],"Serializer":["BuiltMap<@,@>"]},"BuiltSetMultimapSerializer":{"StructuredSerializer":["BuiltSetMultimap<@,@>"],"Serializer":["BuiltSetMultimap<@,@>"]},"BuiltSetSerializer":{"StructuredSerializer":["BuiltSet<@>"],"Serializer":["BuiltSet<@>"]},"DateTimeSerializer":{"PrimitiveSerializer":["DateTime"],"Serializer":["DateTime"]},"DoubleSerializer":{"PrimitiveSerializer":["double"],"Serializer":["double"]},"DurationSerializer":{"PrimitiveSerializer":["Duration"],"Serializer":["Duration"]},"Int32Serializer":{"PrimitiveSerializer":["Int32"],"Serializer":["Int32"]},"Int64Serializer":{"PrimitiveSerializer":["Int64"],"Serializer":["Int64"]},"IntSerializer":{"PrimitiveSerializer":["int"],"Serializer":["int"]},"JsonObjectSerializer":{"PrimitiveSerializer":["JsonObject"],"Serializer":["JsonObject"]},"NullSerializer":{"PrimitiveSerializer":["Null"],"Serializer":["Null"]},"NumSerializer":{"PrimitiveSerializer":["num"],"Serializer":["num"]},"RegExpSerializer":{"PrimitiveSerializer":["RegExp"],"Serializer":["RegExp"]},"StringSerializer":{"PrimitiveSerializer":["String"],"Serializer":["String"]},"Uint8ListSerializer":{"PrimitiveSerializer":["Uint8List"],"Serializer":["Uint8List"]},"UriSerializer":{"PrimitiveSerializer":["Uri"],"Serializer":["Uri"]},"CanonicalizedMap":{"Map":["2","3"]},"DefaultEquality":{"Equality":["1"]},"IterableEquality":{"Equality":["Iterable<1>"]},"ListEquality":{"Equality":["List<1>"]},"_UnorderedEquality":{"Equality":["2"]},"SetEquality":{"_UnorderedEquality":["1","Set<1>"],"Equality":["Set<1>"],"_UnorderedEquality.E":"1","_UnorderedEquality.T":"Set<1>"},"MapEquality":{"Equality":["Map<1,2>"]},"DeepCollectionEquality":{"Equality":["@"]},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1","Iterable.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2","Iterable.E":"2"},"_$BuildStatusSerializer":{"PrimitiveSerializer":["BuildStatus"],"Serializer":["BuildStatus"]},"_$BuildResultSerializer":{"StructuredSerializer":["BuildResult"],"Serializer":["BuildResult"]},"_$BuildResult":{"BuildResult":[]},"_$ConnectRequestSerializer":{"StructuredSerializer":["ConnectRequest"],"Serializer":["ConnectRequest"]},"_$ConnectRequest":{"ConnectRequest":[]},"_$DebugEventSerializer":{"StructuredSerializer":["DebugEvent"],"Serializer":["DebugEvent"]},"_$BatchedDebugEventsSerializer":{"StructuredSerializer":["BatchedDebugEvents"],"Serializer":["BatchedDebugEvents"]},"_$DebugEvent":{"DebugEvent":[]},"_$BatchedDebugEvents":{"BatchedDebugEvents":[]},"_$DebugInfoSerializer":{"StructuredSerializer":["DebugInfo"],"Serializer":["DebugInfo"]},"_$DebugInfo":{"DebugInfo":[]},"_$DevToolsRequestSerializer":{"StructuredSerializer":["DevToolsRequest"],"Serializer":["DevToolsRequest"]},"_$DevToolsResponseSerializer":{"StructuredSerializer":["DevToolsResponse"],"Serializer":["DevToolsResponse"]},"_$DevToolsRequest":{"DevToolsRequest":[]},"_$DevToolsResponse":{"DevToolsResponse":[]},"_$ErrorResponseSerializer":{"StructuredSerializer":["ErrorResponse"],"Serializer":["ErrorResponse"]},"_$ErrorResponse":{"ErrorResponse":[]},"_$ExtensionRequestSerializer":{"StructuredSerializer":["ExtensionRequest"],"Serializer":["ExtensionRequest"]},"_$ExtensionResponseSerializer":{"StructuredSerializer":["ExtensionResponse"],"Serializer":["ExtensionResponse"]},"_$ExtensionEventSerializer":{"StructuredSerializer":["ExtensionEvent"],"Serializer":["ExtensionEvent"]},"_$BatchedEventsSerializer":{"StructuredSerializer":["BatchedEvents"],"Serializer":["BatchedEvents"]},"_$ExtensionRequest":{"ExtensionRequest":[]},"_$ExtensionResponse":{"ExtensionResponse":[]},"_$ExtensionEvent":{"ExtensionEvent":[]},"_$BatchedEvents":{"BatchedEvents":[]},"_$IsolateExitSerializer":{"StructuredSerializer":["IsolateExit"],"Serializer":["IsolateExit"]},"_$IsolateStartSerializer":{"StructuredSerializer":["IsolateStart"],"Serializer":["IsolateStart"]},"_$IsolateExit":{"IsolateExit":[]},"_$IsolateStart":{"IsolateStart":[]},"_$RegisterEventSerializer":{"StructuredSerializer":["RegisterEvent"],"Serializer":["RegisterEvent"]},"_$RegisterEvent":{"RegisterEvent":[]},"_$RunRequestSerializer":{"StructuredSerializer":["RunRequest"],"Serializer":["RunRequest"]},"_$RunRequest":{"RunRequest":[]},"SseSocketClient":{"SocketClient":[]},"WebSocketClient":{"SocketClient":[]},"Int32":{"Comparable":["Object"]},"Int64":{"Comparable":["Object"]},"ByteStream":{"StreamView":["List"],"Stream":["List"],"Stream.T":"List","StreamView.T":"List"},"ClientException":{"Exception":[]},"Request":{"BaseRequest":[]},"StreamedResponseV2":{"StreamedResponse":[]},"CaseInsensitiveMap":{"CanonicalizedMap":["String","String","1"],"Map":["String","1"],"CanonicalizedMap.K":"String","CanonicalizedMap.V":"1","CanonicalizedMap.C":"String"},"Level":{"Comparable":["Level"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"_FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SseClient":{"StreamChannel":["String?"]},"GuaranteeChannel":{"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"StringScannerException":{"FormatException":[],"Exception":[]},"_EventStream":{"Stream":["1"],"Stream.T":"1"},"_EventStreamSubscription":{"StreamSubscription":["1"]},"BrowserWebSocket":{"WebSocket":[]},"TextDataReceived":{"WebSocketEvent":[]},"BinaryDataReceived":{"WebSocketEvent":[]},"CloseReceived":{"WebSocketEvent":[]},"WebSocketException":{"Exception":[]},"WebSocketConnectionClosed":{"Exception":[]},"AdapterWebSocketChannel":{"WebSocketChannel":[],"StreamChannel":["@"]},"_WebSocketSink":{"WebSocketSink":[],"DelegatingStreamSink":["@"],"StreamSink":["@"],"DelegatingStreamSink.T":"@"},"WebSocketChannelException":{"Exception":[]},"DdcLibraryBundleRestarter":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"HotReloadFailedException":{"Exception":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); + A._Universe_addRules(init.typeUniverse, JSON.parse('{"JavaScriptFunction":"LegacyJavaScriptObject","PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptObject":{"JSObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"],"JSIndexable":["1"],"Iterable.E":"1"},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[],"Comparable":["num"]},"JSInt":{"double":[],"int":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"Comparable":["num"],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Comparable":["String"],"Pattern":[],"JSIndexable":["@"],"TrustedGetRuntimeType":[]},"_CastIterableBase":{"Iterable":["2"]},"CastIterator":{"Iterator":["2"]},"CastIterable":{"_CastIterableBase":["1","2"],"Iterable":["2"],"Iterable.E":"2"},"_EfficientLengthCastIterable":{"CastIterable":["1","2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"_CastListBase":{"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"]},"CastList":{"_CastListBase":["1","2"],"ListBase":["2"],"List":["2"],"_CastIterableBase":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","Iterable.E":"2"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.K":"3","MapBase.V":"4"},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int","Iterable.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListIterable.E":"2","Iterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"ExpandIterable":{"Iterable":["2"],"Iterable.E":"2"},"ExpandIterator":{"Iterator":["2"]},"TakeIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthTakeIterable":{"TakeIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"TakeIterator":{"Iterator":["1"]},"SkipIterable":{"Iterable":["1"],"Iterable.E":"1"},"EfficientLengthSkipIterable":{"SkipIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"SkipIterator":{"Iterator":["1"]},"EmptyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"EmptyIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"ReversedListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"ConstantMap":{"Map":["1","2"]},"ConstantStringMap":{"ConstantMap":["1","2"],"Map":["1","2"]},"_KeysOrValues":{"Iterable":["1"],"Iterable.E":"1"},"_KeysOrValuesOrElementsIterator":{"Iterator":["1"]},"Instantiation":{"Closure":[],"Function":[]},"Instantiation1":{"Closure":[],"Function":[]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"NullThrownFromJavaScriptException":{"Exception":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Closure":[],"Function":[]},"Closure2Args":{"Closure":[],"Function":[]},"TearOffClosure":{"Closure":[],"Function":[]},"StaticClosure":{"Closure":[],"Function":[]},"BoundClosure":{"Closure":[],"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeysIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"LinkedHashMapValuesIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapValueIterator":{"Iterator":["1"]},"LinkedHashMapEntriesIterable":{"EfficientLengthIterable":["MapEntry<1,2>"],"Iterable":["MapEntry<1,2>"],"Iterable.E":"MapEntry<1,2>"},"LinkedHashMapEntryIterator":{"Iterator":["MapEntry<1,2>"]},"JsIdentityLinkedHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"JSSyntaxRegExp":{"RegExp":[],"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeByteBuffer":{"JavaScriptObject":[],"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JavaScriptObject":[],"JSObject":[]},"NativeByteData":{"JavaScriptObject":[],"ByteData":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[],"JSObject":[],"JSIndexable":["1"]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"NativeTypedArray":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"JSIndexable":["double"],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double","FixedLengthListMixin.E":"double"},"NativeInt16List":{"NativeTypedArrayOfInt":[],"Int16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt32List":{"NativeTypedArrayOfInt":[],"Int32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeInt8List":{"NativeTypedArrayOfInt":[],"Int8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint16List":{"NativeTypedArrayOfInt":[],"Uint16List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint32List":{"NativeTypedArrayOfInt":[],"Uint32List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8ClampedList":{"NativeTypedArrayOfInt":[],"Uint8ClampedList":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"NativeUint8List":{"NativeTypedArrayOfInt":[],"Uint8List":[],"ListBase":["int"],"NativeTypedArray":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"JSIndexable":["int"],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int","FixedLengthListMixin.E":"int"},"_Type":{"Type":[]},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_TimerImpl":{"Timer":[]},"_AsyncAwaitCompleter":{"Completer":["1"]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_Future":{"Future":["1"]},"StreamView":{"Stream":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_AsyncStreamController":{"_AsyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_SyncStreamController":{"_SyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_EventSink":["2"],"_EventDispatch":["2"],"_BufferingStreamSubscription.T":"2"},"_MapStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_ZoneSpecification":{"ZoneSpecification":[]},"_ZoneDelegate":{"ZoneDelegate":[]},"_Zone":{"Zone":[]},"_CustomZone":{"_Zone":[],"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"_SplayTreeSetNode":{"_SplayTreeNode":["1","_SplayTreeSetNode<1>"],"_SplayTreeNode.K":"1","_SplayTreeNode.1":"_SplayTreeSetNode<1>"},"_HashMap":{"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_CustomHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashSetIterator":{"Iterator":["1"]},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedHashSetIterator":{"Iterator":["1"]},"UnmodifiableListView":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","Iterable.E":"1","UnmodifiableListMixin.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_ListQueueIterator":{"Iterator":["1"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SplayTreeIterator":{"Iterator":["3"]},"_SplayTreeKeyIterator":{"_SplayTreeIterator":["1","2","1"],"Iterator":["1"],"_SplayTreeIterator.K":"1","_SplayTreeIterator.T":"1","_SplayTreeIterator.1":"2"},"SplayTreeSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"_SplayTree":["1","_SplayTreeSetNode<1>"],"Iterable":["1"],"Iterable.E":"1","_SplayTree.1":"_SplayTreeSetNode<1>","_SplayTree.K":"1"},"Encoding":{"Codec":["String","List"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"_UnicodeSubsetEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"AsciiEncoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"_UnicodeSubsetDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"AsciiDecoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Codec":{"Codec":["List","String"],"Codec.S":"List"},"Base64Encoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Base64Decoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Converter":{"StreamTransformer":["1","2"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"],"Codec.S":"Object?"},"JsonEncoder":{"Converter":["Object?","String"],"StreamTransformer":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"],"StreamTransformer":["String","Object?"]},"Latin1Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Latin1Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Latin1Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"Utf8Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"Utf8Decoder":{"Converter":["List","String"],"StreamTransformer":["List","String"]},"BigInt":{"Comparable":["BigInt"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExp":{"Pattern":[]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"],"Pattern":[]},"_BigIntImpl":{"BigInt":[],"Comparable":["BigInt"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"IntegerDivisionByZeroException":{"Exception":[],"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"_JSRandom":{"Random":[]},"DelegatingStreamSink":{"StreamSink":["1"]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_NextRequest":{"_EventRequest":["1"]},"_HasNextRequest":{"_EventRequest":["1"]},"BuiltList":{"Iterable":["1"]},"_BuiltList":{"BuiltList":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltListMultimap":{"BuiltListMultimap":["1","2"]},"_BuiltMap":{"BuiltMap":["1","2"]},"BuiltSet":{"Iterable":["1"]},"_BuiltSet":{"BuiltSet":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltSetMultimap":{"BuiltSetMultimap":["1","2"]},"BuiltValueNullFieldError":{"Error":[]},"BuiltValueNestedFieldError":{"Error":[]},"BoolJsonObject":{"JsonObject":[]},"ListJsonObject":{"JsonObject":[]},"MapJsonObject":{"JsonObject":[]},"NumJsonObject":{"JsonObject":[]},"StringJsonObject":{"JsonObject":[]},"DeserializationError":{"Error":[]},"BigIntSerializer":{"PrimitiveSerializer":["BigInt"],"Serializer":["BigInt"]},"BoolSerializer":{"PrimitiveSerializer":["bool"],"Serializer":["bool"]},"BuiltJsonSerializers":{"Serializers":[]},"BuiltListMultimapSerializer":{"StructuredSerializer":["BuiltListMultimap<@,@>"],"Serializer":["BuiltListMultimap<@,@>"]},"BuiltListSerializer":{"StructuredSerializer":["BuiltList<@>"],"Serializer":["BuiltList<@>"]},"BuiltMapSerializer":{"StructuredSerializer":["BuiltMap<@,@>"],"Serializer":["BuiltMap<@,@>"]},"BuiltSetMultimapSerializer":{"StructuredSerializer":["BuiltSetMultimap<@,@>"],"Serializer":["BuiltSetMultimap<@,@>"]},"BuiltSetSerializer":{"StructuredSerializer":["BuiltSet<@>"],"Serializer":["BuiltSet<@>"]},"DateTimeSerializer":{"PrimitiveSerializer":["DateTime"],"Serializer":["DateTime"]},"DoubleSerializer":{"PrimitiveSerializer":["double"],"Serializer":["double"]},"DurationSerializer":{"PrimitiveSerializer":["Duration"],"Serializer":["Duration"]},"Int32Serializer":{"PrimitiveSerializer":["Int32"],"Serializer":["Int32"]},"Int64Serializer":{"PrimitiveSerializer":["Int64"],"Serializer":["Int64"]},"IntSerializer":{"PrimitiveSerializer":["int"],"Serializer":["int"]},"JsonObjectSerializer":{"PrimitiveSerializer":["JsonObject"],"Serializer":["JsonObject"]},"NullSerializer":{"PrimitiveSerializer":["Null"],"Serializer":["Null"]},"NumSerializer":{"PrimitiveSerializer":["num"],"Serializer":["num"]},"RegExpSerializer":{"PrimitiveSerializer":["RegExp"],"Serializer":["RegExp"]},"StringSerializer":{"PrimitiveSerializer":["String"],"Serializer":["String"]},"Uint8ListSerializer":{"PrimitiveSerializer":["Uint8List"],"Serializer":["Uint8List"]},"UriSerializer":{"PrimitiveSerializer":["Uri"],"Serializer":["Uri"]},"CanonicalizedMap":{"Map":["2","3"]},"DefaultEquality":{"Equality":["1"]},"IterableEquality":{"Equality":["Iterable<1>"]},"ListEquality":{"Equality":["List<1>"]},"_UnorderedEquality":{"Equality":["2"]},"SetEquality":{"_UnorderedEquality":["1","Set<1>"],"Equality":["Set<1>"],"_UnorderedEquality.E":"1","_UnorderedEquality.T":"Set<1>"},"MapEquality":{"Equality":["Map<1,2>"]},"DeepCollectionEquality":{"Equality":["@"]},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1","Iterable.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2","Iterable.E":"2"},"_$BuildStatusSerializer":{"PrimitiveSerializer":["BuildStatus"],"Serializer":["BuildStatus"]},"_$BuildResultSerializer":{"StructuredSerializer":["BuildResult"],"Serializer":["BuildResult"]},"_$BuildResult":{"BuildResult":[]},"_$ConnectRequestSerializer":{"StructuredSerializer":["ConnectRequest"],"Serializer":["ConnectRequest"]},"_$ConnectRequest":{"ConnectRequest":[]},"_$DebugEventSerializer":{"StructuredSerializer":["DebugEvent"],"Serializer":["DebugEvent"]},"_$BatchedDebugEventsSerializer":{"StructuredSerializer":["BatchedDebugEvents"],"Serializer":["BatchedDebugEvents"]},"_$DebugEvent":{"DebugEvent":[]},"_$BatchedDebugEvents":{"BatchedDebugEvents":[]},"_$DebugInfoSerializer":{"StructuredSerializer":["DebugInfo"],"Serializer":["DebugInfo"]},"_$DebugInfo":{"DebugInfo":[]},"_$DevToolsRequestSerializer":{"StructuredSerializer":["DevToolsRequest"],"Serializer":["DevToolsRequest"]},"_$DevToolsResponseSerializer":{"StructuredSerializer":["DevToolsResponse"],"Serializer":["DevToolsResponse"]},"_$DevToolsRequest":{"DevToolsRequest":[]},"_$DevToolsResponse":{"DevToolsResponse":[]},"_$ErrorResponseSerializer":{"StructuredSerializer":["ErrorResponse"],"Serializer":["ErrorResponse"]},"_$ErrorResponse":{"ErrorResponse":[]},"_$ExtensionRequestSerializer":{"StructuredSerializer":["ExtensionRequest"],"Serializer":["ExtensionRequest"]},"_$ExtensionResponseSerializer":{"StructuredSerializer":["ExtensionResponse"],"Serializer":["ExtensionResponse"]},"_$ExtensionEventSerializer":{"StructuredSerializer":["ExtensionEvent"],"Serializer":["ExtensionEvent"]},"_$BatchedEventsSerializer":{"StructuredSerializer":["BatchedEvents"],"Serializer":["BatchedEvents"]},"_$ExtensionRequest":{"ExtensionRequest":[]},"_$ExtensionResponse":{"ExtensionResponse":[]},"_$ExtensionEvent":{"ExtensionEvent":[]},"_$BatchedEvents":{"BatchedEvents":[]},"_$IsolateExitSerializer":{"StructuredSerializer":["IsolateExit"],"Serializer":["IsolateExit"]},"_$IsolateStartSerializer":{"StructuredSerializer":["IsolateStart"],"Serializer":["IsolateStart"]},"_$IsolateExit":{"IsolateExit":[]},"_$IsolateStart":{"IsolateStart":[]},"_$RegisterEventSerializer":{"StructuredSerializer":["RegisterEvent"],"Serializer":["RegisterEvent"]},"_$RegisterEvent":{"RegisterEvent":[]},"_$RunRequestSerializer":{"StructuredSerializer":["RunRequest"],"Serializer":["RunRequest"]},"_$RunRequest":{"RunRequest":[]},"SseSocketClient":{"SocketClient":[]},"WebSocketClient":{"SocketClient":[]},"Int32":{"Comparable":["Object"]},"Int64":{"Comparable":["Object"]},"ByteStream":{"StreamView":["List"],"Stream":["List"],"Stream.T":"List","StreamView.T":"List"},"ClientException":{"Exception":[]},"Request":{"BaseRequest":[]},"StreamedResponseV2":{"StreamedResponse":[]},"CaseInsensitiveMap":{"CanonicalizedMap":["String","String","1"],"Map":["String","1"],"CanonicalizedMap.K":"String","CanonicalizedMap.V":"1","CanonicalizedMap.C":"String"},"Level":{"Comparable":["Level"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"_FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SseClient":{"StreamChannel":["String?"]},"GuaranteeChannel":{"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"StringScannerException":{"FormatException":[],"Exception":[]},"_EventStream":{"Stream":["1"],"Stream.T":"1"},"_EventStreamSubscription":{"StreamSubscription":["1"]},"BrowserWebSocket":{"WebSocket":[]},"TextDataReceived":{"WebSocketEvent":[]},"BinaryDataReceived":{"WebSocketEvent":[]},"CloseReceived":{"WebSocketEvent":[]},"WebSocketException":{"Exception":[]},"WebSocketConnectionClosed":{"Exception":[]},"AdapterWebSocketChannel":{"WebSocketChannel":[],"StreamChannel":["@"]},"_WebSocketSink":{"WebSocketSink":[],"DelegatingStreamSink":["@"],"StreamSink":["@"],"DelegatingStreamSink.T":"@"},"WebSocketChannelException":{"Exception":[]},"DdcLibraryBundleRestarter":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"HotReloadFailedException":{"Exception":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"UnmodifiableListBase":1,"__CastListBase__CastIterableBase_ListMixin":2,"NativeTypedArray":1,"_DelayedEvent":1,"_SplayTreeSet__SplayTree_Iterable":1,"_SplayTreeSet__SplayTree_Iterable_SetMixin":1,"_QueueList_Object_ListMixin":1,"StreamChannelMixin":1}')); var string$ = { x00_____: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\u03f6\x00\u0404\u03f4 \u03f4\u03f6\u01f6\u01f6\u03f6\u03fc\u01f4\u03ff\u03ff\u0584\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u05d4\u01f4\x00\u01f4\x00\u0504\u05c4\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0400\x00\u0400\u0200\u03f7\u0200\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0200\u0200\u0200\u03f7\x00", @@ -28044,7 +27573,6 @@ Cannotfq: "Cannot extract a file path from a URI with a query component", Cannotn: "Cannot extract a non-Windows file path from a file URI with an authority", Error_: "Error handler must accept one Object or one Object and a StackTrace as arguments, and return a value of the returned future's type", - max_mu: "max must be in range 0 < max \u2264 2^32, was ", serial: "serializer must be StructuredSerializer or PrimitiveSerializer" }; var type$ = (function rtii() { @@ -28175,7 +27703,6 @@ StackTrace: findType("StackTrace"), StreamChannelController_nullable_Object: findType("StreamChannelController"), StreamQueue_DebugEvent: findType("StreamQueue"), - Stream_dynamic: findType("Stream<@>"), StreamedResponse: findType("StreamedResponse"), String: findType("String"), String_Function_Match: findType("String(Match)"), @@ -28199,18 +27726,19 @@ Zone: findType("Zone"), _AsyncCompleter_BrowserWebSocket: findType("_AsyncCompleter"), _AsyncCompleter_PoolResource: findType("_AsyncCompleter"), + _AsyncCompleter_StreamedResponse: findType("_AsyncCompleter"), _AsyncCompleter_String: findType("_AsyncCompleter"), _AsyncCompleter_Uint8List: findType("_AsyncCompleter"), _AsyncCompleter_bool: findType("_AsyncCompleter"), _AsyncCompleter_dynamic: findType("_AsyncCompleter<@>"), _AsyncCompleter_void: findType("_AsyncCompleter<~>"), - _AsyncStreamController_List_int: findType("_AsyncStreamController>"), _BigIntImpl: findType("_BigIntImpl"), _BuiltMap_dynamic_dynamic: findType("_BuiltMap<@,@>"), _EventRequest_dynamic: findType("_EventRequest<@>"), _EventStream_JSObject: findType("_EventStream"), _Future_BrowserWebSocket: findType("_Future"), _Future_PoolResource: findType("_Future"), + _Future_StreamedResponse: findType("_Future"), _Future_String: findType("_Future"), _Future_Uint8List: findType("_Future"), _Future_bool: findType("_Future"), @@ -28256,7 +27784,6 @@ nullable__Highlight: findType("_Highlight?"), nullable__LinkedHashSetCell: findType("_LinkedHashSetCell?"), nullable_bool: findType("bool?"), - nullable_bool_Function_Object: findType("bool(Object)?"), nullable_double: findType("double?"), nullable_int: findType("int?"), nullable_num: findType("num?"), @@ -28275,8 +27802,7 @@ void_Function_Object: findType("~(Object)"), void_Function_Object_StackTrace: findType("~(Object,StackTrace)"), void_Function_String_dynamic: findType("~(String,@)"), - void_Function_Timer: findType("~(Timer)"), - void_Function_int_dynamic: findType("~(int,@)") + void_Function_Timer: findType("~(Timer)") }; })(); (function constants() { @@ -28289,7 +27815,6 @@ B.JSString_methods = J.JSString.prototype; B.JavaScriptFunction_methods = J.JavaScriptFunction.prototype; B.JavaScriptObject_methods = J.JavaScriptObject.prototype; - B.NativeByteData_methods = A.NativeByteData.prototype; B.NativeUint32List_methods = A.NativeUint32List.prototype; B.NativeUint8List_methods = A.NativeUint8List.prototype; B.PlainJavaScriptObject_methods = J.PlainJavaScriptObject.prototype; @@ -28694,11 +28219,6 @@ _lazyFinal($, "_Uri__needsNoEncoding", "$get$_Uri__needsNoEncoding", () => A.RegExp_RegExp("^[\\-\\.0-9A-Z_a-z~]*$", true, false)); _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_A4p)); _lazyFinal($, "_jsBoxedDartObjectProperty", "$get$_jsBoxedDartObjectProperty", () => Symbol("jsBoxedDartObjectProperty")); - _lazyFinal($, "Random__secureRandom", "$get$Random__secureRandom", () => { - var t1 = new A._JSSecureRandom(new DataView(new ArrayBuffer(A._checkLength(8)))); - t1._JSSecureRandom$0(); - return t1; - }); _lazyFinal($, "isSoundMode", "$get$isSoundMode", () => !type$.List_int._is(A._setArrayType([], A.findType("JSArray")))); _lazy($, "newBuiltValueToStringHelper", "$get$newBuiltValueToStringHelper", () => new A.newBuiltValueToStringHelper_closure()); _lazyFinal($, "_runtimeType", "$get$_runtimeType", () => A.getRuntimeTypeOfDartObject(A.RegExp_RegExp("", true, false))); @@ -28746,10 +28266,11 @@ }); _lazyFinal($, "_logger", "$get$_logger", () => A.Logger_Logger("Utilities")); _lazyFinal($, "BaseRequest__tokenRE", "$get$BaseRequest__tokenRE", () => A.RegExp_RegExp("^[\\w!#%&'*+\\-.^`|~]+$", true, false)); + _lazyFinal($, "_digitRegex", "$get$_digitRegex", () => A.RegExp_RegExp("^\\d+$", true, false)); _lazyFinal($, "_escapedChar", "$get$_escapedChar", () => A.RegExp_RegExp('["\\x00-\\x1F\\x7F]', true, false)); _lazyFinal($, "token", "$get$token", () => A.RegExp_RegExp('[^()<>@,;:"\\\\/[\\]?={} \\t\\x00-\\x1F\\x7F]+', true, false)); _lazyFinal($, "_lws", "$get$_lws", () => A.RegExp_RegExp("(?:\\r\\n)?[ \\t]+", true, false)); - _lazyFinal($, "_quotedString", "$get$_quotedString", () => A.RegExp_RegExp('"(?:[^"\\x00-\\x1F\\x7F\\\\]|\\\\.)*"', true, false)); + _lazyFinal($, "_quotedString", "$get$_quotedString", () => A.RegExp_RegExp('"(?:[^"\\x00-\\x1F\\x7F]|\\\\.)*"', true, false)); _lazyFinal($, "_quotedPair", "$get$_quotedPair", () => A.RegExp_RegExp("\\\\(.)", true, false)); _lazyFinal($, "nonToken", "$get$nonToken", () => A.RegExp_RegExp('[()<>@,;:"\\\\/\\[\\]?={} \\t\\x00-\\x1F\\x7F]', true, false)); _lazyFinal($, "whitespace", "$get$whitespace", () => A.RegExp_RegExp("(?:" + $.$get$_lws().pattern + ")*", true, false)); @@ -28768,7 +28289,10 @@ t4 = A.Completer_Completer(type$.dynamic); return new A.Pool(t2, t3, t1, 1000, new A.AsyncMemoizer(t4, A.findType("AsyncMemoizer<@>"))); }); - _lazy($, "V1State_random", "$get$V1State_random", () => new A.CryptoRNG()); + _lazy($, "V1State_random", "$get$V1State_random", () => { + var t1 = A.Random_Random(null); + return new A.MathRNG(t1); + }); _lazyFinal($, "UuidParsing__byteToHex", "$get$UuidParsing__byteToHex", () => { var i, _list = J.JSArray_JSArray$allocateGrowable(256, type$.String); @@ -28776,7 +28300,6 @@ _list[i] = B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(i, 16), 2, "0"); return _list; }); - _lazyFinal($, "CryptoRNG__secureRandom", "$get$CryptoRNG__secureRandom", () => $.$get$Random__secureRandom()); _lazyFinal($, "_noncePattern", "$get$_noncePattern", () => A.RegExp_RegExp("^[\\w+/_-]+[=]{0,2}$", true, false)); _lazyFinal($, "_createScript", "$get$_createScript", () => new A._createScript_closure().call$0()); })(); diff --git a/dwds/lib/src/loaders/ddc_library_bundle.dart b/dwds/lib/src/loaders/ddc_library_bundle.dart index 2ea4e4f8b..220b73828 100644 --- a/dwds/lib/src/loaders/ddc_library_bundle.dart +++ b/dwds/lib/src/loaders/ddc_library_bundle.dart @@ -104,6 +104,27 @@ class DdcLibraryBundleStrategy extends LoadStrategy { final BuildSettings _buildSettings; + /// The [Uri] of the file that contains a JSONified list of maps which follows + /// the following format: + /// + /// ```json + /// [ + /// { + /// "src": "", + /// "libraries": ["", ""], + /// }, + /// ] + /// ``` + /// + /// `src`: A string that corresponds to the file path containing a DDC library + /// bundle. + /// `libraries`: An array of strings containing the libraries that were + /// compiled in `src`. + /// + /// This is needed for hot reloads in order to tell the compiler what files + /// need to be loaded and what libraries need to be reloaded. + final Uri? hotReloadSourcesUri; + DdcLibraryBundleStrategy( this.reloadConfiguration, this._moduleProvider, @@ -117,6 +138,7 @@ class DdcLibraryBundleStrategy extends LoadStrategy { this._buildSettings, this._g3RelativePath, { String? packageConfigPath, + this.hotReloadSourcesUri, }) : super(assetReader, packageConfigPath: packageConfigPath); @override diff --git a/dwds/lib/src/loaders/frontend_server_strategy_provider.dart b/dwds/lib/src/loaders/frontend_server_strategy_provider.dart index 85585568d..0aa6930ca 100644 --- a/dwds/lib/src/loaders/frontend_server_strategy_provider.dart +++ b/dwds/lib/src/loaders/frontend_server_strategy_provider.dart @@ -141,21 +141,7 @@ class FrontendServerDdcStrategyProvider /// Server. class FrontendServerDdcLibraryBundleStrategyProvider extends FrontendServerStrategyProvider { - late final DdcLibraryBundleStrategy _libraryBundleStrategy = - DdcLibraryBundleStrategy( - _configuration, - _moduleProvider, - (_) => _digestsProvider(), - _moduleForServerPath, - _serverPathForModule, - _sourceMapPathForModule, - _serverPathForAppUri, - _moduleInfoForProvider, - _assetReader, - _buildSettings, - (String _) => null, - packageConfigPath: _packageConfigPath, - ); + late final DdcLibraryBundleStrategy _libraryBundleStrategy; FrontendServerDdcLibraryBundleStrategyProvider( super._configuration, @@ -164,7 +150,24 @@ class FrontendServerDdcLibraryBundleStrategyProvider super._digestsProvider, super._buildSettings, { super.packageConfigPath, - }); + Uri? hotReloadSourcesUri, + }) { + _libraryBundleStrategy = DdcLibraryBundleStrategy( + _configuration, + _moduleProvider, + (_) => _digestsProvider(), + _moduleForServerPath, + _serverPathForModule, + _sourceMapPathForModule, + _serverPathForAppUri, + _moduleInfoForProvider, + _assetReader, + _buildSettings, + (String _) => null, + packageConfigPath: _packageConfigPath, + hotReloadSourcesUri: hotReloadSourcesUri, + ); + } @override DdcLibraryBundleStrategy get strategy => _libraryBundleStrategy; diff --git a/dwds/lib/src/services/chrome_proxy_service.dart b/dwds/lib/src/services/chrome_proxy_service.dart index ec483b8ce..93b9f6751 100644 --- a/dwds/lib/src/services/chrome_proxy_service.dart +++ b/dwds/lib/src/services/chrome_proxy_service.dart @@ -1098,19 +1098,21 @@ class ChromeProxyService implements VmServiceInterface { String? packagesUri, }) async { _logger.info('Attempting a hot reload'); + ReloadReport getFailedReloadReport(String error) => + _ReloadReportWithMetadata(success: false) + ..json = { + 'notices': [ + {'message': error}, + ], + }; + try { _logger.info('Issuing \$dartHotReloadDwds request'); await inspector.jsEvaluate('\$dartHotReloadDwds();', awaitPromise: true); _logger.info('\$dartHotReloadDwds request complete.'); } catch (e) { _logger.info('Hot reload failed: $e'); - final report = _ReloadReportWithMetadata(success: false); - report.json = { - 'notices': [ - {'message': e.toString()}, - ], - }; - return report; + return getFailedReloadReport(e.toString()); } _logger.info('Successful hot reload'); return _ReloadReportWithMetadata(success: true); diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart index 949f7cf1d..f249957a4 100644 --- a/dwds/lib/src/version.dart +++ b/dwds/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '24.3.6-dev'; +const packageVersion = '24.3.6'; diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index f4858ef63..d2d68a654 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -1,6 +1,6 @@ name: dwds # Every time this changes you need to run `dart run build_runner build`. -version: 24.3.6-dev +version: 24.3.6 description: >- A service that proxies between the Chrome debug protocol and the Dart VM service protocol. diff --git a/dwds/web/client.dart b/dwds/web/client.dart index 06c747f18..d7f5b14d8 100644 --- a/dwds/web/client.dart +++ b/dwds/web/client.dart @@ -63,7 +63,7 @@ Future? main() { hotReloadJs = () { - return manager.hotReload().toJS; + return manager.hotReload(hotReloadSourcesPath).toJS; }.toJS; Completer? readyToRunMainCompleter; @@ -175,7 +175,7 @@ Future? main() { 'ReloadConfiguration.hotRestart') { await manager.hotRestart(); } else if (reloadConfiguration == 'ReloadConfiguration.hotReload') { - await manager.hotReload(); + await manager.hotReload(hotReloadSourcesPath); } } else if (event is DevToolsResponse) { if (!event.success) { @@ -376,6 +376,19 @@ external String get dartModuleStrategy; @JS(r'$dartHotReloadDwds') external set hotReloadJs(JSFunction cb); +@JS(r'$hotReloadSourcesPath') +external String? get _hotReloadSourcesPath; + +String get hotReloadSourcesPath { + final path = _hotReloadSourcesPath; + if (path == null) { + throw StateError( + "Expected 'hotReloadSourcePath' to not be null in a hot reload.", + ); + } + return path; +} + @JS(r'$dartHotRestartDwds') external set hotRestartJs(JSFunction cb); diff --git a/dwds/web/reloader/ddc_library_bundle_restarter.dart b/dwds/web/reloader/ddc_library_bundle_restarter.dart index fe5003539..f91f74aaf 100644 --- a/dwds/web/reloader/ddc_library_bundle_restarter.dart +++ b/dwds/web/reloader/ddc_library_bundle_restarter.dart @@ -11,10 +11,6 @@ import 'restarter.dart'; @JS('dartDevEmbedder') external _DartDevEmbedder get _dartDevEmbedder; -// Flutter tools should set this path up before a hot reload. -@JS('\$reloadScriptsPath') -external String get _reloadScriptsPath; - extension type _DartDevEmbedder._(JSObject _) implements JSObject { external _Debugger get debugger; external JSPromise hotRestart(); @@ -69,7 +65,7 @@ class DdcLibraryBundleRestarter implements Restarter { } @override - Future reload() async { + Future reload(String hotReloadSourcesPath) async { final completer = Completer(); final xhr = _XMLHttpRequest(); xhr.withCredentials = true; @@ -80,20 +76,10 @@ class DdcLibraryBundleRestarter implements Restarter { completer.complete(xhr.responseText); } }.toJS; - xhr.get(_reloadScriptsPath, true); + xhr.get(hotReloadSourcesPath, true); xhr.send(); final responseText = await completer.future; - // Expect the response to be in the format: - // ``` - // [ - // { - // 'src': '', - // 'libraries': ['', ...], - // }, - // ... - // ] - // ``` final srcLibraries = (json.decode(responseText) as List).cast(); final filesToLoad = JSArray(); final librariesToReload = JSArray(); diff --git a/dwds/web/reloader/ddc_restarter.dart b/dwds/web/reloader/ddc_restarter.dart index 6c3ec5371..038d32849 100644 --- a/dwds/web/reloader/ddc_restarter.dart +++ b/dwds/web/reloader/ddc_restarter.dart @@ -41,7 +41,7 @@ class DdcRestarter implements Restarter { } @override - Future reload() => + Future reload(String hotReloadSourcesPath) => throw UnimplementedError( 'Hot reload is not supported for the DDC module format.', ); diff --git a/dwds/web/reloader/manager.dart b/dwds/web/reloader/manager.dart index 9625b1137..1a85fc3cc 100644 --- a/dwds/web/reloader/manager.dart +++ b/dwds/web/reloader/manager.dart @@ -35,9 +35,24 @@ class ReloadingManager { return result; } - /// Performs a hot reload. - Future hotReload() async { - await _restarter.reload(); + /// Performs a hot reload using [hotReloadSourcesPath] as the path to a + /// JSONified list of maps which follows the following format: + /// + /// ```json + /// [ + /// { + /// "src": "", + /// "libraries": ["", ""], + /// }, + /// ] + /// ``` + /// + /// `src`: A string that corresponds to the file path containing a DDC library + /// bundle. + /// `libraries`: An array of strings containing the libraries that were + /// compiled in `src`. + Future hotReload(String hotReloadSourcesPath) async { + await _restarter.reload(hotReloadSourcesPath); } /// Does a hard reload of the application. diff --git a/dwds/web/reloader/require_restarter.dart b/dwds/web/reloader/require_restarter.dart index 3c6bfd60a..520f8faa4 100644 --- a/dwds/web/reloader/require_restarter.dart +++ b/dwds/web/reloader/require_restarter.dart @@ -162,7 +162,7 @@ class RequireRestarter implements Restarter { } @override - Future reload() => + Future reload(String hotReloadSourcesPath) => throw UnimplementedError( 'Hot reload is not supported for the AMD module format.', ); diff --git a/dwds/web/reloader/restarter.dart b/dwds/web/reloader/restarter.dart index af9ad2e11..0c8d317f4 100644 --- a/dwds/web/reloader/restarter.dart +++ b/dwds/web/reloader/restarter.dart @@ -7,6 +7,21 @@ abstract class Restarter { /// not. Future restart({String? runId, Future? readyToRunMain}); - /// Performs a hot reload. - Future reload(); + /// Performs a hot reload using [hotReloadSourcesPath] as the path to a + /// JSONified list of maps which follows the following format: + /// + /// ```json + /// [ + /// { + /// "src": "", + /// "libraries": ["", ""], + /// }, + /// ] + /// ``` + /// + /// `src`: A string that corresponds to the file path containing a DDC library + /// bundle. + /// `libraries`: An array of strings containing the libraries that were + /// compiled in `src`. + Future reload(String hotReloadSourcesPath); }