From 4ba769000ea7323887e003266427aed3fbe6d643 Mon Sep 17 00:00:00 2001 From: Srujan Gaddam Date: Tue, 19 Nov 2024 15:24:38 -0800 Subject: [PATCH 1/5] Add minimal bootstrapper for ddc_library_bundle format Contains the following changes: - Bootstrapping scripts to load the needed scripts (including the module loader, dart_sdk, source maps, etc.) and to call main. - DDC library bundle load strategy that's mostly the DDC load strategy currently. - Fixes tests not passing canary feature flag. - Changes to the injected client to handle the new library format and use a no-op restarter for now. - Fixes some small typos/formatting. --- dwds/lib/src/handlers/injector.dart | 2 +- dwds/lib/src/injected/client.js | 1428 ++++++++--------- dwds/lib/src/loaders/ddc.dart | 4 +- dwds/lib/src/loaders/ddc_library_bundle.dart | 193 +++ .../frontend_server_strategy_provider.dart | 33 + dwds/test/evaluate_common.dart | 2 + dwds/test/fixtures/context.dart | 15 +- dwds/web/client.dart | 16 +- .../ddc_library_bundle_restarter.dart | 15 + .../lib/src/dartdevc_bootstrap_amd.dart | 2 +- frontend_server_common/lib/src/bootstrap.dart | 93 +- frontend_server_common/lib/src/devfs.dart | 41 +- .../lib/src/resident_runner.dart | 2 +- 13 files changed, 1092 insertions(+), 754 deletions(-) create mode 100644 dwds/lib/src/loaders/ddc_library_bundle.dart create mode 100644 dwds/web/reloader/ddc_library_bundle_restarter.dart diff --git a/dwds/lib/src/handlers/injector.dart b/dwds/lib/src/handlers/injector.dart index d179f977b..b9ea9bc72 100644 --- a/dwds/lib/src/handlers/injector.dart +++ b/dwds/lib/src/handlers/injector.dart @@ -18,7 +18,7 @@ import 'package:shelf/shelf.dart'; const bootstrapJsExtension = '.bootstrap.js'; /// Marker placed by build_web_compilers for where to put injected JS code. -const entrypointExtensionMarker = '/* ENTRYPOINT_EXTENTION_MARKER */'; +const entrypointExtensionMarker = '/* ENTRYPOINT_EXTENSION_MARKER */'; /// Marker placed by build_web_compilers for where to put injected JS code. const mainExtensionMarker = '/* MAIN_EXTENSION_MARKER */'; diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index d574bb1b1..0090fece6 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.6.0-134.0.dev. +// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.7.0-157.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -14,17 +14,16 @@ // is loaded. It should load and eval the javascript of `uri`, and call // successCallback. If it fails to do so, it should call errorCallback with // an error. The loadId argument is the deferred import that resulted in -// this uri being loaded. The loadPriority argument is the priority the -// library should be loaded with as specified in the code via the -// load-priority annotation (0: normal, 1: high). +// this uri being loaded. The loadPriority argument is an arbitrary argument +// string forwarded from the 'dart2js:load-priority' pragma option. // dartDeferredLibraryMultiLoader(uris, successCallback, errorCallback, loadId, loadPriority): // if this function is defined, it will be called when a deferred library // is loaded. It should load and eval the javascript of every URI in `uris`, // and call successCallback. If it fails to do so, it should call // errorCallback with an error. The loadId argument is the deferred import -// that resulted in this uri being loaded. The loadPriority argument is the -// priority the library should be loaded with as specified in the code via -// the load-priority annotation (0: normal, 1: high). +// that resulted in this uri being loaded. The loadPriority argument is an +// arbitrary argument string forwarded from the 'dart2js:load-priority' +// pragma option. // // dartCallInstrumentation(id, qualifiedName): // if this function is defined, it will be called at each entry of a @@ -367,15 +366,6 @@ return receiver; return J.getNativeInterceptor(receiver); }, - getInterceptor$n(receiver) { - if (typeof receiver == "number") - return J.JSNumber.prototype; - if (receiver == null) - return receiver; - if (!(receiver instanceof A.Object)) - return J.UnknownJavaScriptObject.prototype; - return receiver; - }, getInterceptor$ns(receiver) { if (typeof receiver == "number") return J.JSNumber.prototype; @@ -396,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); - }, get$first$ax(receiver) { return J.getInterceptor$ax(receiver).get$first(receiver); }, @@ -453,9 +427,6 @@ allMatches$1$s(receiver, a0) { return J.getInterceptor$s(receiver).allMatches$1(receiver, a0); }, - asUint8List$2$x(receiver, a0, a1) { - return J.getInterceptor$x(receiver).asUint8List$2(receiver, a0, a1); - }, compareTo$1$ns(receiver, a0) { return J.getInterceptor$ns(receiver).compareTo$1(receiver, a0); }, @@ -486,9 +457,6 @@ toList$0$ax(receiver) { return J.getInterceptor$ax(receiver).toList$0(receiver); }, - toRadixString$1$n(receiver, a0) { - return J.getInterceptor$n(receiver).toRadixString$1(receiver, a0); - }, toString$0$(receiver) { return J.getInterceptor$(receiver).toString$0(receiver); }, @@ -933,6 +901,14 @@ return null; return A.getTraceFromException(jsError); }, + Primitives_trySetStackTrace(error, stackTrace) { + var jsError; + if (error.$thrownJsError == null) { + jsError = A.wrapException(error); + error.$thrownJsError = jsError; + jsError.stack = stackTrace.toString$0(0); + } + }, iae(argument) { throw A.wrapException(A.argumentErrorValue(argument)); }, @@ -961,9 +937,6 @@ argumentErrorValue(object) { return new A.ArgumentError(true, object, null, null); }, - checkNum(value) { - return value; - }, wrapException(ex) { return A.initializeExceptionWrapper(new Error(), ex); }, @@ -1807,9 +1780,6 @@ this._name = t0; this.__late_helper$_value = null; }, - _checkLength($length) { - return $length; - }, _ensureNativeList(list) { return list; }, @@ -1845,9 +1815,6 @@ }, NativeTypedData: function NativeTypedData() { }, - _UnmodifiableNativeByteBufferView: function _UnmodifiableNativeByteBufferView(t0) { - this.__native_typed_data$_data = t0; - }, NativeByteData: function NativeByteData() { }, NativeTypedArray: function NativeTypedArray() { @@ -2456,7 +2423,7 @@ t4 = t3 - 1 - i; if (!(t4 >= 0)) return A.ioore(genericContext, t4); - typeParametersText = B.JSString_methods.$add(typeParametersText + typeSep, genericContext[t4]); + typeParametersText = typeParametersText + typeSep + genericContext[t4]; boundRti = bounds[i]; kind = boundRti._kind; if (!(kind === 2 || kind === 3 || kind === 4 || kind === 5 || boundRti === t1)) @@ -3528,10 +3495,6 @@ }($function, 1); return $.Zone__current.registerBinaryCallback$3$1(new A._wrapJsFunctionForAsync_closure($protected), type$.void, type$.int, type$.dynamic); }, - AsyncError$(error, stackTrace) { - var t1 = A.checkNotNullable(error, "error", type$.Object); - return new A.AsyncError(t1, stackTrace == null ? A.AsyncError_defaultStackTrace(error) : stackTrace); - }, AsyncError_defaultStackTrace(error) { var stackTrace; if (type$.Error._is(error)) { @@ -3539,7 +3502,7 @@ if (stackTrace != null) return stackTrace; } - return B._StringStackTrace_uwd; + return B._StringStackTrace_OdL; }, Future_Future$microtask(computation, $T) { var result = new A._Future($.Zone__current, $T._eval$1("_Future<0>")); @@ -3547,19 +3510,21 @@ return result; }, Future_Future$sync(computation, $T) { - var error, stackTrace, future, replacement, exception, t1, result = null; + var error, stackTrace, future, exception, replacement, result = null; try { result = computation.call$0(); } catch (exception) { error = A.unwrapException(exception); stackTrace = A.getTraceFromException(exception); - t1 = $.Zone__current; - future = new A._Future(t1, $T._eval$1("_Future<0>")); - replacement = t1.errorCallback$2(error, stackTrace); - if (replacement != null) - future._asyncCompleteError$2(replacement.error, replacement.stackTrace); - else - future._asyncCompleteError$2(error, stackTrace); + future = new A._Future($.Zone__current, $T._eval$1("_Future<0>")); + error = error; + stackTrace = stackTrace; + replacement = A._interceptError(error, stackTrace); + if (replacement != null) { + error = replacement.error; + stackTrace = replacement.stackTrace; + } + future._asyncCompleteError$2(error, stackTrace); return future; } return $T._eval$1("Future<0>")._is(result) ? result : A._Future$value(result, $T); @@ -3574,14 +3539,47 @@ return new A._AsyncCompleter(new A._Future($.Zone__current, $T._eval$1("_Future<0>")), $T._eval$1("_AsyncCompleter<0>")); }, _completeWithErrorCallback(result, error, stackTrace) { - var replacement = $.Zone__current.errorCallback$2(error, stackTrace); + var replacement = A._interceptError(error, stackTrace); if (replacement != null) { error = replacement.error; stackTrace = replacement.stackTrace; - } else if (stackTrace == null) - stackTrace = A.AsyncError_defaultStackTrace(error); + } result._completeError$2(error, stackTrace); }, + _interceptError(error, stackTrace) { + var replacement, t1, t2, + zone = $.Zone__current; + if (zone === B.C__RootZone) + return null; + replacement = zone.errorCallback$2(error, stackTrace); + if (replacement == null) + return null; + t1 = replacement.error; + t2 = replacement.stackTrace; + if (type$.Error._is(t1)) + A.Primitives_trySetStackTrace(t1, t2); + return replacement; + }, + _interceptUserError(error, stackTrace) { + var replacement; + if ($.Zone__current !== B.C__RootZone) { + replacement = A._interceptError(error, stackTrace); + if (replacement != null) + return replacement; + } + if (stackTrace == null) + if (type$.Error._is(error)) { + stackTrace = error.get$stackTrace(); + if (stackTrace == null) { + A.Primitives_trySetStackTrace(error, B._StringStackTrace_OdL); + stackTrace = B._StringStackTrace_OdL; + } + } else + stackTrace = B._StringStackTrace_OdL; + else if (type$.Error._is(error)) + A.Primitives_trySetStackTrace(error, stackTrace); + return new A.AsyncError(error, stackTrace); + }, _Future$value(value, $T) { var t1 = new A._Future($.Zone__current, $T._eval$1("_Future<0>")); $T._as(value); @@ -3589,28 +3587,8 @@ t1._resultOrListeners = value; return t1; }, - _Future__chainCoreFutureSync(source, target) { - var t1, t2, listeners; - for (t1 = type$._Future_dynamic; t2 = source._state, (t2 & 4) !== 0;) - source = t1._as(source._resultOrListeners); - if (source === target) { - target._asyncCompleteError$2(new A.ArgumentError(true, source, null, "Cannot complete a future with itself"), A.StackTrace_current()); - return; - } - t1 = t2 | target._state & 1; - source._state = t1; - if ((t1 & 24) !== 0) { - listeners = target._removeListeners$0(); - target._cloneResult$1(source); - A._Future__propagateToListeners(target, listeners); - } else { - listeners = type$.nullable__FutureListener_dynamic_dynamic._as(target._resultOrListeners); - target._setChained$1(source); - source._prependListeners$1(listeners); - } - }, - _Future__chainCoreFutureAsync(source, target) { - var t2, t3, listeners, _box_0 = {}, + _Future__chainCoreFuture(source, target, sync) { + var t2, t3, ignoreError, listeners, _box_0 = {}, t1 = _box_0.source = source; for (t2 = type$._Future_dynamic; t3 = t1._state, (t3 & 4) !== 0; t1 = source) { source = t2._as(t1._resultOrListeners); @@ -3620,18 +3598,30 @@ target._asyncCompleteError$2(new A.ArgumentError(true, t1, null, "Cannot complete a future with itself"), A.StackTrace_current()); return; } - if ((t3 & 24) === 0) { + ignoreError = target._state & 1; + t2 = t1._state = t3 | ignoreError; + if ((t2 & 24) === 0) { listeners = type$.nullable__FutureListener_dynamic_dynamic._as(target._resultOrListeners); - target._setChained$1(t1); - _box_0.source._prependListeners$1(listeners); + target._state = target._state & 1 | 4; + target._resultOrListeners = t1; + t1._prependListeners$1(listeners); return; } - if ((t3 & 16) === 0 && target._resultOrListeners == null) { - target._cloneResult$1(t1); + if (!sync) + if (target._resultOrListeners == null) + t1 = (t2 & 16) === 0 || ignoreError !== 0; + else + t1 = false; + else + t1 = true; + if (t1) { + listeners = target._removeListeners$0(); + target._cloneResult$1(_box_0.source); + A._Future__propagateToListeners(target, listeners); return; } target._state ^= 2; - target._zone.scheduleMicrotask$1(new A._Future__chainCoreFutureAsync_closure(_box_0, target)); + target._zone.scheduleMicrotask$1(new A._Future__chainCoreFuture_closure(_box_0, target)); }, _Future__propagateToListeners(source, listeners) { var t2, t3, t4, _box_0, t5, t6, hasError, asyncError, nextListener, nextListener0, sourceResult, t7, zone, oldZone, result, current, _box_1 = {}, @@ -3711,7 +3701,7 @@ _box_1.source = t1; continue; } else - A._Future__chainCoreFutureSync(t1, result); + A._Future__chainCoreFuture(t1, result, true); return; } } @@ -3991,11 +3981,9 @@ return t1; }, runZonedGuarded(body, onError, $R) { - var error, stackTrace, parentZone, errorHandler, t1, exception, _null = null, zoneSpecification = null, zoneValues = null; - A.checkNotNullable(body, "body", $R._eval$1("0()")); - A.checkNotNullable(onError, "onError", type$.void_Function_Object_StackTrace); - parentZone = $.Zone__current; - errorHandler = new A.runZonedGuarded_closure(parentZone, onError); + var error, stackTrace, t1, exception, _null = null, zoneSpecification = null, zoneValues = null, + parentZone = $.Zone__current, + errorHandler = new A.runZonedGuarded_closure(parentZone, onError); if (zoneSpecification == null) zoneSpecification = new A._ZoneSpecification(errorHandler, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null); else @@ -4107,7 +4095,7 @@ this.e = t1; this.s = t2; }, - _Future__chainCoreFutureAsync_closure: function _Future__chainCoreFutureAsync_closure(t0, t1) { + _Future__chainCoreFuture_closure: function _Future__chainCoreFuture_closure(t0, t1) { this._box_0 = t0; this.target = t1; }, @@ -4125,8 +4113,12 @@ this._box_1 = t1; this.hasError = t2; }, - _Future__propagateToListeners_handleWhenCompleteCallback_closure: function _Future__propagateToListeners_handleWhenCompleteCallback_closure(t0) { - this.originalSource = t0; + _Future__propagateToListeners_handleWhenCompleteCallback_closure: function _Future__propagateToListeners_handleWhenCompleteCallback_closure(t0, t1) { + this.joinedResult = t0; + this.originalSource = t1; + }, + _Future__propagateToListeners_handleWhenCompleteCallback_closure0: function _Future__propagateToListeners_handleWhenCompleteCallback_closure0(t0) { + this.joinedResult = t0; }, _Future__propagateToListeners_handleValueCallback: function _Future__propagateToListeners_handleValueCallback(t0, t1) { this._box_0 = t0; @@ -4805,7 +4797,7 @@ break; ++i; } - throw A.wrapException(A.ArgumentError$value(bytes, "Not a byte value at index " + i + ": 0x" + J.toRadixString$1$n(t1.$index(bytes, i), 16), null)); + throw A.wrapException(A.ArgumentError$value(bytes, "Not a byte value at index " + i + ": 0x" + B.JSInt_methods.toRadixString$1(t1.$index(bytes, i), 16), null)); }, _Base64Decoder_decodeChunk(input, start, end, output, outIndex, state) { var t1, t2, t3, i, charOr, char, t4, code, outIndex0, expectedPadding, @@ -6183,8 +6175,8 @@ if (char < 127) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_piR, t2); - t2 = (B.List_piR[t2] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_MtP, t2); + t2 = (B.List_MtP[t2] & 1 << (char & 15)) !== 0; } else t2 = false; if (t2) { @@ -6206,7 +6198,7 @@ return A.ioore(host, t2); tail = host.charCodeAt(t2); if ((tail & 64512) === 56320) { - char = (char & 1023) << 10 | tail & 1023 | 65536; + char = 65536 + ((char & 1023) << 10) + (tail & 1023); sourceLength = 2; } } @@ -6267,8 +6259,8 @@ if (char < 127) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_4AN, t2); - t2 = (B.List_4AN[t2] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_q6C, t2); + t2 = (B.List_q6C[t2] & 1 << (char & 15)) !== 0; } else t2 = false; if (t2) { @@ -6286,8 +6278,8 @@ if (char <= 93) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_VOY, t2); - t2 = (B.List_VOY[t2] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_DeU, t2); + t2 = (B.List_DeU[t2] & 1 << (char & 15)) !== 0; } else t2 = false; if (t2) @@ -6300,7 +6292,7 @@ return A.ioore(host, t2); tail = host.charCodeAt(t2); if ((tail & 64512) === 56320) { - char = (char & 1023) << 10 | tail & 1023 | 65536; + char = 65536 + ((char & 1023) << 10) + (tail & 1023); sourceLength = 2; } } @@ -6348,8 +6340,8 @@ if (codeUnit < 128) { t2 = codeUnit >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_GVy, t2); - t2 = (B.List_GVy[t2] & 1 << (codeUnit & 15)) !== 0; + return A.ioore(B.List_9U7, t2); + t2 = (B.List_9U7[t2] & 1 << (codeUnit & 15)) !== 0; } else t2 = false; if (!t2) @@ -6374,7 +6366,7 @@ _Uri__makeUserInfo(userInfo, start, end) { if (userInfo == null) return ""; - return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_2jN, false, false); + return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_Kdb, false, false); }, _Uri__makePath(path, start, end, pathSegments, scheme, hasAuthority) { var t1, result, @@ -6388,7 +6380,7 @@ } else if (pathSegments != null) throw A.wrapException(A.ArgumentError$("Both path and pathSegments specified", null)); else - result = A._Uri__normalizeOrSubstring(path, start, end, B.List_M2I, true, true); + result = A._Uri__normalizeOrSubstring(path, start, end, B.List_AnW, true, true); if (result.length === 0) { if (isFile) return "/"; @@ -6404,13 +6396,13 @@ }, _Uri__makeQuery(query, start, end, queryParameters) { if (query != null) - return A._Uri__normalizeOrSubstring(query, start, end, B.List_42A, true, false); + return A._Uri__normalizeOrSubstring(query, start, end, B.List_dYt, true, false); return null; }, _Uri__makeFragment(fragment, start, end) { if (fragment == null) return null; - return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_42A, true, false); + return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_dYt, true, false); }, _Uri__normalizeEscape(source, index, lowerCase) { var t3, firstDigit, secondDigit, firstDigitValue, secondDigitValue, value, @@ -6433,8 +6425,8 @@ if (value < 127) { t1 = B.JSInt_methods._shrOtherPositive$1(value, 4); if (!(t1 < 8)) - return A.ioore(B.List_piR, t1); - t1 = (B.List_piR[t1] & 1 << (value & 15)) !== 0; + return A.ioore(B.List_MtP, t1); + t1 = (B.List_MtP[t1] & 1 << (value & 15)) !== 0; } else t1 = false; if (t1) @@ -6446,7 +6438,7 @@ _Uri__escapeChar(char) { var codeUnits, t1, flag, encodedBytes, index, byte, t2, t3, _s16_ = "0123456789ABCDEF"; - if (char < 128) { + if (char <= 127) { codeUnits = new Uint8Array(3); codeUnits[0] = 37; t1 = char >>> 4; @@ -6529,8 +6521,8 @@ if (char <= 93) { t3 = char >>> 4; if (!(t3 < 8)) - return A.ioore(B.List_VOY, t3); - t3 = (B.List_VOY[t3] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_DeU, t3); + t3 = (B.List_DeU[t3] & 1 << (char & 15)) !== 0; } if (t3) { A._Uri__fail(component, index, "Invalid character"); @@ -6544,7 +6536,7 @@ return A.ioore(component, t3); tail = component.charCodeAt(t3); if ((tail & 64512) === 56320) { - char = (char & 1023) << 10 | tail & 1023 | 65536; + char = 65536 + ((char & 1023) << 10) + (tail & 1023); sourceLength = 2; } } @@ -6586,7 +6578,7 @@ output = A._setArrayType([], type$.JSArray_String); for (t1 = path.split("/"), t2 = t1.length, appendSlash = false, _i = 0; _i < t2; ++_i) { segment = t1[_i]; - if (J.$eq$(segment, "..")) { + if (segment === "..") { t3 = output.length; if (t3 !== 0) { if (0 >= t3) @@ -6659,8 +6651,8 @@ if (char <= 127) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_GVy, t2); - t2 = (B.List_GVy[t2] & 1 << (char & 15)) === 0; + return A.ioore(B.List_9U7, t2); + t2 = (B.List_9U7[t2] & 1 << (char & 15)) === 0; } else t2 = true; if (t2) @@ -6717,19 +6709,19 @@ if ((indices.length & 1) === 1) text = B.C_Base64Codec.normalize$3(text, t2, t1); else { - data = A._Uri__normalize(text, t2, t1, B.List_42A, true, false); + data = A._Uri__normalize(text, t2, t1, B.List_dYt, true, false); if (data != null) text = B.JSString_methods.replaceRange$3(text, t2, t1, data); } return new A.UriData(text, indices, sourceUri); }, _createTables() { - var _i, t1, t2, t3, b, + var __wc0_formal, t1, t2, t3, b, _s77_ = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-._~!$&'()*+,;=", _s1_ = ".", _s1_0 = ":", _s1_1 = "/", _s1_2 = "\\", _s1_3 = "?", _s1_4 = "#", _s2_ = "/\\", tables = J.JSArray_JSArray$allocateGrowable(22, type$.Uint8List); - for (_i = 0; _i < 22; ++_i) - tables[_i] = new Uint8Array(96); + for (__wc0_formal = 0; __wc0_formal < 22; ++__wc0_formal) + tables[__wc0_formal] = new Uint8Array(96); t1 = new A._createTables_build(tables); t2 = new A._createTables_setChars(); t3 = new A._createTables_setRange(); @@ -7192,10 +7184,10 @@ NullRejectionException: function NullRejectionException(t0) { this.isUndefined = t0; }, - _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; @@ -7488,32 +7480,32 @@ t2 = type$.Serializer_dynamic, t3 = type$.String; t2 = new A.BuiltJsonSerializersBuilder(A.MapBuilder_MapBuilder(t1, t2), A.MapBuilder_MapBuilder(t3, t2), A.MapBuilder_MapBuilder(t3, t2), A.MapBuilder_MapBuilder(type$.FullType, type$.Function), A.ListBuilder_ListBuilder(B.List_empty, type$.SerializerPlugin)); - t2.add$1(0, new A.BigIntSerializer(A.BuiltList_BuiltList$from([B.Type_BigInt_C3o, A.getRuntimeTypeOfDartObject($.$get$_BigIntImpl_zero())], t1))); - t2.add$1(0, new A.BoolSerializer(A.BuiltList_BuiltList$from([B.Type_bool_RoS], t1))); + t2.add$1(0, new A.BigIntSerializer(A.BuiltList_BuiltList$from([B.Type_BigInt_DZK, A.getRuntimeTypeOfDartObject($.$get$_BigIntImpl_zero())], t1))); + t2.add$1(0, new A.BoolSerializer(A.BuiltList_BuiltList$from([B.Type_bool_wF1], t1))); t3 = type$.Object; - t2.add$1(0, new A.BuiltListSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltList_27p, A.getRuntimeTypeOfDartObject(A.BuiltList_BuiltList$from(B.List_empty, t3))], t1))); - t2.add$1(0, new A.BuiltListMultimapSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltListMultimap_apl, A.getRuntimeTypeOfDartObject(A.BuiltListMultimap_BuiltListMultimap(t3, t3))], t1))); - t2.add$1(0, new A.BuiltMapSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltMap_MUU, A.getRuntimeTypeOfDartObject(A.BuiltMap_BuiltMap(t3, t3))], t1))); - t2.add$1(0, new A.BuiltSetSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltSet_MMh, A.getRuntimeTypeOfDartObject(A.BuiltSet_BuiltSet$from(B.List_empty, t3))], t1))); - t2.add$1(0, new A.BuiltSetMultimapSerializer(A.BuiltSet_BuiltSet$from([B.Type_BuiltSetMultimap_Xbt], t1))); - t2.add$1(0, new A.DateTimeSerializer(A.BuiltList_BuiltList$from([B.Type_DateTime_H1G], t1))); - t2.add$1(0, new A.DoubleSerializer(A.BuiltList_BuiltList$from([B.Type_double_23F], t1))); - t2.add$1(0, new A.DurationSerializer(A.BuiltList_BuiltList$from([B.Type_Duration_86y], t1))); - t2.add$1(0, new A.IntSerializer(A.BuiltList_BuiltList$from([B.Type_int_8nG], t1))); - t2.add$1(0, new A.Int32Serializer(A.BuiltList_BuiltList$from([B.Type_Int32_kyU], t1))); - t2.add$1(0, new A.Int64Serializer(A.BuiltList_BuiltList$from([B.Type_Int64_chs], t1))); - t2.add$1(0, new A.JsonObjectSerializer(A.BuiltList_BuiltList$from([B.Type_JsonObject_aJ0, B.Type_BoolJsonObject_Ocu, B.Type_ListJsonObject_l4J, B.Type_MapJsonObject_OYg, B.Type_NumJsonObject_u6D, B.Type_StringJsonObject_wcs], t1))); - t2.add$1(0, new A.NullSerializer(A.BuiltList_BuiltList$from([B.Type_Null_a9w], t1))); - t2.add$1(0, new A.NumSerializer(A.BuiltList_BuiltList$from([B.Type_num_EOZ], t1))); - t2.add$1(0, new A.RegExpSerializer(A.BuiltList_BuiltList$from([B.Type_RegExp_NMc, $.$get$_runtimeType()], t1))); - t2.add$1(0, new A.StringSerializer(A.BuiltList_BuiltList$from([B.Type_String_J2O], t1))); + t2.add$1(0, new A.BuiltListSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltList_fj6, A.getRuntimeTypeOfDartObject(A.BuiltList_BuiltList$from(B.List_empty, t3))], t1))); + t2.add$1(0, new A.BuiltListMultimapSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltListMultimap_HQW, A.getRuntimeTypeOfDartObject(A.BuiltListMultimap_BuiltListMultimap(t3, t3))], t1))); + t2.add$1(0, new A.BuiltMapSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltMap_TeX, A.getRuntimeTypeOfDartObject(A.BuiltMap_BuiltMap(t3, t3))], t1))); + t2.add$1(0, new A.BuiltSetSerializer(A.BuiltList_BuiltList$from([B.Type_BuiltSet_oHu, A.getRuntimeTypeOfDartObject(A.BuiltSet_BuiltSet$from(B.List_empty, t3))], t1))); + t2.add$1(0, new A.BuiltSetMultimapSerializer(A.BuiltSet_BuiltSet$from([B.Type_BuiltSetMultimap_yT7], t1))); + t2.add$1(0, new A.DateTimeSerializer(A.BuiltList_BuiltList$from([B.Type_DateTime_akv], t1))); + t2.add$1(0, new A.DoubleSerializer(A.BuiltList_BuiltList$from([B.Type_double_JIQ], t1))); + t2.add$1(0, new A.DurationSerializer(A.BuiltList_BuiltList$from([B.Type_Duration_VAs], t1))); + t2.add$1(0, new A.IntSerializer(A.BuiltList_BuiltList$from([B.Type_int_T7V], t1))); + t2.add$1(0, new A.Int32Serializer(A.BuiltList_BuiltList$from([B.Type_Int32_291], t1))); + t2.add$1(0, new A.Int64Serializer(A.BuiltList_BuiltList$from([B.Type_Int64_LHp], t1))); + t2.add$1(0, new A.JsonObjectSerializer(A.BuiltList_BuiltList$from([B.Type_JsonObject_5jQ, B.Type_BoolJsonObject_Zqn, B.Type_ListJsonObject_qcV, B.Type_MapJsonObject_VMr, B.Type_NumJsonObject_hYY, B.Type_StringJsonObject_NL7], t1))); + t2.add$1(0, new A.NullSerializer(A.BuiltList_BuiltList$from([B.Type_Null_0Rm], t1))); + t2.add$1(0, new A.NumSerializer(A.BuiltList_BuiltList$from([B.Type_num_LZa], t1))); + t2.add$1(0, new A.RegExpSerializer(A.BuiltList_BuiltList$from([B.Type_RegExp_w5l, $.$get$_runtimeType()], t1))); + t2.add$1(0, new A.StringSerializer(A.BuiltList_BuiltList$from([B.Type_String_AXU], t1))); t2.add$1(0, new A.Uint8ListSerializer()); - t2.add$1(0, new A.UriSerializer(A.BuiltList_BuiltList$from([B.Type_Uri_aPa, A.getRuntimeTypeOfDartObject(A.Uri_parse("http://example.com")), A.getRuntimeTypeOfDartObject(A.Uri_parse("http://example.com:"))], t1))); - t2.addBuilderFactory$2(B.FullType_cgN, new A.Serializers_Serializers_closure()); - t2.addBuilderFactory$2(B.FullType_ow7, new A.Serializers_Serializers_closure0()); - t2.addBuilderFactory$2(B.FullType_wbi, new A.Serializers_Serializers_closure1()); - t2.addBuilderFactory$2(B.FullType_4aQ, new A.Serializers_Serializers_closure2()); - t2.addBuilderFactory$2(B.FullType_2pj, new A.Serializers_Serializers_closure3()); + t2.add$1(0, new A.UriSerializer(A.BuiltList_BuiltList$from([B.Type_Uri_l9i, A.getRuntimeTypeOfDartObject(A.Uri_parse("http://example.com")), A.getRuntimeTypeOfDartObject(A.Uri_parse("http://example.com:"))], t1))); + t2.addBuilderFactory$2(B.FullType_hm4, new A.Serializers_Serializers_closure()); + t2.addBuilderFactory$2(B.FullType_WP0, new A.Serializers_Serializers_closure0()); + t2.addBuilderFactory$2(B.FullType_mo5, new A.Serializers_Serializers_closure1()); + t2.addBuilderFactory$2(B.FullType_tpw, new A.Serializers_Serializers_closure2()); + t2.addBuilderFactory$2(B.FullType_SWR, new A.Serializers_Serializers_closure3()); return t2.build$0(); }, FullType__getRawName(type) { @@ -8009,8 +8001,8 @@ d1 = d0 >>> 10 & 1023; d0 &= 1023; if (!(radix < 37)) - return A.ioore(B.List_BZW, radix); - fatRadix = B.List_BZW[radix]; + return A.ioore(B.List_ZNA, radix); + fatRadix = B.List_ZNA[radix]; chunk1 = ""; chunk2 = ""; chunk3 = ""; @@ -8090,7 +8082,7 @@ t5.toString; t6 = lowLinks.$index(0, iterator.get$current()); t6.toString; - lowLink = Math.min(A.checkNum(t5), A.checkNum(t6)); + lowLink = Math.min(t5, t6); } do { next = iterator.get$current(); @@ -8101,7 +8093,7 @@ } else if (onStack.contains$1(0, next)) { t5 = indexes.$index(0, next); t5.toString; - lowLink = Math.min(lowLink, A.checkNum(t5)); + lowLink = Math.min(lowLink, t5); lowLinks.$indexSet(0, node, lowLink); } } while (iterator.moveNext$0()); @@ -8265,7 +8257,8 @@ }, RNG: function RNG() { }, - CryptoRNG: function CryptoRNG() { + MathRNG: function MathRNG(t0) { + this._rnd = t0; }, UuidV1: function UuidV1(t0) { this.goptions = t0; @@ -8529,6 +8522,8 @@ }, _handleAuthRequest_closure: function _handleAuthRequest_closure() { }, + DdcLibraryBundleRestarter: function DdcLibraryBundleRestarter() { + }, DdcRestarter: function DdcRestarter() { }, DdcRestarter_restart_closure0: function DdcRestarter_restart_closure0(t0) { @@ -8742,7 +8737,7 @@ return 0; }, get$runtimeType(receiver) { - return B.Type_JSObject_0ua; + return B.Type_JSObject_ttY; }, toString$0(receiver) { return String(receiver); @@ -9255,9 +9250,6 @@ } return new A.StringMatch(start, receiver); }, - $add(receiver, other) { - return receiver + other; - }, endsWith$1(receiver, other) { var otherLength = other.length, t1 = receiver.length; @@ -9475,9 +9467,9 @@ }; A.nullFuture_closure.prototype = { call$0() { - return A.Future_Future$value(null, type$.Null); + return A.Future_Future$value(null, type$.void); }, - $signature: 24 + $signature: 25 }; A.SentinelValue.prototype = {}; A.EfficientLengthIterable.prototype = {}; @@ -10356,19 +10348,19 @@ call$1(o) { return this.getTag(o); }, - $signature: 4 + $signature: 5 }; A.initHooks_closure0.prototype = { call$2(o, tag) { return this.getUnknownTag(o, tag); }, - $signature: 28 + $signature: 37 }; A.initHooks_closure1.prototype = { call$1(tag) { return this.prototypeForTag(A._asString(tag)); }, - $signature: 40 + $signature: 49 }; A._Record.prototype = {}; A.JSSyntaxRegExp.prototype = { @@ -10561,34 +10553,16 @@ }; A.NativeByteBuffer.prototype = { get$runtimeType(receiver) { - return B.Type_ByteBuffer_EOZ; - }, - asUint8List$2(receiver, offsetInBytes, $length) { - return $length == null ? new Uint8Array(receiver, offsetInBytes) : new Uint8Array(receiver, offsetInBytes, $length); + return B.Type_ByteBuffer_rqD; }, $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; - } - }; - 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.NativeTypedData.prototype = {}; A.NativeByteData.prototype = { get$runtimeType(receiver) { - return B.Type_ByteData_mF8; + return B.Type_ByteData_9dB; }, $isTrustedGetRuntimeType: 1, $isByteData: 1 @@ -10627,7 +10601,7 @@ }; A.NativeFloat32List.prototype = { get$runtimeType(receiver) { - return B.Type_Float32List_Ymk; + return B.Type_Float32List_9Kz; }, sublist$2(receiver, start, end) { return new Float32Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length))); @@ -10640,7 +10614,7 @@ }; A.NativeFloat64List.prototype = { get$runtimeType(receiver) { - return B.Type_Float64List_Ymk; + return B.Type_Float64List_9Kz; }, sublist$2(receiver, start, end) { return new Float64Array(receiver.subarray(start, A._checkValidRange(start, end, receiver.length))); @@ -10653,7 +10627,7 @@ }; A.NativeInt16List.prototype = { get$runtimeType(receiver) { - return B.Type_Int16List_cot; + return B.Type_Int16List_s5h; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -10670,7 +10644,7 @@ }; A.NativeInt32List.prototype = { get$runtimeType(receiver) { - return B.Type_Int32List_m1p; + return B.Type_Int32List_O8Z; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -10687,7 +10661,7 @@ }; A.NativeInt8List.prototype = { get$runtimeType(receiver) { - return B.Type_Int8List_woc; + return B.Type_Int8List_rFV; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -10704,7 +10678,7 @@ }; A.NativeUint16List.prototype = { get$runtimeType(receiver) { - return B.Type_Uint16List_2mh; + return B.Type_Uint16List_kmP; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -10721,7 +10695,7 @@ }; A.NativeUint32List.prototype = { get$runtimeType(receiver) { - return B.Type_Uint32List_2mh; + return B.Type_Uint32List_kmP; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -10738,7 +10712,7 @@ }; A.NativeUint8ClampedList.prototype = { get$runtimeType(receiver) { - return B.Type_Uint8ClampedList_9Bb; + return B.Type_Uint8ClampedList_04U; }, get$length(receiver) { return receiver.length; @@ -10758,7 +10732,7 @@ }; A.NativeUint8List.prototype = { get$runtimeType(receiver) { - return B.Type_Uint8List_CSc; + return B.Type_Uint8List_8Eb; }, get$length(receiver) { return receiver.length; @@ -10803,7 +10777,7 @@ }; A._TypeError.prototype = {$isTypeError: 1}; A._AsyncRun__initializeScheduleImmediate_internalCallback.prototype = { - call$1(_) { + call$1(__wc0_formal) { var t1 = this._box_0, f = t1.storedCallback; t1.storedCallback = null; @@ -10819,7 +10793,7 @@ t2 = this.span; t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2); }, - $signature: 30 + $signature: 46 }; A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = { call$0() { @@ -10919,19 +10893,19 @@ call$1(result) { return this.bodyFunction.call$2(0, result); }, - $signature: 7 + $signature: 8 }; A._awaitOnObject_closure0.prototype = { call$2(error, stackTrace) { this.bodyFunction.call$2(1, new A.ExceptionAndStackTrace(error, type$.StackTrace._as(stackTrace))); }, - $signature: 38 + $signature: 50 }; A._wrapJsFunctionForAsync_closure.prototype = { call$2(errorCode, result) { this.$protected(A._asInt(errorCode), result); }, - $signature: 39 + $signature: 67 }; A.AsyncError.prototype = { toString$0(_) { @@ -10959,17 +10933,11 @@ }; A._Completer.prototype = { completeError$2(error, stackTrace) { - var replacement; - A.checkNotNullable(error, "error", type$.Object); + var _0_0; if ((this.future._state & 30) !== 0) throw A.wrapException(A.StateError$("Future already completed")); - replacement = $.Zone__current.errorCallback$2(error, stackTrace); - if (replacement != null) { - error = replacement.error; - stackTrace = replacement.stackTrace; - } else if (stackTrace == null) - stackTrace = A.AsyncError_defaultStackTrace(error); - this._completeError$2(error, stackTrace); + _0_0 = A._interceptUserError(error, stackTrace); + this._completeError$2(_0_0.error, _0_0.stackTrace); }, completeError$1(error) { return this.completeError$2(error, null); @@ -11039,10 +11007,6 @@ } }; A._Future.prototype = { - _setChained$1(source) { - this._state = this._state & 1 | 4; - this._resultOrListeners = source; - }, then$1$2$onError(f, onError, $R) { var currentZone, result, t2, t1 = this.$ti; @@ -11176,7 +11140,7 @@ t1._eval$1("1/")._as(value); if (t1._eval$1("Future<1>")._is(value)) if (t1._is(value)) - A._Future__chainCoreFutureSync(value, _this); + A._Future__chainCoreFuture(value, _this, true); else _this._chainForeignFuture$1(value); else { @@ -11195,12 +11159,26 @@ _this._resultOrListeners = value; A._Future__propagateToListeners(_this, listeners); }, + _completeWithResultOf$1(source) { + var t1, t2, listeners, _this = this; + if ((source._state & 16) !== 0) { + t1 = _this._zone; + t2 = source._zone; + t1 = !(t1 === t2 || t1.get$errorZone() === t2.get$errorZone()); + } else + t1 = false; + if (t1) + return; + listeners = _this._removeListeners$0(); + _this._cloneResult$1(source); + A._Future__propagateToListeners(_this, listeners); + }, _completeError$2(error, stackTrace) { var listeners; type$.Object._as(error); type$.StackTrace._as(stackTrace); listeners = this._removeListeners$0(); - this._setErrorObject$1(A.AsyncError$(error, stackTrace)); + this._setErrorObject$1(new A.AsyncError(error, stackTrace)); A._Future__propagateToListeners(this, listeners); }, _asyncComplete$1(value) { @@ -11222,7 +11200,7 @@ var t1 = this.$ti; t1._eval$1("Future<1>")._as(value); if (t1._is(value)) { - A._Future__chainCoreFutureAsync(value, this); + A._Future__chainCoreFuture(value, this, false); return; } this._chainForeignFuture$1(value); @@ -11281,7 +11259,7 @@ call$2(error, stackTrace) { this.$this._completeError$2(type$.Object._as(error), type$.StackTrace._as(stackTrace)); }, - $signature: 5 + $signature: 3 }; A._Future__chainForeignFuture_closure1.prototype = { call$0() { @@ -11289,9 +11267,9 @@ }, $signature: 0 }; - A._Future__chainCoreFutureAsync_closure.prototype = { + A._Future__chainCoreFuture_closure.prototype = { call$0() { - A._Future__chainCoreFutureSync(this._box_0.source, this.target); + A._Future__chainCoreFuture(this._box_0.source, this.target, true); }, $signature: 0 }; @@ -11309,20 +11287,26 @@ }; A._Future__propagateToListeners_handleWhenCompleteCallback.prototype = { call$0() { - var e, s, t1, exception, t2, originalSource, _this = this, completeResult = null; + var e, s, t1, exception, t2, t3, originalSource, joinedResult, _this = this, completeResult = null; try { t1 = _this._box_0.listener; completeResult = t1.result._zone.run$1$1(type$.dynamic_Function._as(t1.callback), type$.dynamic); } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - t1 = _this.hasError && type$.AsyncError._as(_this._box_1.source._resultOrListeners).error === e; - t2 = _this._box_0; - if (t1) - t2.listenerValueOrError = type$.AsyncError._as(_this._box_1.source._resultOrListeners); - else - t2.listenerValueOrError = A.AsyncError$(e, s); - t2.listenerHasError = true; + if (_this.hasError && type$.AsyncError._as(_this._box_1.source._resultOrListeners).error === e) { + t1 = _this._box_0; + t1.listenerValueOrError = type$.AsyncError._as(_this._box_1.source._resultOrListeners); + } else { + t1 = e; + t2 = s; + if (t2 == null) + t2 = A.AsyncError_defaultStackTrace(t1); + t3 = _this._box_0; + t3.listenerValueOrError = new A.AsyncError(t1, t2); + t1 = t3; + } + t1.listenerHasError = true; return; } if (completeResult instanceof A._Future && (completeResult._state & 24) !== 0) { @@ -11335,18 +11319,26 @@ } if (completeResult instanceof A._Future) { originalSource = _this._box_1.source; + joinedResult = new A._Future(originalSource._zone, originalSource.$ti); + completeResult.then$1$2$onError(new A._Future__propagateToListeners_handleWhenCompleteCallback_closure(joinedResult, originalSource), new A._Future__propagateToListeners_handleWhenCompleteCallback_closure0(joinedResult), type$.void); t1 = _this._box_0; - t1.listenerValueOrError = completeResult.then$1$1(new A._Future__propagateToListeners_handleWhenCompleteCallback_closure(originalSource), type$.dynamic); + t1.listenerValueOrError = joinedResult; t1.listenerHasError = false; } }, $signature: 0 }; A._Future__propagateToListeners_handleWhenCompleteCallback_closure.prototype = { - call$1(_) { - return this.originalSource; + call$1(__wc0_formal) { + this.joinedResult._completeWithResultOf$1(this.originalSource); + }, + $signature: 6 + }; + A._Future__propagateToListeners_handleWhenCompleteCallback_closure0.prototype = { + call$2(e, s) { + this.joinedResult._completeError$2(type$.Object._as(e), type$.StackTrace._as(s)); }, - $signature: 84 + $signature: 3 }; A._Future__propagateToListeners_handleValueCallback.prototype = { call$0() { @@ -11361,16 +11353,20 @@ } catch (exception) { e = A.unwrapException(exception); s = A.getTraceFromException(exception); - t1 = this._box_0; - t1.listenerValueOrError = A.AsyncError$(e, s); - t1.listenerHasError = true; + t1 = e; + t2 = s; + if (t2 == null) + t2 = A.AsyncError_defaultStackTrace(t1); + t3 = this._box_0; + t3.listenerValueOrError = new A.AsyncError(t1, t2); + t3.listenerHasError = true; } }, $signature: 0 }; A._Future__propagateToListeners_handleError.prototype = { call$0() { - var asyncError, e, s, t1, exception, t2, _this = this; + var asyncError, e, s, t1, exception, t2, t3, _this = this; try { asyncError = type$.AsyncError._as(_this._box_1.source._resultOrListeners); t1 = _this._box_0; @@ -11382,12 +11378,20 @@ e = A.unwrapException(exception); s = A.getTraceFromException(exception); t1 = type$.AsyncError._as(_this._box_1.source._resultOrListeners); - t2 = _this._box_0; - if (t1.error === e) + if (t1.error === e) { + t2 = _this._box_0; t2.listenerValueOrError = t1; - else - t2.listenerValueOrError = A.AsyncError$(e, s); - t2.listenerHasError = true; + t1 = t2; + } else { + t1 = e; + t2 = s; + if (t2 == null) + t2 = A.AsyncError_defaultStackTrace(t1); + t3 = _this._box_0; + t3.listenerValueOrError = new A.AsyncError(t1, t2); + t1 = t3; + } + t1.listenerHasError = true; } }, $signature: 0 @@ -11430,7 +11434,7 @@ this._future._completeError$2(e, s); } }, - $signature: 5 + $signature: 3 }; A._AsyncCallbackEntry.prototype = {}; A.Stream.prototype = { @@ -11456,8 +11460,8 @@ } }; A.Stream_length_closure.prototype = { - call$1(_) { - A._instanceType(this.$this)._eval$1("Stream.T")._as(_); + call$1(__wc0_formal) { + A._instanceType(this.$this)._eval$1("Stream.T")._as(__wc0_formal); ++this._box_0.count; }, $signature() { @@ -11542,19 +11546,14 @@ _this._ensurePendingEvents$0().add$1(0, new A._DelayedData(value, t1._eval$1("_DelayedData<1>"))); }, addError$2(error, stackTrace) { - var replacement, _this = this, - t1 = type$.Object; - t1._as(error); + var _0_0, t1, _this = this; + type$.Object._as(error); type$.nullable_StackTrace._as(stackTrace); - A.checkNotNullable(error, "error", t1); if (_this._state >= 4) throw A.wrapException(_this._badEventState$0()); - replacement = $.Zone__current.errorCallback$2(error, stackTrace); - if (replacement != null) { - error = replacement.error; - stackTrace = replacement.stackTrace; - } else if (stackTrace == null) - stackTrace = A.AsyncError_defaultStackTrace(error); + _0_0 = A._interceptUserError(error, stackTrace); + error = _0_0.error; + stackTrace = _0_0.stackTrace; t1 = _this._state; if ((t1 & 1) !== 0) _this._sendError$2(error, stackTrace); @@ -11819,7 +11818,10 @@ _this._addPending$1(new A._DelayedData(data, t1._eval$1("_DelayedData<_BufferingStreamSubscription.T>"))); }, _addError$2(error, stackTrace) { - var t1 = this._state; + var t1; + if (type$.Error._is(error)) + A.Primitives_trySetStackTrace(error, stackTrace); + t1 = this._state; if ((t1 & 8) !== 0) return; if (t1 < 64) @@ -11976,7 +11978,7 @@ else t1._completeError$2(error, stackTrace); }, - $signature: 5 + $signature: 3 }; A._BufferingStreamSubscription_asFuture__closure.prototype = { call$0() { @@ -12064,7 +12066,7 @@ get$next() { return null; }, - set$next(_) { + set$next(__wc0_formal) { throw A.wrapException(A.StateError$("No events after a done.")); }, $is_DelayedEvent: 1 @@ -12202,7 +12204,7 @@ s = A.getTraceFromException(exception); error = e; stackTrace = s; - replacement = $.Zone__current.errorCallback$2(error, stackTrace); + replacement = A._interceptError(error, stackTrace); if (replacement != null) { error = replacement.error; stackTrace = replacement.stackTrace; @@ -12359,11 +12361,8 @@ return implementation.$function.call$3$4(t1, t1.get$_parentDelegate(), this, callback, $R, T1, T2); }, errorCallback$2(error, stackTrace) { - var implementation, implementationZone; - type$.nullable_StackTrace._as(stackTrace); - A.checkNotNullable(error, "error", type$.Object); - implementation = this._errorCallback; - implementationZone = implementation.zone; + var implementation = this._errorCallback, + implementationZone = implementation.zone; if (implementationZone === B.C__RootZone) return null; return implementation.$function.call$5(implementationZone, implementationZone.get$_parentDelegate(), this, error, stackTrace); @@ -12489,10 +12488,10 @@ return B._ZoneFunction__RootZone__rootRegisterCallback; }, get$_registerUnaryCallback() { - return B._ZoneFunction_QOa; + return B._ZoneFunction_Xkh; }, get$_registerBinaryCallback() { - return B._ZoneFunction_qxw; + return B._ZoneFunction_e9o; }, get$_errorCallback() { return B._ZoneFunction__RootZone__rootErrorCallback; @@ -12504,7 +12503,7 @@ return B._ZoneFunction__RootZone__rootCreateTimer; }, get$_createPeriodicTimer() { - return B._ZoneFunction_kWM; + return B._ZoneFunction_PAY; }, get$_print() { return B._ZoneFunction__RootZone__rootPrint; @@ -12513,7 +12512,7 @@ return B._ZoneFunction__RootZone__rootFork; }, get$_handleUncaughtError() { - return B._ZoneFunction_NIe; + return B._ZoneFunction_KjJ; }, get$parent() { return null; @@ -12629,7 +12628,6 @@ return $R._eval$1("@<0>")._bind$1(T1)._bind$1(T2)._eval$1("1(2,3)")._as(f); }, errorCallback$2(error, stackTrace) { - type$.nullable_StackTrace._as(stackTrace); return null; }, scheduleMicrotask$1(f) { @@ -12692,7 +12690,7 @@ t2._processUncaughtError$3(zone, type$.Object._as(e), t1._as(s)); } }, - $signature: 68 + $signature: 43 }; A._HashMap.prototype = { get$length(_) { @@ -12914,7 +12912,7 @@ call$1(v) { return this.K._is(v); }, - $signature: 18 + $signature: 20 }; A._HashMapKeyIterable.prototype = { get$length(_) { @@ -13287,7 +13285,7 @@ call$2(k, v) { this.result.$indexSet(0, this.K._as(k), this.V._as(v)); }, - $signature: 19 + $signature: 21 }; A.ListBase.prototype = { get$iterator(receiver) { @@ -13423,7 +13421,7 @@ t2 = A.S(v); t1._contents += t2; }, - $signature: 20 + $signature: 22 }; A._UnmodifiableMapMixin.prototype = { $indexSet(_, key, value) { @@ -13942,7 +13940,7 @@ call$1(v) { return this.E._is(v); }, - $signature: 18 + $signature: 20 }; A._SplayTreeSet__SplayTree_Iterable.prototype = {}; A._SplayTreeSet__SplayTree_Iterable_SetMixin.prototype = {}; @@ -14484,7 +14482,7 @@ B.JSArray_methods.$indexSet(t1, t2.i++, key); B.JSArray_methods.$indexSet(t1, t2.i++, value); }, - $signature: 20 + $signature: 22 }; A._JsonStringStringifier.prototype = { get$_partialResult() { @@ -14978,7 +14976,7 @@ hash = hash + ((hash & 524287) << 10) & 536870911; return hash ^ hash >>> 6; }, - $signature: 21 + $signature: 23 }; A._BigIntImpl_hashCode_finish.prototype = { call$1(hash) { @@ -14986,7 +14984,7 @@ hash ^= hash >>> 11; return hash + ((hash & 16383) << 15) & 536870911; }, - $signature: 22 + $signature: 24 }; A.DateTime.prototype = { $eq(_, other) { @@ -15376,13 +15374,13 @@ call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv4 address, " + msg, this.host, position)); }, - $signature: 44 + $signature: 39 }; A.Uri_parseIPv6Address_error.prototype = { call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv6 address, " + msg, this.host, position)); }, - $signature: 47 + $signature: 38 }; A.Uri_parseIPv6Address_parseHex.prototype = { call$2(start, end) { @@ -15394,7 +15392,7 @@ this.error.call$2("each part must be in the range of `0x0..0xFFFF`", start); return value; }, - $signature: 21 + $signature: 23 }; A._Uri.prototype = { get$_text() { @@ -15562,9 +15560,9 @@ }; A._Uri__makePath_closure.prototype = { call$1(s) { - return A._Uri__uriEncode(B.List_M2I0, A._asString(s), B.C_Utf8Codec, false); + return A._Uri__uriEncode(B.List_bij, A._asString(s), B.C_Utf8Codec, false); }, - $signature: 49 + $signature: 29 }; A.UriData.prototype = { get$uri() { @@ -15579,11 +15577,11 @@ queryIndex = B.JSString_methods.indexOf$2(t2, "?", t1); end = t2.length; if (queryIndex >= 0) { - query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_42A, false, false); + query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_dYt, false, false); end = queryIndex; } else query = _null; - t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_M2I, false, false), query, _null); + t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_AnW, false, false), query, _null); } return t1; }, @@ -15605,7 +15603,7 @@ B.NativeUint8List_methods.fillRange$3(t1, 0, 96, defaultTransition); return t1; }, - $signature: 50 + $signature: 27 }; A._createTables_setChars.prototype = { call$3(target, chars, transition) { @@ -15618,7 +15616,7 @@ target[t3] = transition; } }, - $signature: 23 + $signature: 26 }; A._createTables_setRange.prototype = { call$3(target, range, transition) { @@ -15639,7 +15637,7 @@ target[t2] = transition; } }, - $signature: 23 + $signature: 26 }; A._SimpleUri.prototype = { get$hasAuthority() { @@ -15784,14 +15782,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: 27 + $signature: 41 }; A.FutureOfVoidToJSPromise_get_toJS__closure.prototype = { - call$1(_) { + call$1(__wc0_formal) { var t1 = this.resolve; return t1.call(t1); }, - $signature: 29 + $signature: 28 }; A.FutureOfVoidToJSPromise_get_toJS__closure0.prototype = { call$2(error, stackTrace) { @@ -15810,7 +15808,7 @@ t2 = this.reject; t2.call(t2, t1); }, - $signature: 5 + $signature: 3 }; A.jsify__convert.prototype = { call$1(o) { @@ -15836,13 +15834,13 @@ } else return o; }, - $signature: 12 + $signature: 14 }; A.promiseToFuture_closure.prototype = { call$1(r) { return this.completer.complete$1(this.T._eval$1("0/?")._as(r)); }, - $signature: 7 + $signature: 8 }; A.promiseToFuture_closure0.prototype = { call$1(e) { @@ -15850,7 +15848,7 @@ return this.completer.completeError$1(new A.NullRejectionException(e === undefined)); return this.completer.completeError$1(e); }, - $signature: 7 + $signature: 8 }; A.dartify_convert.prototype = { call$1(o) { @@ -15902,7 +15900,7 @@ } return o; }, - $signature: 12 + $signature: 14 }; A.NullRejectionException.prototype = { toString$0(_) { @@ -15912,44 +15910,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 = { @@ -16061,7 +16025,7 @@ type$.StackTrace._as(stackTrace); this.$this._addResult$1(new A.ErrorResult(error, stackTrace)); }, - $signature: 5 + $signature: 3 }; A.StreamQueue__ensureListening_closure0.prototype = { call$0() { @@ -16115,7 +16079,7 @@ call$2(h, i) { return A._combine(A._asInt(h), J.get$hashCode$(i)); }, - $signature: 31 + $signature: 30 }; A.BuiltList.prototype = { toBuilder$0() { @@ -16335,7 +16299,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 4 + $signature: 5 }; A.BuiltListMultimap_hashCode_closure.prototype = { call$1(key) { @@ -16503,7 +16467,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 4 + $signature: 5 }; A.BuiltMap.prototype = { toBuilder$0() { @@ -16574,7 +16538,7 @@ call$1(k) { return this.map.$index(0, k); }, - $signature: 4 + $signature: 5 }; A.BuiltMap_hashCode_closure.prototype = { call$1(key) { @@ -16699,7 +16663,7 @@ var t1 = this.$this.$ti; this.replacement.$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value)); }, - $signature: 19 + $signature: 21 }; A.BuiltSet.prototype = { get$hashCode(_) { @@ -17084,7 +17048,7 @@ call$1(k) { return this.multimap.$index(0, k); }, - $signature: 4 + $signature: 5 }; A.EnumClass.prototype = { toString$0(_) { @@ -17100,7 +17064,7 @@ $._indentingBuiltValueToStringHelperIndent = $._indentingBuiltValueToStringHelperIndent + 2; return new A.IndentingBuiltValueToStringHelper(t1); }, - $signature: 32 + $signature: 31 }; A.IndentingBuiltValueToStringHelper.prototype = { add$2(_, field, value) { @@ -17236,34 +17200,34 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty, type$.Object); }, - $signature: 33 + $signature: 32 }; A.Serializers_Serializers_closure0.prototype = { call$0() { var t1 = type$.Object; return A.ListMultimapBuilder_ListMultimapBuilder(t1, t1); }, - $signature: 34 + $signature: 33 }; A.Serializers_Serializers_closure1.prototype = { call$0() { var t1 = type$.Object; return A.MapBuilder_MapBuilder(t1, t1); }, - $signature: 35 + $signature: 34 }; A.Serializers_Serializers_closure2.prototype = { call$0() { return A.SetBuilder_SetBuilder(type$.Object); }, - $signature: 36 + $signature: 35 }; A.Serializers_Serializers_closure3.prototype = { call$0() { var t1 = type$.Object; return A.SetMultimapBuilder_SetMultimapBuilder(t1, t1); }, - $signature: 37 + $signature: 36 }; A.FullType.prototype = { $eq(_, other) { @@ -17677,13 +17641,13 @@ call$1(value) { return this.serializers.serialize$2$specifiedType(value, this.valueType); }, - $signature: 3 + $signature: 4 }; A.BuiltListMultimapSerializer_deserialize_closure.prototype = { call$1(value) { return this.serializers.deserialize$2$specifiedType(value, this.valueType); }, - $signature: 12 + $signature: 14 }; A.BuiltListSerializer.prototype = { serialize$3$specifiedType(serializers, builtList, specifiedType) { @@ -17741,13 +17705,13 @@ call$1(item) { return this.serializers.serialize$2$specifiedType(item, this.elementType); }, - $signature: 3 + $signature: 4 }; A.BuiltListSerializer_deserialize_closure.prototype = { call$1(item) { return this.serializers.deserialize$2$specifiedType(item, this.elementType); }, - $signature: 3 + $signature: 4 }; A.BuiltMapSerializer.prototype = { serialize$3$specifiedType(serializers, builtMap, specifiedType) { @@ -17947,13 +17911,13 @@ call$1(value) { return this.serializers.serialize$2$specifiedType(value, this.valueType); }, - $signature: 3 + $signature: 4 }; A.BuiltSetMultimapSerializer_deserialize_closure.prototype = { call$1(value) { return this.serializers.deserialize$2$specifiedType(value, this.valueType); }, - $signature: 3 + $signature: 4 }; A.BuiltSetSerializer.prototype = { serialize$3$specifiedType(serializers, builtSet, specifiedType) { @@ -18011,13 +17975,13 @@ call$1(item) { return this.serializers.serialize$2$specifiedType(item, this.elementType); }, - $signature: 3 + $signature: 4 }; A.BuiltSetSerializer_deserialize_closure.prototype = { call$1(item) { return this.serializers.deserialize$2$specifiedType(item, this.elementType); }, - $signature: 3 + $signature: 4 }; A.DateTimeSerializer.prototype = { serialize$3$specifiedType(serializers, dateTime, specifiedType) { @@ -18320,7 +18284,7 @@ return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); }, get$types() { - return A.BuiltList_BuiltList$from([B.Type_Uint8List_CSc], type$.Type); + return A.BuiltList_BuiltList$from([B.Type_Uint8List_8Eb], type$.Type); }, $isSerializer: 1, $isPrimitiveSerializer: 1, @@ -18630,7 +18594,7 @@ $isSerializer: 1, $isPrimitiveSerializer: 1, get$types() { - return B.List_Type_BuildStatus_Rmx; + return B.List_Type_BuildStatus_8KJ; }, get$wireName() { return "BuildStatus"; @@ -18638,7 +18602,7 @@ }; A._$BuildResultSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { - return ["status", serializers.serialize$2$specifiedType(type$.BuildResult._as(object).status, B.FullType_KDE)]; + return ["status", serializers.serialize$2$specifiedType(type$.BuildResult._as(object).status, B.FullType_k5M)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -18656,7 +18620,7 @@ value = iterator.get$current(); switch (t2) { case "status": - t2 = serializers.deserialize$2$specifiedType(value, B.FullType_KDE); + t2 = serializers.deserialize$2$specifiedType(value, B.FullType_k5M); t2.toString; t1._as(t2); $$v = result._build_result$_$v; @@ -18683,7 +18647,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_Yiv; + return B.List_pLn; }, get$wireName() { return "BuildResult"; @@ -18722,7 +18686,7 @@ A._$ConnectRequestSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { type$.ConnectRequest._as(object); - return ["appId", serializers.serialize$2$specifiedType(object.appId, B.FullType_iHz), "instanceId", serializers.serialize$2$specifiedType(object.instanceId, B.FullType_iHz), "entrypointPath", serializers.serialize$2$specifiedType(object.entrypointPath, B.FullType_iHz)]; + return ["appId", serializers.serialize$2$specifiedType(object.appId, B.FullType_PT1), "instanceId", serializers.serialize$2$specifiedType(object.instanceId, B.FullType_PT1), "entrypointPath", serializers.serialize$2$specifiedType(object.entrypointPath, B.FullType_PT1)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -18739,19 +18703,19 @@ value = iterator.get$current(); switch (t1) { case "appId": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_connect_request$_$this()._appId = t1; break; case "instanceId": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_connect_request$_$this()._instanceId = t1; break; case "entrypointPath": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_connect_request$_$this()._entrypointPath = t1; @@ -18766,7 +18730,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_Avr; + return B.List_xmd; }, get$wireName() { return "ConnectRequest"; @@ -18830,7 +18794,7 @@ A._$DebugEventSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { type$.DebugEvent._as(object); - return ["kind", serializers.serialize$2$specifiedType(object.kind, B.FullType_iHz), "eventData", serializers.serialize$2$specifiedType(object.eventData, B.FullType_iHz), "timestamp", serializers.serialize$2$specifiedType(object.timestamp, B.FullType_xEI)]; + return ["kind", serializers.serialize$2$specifiedType(object.kind, B.FullType_PT1), "eventData", serializers.serialize$2$specifiedType(object.eventData, B.FullType_PT1), "timestamp", serializers.serialize$2$specifiedType(object.timestamp, B.FullType_rTD)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -18847,19 +18811,19 @@ value = iterator.get$current(); switch (t1) { case "kind": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_debug_event$_$this()._debug_event$_kind = t1; break; case "eventData": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_debug_event$_$this()._eventData = t1; break; case "timestamp": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_xEI); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_rTD); t1.toString; A._asInt(t1); result.get$_debug_event$_$this()._timestamp = t1; @@ -18874,7 +18838,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_otF; + return B.List_fK8; }, get$wireName() { return "DebugEvent"; @@ -18882,7 +18846,7 @@ }; A._$BatchedDebugEventsSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { - return ["events", serializers.serialize$2$specifiedType(type$.BatchedDebugEvents._as(object).events, B.FullType_46c)]; + return ["events", serializers.serialize$2$specifiedType(type$.BatchedDebugEvents._as(object).events, B.FullType_3Xm)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -18924,7 +18888,7 @@ t5.set$_listOwner(null); result.set$_events(t5); } - t6 = serializers.deserialize$2$specifiedType(value, B.FullType_46c); + t6 = serializers.deserialize$2$specifiedType(value, B.FullType_3Xm); t6.toString; t1._as(t6); t7 = t5.$ti; @@ -18949,7 +18913,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_qBv; + return B.List_WAE; }, get$wireName() { return "BatchedDebugEvents"; @@ -19092,67 +19056,67 @@ value = object.appEntrypointPath; if (value != null) { result.push("appEntrypointPath"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.appId; if (value != null) { result.push("appId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.appInstanceId; if (value != null) { result.push("appInstanceId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.appOrigin; if (value != null) { result.push("appOrigin"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.appUrl; if (value != null) { result.push("appUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.authUrl; if (value != null) { result.push("authUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.dwdsVersion; if (value != null) { result.push("dwdsVersion"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.extensionUrl; if (value != null) { result.push("extensionUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.isInternalBuild; if (value != null) { result.push("isInternalBuild"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_mpw)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_R6B)); } value = object.isFlutterApp; if (value != null) { result.push("isFlutterApp"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_mpw)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_R6B)); } value = object.workspaceName; if (value != null) { result.push("workspaceName"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.tabUrl; if (value != null) { result.push("tabUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.tabId; if (value != null) { result.push("tabId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_xEI)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_rTD)); } return result; }, @@ -19171,55 +19135,55 @@ value = iterator.get$current(); switch (t1) { case "appEntrypointPath": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._appEntrypointPath = t1; break; case "appId": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._debug_info$_appId = t1; break; case "appInstanceId": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._appInstanceId = t1; break; case "appOrigin": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._appOrigin = t1; break; case "appUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._appUrl = t1; break; case "authUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._authUrl = t1; break; case "dwdsVersion": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._dwdsVersion = t1; break; case "extensionUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._extensionUrl = t1; break; case "isInternalBuild": - t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_mpw)); + t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_R6B)); result.get$_$this()._isInternalBuild = t1; break; case "isFlutterApp": - t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_mpw)); + t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_R6B)); result.get$_$this()._isFlutterApp = t1; break; case "workspaceName": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._workspaceName = t1; break; case "tabUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_$this()._tabUrl = t1; break; case "tabId": - t1 = A._asIntQ(serializers.deserialize$2$specifiedType(value, B.FullType_xEI)); + t1 = A._asIntQ(serializers.deserialize$2$specifiedType(value, B.FullType_rTD)); result.get$_$this()._tabId = t1; break; } @@ -19232,7 +19196,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_nlp; + return B.List_55I; }, get$wireName() { return "DebugInfo"; @@ -19308,26 +19272,26 @@ serialize$3$specifiedType(serializers, object, specifiedType) { var result, value; type$.DevToolsRequest._as(object); - result = ["appId", serializers.serialize$2$specifiedType(object.appId, B.FullType_iHz), "instanceId", serializers.serialize$2$specifiedType(object.instanceId, B.FullType_iHz)]; + result = ["appId", serializers.serialize$2$specifiedType(object.appId, B.FullType_PT1), "instanceId", serializers.serialize$2$specifiedType(object.instanceId, B.FullType_PT1)]; value = object.contextId; if (value != null) { result.push("contextId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_xEI)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_rTD)); } value = object.tabUrl; if (value != null) { result.push("tabUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } value = object.uriOnly; if (value != null) { result.push("uriOnly"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_mpw)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_R6B)); } value = object.client; if (value != null) { result.push("client"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } return result; }, @@ -19346,31 +19310,31 @@ value = iterator.get$current(); switch (t1) { case "appId": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_devtools_request$_$this()._devtools_request$_appId = t1; break; case "instanceId": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_devtools_request$_$this()._devtools_request$_instanceId = t1; break; case "contextId": - t1 = A._asIntQ(serializers.deserialize$2$specifiedType(value, B.FullType_xEI)); + t1 = A._asIntQ(serializers.deserialize$2$specifiedType(value, B.FullType_rTD)); result.get$_devtools_request$_$this()._contextId = t1; break; case "tabUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_devtools_request$_$this()._devtools_request$_tabUrl = t1; break; case "uriOnly": - t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_mpw)); + t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_R6B)); result.get$_devtools_request$_$this()._uriOnly = t1; break; case "client": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_devtools_request$_$this()._devtools_request$_client = t1; break; } @@ -19383,7 +19347,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_RA5; + return B.List_G46; }, get$wireName() { return "DevToolsRequest"; @@ -19393,11 +19357,11 @@ serialize$3$specifiedType(serializers, object, specifiedType) { var result, value; type$.DevToolsResponse._as(object); - result = ["success", serializers.serialize$2$specifiedType(object.success, B.FullType_mpw), "promptExtension", serializers.serialize$2$specifiedType(object.promptExtension, B.FullType_mpw)]; + result = ["success", serializers.serialize$2$specifiedType(object.success, B.FullType_R6B), "promptExtension", serializers.serialize$2$specifiedType(object.promptExtension, B.FullType_R6B)]; value = object.error; if (value != null) { result.push("error"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } return result; }, @@ -19418,19 +19382,19 @@ value = iterator.get$current(); switch (t1) { case "success": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_mpw); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_R6B); t1.toString; A._asBool(t1); result.get$_devtools_request$_$this()._success = t1; break; case "promptExtension": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_mpw); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_R6B); t1.toString; A._asBool(t1); result.get$_devtools_request$_$this()._promptExtension = t1; break; case "error": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_devtools_request$_$this()._error = t1; break; } @@ -19453,7 +19417,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_w61; + return B.List_TEH; }, get$wireName() { return "DevToolsResponse"; @@ -19555,7 +19519,7 @@ A._$ErrorResponseSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { type$.ErrorResponse._as(object); - return ["error", serializers.serialize$2$specifiedType(object.error, B.FullType_iHz), "stackTrace", serializers.serialize$2$specifiedType(object.stackTrace, B.FullType_iHz)]; + return ["error", serializers.serialize$2$specifiedType(object.error, B.FullType_PT1), "stackTrace", serializers.serialize$2$specifiedType(object.stackTrace, B.FullType_PT1)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -19574,7 +19538,7 @@ value = iterator.get$current(); switch (t1) { case "error": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); $$v = result._error_response$_$v; @@ -19586,7 +19550,7 @@ result._error_response$_error = t1; break; case "stackTrace": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); $$v = result._error_response$_$v; @@ -19617,7 +19581,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_UKD; + return B.List_5LV; }, get$wireName() { return "ErrorResponse"; @@ -19662,11 +19626,11 @@ serialize$3$specifiedType(serializers, object, specifiedType) { var result, value; type$.ExtensionRequest._as(object); - result = ["id", serializers.serialize$2$specifiedType(object.id, B.FullType_xEI), "command", serializers.serialize$2$specifiedType(object.command, B.FullType_iHz)]; + result = ["id", serializers.serialize$2$specifiedType(object.id, B.FullType_rTD), "command", serializers.serialize$2$specifiedType(object.command, B.FullType_PT1)]; value = object.commandParams; if (value != null) { result.push("commandParams"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } return result; }, @@ -19686,19 +19650,19 @@ value = iterator.get$current(); switch (t1) { case "id": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_xEI); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_rTD); t1.toString; A._asInt(t1); result.get$_extension_request$_$this()._id = t1; break; case "command": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_extension_request$_$this()._command = t1; break; case "commandParams": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_extension_request$_$this()._commandParams = t1; break; } @@ -19722,7 +19686,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_Azp; + return B.List_2dD; }, get$wireName() { return "ExtensionRequest"; @@ -19732,11 +19696,11 @@ serialize$3$specifiedType(serializers, object, specifiedType) { var result, value; type$.ExtensionResponse._as(object); - result = ["id", serializers.serialize$2$specifiedType(object.id, B.FullType_xEI), "success", serializers.serialize$2$specifiedType(object.success, B.FullType_mpw), "result", serializers.serialize$2$specifiedType(object.result, B.FullType_iHz)]; + result = ["id", serializers.serialize$2$specifiedType(object.id, B.FullType_rTD), "success", serializers.serialize$2$specifiedType(object.success, B.FullType_R6B), "result", serializers.serialize$2$specifiedType(object.result, B.FullType_PT1)]; value = object.error; if (value != null) { result.push("error"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_iHz)); + result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); } return result; }, @@ -19756,25 +19720,25 @@ value = iterator.get$current(); switch (t1) { case "id": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_xEI); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_rTD); t1.toString; A._asInt(t1); result.get$_extension_request$_$this()._id = t1; break; case "success": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_mpw); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_R6B); t1.toString; A._asBool(t1); result.get$_extension_request$_$this()._extension_request$_success = t1; break; case "result": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); result.get$_extension_request$_$this()._extension_request$_result = t1; break; case "error": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_iHz)); + t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); result.get$_extension_request$_$this()._extension_request$_error = t1; break; } @@ -19801,7 +19765,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_EmH; + return B.List_RWp; }, get$wireName() { return "ExtensionResponse"; @@ -19810,7 +19774,7 @@ A._$ExtensionEventSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { type$.ExtensionEvent._as(object); - return ["params", serializers.serialize$2$specifiedType(object.params, B.FullType_iHz), "method", serializers.serialize$2$specifiedType(object.method, B.FullType_iHz)]; + return ["params", serializers.serialize$2$specifiedType(object.params, B.FullType_PT1), "method", serializers.serialize$2$specifiedType(object.method, B.FullType_PT1)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -19828,7 +19792,7 @@ value = iterator.get$current(); switch (t1) { case "params": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); $$v = result._extension_request$_$v; @@ -19840,7 +19804,7 @@ result._params = t1; break; case "method": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); $$v = result._extension_request$_$v; @@ -19871,7 +19835,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_i7r; + return B.List_yvR; }, get$wireName() { return "ExtensionEvent"; @@ -19879,7 +19843,7 @@ }; A._$BatchedEventsSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { - return ["events", serializers.serialize$2$specifiedType(type$.BatchedEvents._as(object).events, B.FullType_zVP)]; + return ["events", serializers.serialize$2$specifiedType(type$.BatchedEvents._as(object).events, B.FullType_ahP)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -19921,7 +19885,7 @@ t5.set$_listOwner(null); result.set$_extension_request$_events(t5); } - t6 = serializers.deserialize$2$specifiedType(value, B.FullType_zVP); + t6 = serializers.deserialize$2$specifiedType(value, B.FullType_ahP); t6.toString; t1._as(t6); t7 = t5.$ti; @@ -19946,7 +19910,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_4mo; + return B.List_oDF; }, get$wireName() { return "BatchedEvents"; @@ -20143,7 +20107,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_NXK; + return B.List_MJN; }, get$wireName() { return "IsolateExit"; @@ -20167,7 +20131,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_qFt; + return B.List_KpG; }, get$wireName() { return "IsolateStart"; @@ -20225,7 +20189,7 @@ A._$RegisterEventSerializer.prototype = { serialize$3$specifiedType(serializers, object, specifiedType) { type$.RegisterEvent._as(object); - return ["eventData", serializers.serialize$2$specifiedType(object.eventData, B.FullType_iHz), "timestamp", serializers.serialize$2$specifiedType(object.timestamp, B.FullType_xEI)]; + return ["eventData", serializers.serialize$2$specifiedType(object.eventData, B.FullType_PT1), "timestamp", serializers.serialize$2$specifiedType(object.timestamp, B.FullType_rTD)]; }, serialize$2(serializers, object) { return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); @@ -20242,7 +20206,7 @@ value = iterator.get$current(); switch (t1) { case "eventData": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_iHz); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); $$v = result._register_event$_$v; @@ -20254,7 +20218,7 @@ result._register_event$_eventData = t1; break; case "timestamp": - t1 = serializers.deserialize$2$specifiedType(value, B.FullType_xEI); + t1 = serializers.deserialize$2$specifiedType(value, B.FullType_rTD); t1.toString; A._asInt(t1); $$v = result._register_event$_$v; @@ -20275,7 +20239,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_2Uk; + return B.List_EMv; }, get$wireName() { return "RegisterEvent"; @@ -20352,7 +20316,7 @@ $isSerializer: 1, $isStructuredSerializer: 1, get$types() { - return B.List_rtI; + return B.List_RlA; }, get$wireName() { return "RunRequest"; @@ -20377,13 +20341,13 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty, type$.DebugEvent); }, - $signature: 42 + $signature: 83 }; A._$serializers_closure0.prototype = { call$0() { return A.ListBuilder_ListBuilder(B.List_empty, type$.ExtensionEvent); }, - $signature: 43 + $signature: 42 }; A.BatchedStreamController.prototype = { _batchAndSendEvents$0() { @@ -20493,13 +20457,13 @@ call$0() { return true; }, - $signature: 25 + $signature: 19 }; A.BatchedStreamController__hasEventDuring_closure.prototype = { call$0() { return false; }, - $signature: 25 + $signature: 19 }; A.SocketClient.prototype = {}; A.SseSocketClient.prototype = { @@ -20541,14 +20505,14 @@ call$1(o) { return J.toString$0$(o); }, - $signature: 45 + $signature: 44 }; 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: 17 + $signature: 18 }; A.Int32.prototype = { _toInt$1(val) { @@ -20759,7 +20723,7 @@ $parent._children.$indexSet(0, thisName, t1); return t1; }, - $signature: 46 + $signature: 45 }; A.Pool.prototype = { request$0() { @@ -20789,10 +20753,10 @@ withResource$body$Pool(callback, $T, $async$type) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter($async$type), - $async$returnValue, $async$handler = 2, $async$currentError, $async$next = [], $async$self = this, resource, t1, t2; + $async$returnValue, $async$handler = 2, $async$errorStack = [], $async$next = [], $async$self = this, resource, t1, t2; var $async$withResource$1$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) { - $async$currentError = $async$result; + $async$errorStack.push($async$result); $async$goto = $async$handler; } while (true) @@ -20852,7 +20816,7 @@ return A._asyncReturn($async$returnValue, $async$completer); case 2: // rethrow - return A._asyncRethrow($async$currentError, $async$completer); + return A._asyncRethrow($async$errorStack.at(-1), $async$completer); } }); return A._asyncStartSync($async$withResource$1$1, $async$completer); @@ -20892,7 +20856,7 @@ type$.StackTrace._as(stackTrace); this.$this._onReleaseCompleters.removeFirst$0().completeError$2(error, stackTrace); }, - $signature: 5 + $signature: 3 }; A.PoolResource.prototype = {}; A.SseClient.prototype = { @@ -21008,10 +20972,10 @@ call$0() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.Null), - $async$handler = 1, $async$currentError, $async$self = this, e, e0, url, error, augmentedError, exception, t1, t2, $async$exception; + $async$handler = 1, $async$errorStack = [], $async$self = this, e, e0, url, error, augmentedError, exception, t1, t2, $async$exception; var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) { - $async$currentError = $async$result; + $async$errorStack.push($async$result); $async$goto = $async$handler; } while (true) @@ -21054,7 +21018,7 @@ case 3: // catch $async$handler = 2; - $async$exception = $async$currentError; + $async$exception = $async$errorStack.pop(); error = A.unwrapException($async$exception); t1 = $async$self.$this; augmentedError = "[" + t1._clientId + "] SSE client failed to send " + A.S($async$self.message) + ":\n " + A.S(error); @@ -21074,30 +21038,30 @@ return A._asyncReturn(null, $async$completer); case 1: // rethrow - return A._asyncRethrow($async$currentError, $async$completer); + return A._asyncRethrow($async$errorStack.at(-1), $async$completer); } }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 24 + $signature: 48 }; A.generateUuidV4_generateBits.prototype = { call$1(bitCount) { return this.random.nextInt$1(B.JSInt_methods._shlPositive$1(1, bitCount)); }, - $signature: 22 + $signature: 24 }; A.generateUuidV4_printDigits.prototype = { call$2(value, count) { return B.JSString_methods.padLeft$2(B.JSInt_methods.toRadixString$1(value, 16), count, "0"); }, - $signature: 26 + $signature: 16 }; A.generateUuidV4_bitsDigits.prototype = { call$2(bitCount, digitCount) { return this.printDigits.call$2(this.generateBits.call$1(bitCount), digitCount); }, - $signature: 26 + $signature: 16 }; A.GuaranteeChannel.prototype = { GuaranteeChannel$3$allowSinkErrors(innerSink, allowSinkErrors, _box_0, $T) { @@ -21222,30 +21186,30 @@ }; A.StreamChannelMixin.prototype = {$isStreamChannel: 1}; 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; } @@ -21507,7 +21471,7 @@ t2.complete$0(); t1._listen$0(); }, - $signature: 8 + $signature: 7 }; A.HtmlWebSocketChannel_closure0.prototype = { call$1(_) { @@ -21528,7 +21492,7 @@ t1 === $ && A.throwLateFieldNI("_sink"); t1.close$0(); }, - $signature: 8 + $signature: 7 }; A.HtmlWebSocketChannel_closure1.prototype = { call$1($event) { @@ -21542,7 +21506,7 @@ t1 === $ && A.throwLateFieldNI("_sink"); t1.close$0(); }, - $signature: 8 + $signature: 7 }; A.HtmlWebSocketChannel__listen_closure.prototype = { call$1(obj) { @@ -21574,7 +21538,7 @@ $call$body$main_closure() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.void), - uri, t3, fixedPath, fixedUri, client, restarter, manager, t4, t5, t6, debugEventController, t7, t1, t2; + uri, t2, fixedPath, fixedUri, client, _0_0, t3, manager, t4, t5, t6, debugEventController, t7, _box_0, t1; var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -21582,60 +21546,70 @@ switch ($async$goto) { case 0: // Function start - t1 = {}; - t2 = self; - if (A._asStringQ(t2.$dartAppInstanceId) == null) - t2.$dartAppInstanceId = new A.UuidV1(null).generate$1$options(null); - uri = A.Uri_parse(A._asString(t2.$dwdsDevHandlerPath)); - t3 = type$.JavaScriptObject; - if (A._asString(t3._as(t3._as(t2.window).location).protocol) === "https:" && uri.get$scheme() === "http" && uri.get$host() !== "localhost") + _box_0 = {}; + t1 = self; + if (A._asStringQ(t1.$dartAppInstanceId) == null) + t1.$dartAppInstanceId = new A.UuidV1(null).generate$1$options(null); + uri = A.Uri_parse(A._asString(t1.$dwdsDevHandlerPath)); + t2 = type$.JavaScriptObject; + if (A._asString(t2._as(t2._as(t1.window).location).protocol) === "https:" && uri.get$scheme() === "http" && uri.get$host() !== "localhost") uri = uri.replace$1$scheme("https"); - else if (A._asString(t3._as(t3._as(t2.window).location).protocol) === "wss:" && uri.get$scheme() === "ws" && uri.get$host() !== "localhost") + else if (A._asString(t2._as(t2._as(t1.window).location).protocol) === "wss:" && uri.get$scheme() === "ws" && uri.get$host() !== "localhost") uri = uri.replace$1$scheme("wss"); fixedPath = uri.toString$0(0); fixedUri = A.Uri_parse(fixedPath); client = fixedUri.isScheme$1("ws") || fixedUri.isScheme$1("wss") ? new A.WebSocketClient(A.HtmlWebSocketChannel$connect(fixedUri, null)) : new A.SseSocketClient(A.SseClient$(fixedPath, "InjectedClient")); - $async$goto = A._asString(t2.$dartModuleStrategy) === "require-js" ? 2 : 4; + _0_0 = A._asString(t1.$dartModuleStrategy); + $async$goto = "require-js" === _0_0 ? 3 : 4; break; - case 2: + case 3: // then $async$goto = 5; return A._asyncAwait(A.RequireRestarter_create(), $async$call$0); case 5: // returning from await. - restarter = $async$result; - // goto join - $async$goto = 3; + t3 = $async$result; + // goto break $label0$0 + $async$goto = 2; break; case 4: - // else - if (A._asString(t2.$dartModuleStrategy) === "ddc" || A._asString(t2.$dartModuleStrategy) === "legacy") - restarter = new A.DdcRestarter(); - else - throw A.wrapException(A.StateError$("Unknown module strategy: " + A.S(A.getProperty(A.staticInteropGlobalContext(), "$dartModuleStrategy", type$.String)))); - case 3: // join - manager = new A.ReloadingManager(client, restarter); - t1.readyToRunMainCompleter = null; - t2.$dartHotRestartDwds = A._functionToJS2(new A.main__closure(t1, manager)); - t2.$dartReadyToRunMain = A._functionToJS0(new A.main__closure0(t1)); - t1 = $.Zone__current; + if ("ddc-library-bundle" === _0_0) { + t3 = new A.DdcLibraryBundleRestarter(); + // goto break $label0$0 + $async$goto = 2; + break; + } + if ("ddc" === _0_0 || "legacy" === _0_0) { + t3 = new A.DdcRestarter(); + // goto break $label0$0 + $async$goto = 2; + break; + } + t3 = A.throwExpression(A.StateError$("Unknown module strategy: " + A.S(A.getProperty(A.staticInteropGlobalContext(), "$dartModuleStrategy", type$.String)))); + case 2: + // break $label0$0 + manager = new A.ReloadingManager(client, t3); + _box_0.readyToRunMainCompleter = null; + t1.$dartHotRestartDwds = A._functionToJS2(new A.main__closure(_box_0, manager)); + t1.$dartReadyToRunMain = A._functionToJS0(new A.main__closure0(_box_0)); + t3 = $.Zone__current; t4 = Math.max(100, 1); 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(t1, type$._Future_bool), type$._AsyncCompleter_bool), type$.BatchedStreamController_DebugEvent); - t1 = A.List_List$filled(A.QueueList__computeInitialCapacity(null), null, false, type$.nullable_Result_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); t7 = type$.StreamQueue_DebugEvent; - debugEventController.set$__BatchedStreamController__inputQueue_A(t7._as(new A.StreamQueue(new A._ControllerStream(t5, A._instanceType(t5)._eval$1("_ControllerStream<1>")), new A.QueueList(t1, 0, 0, type$.QueueList_Result_DebugEvent), t4, t7))); + debugEventController.set$__BatchedStreamController__inputQueue_A(t7._as(new A.StreamQueue(new A._ControllerStream(t5, A._instanceType(t5)._eval$1("_ControllerStream<1>")), new A.QueueList(t3, 0, 0, type$.QueueList_Result_DebugEvent), t4, t7))); A.safeUnawaited(debugEventController._batchAndSendEvents$0()); new A._ControllerStream(t6, A._instanceType(t6)._eval$1("_ControllerStream<1>")).listen$1(new A.main__closure1(client)); - t2.$emitDebugEvent = A._functionToJS2(new A.main__closure2(debugEventController)); - t2.$emitRegisterEvent = A._functionToJS1(new A.main__closure3(client)); - t2.$launchDevTools = A._functionToJS0(new A.main__closure4(client)); + t1.$emitDebugEvent = A._functionToJS2(new A.main__closure2(debugEventController)); + t1.$emitRegisterEvent = A._functionToJS1(new A.main__closure3(client)); + t1.$launchDevTools = A._functionToJS0(new A.main__closure4(client)); client.get$stream().listen$2$onError(new A.main__closure5(manager), new A.main__closure6()); - if (A._asBool(t2.$dwdsEnableDevToolsLaunch)) - A._EventStreamSubscription$(t3._as(t2.window), "keydown", type$.nullable_void_Function_JavaScriptObject._as(new A.main__closure7()), false, t3); + if (A._asBool(t1.$dwdsEnableDevToolsLaunch)) + A._EventStreamSubscription$(t2._as(t1.window), "keydown", type$.nullable_void_Function_JavaScriptObject._as(new A.main__closure7()), false, t2); if (A._isChromium()) { t1 = client.get$sink(); t2 = $.$get$serializers(); @@ -21651,7 +21625,7 @@ }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 51 + $signature: 25 }; A.main__closure.prototype = { call$2(runId, pauseIsolatesOnStart) { @@ -21669,7 +21643,7 @@ call$1(runId) { return this.call$2(runId, null); }, - $signature: 52 + $signature: 51 }; A.main__closure0.prototype = { call$0() { @@ -21696,7 +21670,7 @@ A._trySendEvent(t1, B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(t3._debug_event$_build$0()), null), type$.dynamic); } }, - $signature: 53 + $signature: 52 }; A.main___closure2.prototype = { call$1(b) { @@ -21705,7 +21679,7 @@ b.get$_debug_event$_$this().set$_events(t1); return t1; }, - $signature: 54 + $signature: 53 }; A.main__closure2.prototype = { call$2(kind, eventData) { @@ -21719,7 +21693,7 @@ A._trySendEvent(new A._StreamSinkWrapper(t1, A._instanceType(t1)._eval$1("_StreamSinkWrapper<1>")), t2._debug_event$_build$0(), type$.DebugEvent); } }, - $signature: 55 + $signature: 54 }; A.main___closure1.prototype = { call$1(b) { @@ -21729,7 +21703,7 @@ b.get$_debug_event$_$this()._eventData = this.eventData; return b; }, - $signature: 70 + $signature: 69 }; A.main__closure3.prototype = { call$1(eventData) { @@ -21741,7 +21715,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: 57 + $signature: 56 }; A.main___closure0.prototype = { call$1(b) { @@ -21750,7 +21724,7 @@ b.get$_register_event$_$this()._register_event$_eventData = this.eventData; return b; }, - $signature: 58 + $signature: 57 }; A.main__closure4.prototype = { call$0() { @@ -21776,7 +21750,7 @@ b.get$_devtools_request$_$this()._devtools_request$_instanceId = t1; return b; }, - $signature: 59 + $signature: 58 }; A.main__closure5.prototype = { call$1(serialized) { @@ -21840,7 +21814,7 @@ t1 = $event.promptExtension && A._asBool(type$.JavaScriptObject._as(self.window).confirm($alert)); t2 = type$.JavaScriptObject; if (t1) - type$.nullable_JavaScriptObject._as(t2._as(self.window).open("https://goo.gle/dart-debug-extension", "_blank")); + type$.nullable_JavaScriptObject._as(t2._as(self.window).open("https://dart.dev/to/web-debug-extension", "_blank")); else t2._as(self.window).alert($alert); } @@ -21856,7 +21830,7 @@ }); return A._asyncStartSync($async$call$1, $async$completer); }, - $signature: 60 + $signature: 59 }; A.main__closure6.prototype = { call$1(error) { @@ -21865,7 +21839,7 @@ }; A.main__closure7.prototype = { call$1(e) { - if (B.JSArray_methods.contains$1(B.List_2ZF, A._asString(e.key)) && A._asBool(e.altKey) && !A._asBool(e.ctrlKey) && !A._asBool(e.metaKey)) { + if (B.JSArray_methods.contains$1(B.List_fAJ, A._asString(e.key)) && A._asBool(e.altKey) && !A._asBool(e.ctrlKey) && !A._asBool(e.metaKey)) { e.preventDefault(); type$.JavaScriptFunction._as(self.$launchDevTools).call(); } @@ -21883,7 +21857,7 @@ b.get$_connect_request$_$this()._entrypointPath = t1; return b; }, - $signature: 61 + $signature: 60 }; A.main_closure0.prototype = { call$2(error, stackTrace) { @@ -21891,7 +21865,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: 10 }; A._launchCommunicationWithDebugExtension_closure.prototype = { call$1(b) { @@ -21920,13 +21894,33 @@ b.get$_$this()._workspaceName = t1; return b; }, - $signature: 62 + $signature: 61 }; A._handleAuthRequest_closure.prototype = { call$1(isAuthenticated) { return A._dispatchEvent("dart-auth-response", "" + A._asBool(isAuthenticated)); }, - $signature: 63 + $signature: 62 + }; + A.DdcLibraryBundleRestarter.prototype = { + restart$2$readyToRunMain$runId(readyToRunMain, runId) { + var $async$goto = 0, + $async$completer = A._makeAsyncAwaitCompleter(type$.bool); + var $async$restart$2$readyToRunMain$runId = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { + if ($async$errorCode === 1) + return A._asyncRethrow($async$result, $async$completer); + while (true) + switch ($async$goto) { + case 0: + // Function start + throw A.wrapException(A.Exception_Exception("Hot reload isn't supported for the DDC library bundle format yet.")); + // implicit return + return A._asyncReturn(null, $async$completer); + } + }); + return A._asyncStartSync($async$restart$2$readyToRunMain$runId, $async$completer); + }, + $isRestarter: 1 }; A.DdcRestarter.prototype = { restart$2$readyToRunMain$runId(readyToRunMain, runId) { @@ -21974,7 +21968,7 @@ this.sub.cancel$0(); return value; }, - $signature: 64 + $signature: 63 }; A.ReloadingManager.prototype = { hotRestart$2$readyToRunMain$runId(readyToRunMain, runId) { @@ -22069,7 +22063,7 @@ t6 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; if (t6 === $.RequireRestarter____lastKnownDigests) A.throwExpression(A.LateError$fieldNI(t4)); - if (!J.$eq$(t6.$index(0, t5), newDigests.$index(0, t5))) { + if (t6.$index(0, t5) != newDigests.$index(0, t5)) { t6 = $.RequireRestarter____lastKnownDigests.__late_helper$_value; if (t6 === $.RequireRestarter____lastKnownDigests) A.throwExpression(A.LateError$fieldNI(t4)); @@ -22217,7 +22211,7 @@ t2.toString; t1 = t1.$index(0, module1); t1.toString; - topological = J.compareTo$1$ns(t2, t1); + topological = B.JSInt_methods.compareTo$1(t2, t1); return topological === 0 ? B.JSString_methods.compareTo$1(module1, module2) : topological; }, _reload$1(modules) { @@ -22226,10 +22220,10 @@ _reload$body$RequireRestarter(modules) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.bool), - $async$returnValue, $async$handler = 2, $async$currentError, $async$self = this, reloadedModules, moduleId, parentIds, e, t4, t5, t6, t7, t8, _this, parentIds0, result, exception, _box_0, t1, t2, dart, t3, $async$exception; + $async$returnValue, $async$handler = 2, $async$errorStack = [], $async$self = this, reloadedModules, moduleId, parentIds, e, t4, t5, t6, t7, t8, _this, parentIds0, result, exception, _box_0, t1, t2, dart, t3, $async$exception; var $async$_reload$1 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) { - $async$currentError = $async$result; + $async$errorStack.push($async$result); $async$goto = $async$handler; } while (true) @@ -22334,7 +22328,7 @@ case 7: // catch $async$handler = 6; - $async$exception = $async$currentError; + $async$exception = $async$errorStack.pop(); t3 = A.unwrapException($async$exception); if (t3 instanceof A.HotReloadFailedException) { e = t3; @@ -22362,7 +22356,7 @@ return A._asyncReturn($async$returnValue, $async$completer); case 2: // rethrow - return A._asyncRethrow($async$currentError, $async$completer); + return A._asyncRethrow($async$errorStack.at(-1), $async$completer); } }); return A._asyncStartSync($async$_reload$1, $async$completer); @@ -22417,17 +22411,16 @@ call$1(e) { this.completer.completeError$2(new A.HotReloadFailedException(A._asString(type$.JavaScriptObject._as(e).message)), this.stackTrace); }, - $signature: 8 + $signature: 7 }; A._createScript_closure.prototype = { call$0() { var nonce = A._findNonce(); if (nonce == null) return new A._createScript__closure(); - else - return new A._createScript__closure0(nonce); + return new A._createScript__closure0(nonce); }, - $signature: 67 + $signature: 66 }; A._createScript__closure.prototype = { call$0() { @@ -22480,46 +22473,46 @@ _instance_1_i = hunkHelpers._instance_1i, _instance_0_u = hunkHelpers._instance_0u, _instance_1_u = hunkHelpers._instance_1u; - _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 69); - _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_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 68); + _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 9); + _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 9); + _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 9); _static_0(A, "async___startMicrotaskLoop$closure", "_startMicrotaskLoop", 0); - _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 7); - _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 9); + _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 8); + _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 10); _static_0(A, "async___nullDoneHandler$closure", "_nullDoneHandler", 0); - _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 71, 0); + _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 70, 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); - }], 72, 0); + }], 71, 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); - }], 73, 0); - _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 74, 0); + }], 72, 0); + _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6"], ["_rootRunBinary"], 73, 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); - }], 75, 0); + }], 74, 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); - }], 76, 0); + }], 75, 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); - }], 77, 0); - _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 78, 0); - _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 79, 0); - _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 80, 0); - _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 81, 0); - _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 82, 0); - _static_1(A, "async___printToZone$closure", "_printToZone", 83); - _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 56, 0); - _instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 16, 0, 0); - _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 9); + }], 76, 0); + _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 77, 0); + _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 78, 0); + _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 79, 0); + _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 80, 0); + _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 81, 0); + _static_1(A, "async___printToZone$closure", "_printToZone", 82); + _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 55, 0); + _instance(A._Completer.prototype, "get$completeError", 0, 1, null, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 17, 0, 0); + _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 10); var _; _instance_1_i(_ = A._StreamController.prototype, "get$add", "add$1", 11); - _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 16, 0, 0); + _instance(_, "get$addError", 0, 1, null, ["call$2", "call$1"], ["addError$2", "addError$1"], 17, 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); @@ -22527,31 +22520,31 @@ _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", 11); - _instance_2_u(_, "get$_handleError", "_handleError$2", 17); + _instance_2_u(_, "get$_handleError", "_handleError$2", 18); _instance_0_u(_, "get$_handleDone", "_handleDone$0", 0); _static_2(A, "collection___defaultEquals$closure", "_defaultEquals0", 13); - _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 14); - _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 4); - _static_1(A, "core__identityHashCode$closure", "identityHashCode", 14); + _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 12); + _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 5); + _static_1(A, "core__identityHashCode$closure", "identityHashCode", 12); _static_2(A, "core__identical$closure", "identical", 13); _instance_2_u(_ = A.DeepCollectionEquality.prototype, "get$equals", "equals$2", 13); - _instance_1_u(_, "get$hash", "hash$1", 14); - _instance_1_u(_, "get$isValidKey", "isValidKey$1", 41); + _instance_1_u(_, "get$hash", "hash$1", 12); + _instance_1_u(_, "get$isValidKey", "isValidKey$1", 40); _instance_1_u(_ = A.SseClient.prototype, "get$_onIncomingControlMessage", "_onIncomingControlMessage$1", 1); _instance_1_u(_, "get$_onIncomingMessage", "_onIncomingMessage$1", 1); _instance_0_u(_, "get$_onOutgoingDone", "_onOutgoingDone$0", 0); - _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 48); + _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 47); _instance_1_u(A.HtmlWebSocketChannel.prototype, "get$_innerListen", "_innerListen$1", 1); _static_1(A, "client___handleAuthRequest$closure", "_handleAuthRequest", 1); - _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 65); - _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 66); + _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 64); + _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 65); })(); (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.MapBase, A.Closure, A.Error, A.SentinelValue, A.ListIterator, A.MappedIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ListBase, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, 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.AsyncError, 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._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._JsonStringifier, A._Utf8Encoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, 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.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.Level, A.LogRecord, A.Logger, A.Pool, A.PoolResource, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.WebSocketChannelException, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); + _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Iterable, A.CastIterator, A.MapBase, A.Closure, A.Error, A.SentinelValue, A.ListIterator, A.MappedIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.ListBase, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, 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._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._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._JsonStringifier, A._Utf8Encoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, 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.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.Level, A.LogRecord, A.Logger, A.Pool, A.PoolResource, A.StreamChannelMixin, A._GuaranteeSink, A.StreamChannelController, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, 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]); @@ -22562,9 +22555,9 @@ _inherit(A._EfficientLengthCastIterable, A.CastIterable); _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A._JsonMap]); _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__chainForeignFuture_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.SplayTreeSet_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A._createTables_setChars, A._createTables_setRange, 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.WebSocketClient_stream_closure, A.Pool__runOnRelease_closure, A.SseClient_closure0, A.SseClient_closure1, A.generateUuidV4_generateBits, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.HttpRequest_request_closure, A.HtmlWebSocketChannel_closure, A.HtmlWebSocketChannel_closure0, A.HtmlWebSocketChannel_closure1, A.HtmlWebSocketChannel__listen_closure, A.main__closure, A.main__closure1, A.main___closure2, A.main___closure1, A.main__closure3, A.main___closure0, A.main___closure, A.main__closure5, A.main__closure6, A.main__closure7, A.main__closure8, 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.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__chainForeignFuture_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._createTables_build, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.safeUnawaited_closure, A.Pool__runOnRelease_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure2, A.main_closure0]); + _inheritMany(A.Closure2Args, [A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__chainForeignFuture_closure0, 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._createTables_build, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.safeUnawaited_closure, A.Pool__runOnRelease_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure2, A.main_closure0]); _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]); - _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__chainForeignFuture_closure1, A._Future__chainCoreFutureAsync_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteError_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.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.Logger_Logger_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A.HtmlWebSocketChannel__listen_closure0, A.main_closure, A.main__closure0, A.main__closure4, 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__chainForeignFuture_closure1, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteError_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.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.Logger_Logger_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.GuaranteeChannel_closure, A.GuaranteeChannel__closure, A.HtmlWebSocketChannel__listen_closure0, A.main_closure, A.main__closure0, A.main__closure4, 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.LinkedHashMapKeyIterable, A._HashMapKeyIterable]); _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A.ListQueue, A._JsonMapKeyIterable]); _inherit(A.EfficientLengthMappedIterable, A.MappedIterable); @@ -22637,7 +22630,7 @@ _inherit(A._$RunRequest, A.RunRequest); _inheritMany(A.SocketClient, [A.SseSocketClient, A.WebSocketClient]); _inheritMany(A.StreamChannelMixin, [A.SseClient, A.GuaranteeChannel, A.HtmlWebSocketChannel, A.WebSocketChannel]); - _inherit(A.CryptoRNG, A.RNG); + _inherit(A.MathRNG, A.RNG); _inherit(A._HtmlWebSocketSink, A.DelegatingStreamSink); _mixin(A.UnmodifiableListBase, A.UnmodifiableListMixin); _mixin(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A.ListBase); @@ -22655,18 +22648,17 @@ 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: ["~()", "~(JavaScriptObject)", "Null()", "Object?(@)", "@(@)", "Null(Object,StackTrace)", "Null(@)", "~(@)", "Null(JavaScriptObject)", "~(Object,StackTrace)", "~(~())", "~(Object?)", "Object?(Object?)", "bool(Object?,Object?)", "int(Object?)", "JavaScriptObject()", "~(Object[StackTrace?])", "~(@,StackTrace)", "bool(@)", "~(@,@)", "~(Object?,Object?)", "int(int,int)", "int(int)", "~(Uint8List,String,int)", "Future()", "bool()", "String(int,int)", "Null(JavaScriptFunction,JavaScriptFunction)", "@(@,String)", "Object?(~)", "Null(~())", "int(int,@)", "IndentingBuiltValueToStringHelper(String)", "ListBuilder()", "ListMultimapBuilder()", "MapBuilder()", "SetBuilder()", "SetMultimapBuilder()", "Null(@,StackTrace)", "~(int,@)", "@(String)", "bool(Object?)", "ListBuilder()", "ListBuilder()", "~(String,int)", "String(@)", "Logger()", "~(String,int?)", "~(String?)", "String(String)", "Uint8List(@,@)", "Future<~>()", "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)", "JavaScriptObject()()", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "int(@,@)", "DebugEventBuilder(DebugEventBuilder)", "~(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)", "_Future<@>(@)"], + types: ["~()", "~(JavaScriptObject)", "Null()", "Null(Object,StackTrace)", "Object?(@)", "@(@)", "Null(@)", "Null(JavaScriptObject)", "~(@)", "~(~())", "~(Object,StackTrace)", "~(Object?)", "int(Object?)", "bool(Object?,Object?)", "Object?(Object?)", "JavaScriptObject()", "String(int,int)", "~(Object[StackTrace?])", "~(@,StackTrace)", "bool()", "bool(@)", "~(@,@)", "~(Object?,Object?)", "int(int,int)", "int(int)", "Future<~>()", "~(Uint8List,String,int)", "Uint8List(@,@)", "Object?(~)", "String(String)", "int(int,@)", "IndentingBuiltValueToStringHelper(String)", "ListBuilder()", "ListMultimapBuilder()", "MapBuilder()", "SetBuilder()", "SetMultimapBuilder()", "@(@,String)", "~(String,int?)", "~(String,int)", "bool(Object?)", "Null(JavaScriptFunction,JavaScriptFunction)", "ListBuilder()", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "String(@)", "Logger()", "Null(~())", "~(String?)", "Future()", "@(String)", "Null(@,StackTrace)", "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)", "JavaScriptObject()()", "~(int,@)", "int(@,@)", "DebugEventBuilder(DebugEventBuilder)", "~(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)", "ListBuilder()"], 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"],"Iterable.E":"1"},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["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":[],"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"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.K":"3","MapBase.V":"4"},"LateError":{"Error":[]},"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"},"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"]},"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"]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Function":[]},"Closure2Args":{"Function":[]},"TearOffClosure":{"Function":[]},"StaticClosure":{"Function":[]},"BoundClosure":{"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"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":[]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double"},"NativeInt16List":{"Int16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeInt32List":{"Int32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeInt8List":{"Int8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint16List":{"Uint16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint32List":{"Uint32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint8ClampedList":{"Uint8ClampedList":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint8List":{"Uint8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.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"]},"_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":["@"]},"_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.1":"_SplayTreeSetNode<1>","_SplayTreeNode.K":"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"]},"_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"},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"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"]},"Encoding":{"Codec":["String","List"]},"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?"]},"Utf8Codec":{"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"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":[]},"IntegerDivisionByZeroException":{"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"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"]},"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"},"_$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"]},"Level":{"Comparable":["Level"]},"SseClient":{"StreamChannel":["String?"]},"GuaranteeChannel":{"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"_EventStream":{"Stream":["1"],"Stream.T":"1"},"_EventStreamSubscription":{"StreamSubscription":["1"]},"HtmlWebSocketChannel":{"WebSocketChannel":[],"StreamChannel":["@"]},"_HtmlWebSocketSink":{"WebSocketSink":[],"DelegatingStreamSink":["@"],"StreamSink":["@"],"DelegatingStreamSink.T":"@"},"WebSocketChannel":{"StreamChannel":["@"]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"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"],"Iterable.E":"1"},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["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":[],"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"},"CastMap":{"MapBase":["3","4"],"Map":["3","4"],"MapBase.K":"3","MapBase.V":"4"},"LateError":{"Error":[]},"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"},"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"]},"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"]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Function":[]},"Closure2Args":{"Function":[]},"TearOffClosure":{"Function":[]},"StaticClosure":{"Function":[]},"BoundClosure":{"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"LinkedHashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"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":[]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"Float32List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double"},"NativeFloat64List":{"Float64List":[],"ListBase":["double"],"List":["double"],"JavaScriptIndexingBehavior":["double"],"JavaScriptObject":[],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double","Iterable.E":"double"},"NativeInt16List":{"Int16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeInt32List":{"Int32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeInt8List":{"Int8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint16List":{"Uint16List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint32List":{"Uint32List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint8ClampedList":{"Uint8ClampedList":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.E":"int"},"NativeUint8List":{"Uint8List":[],"ListBase":["int"],"List":["int"],"JavaScriptIndexingBehavior":["int"],"JavaScriptObject":[],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int","Iterable.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"]},"_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":["@"]},"_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.1":"_SplayTreeSetNode<1>","_SplayTreeNode.K":"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"]},"_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"},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"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"]},"Encoding":{"Codec":["String","List"]},"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?"]},"Utf8Codec":{"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"],"StreamTransformer":["String","List"]},"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":[]},"IntegerDivisionByZeroException":{"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"_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"]},"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"},"_$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"]},"Level":{"Comparable":["Level"]},"SseClient":{"StreamChannel":["String?"]},"GuaranteeChannel":{"StreamChannel":["1"]},"_GuaranteeSink":{"StreamSink":["1"]},"StreamChannelMixin":{"StreamChannel":["1"]},"_EventStream":{"Stream":["1"],"Stream.T":"1"},"_EventStreamSubscription":{"StreamSubscription":["1"]},"HtmlWebSocketChannel":{"WebSocketChannel":[],"StreamChannel":["@"]},"_HtmlWebSocketSink":{"WebSocketSink":[],"DelegatingStreamSink":["@"],"StreamSink":["@"],"DelegatingStreamSink.T":"@"},"WebSocketChannel":{"StreamChannel":["@"]},"DdcLibraryBundleRestarter":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"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,"NativeTypedArray":1,"_DelayedEvent":1,"_SplayTreeSet__SplayTree_Iterable":1,"_SplayTreeSet__SplayTree_Iterable_SetMixin":1,"MapEntry":2,"_QueueList_Object_ListMixin":1,"StreamChannelMixin":1}')); var string$ = { ABCDEF: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 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() { @@ -22867,7 +22859,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.NativeUint8List_methods = A.NativeUint8List.prototype; B.PlainJavaScriptObject_methods = J.PlainJavaScriptObject.prototype; B.UnknownJavaScriptObject_methods = J.UnknownJavaScriptObject.prototype; @@ -23016,134 +23007,135 @@ B.C__RootZone = new A._RootZone(); B.Duration_0 = new A.Duration(0); B.Duration_5000000 = new A.Duration(5000000); - B.Type_BuiltSetMultimap_Xbt = A.typeLiteral("BuiltSetMultimap<@,@>"); - B.Type_Object_QJv = A.typeLiteral("Object"); + B.Type_BuiltList_fj6 = A.typeLiteral("BuiltList<@>"); + B.Type_DebugEvent_gLJ = A.typeLiteral("DebugEvent"); B.List_empty0 = A._setArrayType(makeConstList([]), type$.JSArray_FullType); - B.FullType_Dj3 = new A.FullType(B.Type_Object_QJv, B.List_empty0, false); - B.List_Hhy = A._setArrayType(makeConstList([B.FullType_Dj3, B.FullType_Dj3]), type$.JSArray_FullType); - B.FullType_2pj = new A.FullType(B.Type_BuiltSetMultimap_Xbt, B.List_Hhy, false); - B.Type_BuiltList_27p = A.typeLiteral("BuiltList<@>"); - B.Type_DebugEvent_u7k = A.typeLiteral("DebugEvent"); - B.FullType_yfW = new A.FullType(B.Type_DebugEvent_u7k, B.List_empty0, false); - B.List_cdS = A._setArrayType(makeConstList([B.FullType_yfW]), type$.JSArray_FullType); - B.FullType_46c = new A.FullType(B.Type_BuiltList_27p, B.List_cdS, false); - B.Type_BuiltSet_MMh = A.typeLiteral("BuiltSet<@>"); - B.List_u2C = A._setArrayType(makeConstList([B.FullType_Dj3]), type$.JSArray_FullType); - B.FullType_4aQ = new A.FullType(B.Type_BuiltSet_MMh, B.List_u2C, false); - B.Type_BuildStatus_Rmx = A.typeLiteral("BuildStatus"); - B.FullType_KDE = new A.FullType(B.Type_BuildStatus_Rmx, B.List_empty0, false); - B.FullType_cgN = new A.FullType(B.Type_BuiltList_27p, B.List_u2C, false); - B.Type_String_J2O = A.typeLiteral("String"); - B.FullType_iHz = new A.FullType(B.Type_String_J2O, B.List_empty0, false); - B.Type_bool_RoS = A.typeLiteral("bool"); - B.FullType_mpw = new A.FullType(B.Type_bool_RoS, B.List_empty0, false); + B.FullType_np4 = new A.FullType(B.Type_DebugEvent_gLJ, B.List_empty0, false); + B.List_njn = A._setArrayType(makeConstList([B.FullType_np4]), type$.JSArray_FullType); + B.FullType_3Xm = new A.FullType(B.Type_BuiltList_fj6, B.List_njn, false); + B.Type_String_AXU = A.typeLiteral("String"); + B.FullType_PT1 = new A.FullType(B.Type_String_AXU, B.List_empty0, false); + B.Type_bool_wF1 = A.typeLiteral("bool"); + B.FullType_R6B = new A.FullType(B.Type_bool_wF1, B.List_empty0, false); + B.Type_BuiltSetMultimap_yT7 = A.typeLiteral("BuiltSetMultimap<@,@>"); + B.Type_Object_A4p = A.typeLiteral("Object"); + B.FullType_kV7 = new A.FullType(B.Type_Object_A4p, B.List_empty0, false); + B.List_03P = A._setArrayType(makeConstList([B.FullType_kV7, B.FullType_kV7]), type$.JSArray_FullType); + B.FullType_SWR = new A.FullType(B.Type_BuiltSetMultimap_yT7, B.List_03P, false); + B.Type_BuiltListMultimap_HQW = A.typeLiteral("BuiltListMultimap<@,@>"); + B.FullType_WP0 = new A.FullType(B.Type_BuiltListMultimap_HQW, B.List_03P, false); + B.Type_ExtensionEvent_T8C = A.typeLiteral("ExtensionEvent"); + B.FullType_I4i = new A.FullType(B.Type_ExtensionEvent_T8C, B.List_empty0, false); + B.List_O9J = A._setArrayType(makeConstList([B.FullType_I4i]), type$.JSArray_FullType); + B.FullType_ahP = new A.FullType(B.Type_BuiltList_fj6, B.List_O9J, false); + B.List_LtY = A._setArrayType(makeConstList([B.FullType_kV7]), type$.JSArray_FullType); + B.FullType_hm4 = new A.FullType(B.Type_BuiltList_fj6, B.List_LtY, false); + B.Type_BuildStatus_8KJ = A.typeLiteral("BuildStatus"); + B.FullType_k5M = new A.FullType(B.Type_BuildStatus_8KJ, B.List_empty0, false); + B.Type_BuiltMap_TeX = A.typeLiteral("BuiltMap<@,@>"); + B.FullType_mo5 = new A.FullType(B.Type_BuiltMap_TeX, B.List_03P, false); B.FullType_null_List_empty_false = new A.FullType(null, B.List_empty0, false); - B.Type_BuiltListMultimap_apl = A.typeLiteral("BuiltListMultimap<@,@>"); - B.FullType_ow7 = new A.FullType(B.Type_BuiltListMultimap_apl, B.List_Hhy, false); - B.Type_BuiltMap_MUU = A.typeLiteral("BuiltMap<@,@>"); - B.FullType_wbi = new A.FullType(B.Type_BuiltMap_MUU, B.List_Hhy, false); - B.Type_int_8nG = A.typeLiteral("int"); - B.FullType_xEI = new A.FullType(B.Type_int_8nG, B.List_empty0, false); - B.Type_ExtensionEvent_6Rj = A.typeLiteral("ExtensionEvent"); - B.FullType_6nc = new A.FullType(B.Type_ExtensionEvent_6Rj, B.List_empty0, false); - B.List_2nU = A._setArrayType(makeConstList([B.FullType_6nc]), type$.JSArray_FullType); - B.FullType_zVP = new A.FullType(B.Type_BuiltList_27p, B.List_2nU, false); + B.Type_int_T7V = A.typeLiteral("int"); + B.FullType_rTD = new A.FullType(B.Type_int_T7V, B.List_empty0, false); + B.Type_BuiltSet_oHu = A.typeLiteral("BuiltSet<@>"); + B.FullType_tpw = new A.FullType(B.Type_BuiltSet_oHu, B.List_LtY, false); B.JsonDecoder_null = new A.JsonDecoder(null); B.JsonEncoder_null = new A.JsonEncoder(null); B.Level_INFO_800 = new A.Level("INFO", 800); B.Level_SEVERE_1000 = new A.Level("SEVERE", 1000); B.Level_WARNING_900 = new A.Level("WARNING", 900); - B.Type_RegisterEvent_gc6 = A.typeLiteral("RegisterEvent"); - B.Type__$RegisterEvent_M2b = A.typeLiteral("_$RegisterEvent"); - B.List_2Uk = A._setArrayType(makeConstList([B.Type_RegisterEvent_gc6, B.Type__$RegisterEvent_M2b]), type$.JSArray_Type); - B.List_2ZF = A._setArrayType(makeConstList(["d", "D", "\u2202", "\xce"]), type$.JSArray_String); - B.List_2jN = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int); - B.List_42A = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int); - B.List_4AN = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int); - B.Type_BatchedEvents_JmU = A.typeLiteral("BatchedEvents"); - B.Type__$BatchedEvents_Ctd = A.typeLiteral("_$BatchedEvents"); - B.List_4mo = A._setArrayType(makeConstList([B.Type_BatchedEvents_JmU, B.Type__$BatchedEvents_Ctd]), type$.JSArray_Type); - B.Type_ConnectRequest_K1W = A.typeLiteral("ConnectRequest"); - B.Type__$ConnectRequest_IoR = A.typeLiteral("_$ConnectRequest"); - B.List_Avr = A._setArrayType(makeConstList([B.Type_ConnectRequest_K1W, B.Type__$ConnectRequest_IoR]), type$.JSArray_Type); - B.Type_ExtensionRequest_Ucj = A.typeLiteral("ExtensionRequest"); - B.Type__$ExtensionRequest_bl8 = A.typeLiteral("_$ExtensionRequest"); - B.List_Azp = A._setArrayType(makeConstList([B.Type_ExtensionRequest_Ucj, B.Type__$ExtensionRequest_bl8]), type$.JSArray_Type); - B.List_BZW = A._setArrayType(makeConstList([0, 0, 1048576, 531441, 1048576, 390625, 279936, 823543, 262144, 531441, 1000000, 161051, 248832, 371293, 537824, 759375, 1048576, 83521, 104976, 130321, 160000, 194481, 234256, 279841, 331776, 390625, 456976, 531441, 614656, 707281, 810000, 923521, 1048576, 35937, 39304, 42875, 46656]), type$.JSArray_int); - B.Type_ExtensionResponse_XaB = A.typeLiteral("ExtensionResponse"); - B.Type__$ExtensionResponse_1Ej = A.typeLiteral("_$ExtensionResponse"); - B.List_EmH = A._setArrayType(makeConstList([B.Type_ExtensionResponse_XaB, B.Type__$ExtensionResponse_1Ej]), type$.JSArray_Type); - B.List_GVy = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int); - B.List_M2I0 = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int); - B.List_M2I = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int); - B.Type_IsolateExit_HFE = A.typeLiteral("IsolateExit"); - B.Type__$IsolateExit_dSk = A.typeLiteral("_$IsolateExit"); - B.List_NXK = A._setArrayType(makeConstList([B.Type_IsolateExit_HFE, B.Type__$IsolateExit_dSk]), type$.JSArray_Type); - B.Type_DevToolsRequest_Kj8 = A.typeLiteral("DevToolsRequest"); - B.Type__$DevToolsRequest_uiu = A.typeLiteral("_$DevToolsRequest"); - B.List_RA5 = A._setArrayType(makeConstList([B.Type_DevToolsRequest_Kj8, B.Type__$DevToolsRequest_uiu]), type$.JSArray_Type); - B.List_Type_BuildStatus_Rmx = A._setArrayType(makeConstList([B.Type_BuildStatus_Rmx]), type$.JSArray_Type); - B.Type_ErrorResponse_r9K = A.typeLiteral("ErrorResponse"); - B.Type__$ErrorResponse_ShF = A.typeLiteral("_$ErrorResponse"); - B.List_UKD = A._setArrayType(makeConstList([B.Type_ErrorResponse_r9K, B.Type__$ErrorResponse_ShF]), type$.JSArray_Type); - B.List_VOY = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int); - B.Type_BuildResult_XjJ = A.typeLiteral("BuildResult"); - B.Type__$BuildResult_Tpm = A.typeLiteral("_$BuildResult"); - B.List_Yiv = A._setArrayType(makeConstList([B.Type_BuildResult_XjJ, B.Type__$BuildResult_Tpm]), type$.JSArray_Type); + B.Type_ExtensionRequest_9GR = A.typeLiteral("ExtensionRequest"); + B.Type__$ExtensionRequest_o1C = A.typeLiteral("_$ExtensionRequest"); + B.List_2dD = A._setArrayType(makeConstList([B.Type_ExtensionRequest_9GR, B.Type__$ExtensionRequest_o1C]), type$.JSArray_Type); + B.Type_DebugInfo_ua9 = A.typeLiteral("DebugInfo"); + B.Type__$DebugInfo_ywz = A.typeLiteral("_$DebugInfo"); + B.List_55I = A._setArrayType(makeConstList([B.Type_DebugInfo_ua9, B.Type__$DebugInfo_ywz]), type$.JSArray_Type); + B.Type_ErrorResponse_WMn = A.typeLiteral("ErrorResponse"); + B.Type__$ErrorResponse_9Ps = A.typeLiteral("_$ErrorResponse"); + B.List_5LV = A._setArrayType(makeConstList([B.Type_ErrorResponse_WMn, B.Type__$ErrorResponse_9Ps]), type$.JSArray_Type); + B.List_9U7 = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int); + B.List_AnW = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int); + B.List_DeU = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int); + B.Type_RegisterEvent_0Yw = A.typeLiteral("RegisterEvent"); + B.Type__$RegisterEvent_Ks1 = A.typeLiteral("_$RegisterEvent"); + B.List_EMv = A._setArrayType(makeConstList([B.Type_RegisterEvent_0Yw, B.Type__$RegisterEvent_Ks1]), type$.JSArray_Type); + B.Type_DevToolsRequest_DxE = A.typeLiteral("DevToolsRequest"); + B.Type__$DevToolsRequest_Rak = A.typeLiteral("_$DevToolsRequest"); + B.List_G46 = A._setArrayType(makeConstList([B.Type_DevToolsRequest_DxE, B.Type__$DevToolsRequest_Rak]), type$.JSArray_Type); + B.List_Kdb = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int); + B.Type_IsolateStart_nRT = A.typeLiteral("IsolateStart"); + B.Type__$IsolateStart_Pnq = A.typeLiteral("_$IsolateStart"); + B.List_KpG = A._setArrayType(makeConstList([B.Type_IsolateStart_nRT, B.Type__$IsolateStart_Pnq]), type$.JSArray_Type); + B.Type_IsolateExit_QVA = A.typeLiteral("IsolateExit"); + B.Type__$IsolateExit_4XE = A.typeLiteral("_$IsolateExit"); + B.List_MJN = A._setArrayType(makeConstList([B.Type_IsolateExit_QVA, B.Type__$IsolateExit_4XE]), type$.JSArray_Type); + B.List_MtP = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 34815, 65534, 18431]), type$.JSArray_int); + B.Type_ExtensionResponse_0Oi = A.typeLiteral("ExtensionResponse"); + B.Type__$ExtensionResponse_46G = A.typeLiteral("_$ExtensionResponse"); + B.List_RWp = A._setArrayType(makeConstList([B.Type_ExtensionResponse_0Oi, B.Type__$ExtensionResponse_46G]), type$.JSArray_Type); + B.Type_RunRequest_Hfm = A.typeLiteral("RunRequest"); + B.Type__$RunRequest_3ad = A.typeLiteral("_$RunRequest"); + B.List_RlA = A._setArrayType(makeConstList([B.Type_RunRequest_Hfm, B.Type__$RunRequest_3ad]), type$.JSArray_Type); + B.Type_DevToolsResponse_gVs = A.typeLiteral("DevToolsResponse"); + B.Type__$DevToolsResponse_dcs = A.typeLiteral("_$DevToolsResponse"); + B.List_TEH = A._setArrayType(makeConstList([B.Type_DevToolsResponse_gVs, B.Type__$DevToolsResponse_dcs]), type$.JSArray_Type); + B.List_Type_BuildStatus_8KJ = A._setArrayType(makeConstList([B.Type_BuildStatus_8KJ]), type$.JSArray_Type); + B.Type_BatchedDebugEvents_v7B = A.typeLiteral("BatchedDebugEvents"); + B.Type__$BatchedDebugEvents_LFV = A.typeLiteral("_$BatchedDebugEvents"); + B.List_WAE = A._setArrayType(makeConstList([B.Type_BatchedDebugEvents_v7B, B.Type__$BatchedDebugEvents_LFV]), type$.JSArray_Type); + B.List_ZNA = A._setArrayType(makeConstList([0, 0, 1048576, 531441, 1048576, 390625, 279936, 823543, 262144, 531441, 1000000, 161051, 248832, 371293, 537824, 759375, 1048576, 83521, 104976, 130321, 160000, 194481, 234256, 279841, 331776, 390625, 456976, 531441, 614656, 707281, 810000, 923521, 1048576, 35937, 39304, 42875, 46656]), type$.JSArray_int); + B.List_bij = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int); + B.List_dYt = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int); B.List_empty = A._setArrayType(makeConstList([]), type$.JSArray_dynamic); - B.Type__$ExtensionEvent_23h = A.typeLiteral("_$ExtensionEvent"); - B.List_i7r = A._setArrayType(makeConstList([B.Type_ExtensionEvent_6Rj, B.Type__$ExtensionEvent_23h]), type$.JSArray_Type); - B.Type_DebugInfo_Aym = A.typeLiteral("DebugInfo"); - B.Type__$DebugInfo_RkT = A.typeLiteral("_$DebugInfo"); - B.List_nlp = A._setArrayType(makeConstList([B.Type_DebugInfo_Aym, B.Type__$DebugInfo_RkT]), type$.JSArray_Type); - B.Type__$DebugEvent_AsR = A.typeLiteral("_$DebugEvent"); - B.List_otF = A._setArrayType(makeConstList([B.Type_DebugEvent_u7k, B.Type__$DebugEvent_AsR]), type$.JSArray_Type); - B.List_piR = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 34815, 65534, 18431]), type$.JSArray_int); - B.Type_BatchedDebugEvents_s7p = A.typeLiteral("BatchedDebugEvents"); - B.Type__$BatchedDebugEvents_QtW = A.typeLiteral("_$BatchedDebugEvents"); - B.List_qBv = A._setArrayType(makeConstList([B.Type_BatchedDebugEvents_s7p, B.Type__$BatchedDebugEvents_QtW]), type$.JSArray_Type); - B.Type_IsolateStart_Ybt = A.typeLiteral("IsolateStart"); - B.Type__$IsolateStart_eWg = A.typeLiteral("_$IsolateStart"); - B.List_qFt = A._setArrayType(makeConstList([B.Type_IsolateStart_Ybt, B.Type__$IsolateStart_eWg]), type$.JSArray_Type); - B.Type_RunRequest_OP1 = A.typeLiteral("RunRequest"); - B.Type__$RunRequest_qjY = A.typeLiteral("_$RunRequest"); - B.List_rtI = A._setArrayType(makeConstList([B.Type_RunRequest_OP1, B.Type__$RunRequest_qjY]), type$.JSArray_Type); - B.Type_DevToolsResponse_7BT = A.typeLiteral("DevToolsResponse"); - B.Type__$DevToolsResponse_kWM = A.typeLiteral("_$DevToolsResponse"); - B.List_w61 = A._setArrayType(makeConstList([B.Type_DevToolsResponse_7BT, B.Type__$DevToolsResponse_kWM]), type$.JSArray_Type); + B.List_fAJ = A._setArrayType(makeConstList(["d", "D", "\u2202", "\xce"]), type$.JSArray_String); + B.Type__$DebugEvent_YX4 = A.typeLiteral("_$DebugEvent"); + B.List_fK8 = A._setArrayType(makeConstList([B.Type_DebugEvent_gLJ, B.Type__$DebugEvent_YX4]), type$.JSArray_Type); + B.Type_BatchedEvents_ABc = A.typeLiteral("BatchedEvents"); + B.Type__$BatchedEvents_jAA = A.typeLiteral("_$BatchedEvents"); + B.List_oDF = A._setArrayType(makeConstList([B.Type_BatchedEvents_ABc, B.Type__$BatchedEvents_jAA]), type$.JSArray_Type); + B.Type_BuildResult_SAR = A.typeLiteral("BuildResult"); + B.Type__$BuildResult_Iwz = A.typeLiteral("_$BuildResult"); + B.List_pLn = A._setArrayType(makeConstList([B.Type_BuildResult_SAR, B.Type__$BuildResult_Iwz]), type$.JSArray_Type); + B.List_q6C = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int); + B.Type_ConnectRequest_8Nv = A.typeLiteral("ConnectRequest"); + B.Type__$ConnectRequest_3Qd = A.typeLiteral("_$ConnectRequest"); + B.List_xmd = A._setArrayType(makeConstList([B.Type_ConnectRequest_8Nv, B.Type__$ConnectRequest_3Qd]), type$.JSArray_Type); + B.Type__$ExtensionEvent_WzR = A.typeLiteral("_$ExtensionEvent"); + B.List_yvR = A._setArrayType(makeConstList([B.Type_ExtensionEvent_T8C, B.Type__$ExtensionEvent_WzR]), type$.JSArray_Type); B.Object_empty = {}; B.Map_empty = new A.ConstantStringMap(B.Object_empty, [], A.findType("ConstantStringMap<@,@>")); - B.Type_BigInt_C3o = A.typeLiteral("BigInt"); - B.Type_BoolJsonObject_Ocu = A.typeLiteral("BoolJsonObject"); - B.Type_ByteBuffer_EOZ = A.typeLiteral("ByteBuffer"); - B.Type_ByteData_mF8 = A.typeLiteral("ByteData"); - B.Type_DateTime_H1G = A.typeLiteral("DateTime"); - B.Type_Duration_86y = A.typeLiteral("Duration"); - B.Type_Float32List_Ymk = A.typeLiteral("Float32List"); - B.Type_Float64List_Ymk = A.typeLiteral("Float64List"); - B.Type_Int16List_cot = A.typeLiteral("Int16List"); - B.Type_Int32List_m1p = A.typeLiteral("Int32List"); - B.Type_Int32_kyU = A.typeLiteral("Int32"); - B.Type_Int64_chs = A.typeLiteral("Int64"); - B.Type_Int8List_woc = A.typeLiteral("Int8List"); - B.Type_JSObject_0ua = A.typeLiteral("JSObject"); - B.Type_JsonObject_aJ0 = A.typeLiteral("JsonObject"); - B.Type_ListJsonObject_l4J = A.typeLiteral("ListJsonObject"); - B.Type_MapJsonObject_OYg = A.typeLiteral("MapJsonObject"); - B.Type_Null_a9w = A.typeLiteral("Null"); - B.Type_NumJsonObject_u6D = A.typeLiteral("NumJsonObject"); - B.Type_RegExp_NMc = A.typeLiteral("RegExp"); - B.Type_StringJsonObject_wcs = A.typeLiteral("StringJsonObject"); - B.Type_Uint16List_2mh = A.typeLiteral("Uint16List"); - B.Type_Uint32List_2mh = A.typeLiteral("Uint32List"); - B.Type_Uint8ClampedList_9Bb = A.typeLiteral("Uint8ClampedList"); - B.Type_Uint8List_CSc = A.typeLiteral("Uint8List"); - B.Type_Uri_aPa = A.typeLiteral("Uri"); - B.Type_double_23F = A.typeLiteral("double"); - B.Type_num_EOZ = A.typeLiteral("num"); - B._StringStackTrace_uwd = new A._StringStackTrace(""); - B._ZoneFunction_NIe = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError$closure(), type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace); - B._ZoneFunction_QOa = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback$closure(), A.findType("_ZoneFunction<0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))>")); + B.Type_BigInt_DZK = A.typeLiteral("BigInt"); + B.Type_BoolJsonObject_Zqn = A.typeLiteral("BoolJsonObject"); + B.Type_ByteBuffer_rqD = A.typeLiteral("ByteBuffer"); + B.Type_ByteData_9dB = A.typeLiteral("ByteData"); + B.Type_DateTime_akv = A.typeLiteral("DateTime"); + B.Type_Duration_VAs = A.typeLiteral("Duration"); + B.Type_Float32List_9Kz = A.typeLiteral("Float32List"); + B.Type_Float64List_9Kz = A.typeLiteral("Float64List"); + B.Type_Int16List_s5h = A.typeLiteral("Int16List"); + B.Type_Int32List_O8Z = A.typeLiteral("Int32List"); + B.Type_Int32_291 = A.typeLiteral("Int32"); + B.Type_Int64_LHp = A.typeLiteral("Int64"); + B.Type_Int8List_rFV = A.typeLiteral("Int8List"); + B.Type_JSObject_ttY = A.typeLiteral("JSObject"); + B.Type_JsonObject_5jQ = A.typeLiteral("JsonObject"); + B.Type_ListJsonObject_qcV = A.typeLiteral("ListJsonObject"); + B.Type_MapJsonObject_VMr = A.typeLiteral("MapJsonObject"); + B.Type_Null_0Rm = A.typeLiteral("Null"); + B.Type_NumJsonObject_hYY = A.typeLiteral("NumJsonObject"); + B.Type_RegExp_w5l = A.typeLiteral("RegExp"); + B.Type_StringJsonObject_NL7 = A.typeLiteral("StringJsonObject"); + B.Type_Uint16List_kmP = A.typeLiteral("Uint16List"); + B.Type_Uint32List_kmP = A.typeLiteral("Uint32List"); + B.Type_Uint8ClampedList_04U = A.typeLiteral("Uint8ClampedList"); + B.Type_Uint8List_8Eb = A.typeLiteral("Uint8List"); + B.Type_Uri_l9i = A.typeLiteral("Uri"); + B.Type_double_JIQ = A.typeLiteral("double"); + B.Type_num_LZa = A.typeLiteral("num"); + B._StringStackTrace_OdL = new A._StringStackTrace(""); + B._ZoneFunction_KjJ = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError$closure(), type$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace); + B._ZoneFunction_PAY = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer$closure(), A.findType("_ZoneFunction")); + B._ZoneFunction_Xkh = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback$closure(), A.findType("_ZoneFunction<0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))>")); B._ZoneFunction__RootZone__rootCreateTimer = new A._ZoneFunction(B.C__RootZone, A.async___rootCreateTimer$closure(), A.findType("_ZoneFunction")); B._ZoneFunction__RootZone__rootErrorCallback = new A._ZoneFunction(B.C__RootZone, A.async___rootErrorCallback$closure(), A.findType("_ZoneFunction")); B._ZoneFunction__RootZone__rootFork = new A._ZoneFunction(B.C__RootZone, A.async___rootFork$closure(), A.findType("_ZoneFunction?)>")); @@ -23153,8 +23145,7 @@ B._ZoneFunction__RootZone__rootRunBinary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunBinary$closure(), A.findType("_ZoneFunction<0^(Zone,ZoneDelegate,Zone,0^(1^,2^),1^,2^)>")); B._ZoneFunction__RootZone__rootRunUnary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunUnary$closure(), A.findType("_ZoneFunction<0^(Zone,ZoneDelegate,Zone,0^(1^),1^)>")); B._ZoneFunction__RootZone__rootScheduleMicrotask = new A._ZoneFunction(B.C__RootZone, A.async___rootScheduleMicrotask$closure(), A.findType("_ZoneFunction<~(Zone,ZoneDelegate,Zone,~())>")); - B._ZoneFunction_kWM = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer$closure(), A.findType("_ZoneFunction")); - B._ZoneFunction_qxw = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterBinaryCallback$closure(), A.findType("_ZoneFunction<0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))>")); + B._ZoneFunction_e9o = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterBinaryCallback$closure(), A.findType("_ZoneFunction<0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))>")); })(); (function staticFields() { $._JS_INTEROP_INTERCEPTOR_TAG = null; @@ -23198,7 +23189,7 @@ var _lazyFinal = hunkHelpers.lazyFinal, _lazy = hunkHelpers.lazy; _lazyFinal($, "DART_CLOSURE_PROPERTY_NAME", "$get$DART_CLOSURE_PROPERTY_NAME", () => A.getIsolateAffinityTag("_$dart_dartClosure")); - _lazyFinal($, "nullFuture", "$get$nullFuture", () => B.C__RootZone.run$1$1(new A.nullFuture_closure(), A.findType("Future"))); + _lazyFinal($, "nullFuture", "$get$nullFuture", () => B.C__RootZone.run$1$1(new A.nullFuture_closure(), type$.Future_void)); _lazyFinal($, "TypeErrorDecoder_noSuchMethodPattern", "$get$TypeErrorDecoder_noSuchMethodPattern", () => A.TypeErrorDecoder_extractPattern(A.TypeErrorDecoder_provokeCallErrorOn({ toString: function() { return "$receiver$"; @@ -23244,7 +23235,7 @@ } }())); _lazyFinal($, "_AsyncRun__scheduleImmediateClosure", "$get$_AsyncRun__scheduleImmediateClosure", () => A._AsyncRun__initializeScheduleImmediate()); - _lazyFinal($, "Future__nullFuture", "$get$Future__nullFuture", () => A.findType("_Future")._as($.$get$nullFuture())); + _lazyFinal($, "Future__nullFuture", "$get$Future__nullFuture", () => $.$get$nullFuture()); _lazyFinal($, "_RootZone__rootMap", "$get$_RootZone__rootMap", () => { var t1 = type$.dynamic; return A.HashMap_HashMap(null, null, null, t1, t1); @@ -23257,14 +23248,9 @@ _lazyFinal($, "_BigIntImpl__bigInt10000", "$get$_BigIntImpl__bigInt10000", () => A._BigIntImpl__BigIntImpl$_fromInt(10000)); _lazy($, "_BigIntImpl__parseRE", "$get$_BigIntImpl__parseRE", () => A.RegExp_RegExp("^\\s*([+-]?)((0x[a-f0-9]+)|(\\d+)|([a-z0-9]+))\\s*$", false, false)); _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_QJv)); + _lazyFinal($, "_hashSeed", "$get$_hashSeed", () => A.objectHashCode(B.Type_Object_A4p)); _lazyFinal($, "_scannerTables", "$get$_scannerTables", () => A._createTables()); _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))); @@ -23306,8 +23292,8 @@ t1.add$1(0, $.$get$_$isolateStartSerializer()); t1.add$1(0, $.$get$_$registerEventSerializer()); t1.add$1(0, $.$get$_$runRequestSerializer()); - t1.addBuilderFactory$2(B.FullType_46c, new A._$serializers_closure()); - t1.addBuilderFactory$2(B.FullType_zVP, new A._$serializers_closure0()); + t1.addBuilderFactory$2(B.FullType_3Xm, new A._$serializers_closure()); + t1.addBuilderFactory$2(B.FullType_ahP, new A._$serializers_closure0()); return t1.build$0(); }); _lazyFinal($, "_logger", "$get$_logger", () => A.Logger_Logger("Utilities")); @@ -23321,7 +23307,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); @@ -23329,7 +23318,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.dart b/dwds/lib/src/loaders/ddc.dart index 146c49bae..3613743e0 100644 --- a/dwds/lib/src/loaders/ddc.dart +++ b/dwds/lib/src/loaders/ddc.dart @@ -17,7 +17,7 @@ String removeJsExtension(String path) => String addJsExtension(String path) => '$path.js'; /// JavaScript snippet to determine the base URL of the current path. -const _baseUrlScript = ''' +const baseUrlScript = ''' var baseUrl = (function () { // Attempt to detect --precompiled mode for tests, and set the base url // appropriately, otherwise set it to '/'. @@ -179,7 +179,7 @@ class DdcStrategy extends LoadStrategy { scripts.add({'src': '$path.js', 'id': name}); }); return ''' -$_baseUrlScript +$baseUrlScript var scripts = ${const JsonEncoder.withIndent(" ").convert(scripts)}; window.\$dartLoader.loadConfig.loadScriptFn = function(loader) { loader.addScriptsToQueue(scripts, null); diff --git a/dwds/lib/src/loaders/ddc_library_bundle.dart b/dwds/lib/src/loaders/ddc_library_bundle.dart new file mode 100644 index 000000000..9cfbda5db --- /dev/null +++ b/dwds/lib/src/loaders/ddc_library_bundle.dart @@ -0,0 +1,193 @@ +// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import 'dart:convert'; + +import 'package:dwds/src/debugging/metadata/provider.dart'; +import 'package:dwds/src/loaders/ddc.dart'; +import 'package:dwds/src/loaders/strategy.dart'; +import 'package:dwds/src/readers/asset_reader.dart'; +import 'package:dwds/src/services/expression_compiler.dart'; +import 'package:shelf/shelf.dart'; + +// TODO(srujzs): This is mostly a copy of `DdcStrategy`. Some of the +// functionality in here may not make sense with the library bundle format yet. +class DdcLibraryBundleStrategy extends LoadStrategy { + @override + final ReloadConfiguration reloadConfiguration; + + /// Returns a map of module name to corresponding server path (excluding .js) + /// for the provided Dart application entrypoint. + /// + /// For example: + /// + /// web/main -> main.ddc + /// packages/path/path -> packages/path/path.ddc + /// + final Future> Function(MetadataProvider metadataProvider) + _moduleProvider; + + /// Returns a map of module name to corresponding digest value. + /// + /// For example: + /// + /// web/main -> 8363b363f74b41cac955024ab8b94a3f + /// packages/path/path -> d348c2a4647e998011fe305f74f22961 + /// + final Future> Function(MetadataProvider metadataProvider) + // ignore: unused_field + _digestsProvider; + + /// Returns the module for the corresponding server path. + /// + /// For example: + /// + /// /packages/path/path.ddc.js -> packages/path/path + /// + final Future Function( + MetadataProvider metadataProvider, + String sourcePath, + ) _moduleForServerPath; + + /// Returns a map from module id to module info. + /// + /// For example: + /// + /// web/main -> {main.ddc.full.dill, main.ddc.dill} + /// + final Future> Function( + MetadataProvider metadataProvider, + ) _moduleInfoForProvider; + + /// Returns the server path for the provided module. + /// + /// For example: + /// + /// web/main -> main.ddc.js + /// + final Future Function( + MetadataProvider metadataProvider, + String module, + ) _serverPathForModule; + + /// Returns the source map path for the provided module. + /// + /// For example: + /// + /// web/main -> main.ddc.js.map + /// + final Future Function( + MetadataProvider metadataProvider, + String module, + ) _sourceMapPathForModule; + + /// Returns the server path for the app uri. + /// + /// For example: + /// + /// org-dartlang-app://web/main.dart -> main.dart + /// + /// Will return `null` if the provided uri is not + /// an app URI. + final String? Function(String appUri) _serverPathForAppUri; + + /// Returns the relative path in google3, determined by the [absolutePath]. + /// + /// Returns `null` if not a google3 app. + final String? Function(String absolutePath) _g3RelativePath; + + final BuildSettings _buildSettings; + + DdcLibraryBundleStrategy( + this.reloadConfiguration, + this._moduleProvider, + this._digestsProvider, + this._moduleForServerPath, + this._serverPathForModule, + this._sourceMapPathForModule, + this._serverPathForAppUri, + this._moduleInfoForProvider, + AssetReader assetReader, + this._buildSettings, + this._g3RelativePath, + String? packageConfigPath, + ) : super(assetReader, packageConfigPath: packageConfigPath); + + @override + Handler get handler => (request) async { + // TODO(markzipan): Implement a hot restarter that uses digests for + // the DDC module system. + return Response.notFound(request.url.toString()); + }; + + @override + String get id => 'ddc-library-bundle'; + + // DDC doesn't have a 'ddc-library-bundle' format flag. Instead, it treats the + // combination of the DDC module format and canary mode as the DDC library + // bundle format, so we just pass 'ddc' here. + @override + String get moduleFormat => 'ddc'; + + @override + String get loadLibrariesModule => 'ddc_module_loader.ddk.js'; + + // TODO(srujzs): Refactor code that uses this to avoid loading individual + // libraries, as that's no longer supported in the new module format. + @override + String get loadModuleSnippet => + "function() { throw new Error('LoadStrategy.loadModuleSnippet is used. " + "This is currently unsupported in the DDC library bundle format.'); }"; + + @override + Future bootstrapFor(String entrypoint) async => + await _ddcLoaderSetup(entrypoint); + + @override + String loadClientSnippet(String clientScript) => + 'window.\$dartLoader.forceLoadModule("$clientScript");\n'; + + Future _ddcLoaderSetup(String entrypoint) async { + final metadataProvider = metadataProviderFor(entrypoint); + final modulePaths = await _moduleProvider(metadataProvider); + final scripts = >[]; + modulePaths.forEach((name, path) { + scripts.add({'src': '$path.js', 'id': name}); + }); + return ''' +$baseUrlScript +var scripts = ${const JsonEncoder.withIndent(" ").convert(scripts)}; +window.\$dartLoader.loadConfig.loadScriptFn = function(loader) { + loader.addScriptsToQueue(scripts, null); + loader.loadEnqueuedModules(); +}; +window.\$dartLoader.loader.nextAttempt(); +'''; + } + + @override + Future moduleForServerPath(String entrypoint, String serverPath) => + _moduleForServerPath(metadataProviderFor(entrypoint), serverPath); + + @override + Future> moduleInfoForEntrypoint(String entrypoint) => + _moduleInfoForProvider(metadataProviderFor(entrypoint)); + + @override + Future serverPathForModule(String entrypoint, String module) => + _serverPathForModule(metadataProviderFor(entrypoint), module); + + @override + Future sourceMapPathForModule(String entrypoint, String module) => + _sourceMapPathForModule(metadataProviderFor(entrypoint), module); + + @override + String? serverPathForAppUri(String appUri) => _serverPathForAppUri(appUri); + + @override + BuildSettings get buildSettings => _buildSettings; + + @override + String? g3RelativePath(String absolutePath) => _g3RelativePath(absolutePath); +} diff --git a/dwds/lib/src/loaders/frontend_server_strategy_provider.dart b/dwds/lib/src/loaders/frontend_server_strategy_provider.dart index 1dbc8a069..d46362645 100644 --- a/dwds/lib/src/loaders/frontend_server_strategy_provider.dart +++ b/dwds/lib/src/loaders/frontend_server_strategy_provider.dart @@ -4,6 +4,7 @@ import 'package:dwds/src/debugging/metadata/provider.dart'; import 'package:dwds/src/loaders/ddc.dart'; +import 'package:dwds/src/loaders/ddc_library_bundle.dart'; import 'package:dwds/src/loaders/require.dart'; import 'package:dwds/src/loaders/strategy.dart'; import 'package:dwds/src/readers/asset_reader.dart'; @@ -132,6 +133,38 @@ class FrontendServerDdcStrategyProvider DdcStrategy get strategy => _ddcStrategy; } +/// Provides a [DdcLibraryBundleStrategy] suitable for use with the Frontend +/// Server. +class FrontendServerDdcLibraryBundleStrategyProvider + extends FrontendServerStrategyProvider { + late final DdcLibraryBundleStrategy _libraryBundleStrategy = + DdcLibraryBundleStrategy( + _configuration, + _moduleProvider, + (_) => _digestsProvider(), + _moduleForServerPath, + _serverPathForModule, + _sourceMapPathForModule, + _serverPathForAppUri, + _moduleInfoForProvider, + _assetReader, + _buildSettings, + (String _) => null, + null, + ); + + FrontendServerDdcLibraryBundleStrategyProvider( + super._configuration, + super._assetReader, + super._packageUriMapper, + super._digestsProvider, + super._buildSettings, + ); + + @override + DdcLibraryBundleStrategy get strategy => _libraryBundleStrategy; +} + /// Provides a [RequireStrategy] suitable for use with Frontend Server. class FrontendServerRequireStrategyProvider extends FrontendServerStrategyProvider { diff --git a/dwds/test/evaluate_common.dart b/dwds/test/evaluate_common.dart index 368ff09f7..b78dec053 100644 --- a/dwds/test/evaluate_common.dart +++ b/dwds/test/evaluate_common.dart @@ -75,6 +75,7 @@ void testAll({ enableExpressionEvaluation: true, useDebuggerModuleNames: useDebuggerModuleNames, verboseCompiler: debug, + canaryFeatures: provider.canaryFeatures, ), ); }); @@ -832,6 +833,7 @@ void testAll({ moduleFormat: provider.ddcModuleFormat, enableExpressionEvaluation: false, verboseCompiler: debug, + canaryFeatures: provider.canaryFeatures, ), ); }); diff --git a/dwds/test/fixtures/context.dart b/dwds/test/fixtures/context.dart index 5443000f2..c0f893124 100644 --- a/dwds/test/fixtures/context.dart +++ b/dwds/test/fixtures/context.dart @@ -348,10 +348,13 @@ class TestContext { buildSettings, ).strategy, ModuleFormat.ddc => buildSettings.canaryFeatures - ? throw Exception( - '''Unsupported DDC module format ${testSettings.moduleFormat.name} - with canaryFeatures set to ${buildSettings.canaryFeatures}.''', - ) + ? FrontendServerDdcLibraryBundleStrategyProvider( + testSettings.reloadConfiguration, + assetReader, + packageUriMapper, + () async => {}, + buildSettings, + ).strategy : FrontendServerDdcStrategyProvider( testSettings.reloadConfiguration, assetReader, @@ -370,8 +373,8 @@ class TestContext { final debugPort = await findUnusedPort(); if (testSettings.launchChrome) { - // If the environment variable DWDS_DEBUG_CHROME is set to the string true - // then Chrome will be launched with a UI rather than headless. + // If the environment variable DWDS_DEBUG_CHROME is set to the string + // true then Chrome will be launched with a UI rather than headless. // If the extension is enabled, then Chrome will be launched with a UI // since headless Chrome does not support extensions. final enableDebugExtension = debugSettings.enableDebugExtension; diff --git a/dwds/web/client.dart b/dwds/web/client.dart index 4311d616d..26b059f22 100644 --- a/dwds/web/client.dart +++ b/dwds/web/client.dart @@ -24,10 +24,10 @@ import 'package:uuid/uuid.dart'; import 'package:web/helpers.dart'; import 'package:web_socket_channel/web_socket_channel.dart'; +import 'reloader/ddc_library_bundle_restarter.dart'; import 'reloader/ddc_restarter.dart'; import 'reloader/manager.dart'; import 'reloader/require_restarter.dart'; -import 'reloader/restarter.dart'; import 'run_main.dart'; import 'web_utils.dart'; @@ -47,14 +47,12 @@ Future? main() { ? WebSocketClient(WebSocketChannel.connect(fixedUri)) : SseSocketClient(SseClient(fixedPath, debugKey: 'InjectedClient')); - Restarter restarter; - if (dartModuleStrategy == 'require-js') { - restarter = await RequireRestarter.create(); - } else if (dartModuleStrategy == 'ddc' || dartModuleStrategy == 'legacy') { - restarter = DdcRestarter(); - } else { - throw StateError('Unknown module strategy: $dartModuleStrategy'); - } + final restarter = switch (dartModuleStrategy) { + 'require-js' => await RequireRestarter.create(), + 'ddc-library-bundle' => DdcLibraryBundleRestarter(), + 'ddc' || 'legacy' => DdcRestarter(), + _ => throw StateError('Unknown module strategy: $dartModuleStrategy') + }; final manager = ReloadingManager(client, restarter); diff --git a/dwds/web/reloader/ddc_library_bundle_restarter.dart b/dwds/web/reloader/ddc_library_bundle_restarter.dart new file mode 100644 index 000000000..ea0a3331d --- /dev/null +++ b/dwds/web/reloader/ddc_library_bundle_restarter.dart @@ -0,0 +1,15 @@ +// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import 'dart:async'; + +import 'restarter.dart'; + +class DdcLibraryBundleRestarter implements Restarter { + @override + Future restart({String? runId, Future? readyToRunMain}) async { + throw UnimplementedError( + "Hot reload isn't supported for the DDC library bundle format yet."); + } +} diff --git a/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart b/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart index 74c6c228c..f828de74f 100644 --- a/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart +++ b/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart @@ -48,7 +48,7 @@ document.head.appendChild(requireEl); /// `foo__bar__baz`. Rather than attempt to guess, we assume the first property of /// this object is the module. String generateAmdMainModule({required String entrypoint}) { - return '''/* ENTRYPOINT_EXTENTION_MARKER */ + return '''/* ENTRYPOINT_EXTENSION_MARKER */ // Create the main module loaded below. require(["$entrypoint.lib.js", "dart_sdk"], function(app, dart_sdk) { dart_sdk.dart.setStartAsyncSynchronously(true); diff --git a/frontend_server_common/lib/src/bootstrap.dart b/frontend_server_common/lib/src/bootstrap.dart index 206e73e51..0aa687bbb 100644 --- a/frontend_server_common/lib/src/bootstrap.dart +++ b/frontend_server_common/lib/src/bootstrap.dart @@ -122,7 +122,7 @@ document.head.appendChild(requireEl); /// `foo__bar__baz`. Rather than attempt to guess, we assume the first property of /// this object is the module. String generateMainModule({required String entrypoint}) { - return '''/* ENTRYPOINT_EXTENTION_MARKER */ + return '''/* ENTRYPOINT_EXTENSION_MARKER */ // Create the main module loaded below. define("main_module.bootstrap", ["$entrypoint", "dart_sdk"], function(app, dart_sdk) { @@ -357,7 +357,7 @@ $_simpleLoaderScript String generateDDCMainModule( {required String entrypoint, String? exportedMain}) { final exportedMainName = exportedMain ?? entrypoint.split('.')[0]; - return '''/* ENTRYPOINT_EXTENTION_MARKER */ + return '''/* ENTRYPOINT_EXTENSION_MARKER */ (function() { let appName = "$entrypoint"; @@ -381,3 +381,92 @@ String generateDDCMainModule( })(); '''; } + +String generateDDCLibraryBundleBootstrapScript({ + required String ddcModuleLoaderUrl, + required String mapperUrl, + required String entrypoint, + required String bootstrapUrl, +}) { + return ''' +$_baseUrlScript +$_simpleLoaderScript + +(function() { + // Load pre-requisite DDC scripts. We intentionally use invalid names to avoid + // namespace clashes. + let prerequisiteScripts = [ + { + "src": "$ddcModuleLoaderUrl", + "id": "ddc_module_loader \x00" + }, + { + "src": "$mapperUrl", + "id": "dart_stack_trace_mapper \x00" + } + ]; + + // Load ddc_module_loader.js to access DDC's module loader API. + let prerequisiteLoads = []; + for (let i = 0; i < prerequisiteScripts.length; i++) { + prerequisiteLoads.push(forceLoadModule(prerequisiteScripts[i].src)); + } + Promise.all(prerequisiteLoads).then((_) => afterPrerequisiteLogic()); + + var afterPrerequisiteLogic = function() { + window.\$dartLoader.rootDirectories.push(_currentDirectory); + let scripts = [ + { + "src": "dart_sdk.js", + "id": "dart_sdk \\0" + }, + ]; + + let loadConfig = new window.\$dartLoader.LoadConfiguration(); + loadConfig.root = _currentDirectory; + loadConfig.bootstrapScript = { + "src": "$bootstrapUrl", + "id": "data-main" + }; + scripts.push(loadConfig.bootstrapScript); + loadConfig.loadScriptFn = function(loader) { + loader.addScriptsToQueue(scripts, null); + loader.loadEnqueuedModules(); + } + let loader = new window.\$dartLoader.DDCLoader(loadConfig); + + // Record prerequisite scripts' fully resolved URLs. + prerequisiteScripts.forEach(script => loader.registerScript(script)); + + // Note: these variables should only be used in non-multi-app scenarios + // since they can be arbitrarily overridden based on multi-app load order. + window.\$dartLoader.loadConfig = loadConfig; + window.\$dartLoader.loader = loader; + + // TODO(srujzs): Support hot restart. + + // Begin loading libraries + loader.nextAttempt(); + } +})(); +'''; +} + +String generateDDCLibraryBundleMainModule({required String entrypoint}) { + return '''/* ENTRYPOINT_EXTENSION_MARKER */ + +(function() { + let appName = "org-dartlang-app:///$entrypoint"; + + dartDevEmbedder.debugger.registerDevtoolsFormatter(); + + let child = {}; + child.main = function() { + dartDevEmbedder.runMain(appName, {}); + } + + /* MAIN_EXTENSION_MARKER */ + child.main(); +})(); +'''; +} diff --git a/frontend_server_common/lib/src/devfs.dart b/frontend_server_common/lib/src/devfs.dart index 47607a742..e7d5e67ba 100644 --- a/frontend_server_common/lib/src/devfs.dart +++ b/frontend_server_common/lib/src/devfs.dart @@ -27,7 +27,7 @@ class WebDevFS { this.soundNullSafety = true, this.urlTunneler, required this.sdkLayout, - required this.ddcModuleFormat, + required this.compilerOptions, }); final FileSystem fileSystem; @@ -43,7 +43,7 @@ class WebDevFS { final bool soundNullSafety; final TestSdkLayout sdkLayout; - final ModuleFormat ddcModuleFormat; + final CompilerOptions compilerOptions; late final Directory _savedCurrentDirectory; Future create() async { @@ -120,23 +120,39 @@ class WebDevFS { case ModuleFormat.ddc: assetServer.writeFile( ddcModuleLoader, ddcModuleLoaderJS.readAsStringSync()); - assetServer.writeFile( - main, - generateDDCBootstrapScript( + String bootstrapper; + String mainModule; + if (compilerOptions.canaryFeatures) { + bootstrapper = generateDDCLibraryBundleBootstrapScript( + ddcModuleLoaderUrl: ddcModuleLoader, + mapperUrl: stackMapper, + entrypoint: entryPoint, + bootstrapUrl: bootstrap); + mainModule = + generateDDCLibraryBundleMainModule(entrypoint: entryPoint); + } else { + bootstrapper = generateDDCBootstrapScript( ddcModuleLoaderUrl: ddcModuleLoader, mapperUrl: stackMapper, entrypoint: entryPoint, bootstrapUrl: bootstrap, - ), + ); + + // DDC uses a simple heuristic to determine exported identifier names. + // The module name (entrypoint name here) has its extension removed, + // and special path elements like '/', '\', and '..' are replaced with + // '__'. + final exportedMainName = pathToJSIdentifier(entryPoint.split('.')[0]); + mainModule = generateDDCMainModule( + entrypoint: entryPoint, exportedMain: exportedMainName); + } + assetServer.writeFile( + main, + bootstrapper, ); - // DDC uses a simple heuristic to determine exported identifier names. - // The module name (entrypoint name here) has its extension removed, and - // special path elements like '/', '\', and '..' are replaced with '__'. - final exportedMainName = pathToJSIdentifier(entryPoint.split('.')[0]); assetServer.writeFile( bootstrap, - generateDDCMainModule( - entrypoint: entryPoint, exportedMain: exportedMainName), + mainModule, ); break; default: @@ -202,6 +218,7 @@ class WebDevFS { _ => throw Exception('Unsupported DDC module format $ddcModuleFormat.') }); File get stackTraceMapper => fileSystem.file(sdkLayout.stackTraceMapperPath); + ModuleFormat get ddcModuleFormat => compilerOptions.moduleFormat; } class UpdateFSReport { diff --git a/frontend_server_common/lib/src/resident_runner.dart b/frontend_server_common/lib/src/resident_runner.dart index b0d8b3a73..fafbf345a 100644 --- a/frontend_server_common/lib/src/resident_runner.dart +++ b/frontend_server_common/lib/src/resident_runner.dart @@ -78,7 +78,7 @@ class ResidentWebRunner { index: index, urlTunneler: urlTunneler, sdkLayout: sdkLayout, - ddcModuleFormat: compilerOptions.moduleFormat, + compilerOptions: compilerOptions, ); uri = await devFS.create(); From f9e3f813b57f58422cc6ec16fde13ab810cced98 Mon Sep 17 00:00:00 2001 From: Srujan Gaddam Date: Tue, 19 Nov 2024 17:50:42 -0800 Subject: [PATCH 2/5] Update changelogs --- dwds/CHANGELOG.md | 1 + frontend_server_common/CHANGELOG.md | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 2172c4ea9..ca8143577 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -5,6 +5,7 @@ - Replace deprecated JS code `this.__proto__` with `Object.getPrototypeOf(this)`. - [#2500](https://github.com/dart-lang/webdev/pull/2500) - Migrate injected client code to `package:web`. - [#2491](https://github.com/dart-lang/webdev/pull/2491) - Deprecated MetadataProvider's, CompilerOptions', SdkConfiguration's & SdkLayout's soundNullSafety. - [#2427](https://github.com/dart-lang/webdev/issues/2427) +- Add load strategy and an unimplemented hot restart strategy for DDC library bundle format. ## 24.1.0 diff --git a/frontend_server_common/CHANGELOG.md b/frontend_server_common/CHANGELOG.md index 6704b3872..d1c229c14 100644 --- a/frontend_server_common/CHANGELOG.md +++ b/frontend_server_common/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.2.3-wip + +- Add bootstrapping code for DDC library bundle format. + ## 0.2.2 - Start the frontend server from the AOT snapshot shipped in the Dart SDK. From a840020fe167a01bf58dbdc97cc6290dcdf01bca Mon Sep 17 00:00:00 2001 From: Srujan Gaddam Date: Tue, 19 Nov 2024 21:14:38 -0800 Subject: [PATCH 3/5] Add trailing comma --- dwds/web/reloader/ddc_library_bundle_restarter.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dwds/web/reloader/ddc_library_bundle_restarter.dart b/dwds/web/reloader/ddc_library_bundle_restarter.dart index ea0a3331d..4478a7803 100644 --- a/dwds/web/reloader/ddc_library_bundle_restarter.dart +++ b/dwds/web/reloader/ddc_library_bundle_restarter.dart @@ -10,6 +10,7 @@ class DdcLibraryBundleRestarter implements Restarter { @override Future restart({String? runId, Future? readyToRunMain}) async { throw UnimplementedError( - "Hot reload isn't supported for the DDC library bundle format yet."); + "Hot reload isn't supported for the DDC library bundle format yet.", + ); } } From 475b9ba65b65109a8216dd951586b9eebd12cd39 Mon Sep 17 00:00:00 2001 From: Srujan Gaddam Date: Wed, 20 Nov 2024 14:54:51 -0800 Subject: [PATCH 4/5] Revert extention -> extension change "EXTENTION" is used for bootstrapping in the build_runner which will need to change for this change. --- dwds/lib/src/handlers/injector.dart | 2 +- frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart | 2 +- frontend_server_common/lib/src/bootstrap.dart | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dwds/lib/src/handlers/injector.dart b/dwds/lib/src/handlers/injector.dart index b9ea9bc72..d179f977b 100644 --- a/dwds/lib/src/handlers/injector.dart +++ b/dwds/lib/src/handlers/injector.dart @@ -18,7 +18,7 @@ import 'package:shelf/shelf.dart'; const bootstrapJsExtension = '.bootstrap.js'; /// Marker placed by build_web_compilers for where to put injected JS code. -const entrypointExtensionMarker = '/* ENTRYPOINT_EXTENSION_MARKER */'; +const entrypointExtensionMarker = '/* ENTRYPOINT_EXTENTION_MARKER */'; /// Marker placed by build_web_compilers for where to put injected JS code. const mainExtensionMarker = '/* MAIN_EXTENSION_MARKER */'; diff --git a/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart b/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart index f828de74f..74c6c228c 100644 --- a/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart +++ b/frontend_server_client/lib/src/dartdevc_bootstrap_amd.dart @@ -48,7 +48,7 @@ document.head.appendChild(requireEl); /// `foo__bar__baz`. Rather than attempt to guess, we assume the first property of /// this object is the module. String generateAmdMainModule({required String entrypoint}) { - return '''/* ENTRYPOINT_EXTENSION_MARKER */ + return '''/* ENTRYPOINT_EXTENTION_MARKER */ // Create the main module loaded below. require(["$entrypoint.lib.js", "dart_sdk"], function(app, dart_sdk) { dart_sdk.dart.setStartAsyncSynchronously(true); diff --git a/frontend_server_common/lib/src/bootstrap.dart b/frontend_server_common/lib/src/bootstrap.dart index 0aa687bbb..faf2fa420 100644 --- a/frontend_server_common/lib/src/bootstrap.dart +++ b/frontend_server_common/lib/src/bootstrap.dart @@ -122,7 +122,7 @@ document.head.appendChild(requireEl); /// `foo__bar__baz`. Rather than attempt to guess, we assume the first property of /// this object is the module. String generateMainModule({required String entrypoint}) { - return '''/* ENTRYPOINT_EXTENSION_MARKER */ + return '''/* ENTRYPOINT_EXTENTION_MARKER */ // Create the main module loaded below. define("main_module.bootstrap", ["$entrypoint", "dart_sdk"], function(app, dart_sdk) { @@ -357,7 +357,7 @@ $_simpleLoaderScript String generateDDCMainModule( {required String entrypoint, String? exportedMain}) { final exportedMainName = exportedMain ?? entrypoint.split('.')[0]; - return '''/* ENTRYPOINT_EXTENSION_MARKER */ + return '''/* ENTRYPOINT_EXTENTION_MARKER */ (function() { let appName = "$entrypoint"; @@ -453,7 +453,7 @@ $_simpleLoaderScript } String generateDDCLibraryBundleMainModule({required String entrypoint}) { - return '''/* ENTRYPOINT_EXTENSION_MARKER */ + return '''/* ENTRYPOINT_EXTENTION_MARKER */ (function() { let appName = "org-dartlang-app:///$entrypoint"; From 8894f5a9ec31a72d97067b9a18202c14997af634 Mon Sep 17 00:00:00 2001 From: Srujan Gaddam Date: Fri, 22 Nov 2024 15:43:11 -0800 Subject: [PATCH 5/5] Hot reload -> hot restart in error message --- dwds/lib/src/injected/client.js | 2 +- dwds/web/reloader/ddc_library_bundle_restarter.dart | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index 0090fece6..a02394a50 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -21913,7 +21913,7 @@ switch ($async$goto) { case 0: // Function start - throw A.wrapException(A.Exception_Exception("Hot reload isn't supported for the DDC library bundle format yet.")); + throw A.wrapException(A.UnimplementedError$("Hot restart isn't supported for the DDC library bundle format yet.")); // implicit return return A._asyncReturn(null, $async$completer); } diff --git a/dwds/web/reloader/ddc_library_bundle_restarter.dart b/dwds/web/reloader/ddc_library_bundle_restarter.dart index 4478a7803..268102dd2 100644 --- a/dwds/web/reloader/ddc_library_bundle_restarter.dart +++ b/dwds/web/reloader/ddc_library_bundle_restarter.dart @@ -10,7 +10,7 @@ class DdcLibraryBundleRestarter implements Restarter { @override Future restart({String? runId, Future? readyToRunMain}) async { throw UnimplementedError( - "Hot reload isn't supported for the DDC library bundle format yet.", + "Hot restart isn't supported for the DDC library bundle format yet.", ); } }