Fix WebSocket protocol upgrade in DWDS injected client  (#2868)

Fixes an issue where WebSocket URLs were not upgraded from ws:// to wss:// when the application is served over HTTPS (window.location.protocol == 'https:') on non-localhost hosts.

Previously, _fixProtocol checked `window.location.protocol == 'wss:'`, which is never true for browser pages, leaving ws:// connections unchanged and causing mixed-content blocking in browsers.

Extracts the logic into an internal utility function `fixProtocol` and adds unit tests.
diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md
index a91b7be..051fe13 100644
--- a/dwds/CHANGELOG.md
+++ b/dwds/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 27.1.3
+
+- Fix WebSocket protocol upgrade to `wss` in the DWDS injected client when served over HTTPS on non-localhost hosts.
+
 ## 27.1.2
 
 - Bump the min sdk to 3.13.0-107.0.dev.
diff --git a/dwds/lib/src/handlers/injected_client_js.dart b/dwds/lib/src/handlers/injected_client_js.dart
index 78ae20d..f7a6697 100644
--- a/dwds/lib/src/handlers/injected_client_js.dart
+++ b/dwds/lib/src/handlers/injected_client_js.dart
@@ -2,7 +2,7 @@
 // Emits the transpiled client.js directly into a statically embeddable string.
 // dart format off
 
-const injectedClientJs = "// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.13.0-107.0.dev.\n"
+const injectedClientJs = "// Generated by dart2js (, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.14.0-164.0.dev.\n"
 "// The code supports the following hooks:\n"
 "// dartPrint(message):\n"
 "//    if this function is defined it is called instead of the Dart [print]\n"
@@ -235,6 +235,7 @@
 "    },\n"
 "    getNativeInterceptor(object) {\n"
 "      var proto, objectProto, \$constructor, interceptor, t1,\n"
+"        _s9_ = \"_\$dart_js\",\n"
 "        record = object[init.dispatchPropertyName];\n"
 "      if (record == null)\n"
 "        if (\$.initNativeDispatchFlag == null) {\n"
@@ -259,7 +260,7 @@
 "      else {\n"
 "        t1 = \$._JS_INTEROP_INTERCEPTOR_TAG;\n"
 "        if (t1 == null)\n"
-"          t1 = \$._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag(\"_\$dart_js\");\n"
+"          t1 = \$._JS_INTEROP_INTERCEPTOR_TAG = A.getIsolateAffinityTag(_s9_);\n"
 "        interceptor = \$constructor[t1];\n"
 "      }\n"
 "      if (interceptor != null)\n"
@@ -277,7 +278,7 @@
 "      if (typeof \$constructor == \"function\") {\n"
 "        t1 = \$._JS_INTEROP_INTERCEPTOR_TAG;\n"
 "        if (t1 == null)\n"
-"          t1 = \$._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag(\"_\$dart_js\");\n"
+"          t1 = \$._JS_INTEROP_INTERCEPTOR_TAG = A.getIsolateAffinityTag(_s9_);\n"
 "        Object.defineProperty(\$constructor, t1, {value: B.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});\n"
 "        return B.UnknownJavaScriptObject_methods;\n"
 "      }\n"
@@ -1042,7 +1043,7 @@
 "      throw A.wrapException(A.UnsupportedError\$(\"Cannot modify unmodifiable Map\"));\n"
 "    },\n"
 "    unminifyOrTag(rawClassName) {\n"
-"      var preserved = init.mangledGlobalNames[rawClassName];\n"
+"      var preserved = A.unmangleGlobalNameIfPreservedAnyways(rawClassName);\n"
 "      if (preserved != null)\n"
 "        return preserved;\n"
 "      return rawClassName;\n"
@@ -2114,7 +2115,7 @@
 "    JsLinkedHashMap: function JsLinkedHashMap(t0) {\n"
 "      var _ = this;\n"
 "      _.__js_helper\$_length = 0;\n"
-"      _._last = _._first = _.__js_helper\$_rest = _.__js_helper\$_nums = _.__js_helper\$_strings = null;\n"
+"      _._last = _._first = _.__js_helper\$_rest = _._nums = _._strings = null;\n"
 "      _._modifications = 0;\n"
 "      _.\$ti = t0;\n"
 "    },\n"
@@ -2163,7 +2164,7 @@
 "    JsIdentityLinkedHashMap: function JsIdentityLinkedHashMap(t0) {\n"
 "      var _ = this;\n"
 "      _.__js_helper\$_length = 0;\n"
-"      _._last = _._first = _.__js_helper\$_rest = _.__js_helper\$_nums = _.__js_helper\$_strings = null;\n"
+"      _._last = _._first = _.__js_helper\$_rest = _._nums = _._strings = null;\n"
 "      _._modifications = 0;\n"
 "      _.\$ti = t0;\n"
 "    },\n"
@@ -2972,7 +2973,7 @@
 "      return \"?\";\n"
 "    },\n"
 "    _unminifyOrTag(rawClassName) {\n"
-"      var preserved = init.mangledGlobalNames[rawClassName];\n"
+"      var preserved = A.unmangleGlobalNameIfPreservedAnyways(rawClassName);\n"
 "      if (preserved != null)\n"
 "        return preserved;\n"
 "      return rawClassName;\n"
@@ -3013,7 +3014,7 @@
 "        probe = cache.get(recipe);\n"
 "      if (probe != null)\n"
 "        return probe;\n"
-"      rti = A._Parser_parse(A._Parser_create(universe, null, recipe, false));\n"
+"      rti = A._Universe__parseRecipe(universe, null, recipe, false);\n"
 "      cache.set(recipe, rti);\n"
 "      return rti;\n"
 "    },\n"
@@ -3025,7 +3026,7 @@
 "      probe = cache.get(recipe);\n"
 "      if (probe != null)\n"
 "        return probe;\n"
-"      rti = A._Parser_parse(A._Parser_create(universe, environment, recipe, true));\n"
+"      rti = A._Universe__parseRecipe(universe, environment, recipe, true);\n"
 "      cache.set(recipe, rti);\n"
 "      return rti;\n"
 "    },\n"
@@ -3042,6 +3043,9 @@
 "      cache.set(argumentsRecipe, rti);\n"
 "      return rti;\n"
 "    },\n"
+"    _Universe__parseRecipe(universe, environment, recipe, normalize) {\n"
+"      return A._Parser_parse(A._Parser_create(universe, environment, recipe, normalize));\n"
+"    },\n"
 "    _Universe__installTypeTests(universe, rti) {\n"
 "      rti._as = A._installSpecializedAsCheck;\n"
 "      rti._is = A._installSpecializedIsTest;\n"
@@ -3822,19 +3826,14 @@
 "      A.Timer__createTimer(B.Duration_0, type\$.void_Function._as(callback));\n"
 "    },\n"
 "    Timer__createTimer(duration, callback) {\n"
-"      var milliseconds = B.JSInt_methods._tdivFast\$1(duration._duration, 1000);\n"
+"      var milliseconds = B.JSInt_methods._tdivFast\$1(duration.inMicroseconds, 1000);\n"
 "      return A._TimerImpl\$(milliseconds < 0 ? 0 : milliseconds, callback);\n"
 "    },\n"
 "    _TimerImpl\$(milliseconds, callback) {\n"
-"      var t1 = new A._TimerImpl(true);\n"
+"      var t1 = new A._TimerImpl();\n"
 "      t1._TimerImpl\$2(milliseconds, callback);\n"
 "      return t1;\n"
 "    },\n"
-"    _TimerImpl\$periodic(milliseconds, callback) {\n"
-"      var t1 = new A._TimerImpl(false);\n"
-"      t1._TimerImpl\$periodic\$2(milliseconds, callback);\n"
-"      return t1;\n"
-"    },\n"
 "    _makeAsyncAwaitCompleter(\$T) {\n"
 "      return new A._AsyncAwaitCompleter(new A._Future(\$.Zone__current, \$T._eval\$1(\"_Future<0>\")), \$T._eval\$1(\"_AsyncAwaitCompleter<0>\"));\n"
 "    },\n"
@@ -3872,19 +3871,20 @@
 "    },\n"
 "    _wrapJsFunctionForAsync(\$function) {\n"
 "      var \$protected = function(fn, ERROR) {\n"
-"        return function(errorCode, result) {\n"
-"          while (true) {\n"
-"            try {\n"
-"              fn(errorCode, result);\n"
-"              break;\n"
-"            } catch (error) {\n"
-"              result = error;\n"
-"              errorCode = ERROR;\n"
+"          return function(errorCode, result) {\n"
+"            while (true) {\n"
+"              try {\n"
+"                fn(errorCode, result);\n"
+"                break;\n"
+"              } catch (error) {\n"
+"                result = error;\n"
+"                errorCode = ERROR;\n"
+"              }\n"
 "            }\n"
-"          }\n"
-"        };\n"
-"      }(\$function, 1);\n"
-"      return \$.Zone__current.registerBinaryCallback\$3\$1(new A._wrapJsFunctionForAsync_closure(\$protected), type\$.void, type\$.int, type\$.dynamic);\n"
+"          };\n"
+"        }(\$function, 1),\n"
+"        t1 = \$.Zone__current;\n"
+"      return t1._registerBinaryCallbackZoned\$3\$2(t1, type\$.void_Function_int_dynamic._as(new A._wrapJsFunctionForAsync_closure(\$protected)), type\$.void, type\$.int, type\$.dynamic);\n"
 "    },\n"
 "    AsyncError_defaultStackTrace(error) {\n"
 "      var stackTrace;\n"
@@ -3940,9 +3940,9 @@
 "    _interceptError(error, stackTrace) {\n"
 "      var replacement, t1, t2,\n"
 "        zone = \$.Zone__current;\n"
-"      if (zone === B.C__RootZone)\n"
+"      if (zone === B.Zone_jYP)\n"
 "        return null;\n"
-"      replacement = zone.errorCallback\$2(error, stackTrace);\n"
+"      replacement = zone._errorCallbackZoned\$3(zone, error, stackTrace);\n"
 "      if (replacement == null)\n"
 "        return null;\n"
 "      t1 = replacement.error;\n"
@@ -3953,7 +3953,7 @@
 "    },\n"
 "    _interceptUserError(error, stackTrace) {\n"
 "      var replacement;\n"
-"      if (\$.Zone__current !== B.C__RootZone) {\n"
+"      if (\$.Zone__current !== B.Zone_jYP) {\n"
 "        replacement = A._interceptError(error, stackTrace);\n"
 "        if (replacement != null)\n"
 "          return replacement;\n"
@@ -3979,7 +3979,7 @@
 "      return t1;\n"
 "    },\n"
 "    _Future__chainCoreFuture(source, target, sync) {\n"
-"      var t2, t3, ignoreError, listeners, _box_0 = {},\n"
+"      var t2, t3, ignoreError, listeners, targetZone, _box_0 = {},\n"
 "        t1 = _box_0.source = source;\n"
 "      for (t2 = type\$._Future_dynamic; t3 = t1._state, (t3 & 4) !== 0; t1 = source) {\n"
 "        source = t2._as(t1._resultOrListeners);\n"
@@ -4013,7 +4013,8 @@
 "        return;\n"
 "      }\n"
 "      target._state ^= 2;\n"
-"      target._zone.scheduleMicrotask\$1(new A._Future__chainCoreFuture_closure(_box_0, target));\n"
+"      targetZone = target._zone;\n"
+"      targetZone._scheduleMicrotaskZoned\$2(targetZone, new A._Future__chainCoreFuture_closure(_box_0, target));\n"
 "    },\n"
 "    _Future__propagateToListeners(source, listeners) {\n"
 "      var t2, t3, _box_0, t4, t5, hasError, asyncError, nextListener, nextListener0, sourceResult, t6, zone, oldZone, result, current, _box_1 = {},\n"
@@ -4026,7 +4027,8 @@
 "        if (listeners == null) {\n"
 "          if (hasError && (t4 & 1) === 0) {\n"
 "            asyncError = t2._as(t1._resultOrListeners);\n"
-"            t1._zone.handleUncaughtError\$2(asyncError.error, asyncError.stackTrace);\n"
+"            t1 = t1._zone;\n"
+"            t1._handleUncaughtErrorZoned\$3(t1, asyncError.error, asyncError.stackTrace);\n"
 "          }\n"
 "          return;\n"
 "        }\n"
@@ -4049,15 +4051,10 @@
 "          t6 = true;\n"
 "        if (t6) {\n"
 "          zone = t1.result._zone;\n"
-"          if (hasError) {\n"
+"          if (hasError && t4._zone._handleUncaughtErrorFunction != zone._handleUncaughtErrorFunction) {\n"
+"            t2._as(sourceResult);\n"
 "            t1 = t4._zone;\n"
-"            t1 = !(t1 === zone || t1.get\$errorZone() === zone.get\$errorZone());\n"
-"          } else\n"
-"            t1 = false;\n"
-"          if (t1) {\n"
-"            t1 = _box_1.source;\n"
-"            asyncError = t2._as(t1._resultOrListeners);\n"
-"            t1._zone.handleUncaughtError\$2(asyncError.error, asyncError.stackTrace);\n"
+"            t1._handleUncaughtErrorZoned\$3(t1, sourceResult.error, sourceResult.stackTrace);\n"
 "            return;\n"
 "          }\n"
 "          oldZone = \$.Zone__current;\n"
@@ -4065,7 +4062,7 @@
 "            \$.Zone__current = zone;\n"
 "          else\n"
 "            oldZone = null;\n"
-"          t1 = _box_0.listener.state;\n"
+"          t1 = t1.state;\n"
 "          if ((t1 & 15) === 8)\n"
 "            new A._Future__propagateToListeners_handleWhenCompleteCallback(_box_0, _box_1, hasError).call\$0();\n"
 "          else if (t5) {\n"
@@ -4116,10 +4113,12 @@
 "      }\n"
 "    },\n"
 "    _registerErrorHandler(errorHandler, zone) {\n"
-"      if (type\$.dynamic_Function_Object_StackTrace._is(errorHandler))\n"
-"        return zone.registerBinaryCallback\$3\$1(errorHandler, type\$.dynamic, type\$.Object, type\$.StackTrace);\n"
-"      if (type\$.dynamic_Function_Object._is(errorHandler))\n"
-"        return zone.registerUnaryCallback\$2\$1(errorHandler, type\$.dynamic, type\$.Object);\n"
+"      var t1 = type\$.dynamic_Function_Object_StackTrace;\n"
+"      if (t1._is(errorHandler))\n"
+"        return zone._registerBinaryCallbackZoned\$3\$2(zone, t1._as(errorHandler), type\$.dynamic, type\$.Object, type\$.StackTrace);\n"
+"      t1 = type\$.dynamic_Function_Object;\n"
+"      if (t1._is(errorHandler))\n"
+"        return zone._registerUnaryCallbackZoned\$2\$2(zone, t1._as(errorHandler), type\$.dynamic, type\$.Object);\n"
 "      throw A.wrapException(A.ArgumentError\$value(errorHandler, \"onError\", string\$.Error_));\n"
 "    },\n"
 "    _microtaskLoop() {\n"
@@ -4176,22 +4175,16 @@
 "      }\n"
 "    },\n"
 "    scheduleMicrotask(callback) {\n"
-"      var t1, _null = null,\n"
-"        currentZone = \$.Zone__current;\n"
-"      if (B.C__RootZone === currentZone) {\n"
-"        A._rootScheduleMicrotask(_null, _null, B.C__RootZone, callback);\n"
+"      var currentZone = \$.Zone__current;\n"
+"      if (B.Zone_jYP === currentZone) {\n"
+"        A._rootScheduleMicrotask(B.Zone_jYP, callback);\n"
 "        return;\n"
 "      }\n"
-"      if (B.C__RootZone === currentZone.get\$_scheduleMicrotask().zone)\n"
-"        t1 = B.C__RootZone.get\$errorZone() === currentZone.get\$errorZone();\n"
-"      else\n"
-"        t1 = false;\n"
-"      if (t1) {\n"
-"        A._rootScheduleMicrotask(_null, _null, currentZone, currentZone.registerCallback\$1\$1(callback, type\$.void));\n"
+"      if (currentZone._scheduleMicrotaskFunction == null && currentZone._handleUncaughtErrorFunction == null) {\n"
+"        A._rootScheduleMicrotask(currentZone, currentZone._registerCallbackZoned\$1\$2(currentZone, callback, type\$.void));\n"
 "        return;\n"
 "      }\n"
-"      t1 = \$.Zone__current;\n"
-"      t1.scheduleMicrotask\$1(t1.bindCallbackGuarded\$1(callback));\n"
+"      currentZone._scheduleMicrotaskZoned\$2(currentZone, currentZone.bindCallbackGuarded\$1(callback));\n"
 "    },\n"
 "    StreamIterator_StreamIterator(stream, \$T) {\n"
 "      A.checkNotNullable(stream, \"stream\", type\$.Object);\n"
@@ -4202,7 +4195,7 @@
 "      return new A._AsyncStreamController(_null, _null, _null, _null, \$T._eval\$1(\"_AsyncStreamController<0>\"));\n"
 "    },\n"
 "    _runGuarded(notificationHandler) {\n"
-"      var e, s, exception;\n"
+"      var e, s, exception, t1;\n"
 "      if (notificationHandler == null)\n"
 "        return;\n"
 "      try {\n"
@@ -4210,28 +4203,31 @@
 "      } catch (exception) {\n"
 "        e = A.unwrapException(exception);\n"
 "        s = A.getTraceFromException(exception);\n"
-"        \$.Zone__current.handleUncaughtError\$2(e, s);\n"
+"        t1 = \$.Zone__current;\n"
+"        t1._handleUncaughtErrorZoned\$3(t1, A._asObject(e), type\$.StackTrace._as(s));\n"
 "      }\n"
 "    },\n"
 "    _BufferingStreamSubscription__registerDataHandler(zone, handleData, \$T) {\n"
 "      var t1 = handleData == null ? A.async___nullDataHandler\$closure() : handleData;\n"
-"      return zone.registerUnaryCallback\$2\$1(t1, type\$.void, \$T);\n"
+"      return zone._registerUnaryCallbackZoned\$2\$2(zone, type\$.\$env_1_1_void._bind\$1(\$T)._eval\$1(\"1(2)\")._as(t1), type\$.void, \$T);\n"
 "    },\n"
 "    _BufferingStreamSubscription__registerErrorHandler(zone, handleError) {\n"
 "      if (handleError == null)\n"
 "        handleError = A.async___nullErrorHandler\$closure();\n"
 "      if (type\$.void_Function_Object_StackTrace._is(handleError))\n"
-"        return zone.registerBinaryCallback\$3\$1(handleError, type\$.dynamic, type\$.Object, type\$.StackTrace);\n"
+"        return zone._registerBinaryCallbackZoned\$3\$2(zone, type\$.dynamic_Function_Object_StackTrace._as(handleError), type\$.dynamic, type\$.Object, type\$.StackTrace);\n"
 "      if (type\$.void_Function_Object._is(handleError))\n"
-"        return zone.registerUnaryCallback\$2\$1(handleError, type\$.dynamic, type\$.Object);\n"
+"        return zone._registerUnaryCallbackZoned\$2\$2(zone, type\$.dynamic_Function_Object._as(handleError), type\$.dynamic, type\$.Object);\n"
 "      throw A.wrapException(A.ArgumentError\$(string\$.handle, null));\n"
 "    },\n"
 "    _nullDataHandler(value) {\n"
 "    },\n"
 "    _nullErrorHandler(error, stackTrace) {\n"
+"      var t1;\n"
 "      A._asObject(error);\n"
 "      type\$.StackTrace._as(stackTrace);\n"
-"      \$.Zone__current.handleUncaughtError\$2(error, stackTrace);\n"
+"      t1 = \$.Zone__current;\n"
+"      t1._handleUncaughtErrorZoned\$3(t1, error, stackTrace);\n"
 "    },\n"
 "    _nullDoneHandler() {\n"
 "    },\n"
@@ -4244,20 +4240,35 @@
 "    },\n"
 "    Timer_Timer(duration, callback) {\n"
 "      var t1 = \$.Zone__current;\n"
-"      if (t1 === B.C__RootZone)\n"
-"        return t1.createTimer\$2(duration, callback);\n"
-"      return t1.createTimer\$2(duration, t1.bindCallbackGuarded\$1(callback));\n"
+"      if (t1 === B.Zone_jYP)\n"
+"        return t1._createTimerZoned\$3(t1, duration, type\$.void_Function._as(callback));\n"
+"      return t1._createTimerZoned\$3(t1, duration, type\$.void_Function._as(t1.bindCallbackGuarded\$1(callback)));\n"
 "    },\n"
 "    runZonedGuarded(body, onError, \$R) {\n"
-"      var error, stackTrace, t1, exception, _null = null, zoneSpecification = null, zoneValues = null,\n"
+"      var error, stackTrace, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, newZone, exception, _null = null, zoneSpecification = null, zoneValues = null,\n"
 "        parentZone = \$.Zone__current,\n"
-"        errorHandler = new A.runZonedGuarded_closure(parentZone, onError);\n"
+"        t1 = new A.runZonedGuarded_errorHandler(parentZone, onError);\n"
 "      if (zoneSpecification == null)\n"
-"        zoneSpecification = new A._ZoneSpecification(errorHandler, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);\n"
-"      else\n"
-"        zoneSpecification = A.ZoneSpecification_ZoneSpecification\$from(zoneSpecification, errorHandler);\n"
+"        zoneSpecification = new A.ZoneSpecification(t1, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null, _null);\n"
+"      else {\n"
+"        t2 = zoneSpecification;\n"
+"        t3 = t2.run;\n"
+"        t4 = t2.runUnary;\n"
+"        t5 = t2.runBinary;\n"
+"        t6 = t2.registerCallback;\n"
+"        t7 = t2.registerUnaryCallback;\n"
+"        t8 = t2.registerBinaryCallback;\n"
+"        t9 = t2.errorCallback;\n"
+"        t10 = t2.scheduleMicrotask;\n"
+"        t11 = t2.createTimer;\n"
+"        t12 = t2.createPeriodicTimer;\n"
+"        t13 = t2.print;\n"
+"        t2 = t2.fork;\n"
+"        zoneSpecification = new A.ZoneSpecification(t1, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t2);\n"
+"      }\n"
 "      try {\n"
-"        t1 = parentZone.fork\$2\$specification\$zoneValues(zoneSpecification, zoneValues).run\$1\$1(body, \$R);\n"
+"        newZone = parentZone._forkZoned\$3(parentZone, zoneSpecification, zoneValues);\n"
+"        t1 = newZone._runZoned\$1\$2(newZone, body, \$R);\n"
 "        return t1;\n"
 "      } catch (exception) {\n"
 "        error = A.unwrapException(exception);\n"
@@ -4266,128 +4277,24 @@
 "      }\n"
 "      return _null;\n"
 "    },\n"
-"    _rootHandleUncaughtError(\$self, \$parent, zone, error, stackTrace) {\n"
-"      A._rootHandleError(error, type\$.StackTrace._as(stackTrace));\n"
+"    ZoneDelegate\$_() {\n"
+"      return new A.ZoneDelegate(B.Zone_jYP);\n"
 "    },\n"
-"    _rootHandleError(error, stackTrace) {\n"
-"      A._schedulePriorityAsyncCallback(new A._rootHandleError_closure(error, stackTrace));\n"
+"    _rootHandleUncaughtError(error, stackTrace) {\n"
+"      A._schedulePriorityAsyncCallback(new A._rootHandleUncaughtError_closure(error, stackTrace));\n"
 "    },\n"
-"    _rootRun(\$self, \$parent, zone, f, \$R) {\n"
-"      var old, t1;\n"
-"      type\$.nullable_Zone._as(\$self);\n"
-"      type\$.nullable_ZoneDelegate._as(\$parent);\n"
-"      type\$.Zone._as(zone);\n"
-"      \$R._eval\$1(\"0()\")._as(f);\n"
-"      t1 = \$.Zone__current;\n"
-"      if (t1 === zone)\n"
-"        return f.call\$0();\n"
-"      \$.Zone__current = zone;\n"
-"      old = t1;\n"
-"      try {\n"
-"        t1 = f.call\$0();\n"
-"        return t1;\n"
-"      } finally {\n"
-"        \$.Zone__current = old;\n"
-"      }\n"
+"    _rootScheduleMicrotask(zone, callback) {\n"
+"      if (B.Zone_jYP !== zone)\n"
+"        callback = zone._handleUncaughtErrorFunction != null ? zone.bindCallbackGuarded\$1(callback) : zone.bindCallback\$1\$1(callback, type\$.void);\n"
+"      A._scheduleAsyncCallback(callback);\n"
 "    },\n"
-"    _rootRunUnary(\$self, \$parent, zone, f, arg, \$R, \$T) {\n"
-"      var old, t1;\n"
-"      type\$.nullable_Zone._as(\$self);\n"
-"      type\$.nullable_ZoneDelegate._as(\$parent);\n"
-"      type\$.Zone._as(zone);\n"
-"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f);\n"
-"      \$T._as(arg);\n"
-"      t1 = \$.Zone__current;\n"
-"      if (t1 === zone)\n"
-"        return f.call\$1(arg);\n"
-"      \$.Zone__current = zone;\n"
-"      old = t1;\n"
-"      try {\n"
-"        t1 = f.call\$1(arg);\n"
-"        return t1;\n"
-"      } finally {\n"
-"        \$.Zone__current = old;\n"
-"      }\n"
-"    },\n"
-"    _rootRunBinary(\$self, \$parent, zone, f, arg1, arg2, \$R, \$T1, \$T2) {\n"
-"      var old, t1;\n"
-"      type\$.nullable_Zone._as(\$self);\n"
-"      type\$.nullable_ZoneDelegate._as(\$parent);\n"
-"      type\$.Zone._as(zone);\n"
-"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(f);\n"
-"      \$T1._as(arg1);\n"
-"      \$T2._as(arg2);\n"
-"      t1 = \$.Zone__current;\n"
-"      if (t1 === zone)\n"
-"        return f.call\$2(arg1, arg2);\n"
-"      \$.Zone__current = zone;\n"
-"      old = t1;\n"
-"      try {\n"
-"        t1 = f.call\$2(arg1, arg2);\n"
-"        return t1;\n"
-"      } finally {\n"
-"        \$.Zone__current = old;\n"
-"      }\n"
-"    },\n"
-"    _rootRegisterCallback(\$self, \$parent, zone, f, \$R) {\n"
-"      return \$R._eval\$1(\"0()\")._as(f);\n"
-"    },\n"
-"    _rootRegisterUnaryCallback(\$self, \$parent, zone, f, \$R, \$T) {\n"
-"      return \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f);\n"
-"    },\n"
-"    _rootRegisterBinaryCallback(\$self, \$parent, zone, f, \$R, \$T1, \$T2) {\n"
-"      return \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(f);\n"
-"    },\n"
-"    _rootErrorCallback(\$self, \$parent, zone, error, stackTrace) {\n"
-"      type\$.nullable_StackTrace._as(stackTrace);\n"
-"      return null;\n"
-"    },\n"
-"    _rootScheduleMicrotask(\$self, \$parent, zone, f) {\n"
-"      var t1, t2;\n"
-"      type\$.void_Function._as(f);\n"
-"      if (B.C__RootZone !== zone) {\n"
-"        t1 = B.C__RootZone.get\$errorZone();\n"
-"        t2 = zone.get\$errorZone();\n"
-"        f = t1 !== t2 ? zone.bindCallbackGuarded\$1(f) : zone.bindCallback\$1\$1(f, type\$.void);\n"
-"      }\n"
-"      A._scheduleAsyncCallback(f);\n"
-"    },\n"
-"    _rootCreateTimer(\$self, \$parent, zone, duration, callback) {\n"
-"      type\$.Duration._as(duration);\n"
-"      type\$.void_Function._as(callback);\n"
-"      return A.Timer__createTimer(duration, B.C__RootZone !== zone ? zone.bindCallback\$1\$1(callback, type\$.void) : callback);\n"
-"    },\n"
-"    _rootCreatePeriodicTimer(\$self, \$parent, zone, duration, callback) {\n"
-"      var milliseconds;\n"
-"      type\$.Duration._as(duration);\n"
-"      type\$.void_Function_Timer._as(callback);\n"
-"      if (B.C__RootZone !== zone)\n"
-"        callback = zone.bindUnaryCallback\$2\$1(callback, type\$.void, type\$.Timer);\n"
-"      milliseconds = B.JSInt_methods._tdivFast\$1(duration._duration, 1000);\n"
-"      return A._TimerImpl\$periodic(milliseconds < 0 ? 0 : milliseconds, callback);\n"
-"    },\n"
-"    _rootPrint(\$self, \$parent, zone, line) {\n"
-"      A.printString(A._asString(line));\n"
-"    },\n"
-"    _printToZone0(line) {\n"
-"      \$.Zone__current.print\$1(line);\n"
-"    },\n"
-"    _rootFork(\$self, \$parent, zone, specification, zoneValues) {\n"
-"      var valueMap, t1, handleUncaughtError;\n"
-"      type\$.nullable_ZoneSpecification._as(specification);\n"
-"      type\$.nullable_Map_of_nullable_Object_and_nullable_Object._as(zoneValues);\n"
-"      \$._printToZone = A.async___printToZone\$closure();\n"
-"      valueMap = zone.get\$_map();\n"
-"      t1 = new A._CustomZone(zone.get\$_run(), zone.get\$_runUnary(), zone.get\$_runBinary(), zone.get\$_registerCallback(), zone.get\$_registerUnaryCallback(), zone.get\$_registerBinaryCallback(), zone.get\$_errorCallback(), zone.get\$_scheduleMicrotask(), zone.get\$_createTimer(), zone.get\$_createPeriodicTimer(), zone.get\$_print(), zone.get\$_fork(), zone.get\$_handleUncaughtError(), zone, valueMap);\n"
-"      handleUncaughtError = specification.handleUncaughtError;\n"
-"      if (handleUncaughtError != null)\n"
-"        t1._handleUncaughtError = new A._ZoneFunction(t1, handleUncaughtError, type\$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace);\n"
+"    _rootFork(zone, specification, zoneValues) {\n"
+"      var t1 = new A.ZoneDelegate(B.Zone_jYP),\n"
+"        t2 = new A._ZoneHandleUncaughtError(B.Zone_jYP, specification.handleUncaughtError);\n"
+"      t1 = t1._zone = new A.Zone(zone, t1, zone._runFunction, zone._runUnaryFunction, zone._runBinaryFunction, zone._registerCallbackFunction, zone._registerUnaryCallbackFunction, zone._registerBinaryCallbackFunction, zone._errorCallbackFunction, zone._scheduleMicrotaskFunction, zone._createTimerFunction, zone._createPeriodicTimerFunction, zone._printFunction, zone._forkFunction, t2, zone._zoneValues);\n"
+"      t2.zone = t1;\n"
 "      return t1;\n"
 "    },\n"
-"    ZoneSpecification_ZoneSpecification\$from(other, handleUncaughtError) {\n"
-"      var t1 = handleUncaughtError == null ? other.handleUncaughtError : handleUncaughtError;\n"
-"      return new A._ZoneSpecification(t1, other.run, other.runUnary, other.runBinary, other.registerCallback, other.registerUnaryCallback, other.registerBinaryCallback, other.errorCallback, other.scheduleMicrotask, other.createTimer, other.createPeriodicTimer, other.print, other.fork);\n"
-"    },\n"
 "    _AsyncRun__initializeScheduleImmediate_internalCallback: function _AsyncRun__initializeScheduleImmediate_internalCallback(t0) {\n"
 "      this._box_0 = t0;\n"
 "    },\n"
@@ -4402,22 +4309,13 @@
 "    _AsyncRun__scheduleImmediateWithSetImmediate_internalCallback: function _AsyncRun__scheduleImmediateWithSetImmediate_internalCallback(t0) {\n"
 "      this.callback = t0;\n"
 "    },\n"
-"    _TimerImpl: function _TimerImpl(t0) {\n"
-"      this._once = t0;\n"
+"    _TimerImpl: function _TimerImpl() {\n"
 "      this._handle = null;\n"
-"      this._tick = 0;\n"
 "    },\n"
 "    _TimerImpl_internalCallback: function _TimerImpl_internalCallback(t0, t1) {\n"
 "      this.\$this = t0;\n"
 "      this.callback = t1;\n"
 "    },\n"
-"    _TimerImpl\$periodic_closure: function _TimerImpl\$periodic_closure(t0, t1, t2, t3) {\n"
-"      var _ = this;\n"
-"      _.\$this = t0;\n"
-"      _.milliseconds = t1;\n"
-"      _.start = t2;\n"
-"      _.callback = t3;\n"
-"    },\n"
 "    _AsyncAwaitCompleter: function _AsyncAwaitCompleter(t0, t1) {\n"
 "      this._future = t0;\n"
 "      this.isSync = false;\n"
@@ -4696,88 +4594,55 @@
 "      this._source = t1;\n"
 "      this.\$ti = t2;\n"
 "    },\n"
-"    _ZoneFunction: function _ZoneFunction(t0, t1, t2) {\n"
+"    _ZoneHandleUncaughtError: function _ZoneHandleUncaughtError(t0, t1) {\n"
 "      this.zone = t0;\n"
 "      this.\$function = t1;\n"
-"      this.\$ti = t2;\n"
 "    },\n"
-"    _Zone: function _Zone() {\n"
-"    },\n"
-"    _CustomZone: function _CustomZone(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14) {\n"
+"    Zone: function Zone(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15) {\n"
 "      var _ = this;\n"
-"      _._run = t0;\n"
-"      _._runUnary = t1;\n"
-"      _._runBinary = t2;\n"
-"      _._registerCallback = t3;\n"
-"      _._registerUnaryCallback = t4;\n"
-"      _._registerBinaryCallback = t5;\n"
-"      _._errorCallback = t6;\n"
-"      _._scheduleMicrotask = t7;\n"
-"      _._createTimer = t8;\n"
-"      _._createPeriodicTimer = t9;\n"
-"      _._print = t10;\n"
-"      _._fork = t11;\n"
-"      _._handleUncaughtError = t12;\n"
-"      _._delegateCache = null;\n"
-"      _.parent = t13;\n"
-"      _._map = t14;\n"
+"      _._parent = t0;\n"
+"      _._delegate = t1;\n"
+"      _._runFunction = t2;\n"
+"      _._runUnaryFunction = t3;\n"
+"      _._runBinaryFunction = t4;\n"
+"      _._registerCallbackFunction = t5;\n"
+"      _._registerUnaryCallbackFunction = t6;\n"
+"      _._registerBinaryCallbackFunction = t7;\n"
+"      _._errorCallbackFunction = t8;\n"
+"      _._scheduleMicrotaskFunction = t9;\n"
+"      _._createTimerFunction = t10;\n"
+"      _._createPeriodicTimerFunction = t11;\n"
+"      _._printFunction = t12;\n"
+"      _._forkFunction = t13;\n"
+"      _._handleUncaughtErrorFunction = t14;\n"
+"      _._zoneValues = t15;\n"
 "    },\n"
-"    _CustomZone_bindCallback_closure: function _CustomZone_bindCallback_closure(t0, t1, t2) {\n"
+"    Zone_bindCallback_closure: function Zone_bindCallback_closure(t0, t1, t2) {\n"
 "      this.\$this = t0;\n"
 "      this.registered = t1;\n"
 "      this.R = t2;\n"
 "    },\n"
-"    _CustomZone_bindUnaryCallback_closure: function _CustomZone_bindUnaryCallback_closure(t0, t1, t2, t3) {\n"
-"      var _ = this;\n"
-"      _.\$this = t0;\n"
-"      _.registered = t1;\n"
-"      _.T = t2;\n"
-"      _.R = t3;\n"
-"    },\n"
-"    _CustomZone_bindCallbackGuarded_closure: function _CustomZone_bindCallbackGuarded_closure(t0, t1) {\n"
+"    Zone_bindCallbackGuarded_closure: function Zone_bindCallbackGuarded_closure(t0, t1) {\n"
 "      this.\$this = t0;\n"
 "      this.registered = t1;\n"
 "    },\n"
-"    _CustomZone_bindUnaryCallbackGuarded_closure: function _CustomZone_bindUnaryCallbackGuarded_closure(t0, t1, t2) {\n"
+"    Zone_bindUnaryCallbackGuarded_closure: function Zone_bindUnaryCallbackGuarded_closure(t0, t1, t2) {\n"
 "      this.\$this = t0;\n"
 "      this.registered = t1;\n"
 "      this.T = t2;\n"
 "    },\n"
-"    _RootZone: function _RootZone() {\n"
-"    },\n"
-"    _RootZone_bindCallback_closure: function _RootZone_bindCallback_closure(t0, t1, t2) {\n"
-"      this.\$this = t0;\n"
-"      this.f = t1;\n"
-"      this.R = t2;\n"
-"    },\n"
-"    _RootZone_bindUnaryCallback_closure: function _RootZone_bindUnaryCallback_closure(t0, t1, t2, t3) {\n"
-"      var _ = this;\n"
-"      _.\$this = t0;\n"
-"      _.f = t1;\n"
-"      _.T = t2;\n"
-"      _.R = t3;\n"
-"    },\n"
-"    _RootZone_bindCallbackGuarded_closure: function _RootZone_bindCallbackGuarded_closure(t0, t1) {\n"
-"      this.\$this = t0;\n"
-"      this.f = t1;\n"
-"    },\n"
-"    _RootZone_bindUnaryCallbackGuarded_closure: function _RootZone_bindUnaryCallbackGuarded_closure(t0, t1, t2) {\n"
-"      this.\$this = t0;\n"
-"      this.f = t1;\n"
-"      this.T = t2;\n"
-"    },\n"
-"    runZonedGuarded_closure: function runZonedGuarded_closure(t0, t1) {\n"
+"    runZonedGuarded_errorHandler: function runZonedGuarded_errorHandler(t0, t1) {\n"
 "      this.parentZone = t0;\n"
 "      this.onError = t1;\n"
 "    },\n"
-"    _ZoneDelegate: function _ZoneDelegate(t0) {\n"
-"      this._delegationTarget = t0;\n"
+"    ZoneDelegate: function ZoneDelegate(t0) {\n"
+"      this._zone = t0;\n"
 "    },\n"
-"    _rootHandleError_closure: function _rootHandleError_closure(t0, t1) {\n"
+"    _rootHandleUncaughtError_closure: function _rootHandleUncaughtError_closure(t0, t1) {\n"
 "      this.error = t0;\n"
 "      this.stackTrace = t1;\n"
 "    },\n"
-"    _ZoneSpecification: function _ZoneSpecification(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) {\n"
+"    ZoneSpecification: function ZoneSpecification(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) {\n"
 "      var _ = this;\n"
 "      _.handleUncaughtError = t0;\n"
 "      _.run = t1;\n"
@@ -4882,23 +4747,23 @@
 "    _HashMap: function _HashMap(t0) {\n"
 "      var _ = this;\n"
 "      _._collection\$_length = 0;\n"
-"      _._keys = _._collection\$_rest = _._nums = _._strings = null;\n"
+"      _._collection\$_keys = _._collection\$_rest = _._collection\$_nums = _._collection\$_strings = null;\n"
 "      _.\$ti = t0;\n"
 "    },\n"
 "    _IdentityHashMap: function _IdentityHashMap(t0) {\n"
 "      var _ = this;\n"
 "      _._collection\$_length = 0;\n"
-"      _._keys = _._collection\$_rest = _._nums = _._strings = null;\n"
+"      _._collection\$_keys = _._collection\$_rest = _._collection\$_nums = _._collection\$_strings = null;\n"
 "      _.\$ti = t0;\n"
 "    },\n"
 "    _HashMapKeyIterable: function _HashMapKeyIterable(t0, t1) {\n"
-"      this._collection\$_map = t0;\n"
+"      this._map = t0;\n"
 "      this.\$ti = t1;\n"
 "    },\n"
 "    _HashMapKeyIterator: function _HashMapKeyIterator(t0, t1, t2) {\n"
 "      var _ = this;\n"
-"      _._collection\$_map = t0;\n"
-"      _._keys = t1;\n"
+"      _._map = t0;\n"
+"      _._collection\$_keys = t1;\n"
 "      _._offset = 0;\n"
 "      _._collection\$_current = null;\n"
 "      _.\$ti = t2;\n"
@@ -4909,7 +4774,7 @@
 "      _._hashCode = t1;\n"
 "      _._validKey = t2;\n"
 "      _.__js_helper\$_length = 0;\n"
-"      _._last = _._first = _.__js_helper\$_rest = _.__js_helper\$_nums = _.__js_helper\$_strings = null;\n"
+"      _._last = _._first = _.__js_helper\$_rest = _._nums = _._strings = null;\n"
 "      _._modifications = 0;\n"
 "      _.\$ti = t3;\n"
 "    },\n"
@@ -4919,7 +4784,7 @@
 "    _HashSet: function _HashSet(t0) {\n"
 "      var _ = this;\n"
 "      _._collection\$_length = 0;\n"
-"      _._collection\$_elements = _._collection\$_rest = _._nums = _._strings = null;\n"
+"      _._collection\$_elements = _._collection\$_rest = _._collection\$_nums = _._collection\$_strings = null;\n"
 "      _.\$ti = t0;\n"
 "    },\n"
 "    _HashSetIterator: function _HashSetIterator(t0, t1, t2) {\n"
@@ -4943,7 +4808,7 @@
 "    MapView: function MapView() {\n"
 "    },\n"
 "    UnmodifiableMapView: function UnmodifiableMapView(t0, t1) {\n"
-"      this._collection\$_map = t0;\n"
+"      this._map = t0;\n"
 "      this.\$ti = t1;\n"
 "    },\n"
 "    ListQueue: function ListQueue(t0, t1) {\n"
@@ -5108,7 +4973,7 @@
 "      this._data = null;\n"
 "    },\n"
 "    _JsonMapKeyIterable: function _JsonMapKeyIterable(t0) {\n"
-"      this._parent = t0;\n"
+"      this._convert\$_parent = t0;\n"
 "    },\n"
 "    _Utf8Decoder__decoder_closure: function _Utf8Decoder__decoder_closure() {\n"
 "    },\n"
@@ -6830,7 +6695,7 @@
 "      this.isUtc = t2;\n"
 "    },\n"
 "    Duration: function Duration(t0) {\n"
-"      this._duration = t0;\n"
+"      this.inMicroseconds = t0;\n"
 "    },\n"
 "    _Enum: function _Enum() {\n"
 "    },\n"
@@ -6964,6 +6829,21 @@
 "      }\n"
 "      return _this instanceof type\$.JavaScriptFunction._as(\$constructor);\n"
 "    },\n"
+"    _convertError(error, stackTrace) {\n"
+"      var errorConstructor, t1, box;\n"
+"      if (type\$.Interceptor._is(error))\n"
+"        return error;\n"
+"      errorConstructor = type\$.JavaScriptFunction._as(init.G.Error);\n"
+"      t1 = A.S(error);\n"
+"      t1 = A.callConstructor(errorConstructor, [\"Wrapped Dart error thrown from converted Future. See 'error'and 'stack' properties.\\n\" + t1], type\$.JSObject);\n"
+"      if (type\$.JavaScriptObject._is(error))\n"
+"        A.throwExpression(\"Attempting to box non-Dart object.\");\n"
+"      box = {};\n"
+"      box[\$.\$get\$_jsBoxedDartObjectProperty()] = error;\n"
+"      t1.error = box;\n"
+"      t1.stack = stackTrace.toString\$0(0);\n"
+"      return t1;\n"
+"    },\n"
 "    FutureOfJSAnyToJSPromise_get_toJS(_this, \$T) {\n"
 "      return A._asJSObject(new init.G.Promise(A._functionToJS2(new A.FutureOfJSAnyToJSPromise_get_toJS_closure(_this))));\n"
 "    },\n"
@@ -7509,7 +7389,7 @@
 "    _readStreamBody\$body(request, response, controller) {\n"
 "      var \$async\$goto = 0,\n"
 "        \$async\$completer = A._makeAsyncAwaitCompleter(type\$.void),\n"
-"        \$async\$returnValue, \$async\$handler = 2, \$async\$errorStack = [], chunk, e, s, t2, t3, t4, t5, t6, t7, exception, varData, t8, t9, _box_0, t1, reader, \$async\$exception;\n"
+"        \$async\$returnValue, \$async\$handler = 2, \$async\$errorStack = [], chunk, e, s, t2, t3, t4, t5, exception, t6, t7, _box_0, t1, reader, \$async\$exception;\n"
 "      var \$async\$_readStreamBody = A._wrapJsFunctionForAsync(function(\$async\$errorCode, \$async\$result) {\n"
 "        if (\$async\$errorCode === 1) {\n"
 "          \$async\$errorStack.push(\$async\$result);\n"
@@ -7539,14 +7419,14 @@
 "              _box_0.hadError = _box_0.cancelled = false;\n"
 "              controller.set\$onResume(new A._readStreamBody_closure(_box_0));\n"
 "              controller.set\$onCancel(new A._readStreamBody_closure0(_box_0, reader, request));\n"
-"              t1 = type\$.NativeUint8List, t2 = controller.\$ti, t3 = t2._precomputed1, t4 = type\$.JSObject, t2 = t2._eval\$1(\"_ControllerSubscription<1>\"), t5 = type\$._StreamControllerAddStreamState_nullable_Object, t6 = type\$._Future_void, t7 = type\$._AsyncCompleter_void;\n"
+"              t1 = type\$.NativeUint8List, t2 = controller.\$ti._precomputed1, t3 = type\$.JSObject, t4 = type\$._Future_void, t5 = type\$._AsyncCompleter_void;\n"
 "            case 6:\n"
 "              // for condition\n"
 "              // trivial condition\n"
 "              chunk = null;\n"
 "              \$async\$handler = 9;\n"
 "              \$async\$goto = 12;\n"
-"              return A._asyncAwait(A.promiseToFuture(A._asJSObject(reader.read()), t4), \$async\$_readStreamBody);\n"
+"              return A._asyncAwait(A.promiseToFuture(A._asJSObject(reader.read()), t3), \$async\$_readStreamBody);\n"
 "            case 12:\n"
 "              // returning from await.\n"
 "              chunk = \$async\$result;\n"
@@ -7566,14 +7446,13 @@
 "              // then\n"
 "              _box_0.hadError = true;\n"
 "              t1 = A._toClientException(e, request);\n"
-"              t3 = type\$.nullable_StackTrace._as(s);\n"
-"              t4 = controller._state;\n"
-"              if (t4 >= 4)\n"
+"              t2 = type\$.nullable_StackTrace._as(s);\n"
+"              t3 = controller._state;\n"
+"              if (t3 >= 4)\n"
 "                A.throwExpression(controller._badEventState\$0());\n"
-"              if ((t4 & 1) !== 0) {\n"
-"                varData = controller._varData;\n"
-"                t6 = t2._as((t4 & 8) !== 0 ? t5._as(varData).get\$_varData() : varData);\n"
-"                t6._addError\$2(t1, t3 == null ? B._StringStackTrace_OdL : t3);\n"
+"              if ((t3 & 1) !== 0) {\n"
+"                t3 = controller.get\$_subscription();\n"
+"                t3._addError\$2(t1, t2 == null ? B._StringStackTrace_OdL : t2);\n"
 "              }\n"
 "              \$async\$goto = 15;\n"
 "              return A._asyncAwait(controller.close\$0(), \$async\$_readStreamBody);\n"
@@ -7600,31 +7479,23 @@
 "                \$async\$goto = 7;\n"
 "                break;\n"
 "              } else {\n"
-"                t8 = chunk.value;\n"
-"                t8.toString;\n"
-"                t8 = t3._as(t1._as(t8));\n"
-"                t9 = controller._state;\n"
-"                if (t9 >= 4)\n"
+"                t6 = chunk.value;\n"
+"                t6.toString;\n"
+"                t6 = t2._as(t1._as(t6));\n"
+"                t7 = controller._state;\n"
+"                if (t7 >= 4)\n"
 "                  A.throwExpression(controller._badEventState\$0());\n"
-"                if ((t9 & 1) !== 0) {\n"
-"                  varData = controller._varData;\n"
-"                  t2._as((t9 & 8) !== 0 ? t5._as(varData).get\$_varData() : varData)._add\$1(t8);\n"
-"                }\n"
+"                if ((t7 & 1) !== 0)\n"
+"                  controller.get\$_subscription()._add\$1(t6);\n"
 "              }\n"
-"              t8 = controller._state;\n"
-"              if ((t8 & 1) !== 0) {\n"
-"                varData = controller._varData;\n"
-"                t9 = (t2._as((t8 & 8) !== 0 ? t5._as(varData).get\$_varData() : varData)._state & 4) !== 0;\n"
-"                t8 = t9;\n"
-"              } else\n"
-"                t8 = (t8 & 2) === 0;\n"
-"              \$async\$goto = t8 ? 16 : 17;\n"
+"              t6 = controller._state;\n"
+"              \$async\$goto = ((t6 & 1) !== 0 ? (controller.get\$_subscription()._state & 4) !== 0 : (t6 & 2) === 0) ? 16 : 17;\n"
 "              break;\n"
 "            case 16:\n"
 "              // then\n"
-"              t8 = _box_0.resumeSignal;\n"
+"              t6 = _box_0.resumeSignal;\n"
 "              \$async\$goto = 18;\n"
-"              return A._asyncAwait((t8 == null ? _box_0.resumeSignal = new A._AsyncCompleter(new A._Future(\$.Zone__current, t6), t7) : t8).future, \$async\$_readStreamBody);\n"
+"              return A._asyncAwait((t6 == null ? _box_0.resumeSignal = new A._AsyncCompleter(new A._Future(\$.Zone__current, t4), t5) : t6).future, \$async\$_readStreamBody);\n"
 "            case 18:\n"
 "              // returning from await.\n"
 "            case 17:\n"
@@ -8321,7 +8192,7 @@
 "    },\n"
 "    _wrapZone(callback, \$T) {\n"
 "      var t1 = \$.Zone__current;\n"
-"      if (t1 === B.C__RootZone)\n"
+"      if (t1 === B.Zone_jYP)\n"
 "        return callback;\n"
 "      return t1.bindUnaryCallbackGuarded\$1\$1(callback, \$T);\n"
 "    },\n"
@@ -9085,6 +8956,9 @@
 "    JSArrayExtension_toDartIterable_closure: function JSArrayExtension_toDartIterable_closure(t0) {\n"
 "      this.T = t0;\n"
 "    },\n"
+"    unmangleGlobalNameIfPreservedAnyways(\$name) {\n"
+"      return init.mangledGlobalNames[\$name];\n"
+"    },\n"
 "    printString(string) {\n"
 "      if (typeof dartPrint == \"function\") {\n"
 "        dartPrint(string);\n"
@@ -9100,9 +8974,6 @@
 "      }\n"
 "      throw \"Unable to print message: \" + String(string);\n"
 "    },\n"
-"    JSFunctionUnsafeUtilExtension_callAsConstructor(_this, arg1, \$R) {\n"
-"      return \$R._as(A.callConstructor(_this, [arg1], type\$.JSObject));\n"
-"    },\n"
 "    groupBy(values, key, \$S, \$T) {\n"
 "      var t1, _i, element, t2, t3,\n"
 "        map = A.LinkedHashMap_LinkedHashMap\$_empty(\$T, \$S._eval\$1(\"List<0>\"));\n"
@@ -9137,7 +9008,7 @@
 "    },\n"
 "    encodingForContentTypeHeader(contentTypeHeader) {\n"
 "      var t1,\n"
-"        charset = contentTypeHeader.parameters._collection\$_map.\$index(0, \"charset\");\n"
+"        charset = contentTypeHeader.parameters._map.\$index(0, \"charset\");\n"
 "      if (contentTypeHeader.type === \"application\" && contentTypeHeader.subtype === \"json\" && charset == null)\n"
 "        return B.C_Utf8Codec;\n"
 "      if (charset != null) {\n"
@@ -9828,12 +9699,6 @@
 "        return result;\n"
 "      return result + other;\n"
 "    },\n"
-"    \$tdiv(receiver, other) {\n"
-"      if ((receiver | 0) === receiver)\n"
-"        if (other >= 1 || other < -1)\n"
-"          return receiver / other | 0;\n"
-"      return this._tdivSlow\$1(receiver, other);\n"
-"    },\n"
 "    _tdivFast\$1(receiver, other) {\n"
 "      return (receiver | 0) === receiver ? receiver / other | 0 : this._tdivSlow\$1(receiver, other);\n"
 "    },\n"
@@ -10068,20 +9933,30 @@
 "      return this.__internal\$_source.cancel\$0();\n"
 "    },\n"
 "    onData\$1(handleData) {\n"
-"      var t1 = this.\$ti;\n"
+"      var t2,\n"
+"        t1 = this.\$ti;\n"
 "      t1._eval\$1(\"~(2)?\")._as(handleData);\n"
-"      this.__internal\$_handleData = handleData == null ? null : this.__internal\$_zone.registerUnaryCallback\$2\$1(handleData, type\$.dynamic, t1._rest[1]);\n"
+"      if (handleData == null)\n"
+"        t1 = null;\n"
+"      else {\n"
+"        t2 = this.__internal\$_zone;\n"
+"        t1 = t1._rest[1];\n"
+"        t1 = t2._registerUnaryCallbackZoned\$2\$2(t2, type\$.\$env_1_1_dynamic._bind\$1(t1)._eval\$1(\"1(2)\")._as(handleData), type\$.dynamic, t1);\n"
+"      }\n"
+"      this.__internal\$_handleData = t1;\n"
 "    },\n"
 "    onError\$1(handleError) {\n"
-"      var _this = this;\n"
+"      var t1, _this = this;\n"
 "      _this.__internal\$_source.onError\$1(handleError);\n"
 "      if (handleError == null)\n"
 "        _this.__internal\$_handleError = null;\n"
-"      else if (type\$.void_Function_Object_StackTrace._is(handleError))\n"
-"        _this.__internal\$_handleError = _this.__internal\$_zone.registerBinaryCallback\$3\$1(handleError, type\$.dynamic, type\$.Object, type\$.StackTrace);\n"
-"      else if (type\$.void_Function_Object._is(handleError))\n"
-"        _this.__internal\$_handleError = _this.__internal\$_zone.registerUnaryCallback\$2\$1(handleError, type\$.dynamic, type\$.Object);\n"
-"      else\n"
+"      else if (type\$.void_Function_Object_StackTrace._is(handleError)) {\n"
+"        t1 = _this.__internal\$_zone;\n"
+"        _this.__internal\$_handleError = t1._registerBinaryCallbackZoned\$3\$2(t1, type\$.dynamic_Function_Object_StackTrace._as(handleError), type\$.dynamic, type\$.Object, type\$.StackTrace);\n"
+"      } else if (type\$.void_Function_Object._is(handleError)) {\n"
+"        t1 = _this.__internal\$_zone;\n"
+"        _this.__internal\$_handleError = t1._registerUnaryCallbackZoned\$2\$2(t1, type\$.dynamic_Function_Object._as(handleError), type\$.dynamic, type\$.Object);\n"
+"      } else\n"
 "        throw A.wrapException(A.ArgumentError\$(string\$.handle, null));\n"
 "    },\n"
 "    __internal\$_onData\$1(data) {\n"
@@ -10098,9 +9973,10 @@
 "        error = A.unwrapException(exception);\n"
 "        stack = A.getTraceFromException(exception);\n"
 "        handleError = _this.__internal\$_handleError;\n"
-"        if (handleError == null)\n"
-"          _this.__internal\$_zone.handleUncaughtError\$2(error, stack);\n"
-"        else {\n"
+"        if (handleError == null) {\n"
+"          t1 = _this.__internal\$_zone;\n"
+"          t1._handleUncaughtErrorZoned\$3(t1, A._asObject(error), type\$.StackTrace._as(stack));\n"
+"        } else {\n"
 "          t1 = type\$.Object;\n"
 "          t2 = _this.__internal\$_zone;\n"
 "          if (type\$.void_Function_Object_StackTrace._is(handleError))\n"
@@ -10770,7 +10646,7 @@
 "    get\$length(_) {\n"
 "      return this._values.length;\n"
 "    },\n"
-"    get\$__js_helper\$_keys() {\n"
+"    get\$_keys() {\n"
 "      var keys = this.\$keys;\n"
 "      if (keys == null) {\n"
 "        keys = Object.keys(this._jsIndex);\n"
@@ -10793,13 +10669,13 @@
 "    forEach\$1(_, f) {\n"
 "      var keys, values, t1, i;\n"
 "      this.\$ti._eval\$1(\"~(1,2)\")._as(f);\n"
-"      keys = this.get\$__js_helper\$_keys();\n"
+"      keys = this.get\$_keys();\n"
 "      values = this._values;\n"
 "      for (t1 = keys.length, i = 0; i < t1; ++i)\n"
 "        f.call\$2(keys[i], values[i]);\n"
 "    },\n"
 "    get\$keys() {\n"
-"      return new A._KeysOrValues(this.get\$__js_helper\$_keys(), this.\$ti._eval\$1(\"_KeysOrValues<1>\"));\n"
+"      return new A._KeysOrValues(this.get\$_keys(), this.\$ti._eval\$1(\"_KeysOrValues<1>\"));\n"
 "    }\n"
 "  };\n"
 "  A._KeysOrValues.prototype = {\n"
@@ -10853,9 +10729,6 @@
 "    call\$2(a0, a1) {\n"
 "      return this._genericClosure.call\$1\$2(a0, a1, this.\$ti._rest[0]);\n"
 "    },\n"
-"    call\$4(a0, a1, a2, a3) {\n"
-"      return this._genericClosure.call\$1\$4(a0, a1, a2, a3, this.\$ti._rest[0]);\n"
-"    },\n"
 "    \$signature() {\n"
 "      return A.instantiatedGenericFunctionType(A.closureFunctionType(this._genericClosure), this.\$ti);\n"
 "    }\n"
@@ -10996,12 +10869,12 @@
 "    containsKey\$1(key) {\n"
 "      var strings, nums;\n"
 "      if (typeof key == \"string\") {\n"
-"        strings = this.__js_helper\$_strings;\n"
+"        strings = this._strings;\n"
 "        if (strings == null)\n"
 "          return false;\n"
 "        return strings[key] != null;\n"
 "      } else if (typeof key == \"number\" && (key & 0x3fffffff) === key) {\n"
-"        nums = this.__js_helper\$_nums;\n"
+"        nums = this._nums;\n"
 "        if (nums == null)\n"
 "          return false;\n"
 "        return nums[key] != null;\n"
@@ -11012,19 +10885,19 @@
 "      var rest = this.__js_helper\$_rest;\n"
 "      if (rest == null)\n"
 "        return false;\n"
-"      return this.internalFindBucketIndex\$2(rest[this.internalComputeHashCode\$1(key)], key) >= 0;\n"
+"      return this.internalFindBucketIndex\$2(this._getBucket\$2(rest, key), key) >= 0;\n"
 "    },\n"
 "    \$index(_, key) {\n"
 "      var strings, cell, t1, nums, _null = null;\n"
 "      if (typeof key == \"string\") {\n"
-"        strings = this.__js_helper\$_strings;\n"
+"        strings = this._strings;\n"
 "        if (strings == null)\n"
 "          return _null;\n"
 "        cell = strings[key];\n"
 "        t1 = cell == null ? _null : cell.hashMapCellValue;\n"
 "        return t1;\n"
 "      } else if (typeof key == \"number\" && (key & 0x3fffffff) === key) {\n"
-"        nums = this.__js_helper\$_nums;\n"
+"        nums = this._nums;\n"
 "        if (nums == null)\n"
 "          return _null;\n"
 "        cell = nums[key];\n"
@@ -11038,7 +10911,7 @@
 "        rest = this.__js_helper\$_rest;\n"
 "      if (rest == null)\n"
 "        return null;\n"
-"      bucket = rest[this.internalComputeHashCode\$1(key)];\n"
+"      bucket = this._getBucket\$2(rest, key);\n"
 "      index = this.internalFindBucketIndex\$2(bucket, key);\n"
 "      if (index < 0)\n"
 "        return null;\n"
@@ -11050,11 +10923,11 @@
 "      t1._precomputed1._as(key);\n"
 "      t1._rest[1]._as(value);\n"
 "      if (typeof key == \"string\") {\n"
-"        strings = _this.__js_helper\$_strings;\n"
-"        _this._addHashTableEntry\$3(strings == null ? _this.__js_helper\$_strings = _this._newHashTable\$0() : strings, key, value);\n"
+"        strings = _this._strings;\n"
+"        _this._addHashTableEntry\$3(strings == null ? _this._strings = _this._newHashTable\$0() : strings, key, value);\n"
 "      } else if (typeof key == \"number\" && (key & 0x3fffffff) === key) {\n"
-"        nums = _this.__js_helper\$_nums;\n"
-"        _this._addHashTableEntry\$3(nums == null ? _this.__js_helper\$_nums = _this._newHashTable\$0() : nums, key, value);\n"
+"        nums = _this._nums;\n"
+"        _this._addHashTableEntry\$3(nums == null ? _this._nums = _this._newHashTable\$0() : nums, key, value);\n"
 "      } else\n"
 "        _this.internalSet\$2(key, value);\n"
 "    },\n"
@@ -11136,6 +11009,9 @@
 "    internalComputeHashCode\$1(key) {\n"
 "      return J.get\$hashCode\$(key) & 1073741823;\n"
 "    },\n"
+"    _getBucket\$2(table, key) {\n"
+"      return table[this.internalComputeHashCode\$1(key)];\n"
+"    },\n"
 "    internalFindBucketIndex\$2(bucket, key) {\n"
 "      var \$length, i;\n"
 "      if (bucket == null)\n"
@@ -11289,13 +11165,13 @@
 "    call\$2(o, tag) {\n"
 "      return this.getUnknownTag(o, tag);\n"
 "    },\n"
-"    \$signature: 58\n"
+"    \$signature: 59\n"
 "  };\n"
 "  A.initHooks_closure1.prototype = {\n"
 "    call\$1(tag) {\n"
 "      return this.prototypeForTag(A._asString(tag));\n"
 "    },\n"
-"    \$signature: 55\n"
+"    \$signature: 58\n"
 "  };\n"
 "  A._Record.prototype = {\n"
 "    get\$runtimeType(_) {\n"
@@ -11813,7 +11689,7 @@
 "      t2 = this.span;\n"
 "      t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2);\n"
 "    },\n"
-"    \$signature: 90\n"
+"    \$signature: 41\n"
 "  };\n"
 "  A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = {\n"
 "    call\$0() {\n"
@@ -11834,12 +11710,6 @@
 "      else\n"
 "        throw A.wrapException(A.UnsupportedError\$(\"`setTimeout()` not found.\"));\n"
 "    },\n"
-"    _TimerImpl\$periodic\$2(milliseconds, callback) {\n"
-"      if (self.setTimeout != null)\n"
-"        this._handle = self.setInterval(A.convertDartClosureToJS(new A._TimerImpl\$periodic_closure(this, milliseconds, Date.now(), callback), 0), milliseconds);\n"
-"      else\n"
-"        throw A.wrapException(A.UnsupportedError\$(\"Periodic timer.\"));\n"
-"    },\n"
 "    get\$isActive() {\n"
 "      return this._handle != null;\n"
 "    },\n"
@@ -11848,10 +11718,7 @@
 "        var t1 = this._handle;\n"
 "        if (t1 == null)\n"
 "          return;\n"
-"        if (this._once)\n"
-"          self.clearTimeout(t1);\n"
-"        else\n"
-"          self.clearInterval(t1);\n"
+"        self.clearTimeout(t1);\n"
 "        this._handle = null;\n"
 "      } else\n"
 "        throw A.wrapException(A.UnsupportedError\$(\"Canceling a timer.\"));\n"
@@ -11860,29 +11727,11 @@
 "  };\n"
 "  A._TimerImpl_internalCallback.prototype = {\n"
 "    call\$0() {\n"
-"      var t1 = this.\$this;\n"
-"      t1._handle = null;\n"
-"      t1._tick = 1;\n"
+"      this.\$this._handle = null;\n"
 "      this.callback.call\$0();\n"
 "    },\n"
 "    \$signature: 0\n"
 "  };\n"
-"  A._TimerImpl\$periodic_closure.prototype = {\n"
-"    call\$0() {\n"
-"      var duration, _this = this,\n"
-"        t1 = _this.\$this,\n"
-"        tick = t1._tick + 1,\n"
-"        t2 = _this.milliseconds;\n"
-"      if (t2 > 0) {\n"
-"        duration = Date.now() - _this.start;\n"
-"        if (duration > (tick + 1) * t2)\n"
-"          tick = B.JSInt_methods.\$tdiv(duration, t2);\n"
-"      }\n"
-"      t1._tick = tick;\n"
-"      _this.callback.call\$1(t1);\n"
-"    },\n"
-"    \$signature: 1\n"
-"  };\n"
 "  A._AsyncAwaitCompleter.prototype = {\n"
 "    complete\$1(value) {\n"
 "      var t2, _this = this,\n"
@@ -11913,19 +11762,19 @@
 "    call\$1(result) {\n"
 "      return this.bodyFunction.call\$2(0, result);\n"
 "    },\n"
-"    \$signature: 4\n"
+"    \$signature: 3\n"
 "  };\n"
 "  A._awaitOnObject_closure0.prototype = {\n"
 "    call\$2(error, stackTrace) {\n"
 "      this.bodyFunction.call\$2(1, new A.ExceptionAndStackTrace(error, type\$.StackTrace._as(stackTrace)));\n"
 "    },\n"
-"    \$signature: 41\n"
+"    \$signature: 43\n"
 "  };\n"
 "  A._wrapJsFunctionForAsync_closure.prototype = {\n"
 "    call\$2(errorCode, result) {\n"
 "      this.\$protected(A._asInt(errorCode), result);\n"
 "    },\n"
-"    \$signature: 43\n"
+"    \$signature: 53\n"
 "  };\n"
 "  A.AsyncError.prototype = {\n"
 "    toString\$0(_) {\n"
@@ -12011,9 +11860,11 @@
 "  };\n"
 "  A._FutureListener.prototype = {\n"
 "    matchesErrorTest\$1(asyncError) {\n"
+"      var t1;\n"
 "      if ((this.state & 15) !== 6)\n"
 "        return true;\n"
-"      return this.result._zone.runUnary\$2\$2(type\$.bool_Function_Object._as(this.callback), asyncError.error, type\$.bool, type\$.Object);\n"
+"      t1 = this.result._zone;\n"
+"      return t1._runUnaryZoned\$2\$3(t1, type\$.bool_Function_Object._as(this.callback), asyncError.error, type\$.bool, type\$.Object);\n"
 "    },\n"
 "    handleError\$1(asyncError) {\n"
 "      var exception, _this = this,\n"
@@ -12024,9 +11875,9 @@
 "        t3 = asyncError.error,\n"
 "        t4 = _this.result._zone;\n"
 "      if (type\$.dynamic_Function_Object_StackTrace._is(errorCallback))\n"
-"        result = t4.runBinary\$3\$3(errorCallback, t3, asyncError.stackTrace, t1, t2, type\$.StackTrace);\n"
+"        result = t4._runBinaryZoned\$3\$4(t4, errorCallback, t3, asyncError.stackTrace, t1, t2, type\$.StackTrace);\n"
 "      else\n"
-"        result = t4.runUnary\$2\$2(type\$.dynamic_Function_Object._as(errorCallback), t3, t1, t2);\n"
+"        result = t4._runUnaryZoned\$2\$3(t4, type\$.dynamic_Function_Object._as(errorCallback), t3, t1, t2);\n"
 "      try {\n"
 "        t1 = _this.\$ti._eval\$1(\"2/\")._as(result);\n"
 "        return t1;\n"
@@ -12042,15 +11893,16 @@
 "  };\n"
 "  A._Future.prototype = {\n"
 "    then\$1\$2\$onError(f, onError, \$R) {\n"
-"      var currentZone, result, t2,\n"
+"      var currentZone, t2, result,\n"
 "        t1 = this.\$ti;\n"
 "      t1._bind\$1(\$R)._eval\$1(\"1/(2)\")._as(f);\n"
 "      currentZone = \$.Zone__current;\n"
-"      if (currentZone === B.C__RootZone) {\n"
+"      if (currentZone === B.Zone_jYP) {\n"
 "        if (onError != null && !type\$.dynamic_Function_Object_StackTrace._is(onError) && !type\$.dynamic_Function_Object._is(onError))\n"
 "          throw A.wrapException(A.ArgumentError\$value(onError, \"onError\", string\$.Error_));\n"
 "      } else {\n"
-"        f = currentZone.registerUnaryCallback\$2\$1(f, \$R._eval\$1(\"0/\"), t1._precomputed1);\n"
+"        t2 = t1._precomputed1;\n"
+"        f = currentZone._registerUnaryCallbackZoned\$2\$2(currentZone, \$R._eval\$1(\"@<0/>\")._bind\$1(t2)._eval\$1(\"1(2)\")._as(f), \$R._eval\$1(\"0/\"), t2);\n"
 "        if (onError != null)\n"
 "          onError = A._registerErrorHandler(onError, currentZone);\n"
 "      }\n"
@@ -12072,21 +11924,21 @@
 "    },\n"
 "    catchError\$1(onError) {\n"
 "      var t1 = this.\$ti,\n"
-"        t2 = \$.Zone__current,\n"
-"        result = new A._Future(t2, t1);\n"
-"      if (t2 !== B.C__RootZone)\n"
-"        onError = A._registerErrorHandler(onError, t2);\n"
+"        resultZone = \$.Zone__current,\n"
+"        result = new A._Future(resultZone, t1);\n"
+"      if (resultZone !== B.Zone_jYP)\n"
+"        onError = A._registerErrorHandler(onError, resultZone);\n"
 "      this._addListener\$1(new A._FutureListener(result, 2, null, onError, t1._eval\$1(\"_FutureListener<1,1>\")));\n"
 "      return result;\n"
 "    },\n"
 "    whenComplete\$1(action) {\n"
-"      var t1, t2, result;\n"
+"      var t1, resultZone, result;\n"
 "      type\$.dynamic_Function._as(action);\n"
 "      t1 = this.\$ti;\n"
-"      t2 = \$.Zone__current;\n"
-"      result = new A._Future(t2, t1);\n"
-"      if (t2 !== B.C__RootZone)\n"
-"        action = t2.registerCallback\$1\$1(action, type\$.dynamic);\n"
+"      resultZone = \$.Zone__current;\n"
+"      result = new A._Future(resultZone, t1);\n"
+"      if (resultZone !== B.Zone_jYP)\n"
+"        action = resultZone._registerCallbackZoned\$1\$2(resultZone, action, type\$.dynamic);\n"
 "      this._addListener\$1(new A._FutureListener(result, 8, action, null, t1._eval\$1(\"_FutureListener<1,1>\")));\n"
 "      return result;\n"
 "    },\n"
@@ -12113,7 +11965,8 @@
 "          }\n"
 "          _this._cloneResult\$1(source);\n"
 "        }\n"
-"        _this._zone.scheduleMicrotask\$1(new A._Future__addListener_closure(_this, listener));\n"
+"        t1 = _this._zone;\n"
+"        t1._scheduleMicrotaskZoned\$2(t1, new A._Future__addListener_closure(_this, listener));\n"
 "      }\n"
 "    },\n"
 "    _prependListeners\$1(listeners) {\n"
@@ -12141,7 +11994,8 @@
 "          _this._cloneResult\$1(source);\n"
 "        }\n"
 "        _box_0.listeners = _this._reverseListeners\$1(listeners);\n"
-"        _this._zone.scheduleMicrotask\$1(new A._Future__prependListeners_closure(_box_0, _this));\n"
+"        t1 = _this._zone;\n"
+"        t1._scheduleMicrotaskZoned\$2(t1, new A._Future__prependListeners_closure(_box_0, _this));\n"
 "      }\n"
 "    },\n"
 "    _removeListeners\$0() {\n"
@@ -12180,14 +12034,8 @@
 "      A._Future__propagateToListeners(_this, listeners);\n"
 "    },\n"
 "    _completeWithResultOf\$1(source) {\n"
-"      var t1, t2, listeners, _this = this;\n"
-"      if ((source._state & 16) !== 0) {\n"
-"        t1 = _this._zone;\n"
-"        t2 = source._zone;\n"
-"        t1 = !(t1 === t2 || t1.get\$errorZone() === t2.get\$errorZone());\n"
-"      } else\n"
-"        t1 = false;\n"
-"      if (t1)\n"
+"      var listeners, _this = this;\n"
+"      if ((source._state & 16) !== 0 && _this._zone._handleUncaughtErrorFunction != source._zone._handleUncaughtErrorFunction)\n"
 "        return;\n"
 "      listeners = _this._removeListeners\$0();\n"
 "      _this._cloneResult\$1(source);\n"
@@ -12213,18 +12061,21 @@
 "      this._asyncCompleteWithValue\$1(value);\n"
 "    },\n"
 "    _asyncCompleteWithValue\$1(value) {\n"
-"      var _this = this;\n"
+"      var t1, _this = this;\n"
 "      _this.\$ti._precomputed1._as(value);\n"
 "      _this._state ^= 2;\n"
-"      _this._zone.scheduleMicrotask\$1(new A._Future__asyncCompleteWithValue_closure(_this, value));\n"
+"      t1 = _this._zone;\n"
+"      t1._scheduleMicrotaskZoned\$2(t1, new A._Future__asyncCompleteWithValue_closure(_this, value));\n"
 "    },\n"
 "    _chainFuture\$1(value) {\n"
 "      A._Future__chainCoreFuture(this.\$ti._eval\$1(\"Future<1>\")._as(value), this, false);\n"
 "      return;\n"
 "    },\n"
 "    _asyncCompleteErrorObject\$1(error) {\n"
+"      var t1;\n"
 "      this._state ^= 2;\n"
-"      this._zone.scheduleMicrotask\$1(new A._Future__asyncCompleteErrorObject_closure(this, error));\n"
+"      t1 = this._zone;\n"
+"      t1._scheduleMicrotaskZoned\$2(t1, new A._Future__asyncCompleteErrorObject_closure(this, error));\n"
 "    },\n"
 "    timeout\$2\$onTimeout(timeLimit, onTimeout) {\n"
 "      var t3, _future, _this = this, t1 = {},\n"
@@ -12238,7 +12089,7 @@
 "      t3 = \$.Zone__current;\n"
 "      _future = new A._Future(t3, t2);\n"
 "      t1.timer = null;\n"
-"      t1.timer = A.Timer_Timer(timeLimit, new A._Future_timeout_closure(_this, _future, t3, t3.registerCallback\$1\$1(onTimeout, t2._eval\$1(\"1/\"))));\n"
+"      t1.timer = A.Timer_Timer(timeLimit, new A._Future_timeout_closure(_this, _future, t3, t3._registerCallbackZoned\$1\$2(t3, t2._eval\$1(\"1/()\")._as(onTimeout), t2._eval\$1(\"1/\"))));\n"
 "      _this.then\$1\$2\$onError(new A._Future_timeout_closure0(t1, _this, _future), new A._Future_timeout_closure1(t1, _future), type\$.Null);\n"
 "      return _future;\n"
 "    },\n"
@@ -12276,10 +12127,11 @@
 "  };\n"
 "  A._Future__propagateToListeners_handleWhenCompleteCallback.prototype = {\n"
 "    call\$0() {\n"
-"      var e, s, t1, exception, t2, t3, originalSource, joinedResult, _this = this, completeResult = null;\n"
+"      var e, s, t1, t2, exception, t3, originalSource, joinedResult, _this = this, completeResult = null;\n"
 "      try {\n"
 "        t1 = _this._box_0.listener;\n"
-"        completeResult = t1.result._zone.run\$1\$1(type\$.dynamic_Function._as(t1.callback), type\$.dynamic);\n"
+"        t2 = t1.result._zone;\n"
+"        completeResult = t2._runZoned\$1\$2(t2, type\$.dynamic_Function._as(t1.callback), type\$.dynamic);\n"
 "      } catch (exception) {\n"
 "        e = A.unwrapException(exception);\n"
 "        s = A.getTraceFromException(exception);\n"
@@ -12329,18 +12181,19 @@
 "      type\$.StackTrace._as(s);\n"
 "      this.joinedResult._completeErrorObject\$1(new A.AsyncError(e, s));\n"
 "    },\n"
-"    \$signature: 3\n"
+"    \$signature: 4\n"
 "  };\n"
 "  A._Future__propagateToListeners_handleValueCallback.prototype = {\n"
 "    call\$0() {\n"
-"      var e, s, t1, t2, t3, t4, t5, exception;\n"
+"      var e, s, t1, t2, t3, t4, t5, t6, exception;\n"
 "      try {\n"
 "        t1 = this._box_0;\n"
 "        t2 = t1.listener;\n"
 "        t3 = t2.\$ti;\n"
 "        t4 = t3._precomputed1;\n"
 "        t5 = t4._as(this.sourceResult);\n"
-"        t1.listenerValueOrError = t2.result._zone.runUnary\$2\$2(t3._eval\$1(\"2/(1)\")._as(t2.callback), t5, t3._eval\$1(\"2/\"), t4);\n"
+"        t6 = t2.result._zone;\n"
+"        t1.listenerValueOrError = t6._runUnaryZoned\$2\$3(t6, t3._eval\$1(\"2/(1)\")._as(t2.callback), t5, t3._eval\$1(\"2/\"), t4);\n"
 "      } catch (exception) {\n"
 "        e = A.unwrapException(exception);\n"
 "        s = A.getTraceFromException(exception);\n"
@@ -12389,9 +12242,11 @@
 "  };\n"
 "  A._Future_timeout_closure.prototype = {\n"
 "    call\$0() {\n"
-"      var e, s, exception, t1, t2, _this = this;\n"
+"      var e, s, t1, t2, exception, _this = this;\n"
 "      try {\n"
-"        _this._future._complete\$1(_this.zone.run\$1\$1(_this.onTimeoutHandler, _this.\$this.\$ti._eval\$1(\"1/\")));\n"
+"        t1 = _this.zone;\n"
+"        t2 = _this.\$this.\$ti;\n"
+"        _this._future._complete\$1(t1._runZoned\$1\$2(t1, t2._eval\$1(\"1/()\")._as(_this.onTimeoutHandler), t2._eval\$1(\"1/\")));\n"
 "      } catch (exception) {\n"
 "        e = A.unwrapException(exception);\n"
 "        s = A.getTraceFromException(exception);\n"
@@ -12429,7 +12284,7 @@
 "        this._future._completeErrorObject\$1(new A.AsyncError(e, s));\n"
 "      }\n"
 "    },\n"
-"    \$signature: 3\n"
+"    \$signature: 4\n"
 "  };\n"
 "  A._AsyncCallbackEntry.prototype = {};\n"
 "  A.Stream.prototype = {\n"
@@ -12578,7 +12433,7 @@
 "      t5 = A._BufferingStreamSubscription__registerDataHandler(t2, onData, t1._precomputed1);\n"
 "      t6 = A._BufferingStreamSubscription__registerErrorHandler(t2, onError);\n"
 "      t7 = onDone == null ? A.async___nullDoneHandler\$closure() : onDone;\n"
-"      subscription = new A._ControllerSubscription(_this, t5, t6, t2.registerCallback\$1\$1(t7, type\$.void), t2, t3 | t4, t1._eval\$1(\"_ControllerSubscription<1>\"));\n"
+"      subscription = new A._ControllerSubscription(_this, t5, t6, t2._registerCallbackZoned\$1\$2(t2, type\$.void_Function._as(t7), type\$.void), t2, t3 | t4, t1._eval\$1(\"_ControllerSubscription<1>\"));\n"
 "      pendingEvents = _this.get\$_pendingEvents();\n"
 "      if (((_this._state |= 1) & 8) !== 0) {\n"
 "        addState = t1._eval\$1(\"_StreamControllerAddStreamState<1>\")._as(_this._varData);\n"
@@ -12959,7 +12814,7 @@
 "      else\n"
 "        t1._completeErrorObject\$1(new A.AsyncError(error, stackTrace));\n"
 "    },\n"
-"    \$signature: 3\n"
+"    \$signature: 4\n"
 "  };\n"
 "  A._BufferingStreamSubscription_asFuture__closure.prototype = {\n"
 "    call\$0() {\n"
@@ -13154,7 +13009,7 @@
 "      t1 = new A._DoneStreamSubscription(t2, t1._eval\$1(\"_DoneStreamSubscription<1>\"));\n"
 "      A.scheduleMicrotask(t1.get\$_onMicrotask());\n"
 "      if (onDone != null)\n"
-"        t1._onDone = t2.registerCallback\$1\$1(onDone, type\$.void);\n"
+"        t1._onDone = t2._registerCallbackZoned\$1\$2(t2, type\$.void_Function._as(onDone), type\$.void);\n"
 "      return t1;\n"
 "    },\n"
 "    listen\$3\$onDone\$onError(onData, onDone, onError) {\n"
@@ -13220,7 +13075,7 @@
 "      t5 = A._BufferingStreamSubscription__registerDataHandler(t2, onData, t1._rest[1]);\n"
 "      t6 = A._BufferingStreamSubscription__registerErrorHandler(t2, onError);\n"
 "      t7 = onDone == null ? A.async___nullDoneHandler\$closure() : onDone;\n"
-"      t1 = new A._ForwardingStreamSubscription(this, t5, t6, t2.registerCallback\$1\$1(t7, type\$.void), t2, t3 | t4, t1._eval\$1(\"_ForwardingStreamSubscription<1,2>\"));\n"
+"      t1 = new A._ForwardingStreamSubscription(this, t5, t6, t2._registerCallbackZoned\$1\$2(t2, type\$.void_Function._as(t7), type\$.void), t2, t3 | t4, t1._eval\$1(\"_ForwardingStreamSubscription<1,2>\"));\n"
 "      t1._subscription = this._source.listen\$3\$onDone\$onError(t1.get\$_handleData(), t1.get\$_handleDone(), t1.get\$_handleError());\n"
 "      return t1;\n"
 "    },\n"
@@ -13302,480 +13157,276 @@
 "      sink._add\$1(outputEvent);\n"
 "    }\n"
 "  };\n"
-"  A._ZoneFunction.prototype = {};\n"
-"  A._Zone.prototype = {\n"
-"    _processUncaughtError\$3(zone, error, stackTrace) {\n"
-"      var implZone, handler, parentDelegate, parentZone, currentZone, e, s, implementation, t1, exception;\n"
+"  A._ZoneHandleUncaughtError.prototype = {};\n"
+"  A.Zone.prototype = {\n"
+"    run\$1\$1(action, \$R) {\n"
+"      return this._runZoned\$1\$2(this, \$R._eval\$1(\"0()\")._as(action), \$R);\n"
+"    },\n"
+"    runGuarded\$1(action) {\n"
+"      var e, s, t1, exception, _this = this;\n"
+"      type\$.void_Function._as(action);\n"
+"      try {\n"
+"        t1 = _this._runZoned\$1\$2(_this, action, type\$.void);\n"
+"        return t1;\n"
+"      } catch (exception) {\n"
+"        e = A.unwrapException(exception);\n"
+"        s = A.getTraceFromException(exception);\n"
+"        _this._handleUncaughtErrorZoned\$3(_this, e, s);\n"
+"      }\n"
+"    },\n"
+"    runUnaryGuarded\$1\$2(action, argument, \$T) {\n"
+"      var e, s, t1, exception, _this = this;\n"
+"      \$T._eval\$1(\"~(0)\")._as(action);\n"
+"      \$T._as(argument);\n"
+"      try {\n"
+"        t1 = _this._runUnaryZoned\$2\$3(_this, action, argument, type\$.void, \$T);\n"
+"        return t1;\n"
+"      } catch (exception) {\n"
+"        e = A.unwrapException(exception);\n"
+"        s = A.getTraceFromException(exception);\n"
+"        _this._handleUncaughtErrorZoned\$3(_this, e, s);\n"
+"      }\n"
+"    },\n"
+"    runBinaryGuarded\$2\$3(action, argument1, argument2, \$T1, \$T2) {\n"
+"      var e, s, t1, exception, _this = this;\n"
+"      \$T1._eval\$1(\"@<0>\")._bind\$1(\$T2)._eval\$1(\"~(1,2)\")._as(action);\n"
+"      \$T1._as(argument1);\n"
+"      \$T2._as(argument2);\n"
+"      try {\n"
+"        t1 = _this._runBinaryZoned\$3\$4(_this, action, argument1, argument2, type\$.void, \$T1, \$T2);\n"
+"        return t1;\n"
+"      } catch (exception) {\n"
+"        e = A.unwrapException(exception);\n"
+"        s = A.getTraceFromException(exception);\n"
+"        _this._handleUncaughtErrorZoned\$3(_this, e, s);\n"
+"      }\n"
+"    },\n"
+"    bindCallback\$1\$1(callback, \$R) {\n"
+"      return new A.Zone_bindCallback_closure(this, this._registerCallbackZoned\$1\$2(this, \$R._eval\$1(\"0()\")._as(callback), \$R), \$R);\n"
+"    },\n"
+"    bindCallbackGuarded\$1(callback) {\n"
+"      return new A.Zone_bindCallbackGuarded_closure(this, this._registerCallbackZoned\$1\$2(this, type\$.void_Function._as(callback), type\$.void));\n"
+"    },\n"
+"    bindUnaryCallbackGuarded\$1\$1(callback, \$T) {\n"
+"      return new A.Zone_bindUnaryCallbackGuarded_closure(this, this._registerUnaryCallbackZoned\$2\$2(this, \$T._eval\$1(\"~(0)\")._as(callback), type\$.void, \$T), \$T);\n"
+"    },\n"
+"    get\$_parentDelegate() {\n"
+"      var t1 = this._parent;\n"
+"      t1 = t1 == null ? null : t1._delegate;\n"
+"      return t1 == null ? \$.\$get\$_rootDelegate() : t1;\n"
+"    },\n"
+"    _handleUncaughtErrorZoned\$3(zone, error, stackTrace) {\n"
+"      var implementation, implZone, parentZone, currentZone, e, s, t1, exception;\n"
 "      type\$.StackTrace._as(stackTrace);\n"
-"      implementation = this.get\$_handleUncaughtError();\n"
-"      implZone = implementation.zone;\n"
-"      if (implZone === B.C__RootZone) {\n"
-"        A._rootHandleError(error, stackTrace);\n"
+"      implementation = this._handleUncaughtErrorFunction;\n"
+"      if (implementation == null) {\n"
+"        A._rootHandleUncaughtError(error, stackTrace);\n"
 "        return;\n"
 "      }\n"
-"      handler = implementation.\$function;\n"
-"      parentDelegate = implZone.get\$_parentDelegate();\n"
-"      t1 = implZone.get\$parent();\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone._parent;\n"
 "      t1.toString;\n"
 "      parentZone = t1;\n"
 "      currentZone = \$.Zone__current;\n"
 "      try {\n"
 "        \$.Zone__current = parentZone;\n"
-"        handler.call\$5(implZone, parentDelegate, zone, error, stackTrace);\n"
+"        t1 = implZone.get\$_parentDelegate();\n"
+"        implementation.\$function.call\$5(implZone, t1, zone, error, stackTrace);\n"
 "        \$.Zone__current = currentZone;\n"
 "      } catch (exception) {\n"
 "        e = A.unwrapException(exception);\n"
 "        s = A.getTraceFromException(exception);\n"
 "        \$.Zone__current = currentZone;\n"
 "        t1 = error === e ? stackTrace : s;\n"
-"        parentZone._processUncaughtError\$3(implZone, e, t1);\n"
+"        parentZone._handleUncaughtErrorZoned\$3(implZone, e, t1);\n"
 "      }\n"
 "    },\n"
-"    \$isZone: 1\n"
-"  };\n"
-"  A._CustomZone.prototype = {\n"
-"    get\$_delegate() {\n"
-"      var t1 = this._delegateCache;\n"
-"      return t1 == null ? this._delegateCache = new A._ZoneDelegate(this) : t1;\n"
+"    _forkZoned\$3(zone, specification, zoneValues) {\n"
+"      var implZone, t1,\n"
+"        implementation = this._forkFunction;\n"
+"      if (implementation == null)\n"
+"        return A._rootFork(zone, specification, zoneValues);\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$5(implZone, t1, zone, specification, zoneValues);\n"
 "    },\n"
-"    get\$_parentDelegate() {\n"
-"      return this.parent.get\$_delegate();\n"
-"    },\n"
-"    get\$errorZone() {\n"
-"      return this._handleUncaughtError.zone;\n"
-"    },\n"
-"    runGuarded\$1(f) {\n"
-"      var e, s, exception;\n"
-"      type\$.void_Function._as(f);\n"
-"      try {\n"
-"        this.run\$1\$1(f, type\$.void);\n"
-"      } catch (exception) {\n"
-"        e = A.unwrapException(exception);\n"
-"        s = A.getTraceFromException(exception);\n"
-"        this._processUncaughtError\$3(this, A._asObject(e), type\$.StackTrace._as(s));\n"
-"      }\n"
-"    },\n"
-"    runUnaryGuarded\$1\$2(f, arg, \$T) {\n"
-"      var e, s, exception;\n"
-"      \$T._eval\$1(\"~(0)\")._as(f);\n"
-"      \$T._as(arg);\n"
-"      try {\n"
-"        this.runUnary\$2\$2(f, arg, type\$.void, \$T);\n"
-"      } catch (exception) {\n"
-"        e = A.unwrapException(exception);\n"
-"        s = A.getTraceFromException(exception);\n"
-"        this._processUncaughtError\$3(this, A._asObject(e), type\$.StackTrace._as(s));\n"
-"      }\n"
-"    },\n"
-"    runBinaryGuarded\$2\$3(f, arg1, arg2, \$T1, \$T2) {\n"
-"      var e, s, exception;\n"
-"      \$T1._eval\$1(\"@<0>\")._bind\$1(\$T2)._eval\$1(\"~(1,2)\")._as(f);\n"
-"      \$T1._as(arg1);\n"
-"      \$T2._as(arg2);\n"
-"      try {\n"
-"        this.runBinary\$3\$3(f, arg1, arg2, type\$.void, \$T1, \$T2);\n"
-"      } catch (exception) {\n"
-"        e = A.unwrapException(exception);\n"
-"        s = A.getTraceFromException(exception);\n"
-"        this._processUncaughtError\$3(this, A._asObject(e), type\$.StackTrace._as(s));\n"
-"      }\n"
-"    },\n"
-"    bindCallback\$1\$1(f, \$R) {\n"
-"      return new A._CustomZone_bindCallback_closure(this, this.registerCallback\$1\$1(\$R._eval\$1(\"0()\")._as(f), \$R), \$R);\n"
-"    },\n"
-"    bindUnaryCallback\$2\$1(f, \$R, \$T) {\n"
-"      return new A._CustomZone_bindUnaryCallback_closure(this, this.registerUnaryCallback\$2\$1(\$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f), \$R, \$T), \$T, \$R);\n"
-"    },\n"
-"    bindCallbackGuarded\$1(f) {\n"
-"      return new A._CustomZone_bindCallbackGuarded_closure(this, this.registerCallback\$1\$1(type\$.void_Function._as(f), type\$.void));\n"
-"    },\n"
-"    bindUnaryCallbackGuarded\$1\$1(f, \$T) {\n"
-"      return new A._CustomZone_bindUnaryCallbackGuarded_closure(this, this.registerUnaryCallback\$2\$1(\$T._eval\$1(\"~(0)\")._as(f), type\$.void, \$T), \$T);\n"
-"    },\n"
-"    handleUncaughtError\$2(error, stackTrace) {\n"
-"      this._processUncaughtError\$3(this, error, type\$.StackTrace._as(stackTrace));\n"
-"    },\n"
-"    fork\$2\$specification\$zoneValues(specification, zoneValues) {\n"
-"      var implementation = this._fork,\n"
-"        t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$5(t1, t1.get\$_parentDelegate(), this, specification, zoneValues);\n"
-"    },\n"
-"    run\$1\$1(f, \$R) {\n"
-"      var implementation, t1;\n"
-"      \$R._eval\$1(\"0()\")._as(f);\n"
-"      implementation = this._run;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$1\$4(t1, t1.get\$_parentDelegate(), this, f, \$R);\n"
-"    },\n"
-"    runUnary\$2\$2(f, arg, \$R, \$T) {\n"
-"      var implementation, t1;\n"
-"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f);\n"
-"      \$T._as(arg);\n"
-"      implementation = this._runUnary;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$2\$5(t1, t1.get\$_parentDelegate(), this, f, arg, \$R, \$T);\n"
-"    },\n"
-"    runBinary\$3\$3(f, arg1, arg2, \$R, \$T1, \$T2) {\n"
-"      var implementation, t1;\n"
-"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(f);\n"
-"      \$T1._as(arg1);\n"
-"      \$T2._as(arg2);\n"
-"      implementation = this._runBinary;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$3\$6(t1, t1.get\$_parentDelegate(), this, f, arg1, arg2, \$R, \$T1, \$T2);\n"
-"    },\n"
-"    registerCallback\$1\$1(callback, \$R) {\n"
-"      var implementation, t1;\n"
+"    _runZoned\$1\$2(zone, callback, \$R) {\n"
+"      var oldZone, implementation, t1, implZone;\n"
 "      \$R._eval\$1(\"0()\")._as(callback);\n"
-"      implementation = this._registerCallback;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$1\$4(t1, t1.get\$_parentDelegate(), this, callback, \$R);\n"
+"      implementation = this._runFunction;\n"
+"      if (implementation == null) {\n"
+"        t1 = \$.Zone__current;\n"
+"        if (t1 === zone)\n"
+"          return callback.call\$0();\n"
+"        oldZone = t1;\n"
+"        \$.Zone__current = zone;\n"
+"        try {\n"
+"          t1 = callback.call\$0();\n"
+"          return t1;\n"
+"        } finally {\n"
+"          \$.Zone__current = oldZone;\n"
+"        }\n"
+"      }\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$1\$4(implZone, t1, zone, callback, \$R);\n"
 "    },\n"
-"    registerUnaryCallback\$2\$1(callback, \$R, \$T) {\n"
-"      var implementation, t1;\n"
+"    _runUnaryZoned\$2\$3(zone, callback, argument, \$R, \$T) {\n"
+"      var oldZone, implementation, t1, implZone;\n"
 "      \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(callback);\n"
-"      implementation = this._registerUnaryCallback;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$2\$4(t1, t1.get\$_parentDelegate(), this, callback, \$R, \$T);\n"
+"      \$T._as(argument);\n"
+"      implementation = this._runUnaryFunction;\n"
+"      if (implementation == null) {\n"
+"        t1 = \$.Zone__current;\n"
+"        if (t1 === zone)\n"
+"          return callback.call\$1(argument);\n"
+"        oldZone = t1;\n"
+"        \$.Zone__current = zone;\n"
+"        try {\n"
+"          t1 = callback.call\$1(argument);\n"
+"          return t1;\n"
+"        } finally {\n"
+"          \$.Zone__current = oldZone;\n"
+"        }\n"
+"      }\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$2\$5(implZone, t1, zone, callback, argument, \$R, \$T);\n"
 "    },\n"
-"    registerBinaryCallback\$3\$1(callback, \$R, \$T1, \$T2) {\n"
-"      var implementation, t1;\n"
+"    _runBinaryZoned\$3\$4(zone, callback, argument1, argument2, \$R, \$T1, \$T2) {\n"
+"      var oldZone, implementation, t1, implZone;\n"
 "      \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(callback);\n"
-"      implementation = this._registerBinaryCallback;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$3\$4(t1, t1.get\$_parentDelegate(), this, callback, \$R, \$T1, \$T2);\n"
+"      \$T1._as(argument1);\n"
+"      \$T2._as(argument2);\n"
+"      implementation = this._runBinaryFunction;\n"
+"      if (implementation == null) {\n"
+"        t1 = \$.Zone__current;\n"
+"        if (t1 === zone)\n"
+"          return callback.call\$2(argument1, argument2);\n"
+"        oldZone = t1;\n"
+"        \$.Zone__current = zone;\n"
+"        try {\n"
+"          t1 = callback.call\$2(argument1, argument2);\n"
+"          return t1;\n"
+"        } finally {\n"
+"          \$.Zone__current = oldZone;\n"
+"        }\n"
+"      }\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$3\$6(implZone, t1, zone, callback, argument1, argument2, \$R, \$T1, \$T2);\n"
 "    },\n"
-"    errorCallback\$2(error, stackTrace) {\n"
-"      var implementation = this._errorCallback,\n"
-"        implementationZone = implementation.zone;\n"
-"      if (implementationZone === B.C__RootZone)\n"
+"    _registerCallbackZoned\$1\$2(zone, callback, \$R) {\n"
+"      var implementation, implZone, t1;\n"
+"      \$R._eval\$1(\"0()\")._as(callback);\n"
+"      implementation = this._registerCallbackFunction;\n"
+"      if (implementation == null)\n"
+"        return callback;\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$1\$4(implZone, t1, zone, callback, \$R);\n"
+"    },\n"
+"    _registerUnaryCallbackZoned\$2\$2(zone, callback, \$R, \$T) {\n"
+"      var implementation, implZone, t1;\n"
+"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(callback);\n"
+"      implementation = this._registerUnaryCallbackFunction;\n"
+"      if (implementation == null)\n"
+"        return callback;\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$2\$4(implZone, t1, zone, callback, \$R, \$T);\n"
+"    },\n"
+"    _registerBinaryCallbackZoned\$3\$2(zone, callback, \$R, \$T1, \$T2) {\n"
+"      var implementation, implZone, t1;\n"
+"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(callback);\n"
+"      implementation = this._registerBinaryCallbackFunction;\n"
+"      if (implementation == null)\n"
+"        return callback;\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$3\$4(implZone, t1, zone, callback, \$R, \$T1, \$T2);\n"
+"    },\n"
+"    _errorCallbackZoned\$3(zone, error, stackTrace) {\n"
+"      var implZone, t1,\n"
+"        implementation = this._errorCallbackFunction;\n"
+"      if (implementation == null)\n"
 "        return null;\n"
-"      return implementation.\$function.call\$5(implementationZone, implementationZone.get\$_parentDelegate(), this, error, stackTrace);\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$5(implZone, t1, zone, error, stackTrace);\n"
 "    },\n"
-"    scheduleMicrotask\$1(f) {\n"
-"      var implementation, t1;\n"
-"      type\$.void_Function._as(f);\n"
-"      implementation = this._scheduleMicrotask;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$4(t1, t1.get\$_parentDelegate(), this, f);\n"
+"    _scheduleMicrotaskZoned\$2(zone, callback) {\n"
+"      var implementation, implZone, t1;\n"
+"      type\$.void_Function._as(callback);\n"
+"      implementation = this._scheduleMicrotaskFunction;\n"
+"      if (implementation == null) {\n"
+"        A._rootScheduleMicrotask(zone, callback);\n"
+"        return;\n"
+"      }\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      implementation.\$function.call\$4(implZone, t1, zone, callback);\n"
 "    },\n"
-"    createTimer\$2(duration, f) {\n"
-"      var implementation, t1;\n"
-"      type\$.void_Function._as(f);\n"
-"      implementation = this._createTimer;\n"
-"      t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$5(t1, t1.get\$_parentDelegate(), this, duration, f);\n"
-"    },\n"
-"    print\$1(line) {\n"
-"      var implementation = this._print,\n"
-"        t1 = implementation.zone;\n"
-"      return implementation.\$function.call\$4(t1, t1.get\$_parentDelegate(), this, line);\n"
-"    },\n"
-"    get\$_run() {\n"
-"      return this._run;\n"
-"    },\n"
-"    get\$_runUnary() {\n"
-"      return this._runUnary;\n"
-"    },\n"
-"    get\$_runBinary() {\n"
-"      return this._runBinary;\n"
-"    },\n"
-"    get\$_registerCallback() {\n"
-"      return this._registerCallback;\n"
-"    },\n"
-"    get\$_registerUnaryCallback() {\n"
-"      return this._registerUnaryCallback;\n"
-"    },\n"
-"    get\$_registerBinaryCallback() {\n"
-"      return this._registerBinaryCallback;\n"
-"    },\n"
-"    get\$_errorCallback() {\n"
-"      return this._errorCallback;\n"
-"    },\n"
-"    get\$_scheduleMicrotask() {\n"
-"      return this._scheduleMicrotask;\n"
-"    },\n"
-"    get\$_createTimer() {\n"
-"      return this._createTimer;\n"
-"    },\n"
-"    get\$_createPeriodicTimer() {\n"
-"      return this._createPeriodicTimer;\n"
-"    },\n"
-"    get\$_print() {\n"
-"      return this._print;\n"
-"    },\n"
-"    get\$_fork() {\n"
-"      return this._fork;\n"
-"    },\n"
-"    get\$_handleUncaughtError() {\n"
-"      return this._handleUncaughtError;\n"
-"    },\n"
-"    get\$parent() {\n"
-"      return this.parent;\n"
-"    },\n"
-"    get\$_map() {\n"
-"      return this._map;\n"
+"    _createTimerZoned\$3(zone, duration, callback) {\n"
+"      var implementation, implZone, t1;\n"
+"      type\$.void_Function._as(callback);\n"
+"      implementation = this._createTimerFunction;\n"
+"      if (implementation == null)\n"
+"        return A.Timer__createTimer(duration, B.Zone_jYP !== zone ? zone.bindCallback\$1\$1(callback, type\$.void) : callback);\n"
+"      implZone = implementation.zone;\n"
+"      t1 = implZone.get\$_parentDelegate();\n"
+"      return implementation.\$function.call\$5(implZone, t1, zone, duration, callback);\n"
 "    }\n"
 "  };\n"
-"  A._CustomZone_bindCallback_closure.prototype = {\n"
+"  A.Zone_bindCallback_closure.prototype = {\n"
 "    call\$0() {\n"
-"      return this.\$this.run\$1\$1(this.registered, this.R);\n"
+"      var t1 = this.\$this;\n"
+"      return t1._runZoned\$1\$2(t1, this.registered, this.R);\n"
 "    },\n"
 "    \$signature() {\n"
 "      return this.R._eval\$1(\"0()\");\n"
 "    }\n"
 "  };\n"
-"  A._CustomZone_bindUnaryCallback_closure.prototype = {\n"
-"    call\$1(arg) {\n"
-"      var _this = this,\n"
-"        t1 = _this.T;\n"
-"      return _this.\$this.runUnary\$2\$2(_this.registered, t1._as(arg), _this.R, t1);\n"
-"    },\n"
-"    \$signature() {\n"
-"      return this.R._eval\$1(\"@<0>\")._bind\$1(this.T)._eval\$1(\"1(2)\");\n"
-"    }\n"
-"  };\n"
-"  A._CustomZone_bindCallbackGuarded_closure.prototype = {\n"
+"  A.Zone_bindCallbackGuarded_closure.prototype = {\n"
 "    call\$0() {\n"
 "      return this.\$this.runGuarded\$1(this.registered);\n"
 "    },\n"
 "    \$signature: 0\n"
 "  };\n"
-"  A._CustomZone_bindUnaryCallbackGuarded_closure.prototype = {\n"
-"    call\$1(arg) {\n"
+"  A.Zone_bindUnaryCallbackGuarded_closure.prototype = {\n"
+"    call\$1(argument) {\n"
 "      var t1 = this.T;\n"
-"      return this.\$this.runUnaryGuarded\$1\$2(this.registered, t1._as(arg), t1);\n"
+"      return this.\$this.runUnaryGuarded\$1\$2(this.registered, t1._as(argument), t1);\n"
 "    },\n"
 "    \$signature() {\n"
 "      return this.T._eval\$1(\"~(0)\");\n"
 "    }\n"
 "  };\n"
-"  A._RootZone.prototype = {\n"
-"    get\$_run() {\n"
-"      return B._ZoneFunction__RootZone__rootRun;\n"
-"    },\n"
-"    get\$_runUnary() {\n"
-"      return B._ZoneFunction__RootZone__rootRunUnary;\n"
-"    },\n"
-"    get\$_runBinary() {\n"
-"      return B._ZoneFunction__RootZone__rootRunBinary;\n"
-"    },\n"
-"    get\$_registerCallback() {\n"
-"      return B._ZoneFunction__RootZone__rootRegisterCallback;\n"
-"    },\n"
-"    get\$_registerUnaryCallback() {\n"
-"      return B._ZoneFunction_Xkh;\n"
-"    },\n"
-"    get\$_registerBinaryCallback() {\n"
-"      return B._ZoneFunction_e9o;\n"
-"    },\n"
-"    get\$_errorCallback() {\n"
-"      return B._ZoneFunction__RootZone__rootErrorCallback;\n"
-"    },\n"
-"    get\$_scheduleMicrotask() {\n"
-"      return B._ZoneFunction__RootZone__rootScheduleMicrotask;\n"
-"    },\n"
-"    get\$_createTimer() {\n"
-"      return B._ZoneFunction__RootZone__rootCreateTimer;\n"
-"    },\n"
-"    get\$_createPeriodicTimer() {\n"
-"      return B._ZoneFunction_PAY;\n"
-"    },\n"
-"    get\$_print() {\n"
-"      return B._ZoneFunction__RootZone__rootPrint;\n"
-"    },\n"
-"    get\$_fork() {\n"
-"      return B._ZoneFunction__RootZone__rootFork;\n"
-"    },\n"
-"    get\$_handleUncaughtError() {\n"
-"      return B._ZoneFunction_KjJ;\n"
-"    },\n"
-"    get\$parent() {\n"
-"      return null;\n"
-"    },\n"
-"    get\$_map() {\n"
-"      return \$.\$get\$_RootZone__rootMap();\n"
-"    },\n"
-"    get\$_delegate() {\n"
-"      var t1 = \$._RootZone__rootDelegate;\n"
-"      return t1 == null ? \$._RootZone__rootDelegate = new A._ZoneDelegate(this) : t1;\n"
-"    },\n"
-"    get\$_parentDelegate() {\n"
-"      var t1 = \$._RootZone__rootDelegate;\n"
-"      return t1 == null ? \$._RootZone__rootDelegate = new A._ZoneDelegate(this) : t1;\n"
-"    },\n"
-"    get\$errorZone() {\n"
-"      return this;\n"
-"    },\n"
-"    runGuarded\$1(f) {\n"
-"      var e, s, exception;\n"
-"      type\$.void_Function._as(f);\n"
-"      try {\n"
-"        if (B.C__RootZone === \$.Zone__current) {\n"
-"          f.call\$0();\n"
-"          return;\n"
-"        }\n"
-"        A._rootRun(null, null, this, f, type\$.void);\n"
-"      } catch (exception) {\n"
-"        e = A.unwrapException(exception);\n"
-"        s = A.getTraceFromException(exception);\n"
-"        A._rootHandleError(A._asObject(e), type\$.StackTrace._as(s));\n"
-"      }\n"
-"    },\n"
-"    runUnaryGuarded\$1\$2(f, arg, \$T) {\n"
-"      var e, s, exception;\n"
-"      \$T._eval\$1(\"~(0)\")._as(f);\n"
-"      \$T._as(arg);\n"
-"      try {\n"
-"        if (B.C__RootZone === \$.Zone__current) {\n"
-"          f.call\$1(arg);\n"
-"          return;\n"
-"        }\n"
-"        A._rootRunUnary(null, null, this, f, arg, type\$.void, \$T);\n"
-"      } catch (exception) {\n"
-"        e = A.unwrapException(exception);\n"
-"        s = A.getTraceFromException(exception);\n"
-"        A._rootHandleError(A._asObject(e), type\$.StackTrace._as(s));\n"
-"      }\n"
-"    },\n"
-"    runBinaryGuarded\$2\$3(f, arg1, arg2, \$T1, \$T2) {\n"
-"      var e, s, exception;\n"
-"      \$T1._eval\$1(\"@<0>\")._bind\$1(\$T2)._eval\$1(\"~(1,2)\")._as(f);\n"
-"      \$T1._as(arg1);\n"
-"      \$T2._as(arg2);\n"
-"      try {\n"
-"        if (B.C__RootZone === \$.Zone__current) {\n"
-"          f.call\$2(arg1, arg2);\n"
-"          return;\n"
-"        }\n"
-"        A._rootRunBinary(null, null, this, f, arg1, arg2, type\$.void, \$T1, \$T2);\n"
-"      } catch (exception) {\n"
-"        e = A.unwrapException(exception);\n"
-"        s = A.getTraceFromException(exception);\n"
-"        A._rootHandleError(A._asObject(e), type\$.StackTrace._as(s));\n"
-"      }\n"
-"    },\n"
-"    bindCallback\$1\$1(f, \$R) {\n"
-"      return new A._RootZone_bindCallback_closure(this, \$R._eval\$1(\"0()\")._as(f), \$R);\n"
-"    },\n"
-"    bindUnaryCallback\$2\$1(f, \$R, \$T) {\n"
-"      return new A._RootZone_bindUnaryCallback_closure(this, \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f), \$T, \$R);\n"
-"    },\n"
-"    bindCallbackGuarded\$1(f) {\n"
-"      return new A._RootZone_bindCallbackGuarded_closure(this, type\$.void_Function._as(f));\n"
-"    },\n"
-"    bindUnaryCallbackGuarded\$1\$1(f, \$T) {\n"
-"      return new A._RootZone_bindUnaryCallbackGuarded_closure(this, \$T._eval\$1(\"~(0)\")._as(f), \$T);\n"
-"    },\n"
-"    handleUncaughtError\$2(error, stackTrace) {\n"
-"      A._rootHandleError(error, type\$.StackTrace._as(stackTrace));\n"
-"    },\n"
-"    fork\$2\$specification\$zoneValues(specification, zoneValues) {\n"
-"      return A._rootFork(null, null, this, specification, zoneValues);\n"
-"    },\n"
-"    run\$1\$1(f, \$R) {\n"
-"      \$R._eval\$1(\"0()\")._as(f);\n"
-"      if (\$.Zone__current === B.C__RootZone)\n"
-"        return f.call\$0();\n"
-"      return A._rootRun(null, null, this, f, \$R);\n"
-"    },\n"
-"    runUnary\$2\$2(f, arg, \$R, \$T) {\n"
-"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f);\n"
-"      \$T._as(arg);\n"
-"      if (\$.Zone__current === B.C__RootZone)\n"
-"        return f.call\$1(arg);\n"
-"      return A._rootRunUnary(null, null, this, f, arg, \$R, \$T);\n"
-"    },\n"
-"    runBinary\$3\$3(f, arg1, arg2, \$R, \$T1, \$T2) {\n"
-"      \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(f);\n"
-"      \$T1._as(arg1);\n"
-"      \$T2._as(arg2);\n"
-"      if (\$.Zone__current === B.C__RootZone)\n"
-"        return f.call\$2(arg1, arg2);\n"
-"      return A._rootRunBinary(null, null, this, f, arg1, arg2, \$R, \$T1, \$T2);\n"
-"    },\n"
-"    registerCallback\$1\$1(f, \$R) {\n"
-"      return \$R._eval\$1(\"0()\")._as(f);\n"
-"    },\n"
-"    registerUnaryCallback\$2\$1(f, \$R, \$T) {\n"
-"      return \$R._eval\$1(\"@<0>\")._bind\$1(\$T)._eval\$1(\"1(2)\")._as(f);\n"
-"    },\n"
-"    registerBinaryCallback\$3\$1(f, \$R, \$T1, \$T2) {\n"
-"      return \$R._eval\$1(\"@<0>\")._bind\$1(\$T1)._bind\$1(\$T2)._eval\$1(\"1(2,3)\")._as(f);\n"
-"    },\n"
-"    errorCallback\$2(error, stackTrace) {\n"
-"      return null;\n"
-"    },\n"
-"    scheduleMicrotask\$1(f) {\n"
-"      A._rootScheduleMicrotask(null, null, this, type\$.void_Function._as(f));\n"
-"    },\n"
-"    createTimer\$2(duration, f) {\n"
-"      return A.Timer__createTimer(duration, type\$.void_Function._as(f));\n"
-"    },\n"
-"    print\$1(line) {\n"
-"      A.printString(line);\n"
-"    }\n"
-"  };\n"
-"  A._RootZone_bindCallback_closure.prototype = {\n"
-"    call\$0() {\n"
-"      return this.\$this.run\$1\$1(this.f, this.R);\n"
-"    },\n"
-"    \$signature() {\n"
-"      return this.R._eval\$1(\"0()\");\n"
-"    }\n"
-"  };\n"
-"  A._RootZone_bindUnaryCallback_closure.prototype = {\n"
-"    call\$1(arg) {\n"
-"      var _this = this,\n"
-"        t1 = _this.T;\n"
-"      return _this.\$this.runUnary\$2\$2(_this.f, t1._as(arg), _this.R, t1);\n"
-"    },\n"
-"    \$signature() {\n"
-"      return this.R._eval\$1(\"@<0>\")._bind\$1(this.T)._eval\$1(\"1(2)\");\n"
-"    }\n"
-"  };\n"
-"  A._RootZone_bindCallbackGuarded_closure.prototype = {\n"
-"    call\$0() {\n"
-"      return this.\$this.runGuarded\$1(this.f);\n"
-"    },\n"
-"    \$signature: 0\n"
-"  };\n"
-"  A._RootZone_bindUnaryCallbackGuarded_closure.prototype = {\n"
-"    call\$1(arg) {\n"
-"      var t1 = this.T;\n"
-"      return this.\$this.runUnaryGuarded\$1\$2(this.f, t1._as(arg), t1);\n"
-"    },\n"
-"    \$signature() {\n"
-"      return this.T._eval\$1(\"~(0)\");\n"
-"    }\n"
-"  };\n"
-"  A.runZonedGuarded_closure.prototype = {\n"
+"  A.runZonedGuarded_errorHandler.prototype = {\n"
 "    call\$5(\$self, \$parent, zone, error, stackTrace) {\n"
-"      var e, s, exception, t2,\n"
-"        t1 = type\$.StackTrace;\n"
-"      t1._as(stackTrace);\n"
+"      var e, s, t1, exception, t2;\n"
 "      try {\n"
-"        this.parentZone.runBinary\$3\$3(this.onError, error, stackTrace, type\$.void, type\$.Object, t1);\n"
+"        t1 = this.parentZone;\n"
+"        t1._runBinaryZoned\$3\$4(t1, type\$.void_Function_Object_StackTrace._as(this.onError), error, stackTrace, type\$.void, type\$.Object, type\$.StackTrace);\n"
 "      } catch (exception) {\n"
 "        e = A.unwrapException(exception);\n"
 "        s = A.getTraceFromException(exception);\n"
-"        t2 = \$parent._delegationTarget;\n"
-"        if (e === error)\n"
-"          t2._processUncaughtError\$3(zone, error, stackTrace);\n"
-"        else\n"
-"          t2._processUncaughtError\$3(zone, A._asObject(e), t1._as(s));\n"
+"        t1 = e === error ? stackTrace : s;\n"
+"        t2 = A._asObject(e);\n"
+"        type\$.StackTrace._as(t1);\n"
+"        \$parent._zone._handleUncaughtErrorZoned\$3(zone, t2, t1);\n"
 "      }\n"
 "    },\n"
-"    \$signature: 31\n"
+"    \$signature: 75\n"
 "  };\n"
-"  A._ZoneDelegate.prototype = {\$isZoneDelegate: 1};\n"
-"  A._rootHandleError_closure.prototype = {\n"
+"  A.ZoneDelegate.prototype = {};\n"
+"  A._rootHandleUncaughtError_closure.prototype = {\n"
 "    call\$0() {\n"
 "      A.Error_throwWithStackTrace(this.error, this.stackTrace);\n"
 "    },\n"
 "    \$signature: 0\n"
 "  };\n"
-"  A._ZoneSpecification.prototype = {\$isZoneSpecification: 1};\n"
+"  A.ZoneSpecification.prototype = {};\n"
 "  A._HashMap.prototype = {\n"
 "    get\$length(_) {\n"
 "      return this._collection\$_length;\n"
@@ -13792,10 +13443,10 @@
 "    containsKey\$1(key) {\n"
 "      var strings, nums;\n"
 "      if (typeof key == \"string\" && key !== \"__proto__\") {\n"
-"        strings = this._strings;\n"
+"        strings = this._collection\$_strings;\n"
 "        return strings == null ? false : strings[key] != null;\n"
 "      } else if (typeof key == \"number\" && (key & 1073741823) === key) {\n"
-"        nums = this._nums;\n"
+"        nums = this._collection\$_nums;\n"
 "        return nums == null ? false : nums[key] != null;\n"
 "      } else\n"
 "        return this._containsKey\$1(key);\n"
@@ -13804,16 +13455,16 @@
 "      var rest = this._collection\$_rest;\n"
 "      if (rest == null)\n"
 "        return false;\n"
-"      return this._findBucketIndex\$2(this._getBucket\$2(rest, key), key) >= 0;\n"
+"      return this._findBucketIndex\$2(this._collection\$_getBucket\$2(rest, key), key) >= 0;\n"
 "    },\n"
 "    \$index(_, key) {\n"
 "      var strings, t1, nums;\n"
 "      if (typeof key == \"string\" && key !== \"__proto__\") {\n"
-"        strings = this._strings;\n"
+"        strings = this._collection\$_strings;\n"
 "        t1 = strings == null ? null : A._HashMap__getTableEntry(strings, key);\n"
 "        return t1;\n"
 "      } else if (typeof key == \"number\" && (key & 1073741823) === key) {\n"
-"        nums = this._nums;\n"
+"        nums = this._collection\$_nums;\n"
 "        t1 = nums == null ? null : A._HashMap__getTableEntry(nums, key);\n"
 "        return t1;\n"
 "      } else\n"
@@ -13824,7 +13475,7 @@
 "        rest = this._collection\$_rest;\n"
 "      if (rest == null)\n"
 "        return null;\n"
-"      bucket = this._getBucket\$2(rest, key);\n"
+"      bucket = this._collection\$_getBucket\$2(rest, key);\n"
 "      index = this._findBucketIndex\$2(bucket, key);\n"
 "      return index < 0 ? null : bucket[index + 1];\n"
 "    },\n"
@@ -13834,11 +13485,11 @@
 "      t1._precomputed1._as(key);\n"
 "      t1._rest[1]._as(value);\n"
 "      if (typeof key == \"string\" && key !== \"__proto__\") {\n"
-"        strings = _this._strings;\n"
-"        _this._collection\$_addHashTableEntry\$3(strings == null ? _this._strings = A._HashMap__newHashTable() : strings, key, value);\n"
+"        strings = _this._collection\$_strings;\n"
+"        _this._collection\$_addHashTableEntry\$3(strings == null ? _this._collection\$_strings = A._HashMap__newHashTable() : strings, key, value);\n"
 "      } else if (typeof key == \"number\" && (key & 1073741823) === key) {\n"
-"        nums = _this._nums;\n"
-"        _this._collection\$_addHashTableEntry\$3(nums == null ? _this._nums = A._HashMap__newHashTable() : nums, key, value);\n"
+"        nums = _this._collection\$_nums;\n"
+"        _this._collection\$_addHashTableEntry\$3(nums == null ? _this._collection\$_nums = A._HashMap__newHashTable() : nums, key, value);\n"
 "      } else\n"
 "        _this._set\$2(key, value);\n"
 "    },\n"
@@ -13855,7 +13506,7 @@
 "      if (bucket == null) {\n"
 "        A._HashMap__setTableEntry(rest, hash, [key, value]);\n"
 "        ++_this._collection\$_length;\n"
-"        _this._keys = null;\n"
+"        _this._collection\$_keys = null;\n"
 "      } else {\n"
 "        index = _this._findBucketIndex\$2(bucket, key);\n"
 "        if (index >= 0)\n"
@@ -13863,7 +13514,7 @@
 "        else {\n"
 "          bucket.push(key, value);\n"
 "          ++_this._collection\$_length;\n"
-"          _this._keys = null;\n"
+"          _this._collection\$_keys = null;\n"
 "        }\n"
 "      }\n"
 "    },\n"
@@ -13877,17 +13528,17 @@
 "        t2._as(key);\n"
 "        t3 = _this.\$index(0, key);\n"
 "        action.call\$2(key, t3 == null ? t1._as(t3) : t3);\n"
-"        if (keys !== _this._keys)\n"
+"        if (keys !== _this._collection\$_keys)\n"
 "          throw A.wrapException(A.ConcurrentModificationError\$(_this));\n"
 "      }\n"
 "    },\n"
 "    _computeKeys\$0() {\n"
 "      var strings, index, names, entries, i, nums, rest, bucket, \$length, i0, _this = this,\n"
-"        result = _this._keys;\n"
+"        result = _this._collection\$_keys;\n"
 "      if (result != null)\n"
 "        return result;\n"
 "      result = A.List_List\$filled(_this._collection\$_length, null, false, type\$.dynamic);\n"
-"      strings = _this._strings;\n"
+"      strings = _this._collection\$_strings;\n"
 "      index = 0;\n"
 "      if (strings != null) {\n"
 "        names = Object.getOwnPropertyNames(strings);\n"
@@ -13897,7 +13548,7 @@
 "          ++index;\n"
 "        }\n"
 "      }\n"
-"      nums = _this._nums;\n"
+"      nums = _this._collection\$_nums;\n"
 "      if (nums != null) {\n"
 "        names = Object.getOwnPropertyNames(nums);\n"
 "        entries = names.length;\n"
@@ -13919,7 +13570,7 @@
 "          }\n"
 "        }\n"
 "      }\n"
-"      return _this._keys = result;\n"
+"      return _this._collection\$_keys = result;\n"
 "    },\n"
 "    _collection\$_addHashTableEntry\$3(table, key, value) {\n"
 "      var t1 = A._instanceType(this);\n"
@@ -13927,14 +13578,14 @@
 "      t1._rest[1]._as(value);\n"
 "      if (table[key] == null) {\n"
 "        ++this._collection\$_length;\n"
-"        this._keys = null;\n"
+"        this._collection\$_keys = null;\n"
 "      }\n"
 "      A._HashMap__setTableEntry(table, key, value);\n"
 "    },\n"
 "    _computeHashCode\$1(key) {\n"
 "      return J.get\$hashCode\$(key) & 1073741823;\n"
 "    },\n"
-"    _getBucket\$2(table, key) {\n"
+"    _collection\$_getBucket\$2(table, key) {\n"
 "      return table[this._computeHashCode\$1(key)];\n"
 "    },\n"
 "    _findBucketIndex\$2(bucket, key) {\n"
@@ -13968,20 +13619,20 @@
 "  };\n"
 "  A._HashMapKeyIterable.prototype = {\n"
 "    get\$length(_) {\n"
-"      return this._collection\$_map._collection\$_length;\n"
+"      return this._map._collection\$_length;\n"
 "    },\n"
 "    get\$isEmpty(_) {\n"
-"      return this._collection\$_map._collection\$_length === 0;\n"
+"      return this._map._collection\$_length === 0;\n"
 "    },\n"
 "    get\$isNotEmpty(_) {\n"
-"      return this._collection\$_map._collection\$_length !== 0;\n"
+"      return this._map._collection\$_length !== 0;\n"
 "    },\n"
 "    get\$iterator(_) {\n"
-"      var t1 = this._collection\$_map;\n"
+"      var t1 = this._map;\n"
 "      return new A._HashMapKeyIterator(t1, t1._computeKeys\$0(), this.\$ti._eval\$1(\"_HashMapKeyIterator<1>\"));\n"
 "    },\n"
 "    contains\$1(_, element) {\n"
-"      return this._collection\$_map.containsKey\$1(element);\n"
+"      return this._map.containsKey\$1(element);\n"
 "    }\n"
 "  };\n"
 "  A._HashMapKeyIterator.prototype = {\n"
@@ -13991,10 +13642,10 @@
 "    },\n"
 "    moveNext\$0() {\n"
 "      var _this = this,\n"
-"        keys = _this._keys,\n"
+"        keys = _this._collection\$_keys,\n"
 "        offset = _this._offset,\n"
-"        t1 = _this._collection\$_map;\n"
-"      if (keys !== t1._keys)\n"
+"        t1 = _this._map;\n"
+"      if (keys !== t1._collection\$_keys)\n"
 "        throw A.wrapException(A.ConcurrentModificationError\$(t1));\n"
 "      else if (offset >= keys.length) {\n"
 "        _this._collection\$_current = null;\n"
@@ -14058,10 +13709,10 @@
 "    contains\$1(_, object) {\n"
 "      var strings, nums;\n"
 "      if (typeof object == \"string\" && object !== \"__proto__\") {\n"
-"        strings = this._strings;\n"
+"        strings = this._collection\$_strings;\n"
 "        return strings == null ? false : strings[object] != null;\n"
 "      } else if (typeof object == \"number\" && (object & 1073741823) === object) {\n"
-"        nums = this._nums;\n"
+"        nums = this._collection\$_nums;\n"
 "        return nums == null ? false : nums[object] != null;\n"
 "      } else\n"
 "        return this._contains\$1(object);\n"
@@ -14076,11 +13727,11 @@
 "      var strings, nums, _this = this;\n"
 "      A._instanceType(_this)._precomputed1._as(element);\n"
 "      if (typeof element == \"string\" && element !== \"__proto__\") {\n"
-"        strings = _this._strings;\n"
-"        return _this._collection\$_addHashTableEntry\$2(strings == null ? _this._strings = A._HashSet__newHashTable() : strings, element);\n"
+"        strings = _this._collection\$_strings;\n"
+"        return _this._collection\$_addHashTableEntry\$2(strings == null ? _this._collection\$_strings = A._HashSet__newHashTable() : strings, element);\n"
 "      } else if (typeof element == \"number\" && (element & 1073741823) === element) {\n"
-"        nums = _this._nums;\n"
-"        return _this._collection\$_addHashTableEntry\$2(nums == null ? _this._nums = A._HashSet__newHashTable() : nums, element);\n"
+"        nums = _this._collection\$_nums;\n"
+"        return _this._collection\$_addHashTableEntry\$2(nums == null ? _this._collection\$_nums = A._HashSet__newHashTable() : nums, element);\n"
 "      } else\n"
 "        return _this._collection\$_add\$1(element);\n"
 "    },\n"
@@ -14106,9 +13757,9 @@
 "    remove\$1(_, object) {\n"
 "      var _this = this;\n"
 "      if (typeof object == \"string\" && object !== \"__proto__\")\n"
-"        return _this._removeHashTableEntry\$2(_this._strings, object);\n"
+"        return _this._removeHashTableEntry\$2(_this._collection\$_strings, object);\n"
 "      else if (typeof object == \"number\" && (object & 1073741823) === object)\n"
-"        return _this._removeHashTableEntry\$2(_this._nums, object);\n"
+"        return _this._removeHashTableEntry\$2(_this._collection\$_nums, object);\n"
 "      else\n"
 "        return _this._remove\$1(object);\n"
 "    },\n"
@@ -14135,7 +13786,7 @@
 "      if (result != null)\n"
 "        return result;\n"
 "      result = A.List_List\$filled(_this._collection\$_length, null, false, type\$.dynamic);\n"
-"      strings = _this._strings;\n"
+"      strings = _this._collection\$_strings;\n"
 "      index = 0;\n"
 "      if (strings != null) {\n"
 "        names = Object.getOwnPropertyNames(strings);\n"
@@ -14145,7 +13796,7 @@
 "          ++index;\n"
 "        }\n"
 "      }\n"
-"      nums = _this._nums;\n"
+"      nums = _this._collection\$_nums;\n"
 "      if (nums != null) {\n"
 "        names = Object.getOwnPropertyNames(nums);\n"
 "        entries = names.length;\n"
@@ -14369,7 +14020,7 @@
 "      t2 = A.S(v);\n"
 "      t1._contents += t2;\n"
 "    },\n"
-"    \$signature: 18\n"
+"    \$signature: 17\n"
 "  };\n"
 "  A._UnmodifiableMapMixin.prototype = {\n"
 "    \$indexSet(_, key, value) {\n"
@@ -14381,44 +14032,44 @@
 "  };\n"
 "  A.MapView.prototype = {\n"
 "    cast\$2\$0(_, \$RK, \$RV) {\n"
-"      return this._collection\$_map.cast\$2\$0(0, \$RK, \$RV);\n"
+"      return this._map.cast\$2\$0(0, \$RK, \$RV);\n"
 "    },\n"
 "    \$index(_, key) {\n"
-"      return this._collection\$_map.\$index(0, key);\n"
+"      return this._map.\$index(0, key);\n"
 "    },\n"
 "    \$indexSet(_, key, value) {\n"
 "      var t1 = A._instanceType(this);\n"
-"      this._collection\$_map.\$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value));\n"
+"      this._map.\$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value));\n"
 "    },\n"
 "    containsKey\$1(key) {\n"
-"      return this._collection\$_map.containsKey\$1(key);\n"
+"      return this._map.containsKey\$1(key);\n"
 "    },\n"
 "    forEach\$1(_, action) {\n"
-"      this._collection\$_map.forEach\$1(0, A._instanceType(this)._eval\$1(\"~(1,2)\")._as(action));\n"
+"      this._map.forEach\$1(0, A._instanceType(this)._eval\$1(\"~(1,2)\")._as(action));\n"
 "    },\n"
 "    get\$isEmpty(_) {\n"
-"      var t1 = this._collection\$_map;\n"
+"      var t1 = this._map;\n"
 "      return t1.get\$isEmpty(t1);\n"
 "    },\n"
 "    get\$isNotEmpty(_) {\n"
-"      var t1 = this._collection\$_map;\n"
+"      var t1 = this._map;\n"
 "      return t1.get\$isNotEmpty(t1);\n"
 "    },\n"
 "    get\$length(_) {\n"
-"      var t1 = this._collection\$_map;\n"
+"      var t1 = this._map;\n"
 "      return t1.get\$length(t1);\n"
 "    },\n"
 "    get\$keys() {\n"
-"      return this._collection\$_map.get\$keys();\n"
+"      return this._map.get\$keys();\n"
 "    },\n"
 "    toString\$0(_) {\n"
-"      return this._collection\$_map.toString\$0(0);\n"
+"      return this._map.toString\$0(0);\n"
 "    },\n"
 "    \$isMap: 1\n"
 "  };\n"
 "  A.UnmodifiableMapView.prototype = {\n"
 "    cast\$2\$0(_, \$RK, \$RV) {\n"
-"      return new A.UnmodifiableMapView(this._collection\$_map.cast\$2\$0(0, \$RK, \$RV), \$RK._eval\$1(\"@<0>\")._bind\$1(\$RV)._eval\$1(\"UnmodifiableMapView<1,2>\"));\n"
+"      return new A.UnmodifiableMapView(this._map.cast\$2\$0(0, \$RK, \$RV), \$RK._eval\$1(\"@<0>\")._bind\$1(\$RV)._eval\$1(\"UnmodifiableMapView<1,2>\"));\n"
 "    }\n"
 "  };\n"
 "  A.ListQueue.prototype = {\n"
@@ -14938,10 +14589,10 @@
 "  };\n"
 "  A._JsonMapKeyIterable.prototype = {\n"
 "    get\$length(_) {\n"
-"      return this._parent.get\$length(0);\n"
+"      return this._convert\$_parent.get\$length(0);\n"
 "    },\n"
 "    elementAt\$1(_, index) {\n"
-"      var t1 = this._parent;\n"
+"      var t1 = this._convert\$_parent;\n"
 "      if (t1._processed == null)\n"
 "        t1 = t1.get\$keys().elementAt\$1(0, index);\n"
 "      else {\n"
@@ -14953,7 +14604,7 @@
 "      return t1;\n"
 "    },\n"
 "    get\$iterator(_) {\n"
-"      var t1 = this._parent;\n"
+"      var t1 = this._convert\$_parent;\n"
 "      if (t1._processed == null) {\n"
 "        t1 = t1.get\$keys();\n"
 "        t1 = t1.get\$iterator(t1);\n"
@@ -14964,7 +14615,7 @@
 "      return t1;\n"
 "    },\n"
 "    contains\$1(_, key) {\n"
-"      return this._parent.containsKey\$1(key);\n"
+"      return this._convert\$_parent.containsKey\$1(key);\n"
 "    }\n"
 "  };\n"
 "  A._Utf8Decoder__decoder_closure.prototype = {\n"
@@ -14977,7 +14628,7 @@
 "      }\n"
 "      return null;\n"
 "    },\n"
-"    \$signature: 19\n"
+"    \$signature: 18\n"
 "  };\n"
 "  A._Utf8Decoder__decoderNonfatal_closure.prototype = {\n"
 "    call\$0() {\n"
@@ -14989,7 +14640,7 @@
 "      }\n"
 "      return null;\n"
 "    },\n"
-"    \$signature: 19\n"
+"    \$signature: 18\n"
 "  };\n"
 "  A.AsciiCodec.prototype = {\n"
 "    encode\$1(source) {\n"
@@ -15422,7 +15073,7 @@
 "      B.JSArray_methods.\$indexSet(t1, t2.i++, key);\n"
 "      B.JSArray_methods.\$indexSet(t1, t2.i++, value);\n"
 "    },\n"
-"    \$signature: 18\n"
+"    \$signature: 17\n"
 "  };\n"
 "  A._JsonStringStringifier.prototype = {\n"
 "    get\$_partialResult() {\n"
@@ -15813,17 +15464,17 @@
 "    \$eq(_, other) {\n"
 "      if (other == null)\n"
 "        return false;\n"
-"      return other instanceof A.Duration && this._duration === other._duration;\n"
+"      return other instanceof A.Duration && this.inMicroseconds === other.inMicroseconds;\n"
 "    },\n"
 "    get\$hashCode(_) {\n"
-"      return B.JSInt_methods.get\$hashCode(this._duration);\n"
+"      return B.JSInt_methods.get\$hashCode(this.inMicroseconds);\n"
 "    },\n"
 "    compareTo\$1(_, other) {\n"
-"      return B.JSInt_methods.compareTo\$1(this._duration, type\$.Duration._as(other)._duration);\n"
+"      return B.JSInt_methods.compareTo\$1(this.inMicroseconds, type\$.Duration._as(other).inMicroseconds);\n"
 "    },\n"
 "    toString\$0(_) {\n"
 "      var sign, minutes, minutesPadding, seconds, secondsPadding,\n"
-"        microseconds = this._duration,\n"
+"        microseconds = this.inMicroseconds,\n"
 "        hours = B.JSInt_methods._tdivFast\$1(microseconds, 3600000000),\n"
 "        microseconds0 = microseconds % 3600000000;\n"
 "      if (microseconds < 0) {\n"
@@ -16804,7 +16455,7 @@
 "      var t1 = type\$.JavaScriptFunction;\n"
 "      this._this.then\$1\$2\$onError(new A.FutureOfJSAnyToJSPromise_get_toJS__closure(t1._as(resolve)), new A.FutureOfJSAnyToJSPromise_get_toJS__closure0(t1._as(reject)), type\$.nullable_Object);\n"
 "    },\n"
-"    \$signature: 20\n"
+"    \$signature: 19\n"
 "  };\n"
 "  A.FutureOfJSAnyToJSPromise_get_toJS__closure.prototype = {\n"
 "    call\$1(value) {\n"
@@ -16816,52 +16467,35 @@
 "  };\n"
 "  A.FutureOfJSAnyToJSPromise_get_toJS__closure0.prototype = {\n"
 "    call\$2(error, stackTrace) {\n"
-"      var wrapper, box, t1;\n"
-"      A._asObject(error);\n"
-"      type\$.StackTrace._as(stackTrace);\n"
-"      wrapper = A.JSFunctionUnsafeUtilExtension_callAsConstructor(type\$.JavaScriptFunction._as(init.G.Error), string\$.Dart_e, type\$.JSObject);\n"
-"      if (type\$.JavaScriptObject._is(error))\n"
-"        A.throwExpression(\"Attempting to box non-Dart object.\");\n"
-"      box = {};\n"
-"      box[\$.\$get\$_jsBoxedDartObjectProperty()] = error;\n"
-"      wrapper.error = box;\n"
-"      wrapper.stack = stackTrace.toString\$0(0);\n"
-"      t1 = this.reject;\n"
-"      t1.call(t1, wrapper);\n"
-"      return wrapper;\n"
+"      var jsError = A._convertError(A._asObject(error), type\$.StackTrace._as(stackTrace)),\n"
+"        t1 = this.reject;\n"
+"      t1.call(t1, jsError);\n"
+"      return jsError;\n"
 "    },\n"
-"    \$signature: 59\n"
+"    \$signature: 20\n"
 "  };\n"
 "  A.FutureOfVoidToJSPromise_get_toJS_closure.prototype = {\n"
 "    call\$2(resolve, reject) {\n"
 "      var t1 = type\$.JavaScriptFunction;\n"
 "      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);\n"
 "    },\n"
-"    \$signature: 20\n"
+"    \$signature: 19\n"
 "  };\n"
 "  A.FutureOfVoidToJSPromise_get_toJS__closure.prototype = {\n"
 "    call\$1(__wc0_formal) {\n"
 "      var t1 = this.resolve;\n"
 "      return t1.call(t1);\n"
 "    },\n"
-"    \$signature: 67\n"
+"    \$signature: 61\n"
 "  };\n"
 "  A.FutureOfVoidToJSPromise_get_toJS__closure0.prototype = {\n"
 "    call\$2(error, stackTrace) {\n"
-"      var wrapper, box, t1;\n"
-"      A._asObject(error);\n"
-"      type\$.StackTrace._as(stackTrace);\n"
-"      wrapper = A.JSFunctionUnsafeUtilExtension_callAsConstructor(type\$.JavaScriptFunction._as(init.G.Error), string\$.Dart_e, type\$.JSObject);\n"
-"      if (type\$.JavaScriptObject._is(error))\n"
-"        A.throwExpression(\"Attempting to box non-Dart object.\");\n"
-"      box = {};\n"
-"      box[\$.\$get\$_jsBoxedDartObjectProperty()] = error;\n"
-"      wrapper.error = box;\n"
-"      wrapper.stack = stackTrace.toString\$0(0);\n"
-"      t1 = this.reject;\n"
-"      t1.call(t1, wrapper);\n"
+"      var jsError = A._convertError(A._asObject(error), type\$.StackTrace._as(stackTrace)),\n"
+"        t1 = this.reject;\n"
+"      t1.call(t1, jsError);\n"
+"      return jsError;\n"
 "    },\n"
-"    \$signature: 3\n"
+"    \$signature: 20\n"
 "  };\n"
 "  A.jsify__convert.prototype = {\n"
 "    call\$1(o) {\n"
@@ -16893,7 +16527,7 @@
 "    call\$1(r) {\n"
 "      return this.completer.complete\$1(this.T._eval\$1(\"0/?\")._as(r));\n"
 "    },\n"
-"    \$signature: 4\n"
+"    \$signature: 3\n"
 "  };\n"
 "  A.promiseToFuture_closure0.prototype = {\n"
 "    call\$1(e) {\n"
@@ -16901,7 +16535,7 @@
 "        return this.completer.completeError\$1(new A.NullRejectionException(e === undefined));\n"
 "      return this.completer.completeError\$1(e);\n"
 "    },\n"
-"    \$signature: 4\n"
+"    \$signature: 3\n"
 "  };\n"
 "  A.dartify_convert.prototype = {\n"
 "    call\$1(o) {\n"
@@ -17098,7 +16732,7 @@
 "      type\$.StackTrace._as(stackTrace);\n"
 "      this.\$this._addResult\$1(new A.ErrorResult(error, stackTrace));\n"
 "    },\n"
-"    \$signature: 3\n"
+"    \$signature: 4\n"
 "  };\n"
 "  A.StreamQueue__ensureListening_closure0.prototype = {\n"
 "    call\$0() {\n"
@@ -17369,13 +17003,13 @@
 "    call\$1(e) {\n"
 "      return type\$.BuildStatus._as(e)._name === this.json;\n"
 "    },\n"
-"    \$signature: 73\n"
+"    \$signature: 30\n"
 "  };\n"
 "  A.BuildStatus_BuildStatus\$fromJson_closure0.prototype = {\n"
 "    call\$0() {\n"
 "      throw A.wrapException(A.ArgumentError\$(\"Unknown BuildStatus: \" + this.json, null));\n"
 "    },\n"
-"    \$signature: 74\n"
+"    \$signature: 73\n"
 "  };\n"
 "  A.BuildResult.prototype = {\n"
 "    toJson\$0() {\n"
@@ -17451,7 +17085,7 @@
 "    call\$1(e) {\n"
 "      return type\$.DebugEvent._as(e).toJson\$0();\n"
 "    },\n"
-"    \$signature: 89\n"
+"    \$signature: 74\n"
 "  };\n"
 "  A.DebugInfo.prototype = {\n"
 "    toJson\$0() {\n"
@@ -17864,7 +17498,7 @@
 "    call\$1(o) {\n"
 "      return J.toString\$0\$(o);\n"
 "    },\n"
-"    \$signature: 30\n"
+"    \$signature: 76\n"
 "  };\n"
 "  A.PersistentWebSocket.prototype = {\n"
 "    get\$_incomingStreamController() {\n"
@@ -18043,7 +17677,7 @@
 "      type\$.WebSocket._as(socket);\n"
 "      return new A.PersistentWebSocket(_this.logger, _this.debugName, _this.maxRetryAttempts, new A._AsyncCompleter(new A._Future(\$.Zone__current, type\$._Future_void), type\$._AsyncCompleter_void), _this.uri, _this.onReconnect, socket, A.StreamController_StreamController(type\$.dynamic));\n"
 "    },\n"
-"    \$signature: 29\n"
+"    \$signature: 31\n"
 "  };\n"
 "  A.PersistentWebSocket__listenWithRetry_attemptRetry.prototype = {\n"
 "    call\$1(message) {\n"
@@ -18483,7 +18117,7 @@
 "      buffer._contents = t1;\n"
 "      buffer._contents = t1 + this.subtype;\n"
 "      t1 = this.parameters;\n"
-"      t1._collection\$_map.forEach\$1(0, t1.\$ti._eval\$1(\"~(1,2)\")._as(new A.MediaType_toString_closure(buffer)));\n"
+"      t1._map.forEach\$1(0, t1.\$ti._eval\$1(\"~(1,2)\")._as(new A.MediaType_toString_closure(buffer)));\n"
 "      t1 = buffer._contents;\n"
 "      return t1.charCodeAt(0) == 0 ? t1 : t1;\n"
 "    }\n"
@@ -19362,7 +18996,7 @@
 "        t1._restartable_timer\$_timer.cancel\$0();\n"
 "      else {\n"
 "        t1._restartable_timer\$_timer.cancel\$0();\n"
-"        t1._restartable_timer\$_timer = A.Timer_Timer(t1._restartable_timer\$_duration, t1._restartable_timer\$_callback);\n"
+"        t1._restartable_timer\$_timer = A.Timer_Timer(t1._duration, t1._restartable_timer\$_callback);\n"
 "      }\n"
 "    }\n"
 "  };\n"
@@ -19379,7 +19013,7 @@
 "      type\$.StackTrace._as(stackTrace);\n"
 "      this.\$this._onReleaseCompleters.removeFirst\$0().completeError\$2(error, stackTrace);\n"
 "    },\n"
-"    \$signature: 3\n"
+"    \$signature: 4\n"
 "  };\n"
 "  A.PoolResource.prototype = {};\n"
 "  A.SourceFile.prototype = {\n"
@@ -19893,7 +19527,7 @@
 "      }\n"
 "      return lines;\n"
 "    },\n"
-"    \$signature: 52\n"
+"    \$signature: 78\n"
 "  };\n"
 "  A.Highlighter__collateLines__closure.prototype = {\n"
 "    call\$1(highlight) {\n"
@@ -20743,11 +20377,14 @@
 "                  t2.setItem(\"dartAppInstanceId\", t3);\n"
 "                }\n"
 "              }\n"
-"              uri = A.Uri_parse(A._asString(t1.\$dwdsDevHandlerPath));\n"
-"              if (A._asString(A._asJSObject(A._asJSObject(t1.window).location).protocol) === \"https:\" && uri.get\$scheme() === \"http\" && uri.get\$host() !== \"localhost\")\n"
-"                uri = uri.replace\$1\$scheme(\"https\");\n"
-"              else if (A._asString(A._asJSObject(A._asJSObject(t1.window).location).protocol) === \"wss:\" && uri.get\$scheme() === \"ws\" && uri.get\$host() !== \"localhost\")\n"
-"                uri = uri.replace\$1\$scheme(\"wss\");\n"
+"              t2 = A._asString(t1.\$dwdsDevHandlerPath);\n"
+"              t3 = A._asString(A._asJSObject(A._asJSObject(t1.window).location).protocol);\n"
+"              uri = A.Uri_parse(t2);\n"
+"              if (t3 === \"https:\" && uri.get\$host() !== \"localhost\")\n"
+"                if (uri.get\$scheme() === \"http\")\n"
+"                  uri = uri.replace\$1\$scheme(\"https\");\n"
+"                else if (uri.get\$scheme() === \"ws\")\n"
+"                  uri = uri.replace\$1\$scheme(\"wss\");\n"
 "              fixedPath = uri.toString\$0(0);\n"
 "              fixedUri = A.Uri_parse(fixedPath);\n"
 "              \$async\$goto = fixedUri.isScheme\$1(\"ws\") || fixedUri.isScheme\$1(\"wss\") ? 2 : 4;\n"
@@ -20884,7 +20521,7 @@
 "      t1 = type\$.dynamic;\n"
 "      A._trySendEvent(this.client.get\$sink(), B.C_JsonCodec.encode\$2\$toEncodable(A._setArrayType([\"HotRestartRequest\", A.LinkedHashMap_LinkedHashMap\$_literal([\"id\", runId], type\$.String, t1)], type\$.JSArray_Object), null), t1);\n"
 "    },\n"
-"    \$signature: 17\n"
+"    \$signature: 26\n"
 "  };\n"
 "  A.main__closure4.prototype = {\n"
 "    call\$0() {\n"
@@ -20924,7 +20561,7 @@
 "      A._asString(eventData);\n"
 "      A._trySendEvent(this.client.get\$sink(), B.C_JsonCodec.encode\$2\$toEncodable(A._setArrayType([\"RegisterEvent\", new A.RegisterEvent(eventData, Date.now()).toJson\$0()], type\$.JSArray_Object), null), type\$.dynamic);\n"
 "    },\n"
-"    \$signature: 17\n"
+"    \$signature: 26\n"
 "  };\n"
 "  A.main__closure8.prototype = {\n"
 "    call\$0() {\n"
@@ -21473,13 +21110,13 @@
 "      A._asJSObject(A._asJSObject(init.G.dartDevEmbedder).config).capturedMainHandler = null;\n"
 "      A.safeUnawaited(this.\$this._runMainWhenReady\$2(this.readyToRunMain, runMain));\n"
 "    },\n"
-"    \$signature: 26\n"
+"    \$signature: 27\n"
 "  };\n"
 "  A.DdcLibraryBundleRestarter_hotReloadStart_closure.prototype = {\n"
 "    call\$1(hotReloadEndCallback) {\n"
 "      this.\$this._capturedHotReloadEndCallback = type\$.JavaScriptFunction._as(hotReloadEndCallback);\n"
 "    },\n"
-"    \$signature: 26\n"
+"    \$signature: 27\n"
 "  };\n"
 "  A.DdcRestarter.prototype = {\n"
 "    restart\$3\$readyToRunMain\$reloadedSourcesPath\$runId(readyToRunMain, reloadedSourcesPath, runId) {\n"
@@ -21890,7 +21527,7 @@
 "    _reload\$body\$RequireRestarter(modules) {\n"
 "      var \$async\$goto = 0,\n"
 "        \$async\$completer = A._makeAsyncAwaitCompleter(type\$.bool),\n"
-"        \$async\$returnValue, \$async\$handler = 2, \$async\$errorStack = [], \$async\$self = this, reloadedModules, moduleId, parentIds, e, _box_0, t4, t5, t6, t7, t8, t9, t10, _this, parentIds0, result, exception, t1, t2, dart, t3, \$async\$exception;\n"
+"        \$async\$returnValue, \$async\$handler = 2, \$async\$errorStack = [], \$async\$self = this, reloadedModules, moduleId, parentIds, e, _box_0, t4, t5, t6, t7, t8, t9, _this, parentIds0, exception, t1, t2, dart, t3, \$async\$exception;\n"
 "      var \$async\$_reload\$1 = A._wrapJsFunctionForAsync(function(\$async\$errorCode, \$async\$result) {\n"
 "        if (\$async\$errorCode === 1) {\n"
 "          \$async\$errorStack.push(\$async\$result);\n"
@@ -21926,57 +21563,48 @@
 "              t3 === \$ && A.throwLateFieldNI(\"_dirtyModules\");\n"
 "              t3.addAll\$1(0, modules);\n"
 "              _box_0.previousModuleId = null;\n"
-"              t3 = \$async\$self.get\$_moduleTopologicalCompare(), t4 = type\$.String, t5 = type\$.nullable_JSArray_nullable_Object, t6 = type\$.JSArray_String, t7 = A._callDartFunctionFast0;\n"
+"              t3 = \$async\$self.get\$_moduleTopologicalCompare(), t4 = type\$.String, t5 = type\$.nullable_JSArray_nullable_Object, t6 = type\$.JSArray_String;\n"
 "            case 10:\n"
 "              // for condition\n"
-"              if (!(t8 = \$async\$self.__RequireRestarter__dirtyModules_A, t9 = t8._root, t10 = t9 == null, !t10)) {\n"
+"              if (!(t7 = \$async\$self.__RequireRestarter__dirtyModules_A, t8 = t7._root, t9 = t8 == null, !t9)) {\n"
 "                // goto after for\n"
 "                \$async\$goto = 11;\n"
 "                break;\n"
 "              }\n"
-"              if (t10)\n"
+"              if (t9)\n"
 "                A.throwExpression(A.IterableElementError_noElement());\n"
-"              t9 = t8._splayMin\$1(t9);\n"
-"              t8._root = t9;\n"
-"              moduleId = t9.key;\n"
+"              t8 = t7._splayMin\$1(t8);\n"
+"              t7._root = t8;\n"
+"              moduleId = t8.key;\n"
 "              \$async\$self.__RequireRestarter__dirtyModules_A.remove\$1(0, moduleId);\n"
 "              _this = A._asString(moduleId);\n"
-"              t9 = t5._as(t2._as(t2._as(t1.\$requireLoader).moduleParentsGraph).get(_this));\n"
-"              if (t9 == null)\n"
+"              t8 = t5._as(t2._as(t2._as(t1.\$requireLoader).moduleParentsGraph).get(_this));\n"
+"              if (t8 == null)\n"
 "                parentIds0 = null;\n"
 "              else {\n"
-"                t8 = A.JSArrayExtension_toDartIterable(t9, t4);\n"
-"                t8 = A.List_List\$_of(t8, t8.\$ti._eval\$1(\"ListIterable.E\"));\n"
-"                parentIds0 = t8;\n"
+"                t7 = A.JSArrayExtension_toDartIterable(t8, t4);\n"
+"                t7 = A.List_List\$_of(t7, t7.\$ti._eval\$1(\"ListIterable.E\"));\n"
+"                parentIds0 = t7;\n"
 "              }\n"
 "              parentIds = parentIds0 == null ? A._setArrayType([], t6) : parentIds0;\n"
 "              \$async\$goto = J.get\$length\$asx(parentIds) === 0 ? 12 : 14;\n"
 "              break;\n"
 "            case 12:\n"
 "              // then\n"
-"              t8 = new A.RequireRestarter__reload_closure(_box_0, dart);\n"
-"              if (typeof t8 == \"function\")\n"
-"                A.throwExpression(A.ArgumentError\$(\"Attempting to rewrap a JS function.\", null));\n"
-"              result = function(_call, f) {\n"
-"                return function() {\n"
-"                  return _call(f);\n"
-"                };\n"
-"              }(t7, t8);\n"
-"              result[\$.\$get\$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME()] = t8;\n"
-"              t1.\$dartRunMain = result;\n"
+"              t1.\$dartRunMain = A._functionToJS0(new A.RequireRestarter__reload_closure(_box_0, dart));\n"
 "              // goto join\n"
 "              \$async\$goto = 13;\n"
 "              break;\n"
 "            case 14:\n"
 "              // else\n"
-"              t8 = reloadedModules;\n"
-"              if (typeof t8 !== \"number\") {\n"
-"                \$async\$returnValue = t8.\$add();\n"
+"              t7 = reloadedModules;\n"
+"              if (typeof t7 !== \"number\") {\n"
+"                \$async\$returnValue = t7.\$add();\n"
 "                // goto return\n"
 "                \$async\$goto = 1;\n"
 "                break;\n"
 "              }\n"
-"              reloadedModules = t8 + 1;\n"
+"              reloadedModules = t7 + 1;\n"
 "              \$async\$goto = 15;\n"
 "              return A._asyncAwait(\$async\$self._reloadModule\$1(moduleId), \$async\$_reload\$1);\n"
 "            case 15:\n"
@@ -22049,7 +21677,7 @@
 "      stronglyConnectedComponents = A.stronglyConnectedComponents(A.JSArrayExtension_toDartIterable(type\$.JSArray_nullable_Object._as(t1.Array.from(A._asJSObject(t2.keys()))), t3), this.get\$_moduleParents(), t3);\n"
 "      t3 = this._moduleOrdering;\n"
 "      if (t3._collection\$_length > 0) {\n"
-"        t3._strings = t3._nums = t3._collection\$_rest = t3._keys = null;\n"
+"        t3._collection\$_strings = t3._collection\$_nums = t3._collection\$_rest = t3._collection\$_keys = null;\n"
 "        t3._collection\$_length = 0;\n"
 "      }\n"
 "      for (i = 0; i < stronglyConnectedComponents.length; ++i)\n"
@@ -22139,48 +21767,21 @@
 "      _instance_1_u = hunkHelpers._instance_1u,\n"
 "      _static_1 = hunkHelpers._static_1,\n"
 "      _static_0 = hunkHelpers._static_0,\n"
-"      _static = hunkHelpers.installStaticTearOff,\n"
 "      _instance = hunkHelpers.installInstanceTearOff,\n"
 "      _instance_2_u = hunkHelpers._instance_2u,\n"
 "      _instance_0_u = hunkHelpers._instance_0u,\n"
-"      _instance_1_i = hunkHelpers._instance_1i;\n"
-"    _static_2(J, \"_interceptors_JSArray__compareAny\$closure\", \"JSArray__compareAny\", 27);\n"
+"      _instance_1_i = hunkHelpers._instance_1i,\n"
+"      _static = hunkHelpers.installStaticTearOff;\n"
+"    _static_2(J, \"_interceptors_JSArray__compareAny\$closure\", \"JSArray__compareAny\", 28);\n"
 "    _instance_1_u(A.CastStreamSubscription.prototype, \"get\$__internal\$_onData\", \"__internal\$_onData\$1\", 11);\n"
 "    _static_1(A, \"async__AsyncRun__scheduleImmediateJsOverride\$closure\", \"_AsyncRun__scheduleImmediateJsOverride\", 14);\n"
 "    _static_1(A, \"async__AsyncRun__scheduleImmediateWithSetImmediate\$closure\", \"_AsyncRun__scheduleImmediateWithSetImmediate\", 14);\n"
 "    _static_1(A, \"async__AsyncRun__scheduleImmediateWithTimer\$closure\", \"_AsyncRun__scheduleImmediateWithTimer\", 14);\n"
 "    _static_0(A, \"async___startMicrotaskLoop\$closure\", \"_startMicrotaskLoop\", 0);\n"
-"    _static_1(A, \"async___nullDataHandler\$closure\", \"_nullDataHandler\", 4);\n"
+"    _static_1(A, \"async___nullDataHandler\$closure\", \"_nullDataHandler\", 3);\n"
 "    _static_2(A, \"async___nullErrorHandler\$closure\", \"_nullErrorHandler\", 7);\n"
 "    _static_0(A, \"async___nullDoneHandler\$closure\", \"_nullDoneHandler\", 0);\n"
-"    _static(A, \"async___rootHandleUncaughtError\$closure\", 5, null, [\"call\$5\"], [\"_rootHandleUncaughtError\"], 75, 0);\n"
-"    _static(A, \"async___rootRun\$closure\", 4, null, [\"call\$1\$4\", \"call\$4\"], [\"_rootRun\", function(\$self, \$parent, zone, f) {\n"
-"      return A._rootRun(\$self, \$parent, zone, f, type\$.dynamic);\n"
-"    }], 76, 0);\n"
-"    _static(A, \"async___rootRunUnary\$closure\", 5, null, [\"call\$2\$5\", \"call\$5\"], [\"_rootRunUnary\", function(\$self, \$parent, zone, f, arg) {\n"
-"      var t1 = type\$.dynamic;\n"
-"      return A._rootRunUnary(\$self, \$parent, zone, f, arg, t1, t1);\n"
-"    }], 77, 0);\n"
-"    _static(A, \"async___rootRunBinary\$closure\", 6, null, [\"call\$3\$6\"], [\"_rootRunBinary\"], 78, 0);\n"
-"    _static(A, \"async___rootRegisterCallback\$closure\", 4, null, [\"call\$1\$4\", \"call\$4\"], [\"_rootRegisterCallback\", function(\$self, \$parent, zone, f) {\n"
-"      return A._rootRegisterCallback(\$self, \$parent, zone, f, type\$.dynamic);\n"
-"    }], 79, 0);\n"
-"    _static(A, \"async___rootRegisterUnaryCallback\$closure\", 4, null, [\"call\$2\$4\", \"call\$4\"], [\"_rootRegisterUnaryCallback\", function(\$self, \$parent, zone, f) {\n"
-"      var t1 = type\$.dynamic;\n"
-"      return A._rootRegisterUnaryCallback(\$self, \$parent, zone, f, t1, t1);\n"
-"    }], 80, 0);\n"
-"    _static(A, \"async___rootRegisterBinaryCallback\$closure\", 4, null, [\"call\$3\$4\", \"call\$4\"], [\"_rootRegisterBinaryCallback\", function(\$self, \$parent, zone, f) {\n"
-"      var t1 = type\$.dynamic;\n"
-"      return A._rootRegisterBinaryCallback(\$self, \$parent, zone, f, t1, t1, t1);\n"
-"    }], 81, 0);\n"
-"    _static(A, \"async___rootErrorCallback\$closure\", 5, null, [\"call\$5\"], [\"_rootErrorCallback\"], 82, 0);\n"
-"    _static(A, \"async___rootScheduleMicrotask\$closure\", 4, null, [\"call\$4\"], [\"_rootScheduleMicrotask\"], 83, 0);\n"
-"    _static(A, \"async___rootCreateTimer\$closure\", 5, null, [\"call\$5\"], [\"_rootCreateTimer\"], 84, 0);\n"
-"    _static(A, \"async___rootCreatePeriodicTimer\$closure\", 5, null, [\"call\$5\"], [\"_rootCreatePeriodicTimer\"], 85, 0);\n"
-"    _static(A, \"async___rootPrint\$closure\", 4, null, [\"call\$4\"], [\"_rootPrint\"], 86, 0);\n"
-"    _static_1(A, \"async___printToZone\$closure\", \"_printToZone0\", 87);\n"
-"    _static(A, \"async___rootFork\$closure\", 5, null, [\"call\$5\"], [\"_rootFork\"], 88, 0);\n"
-"    _instance(A._Completer.prototype, \"get\$completeError\", 0, 1, null, [\"call\$2\", \"call\$1\"], [\"completeError\$2\", \"completeError\$1\"], 53, 0, 0);\n"
+"    _instance(A._Completer.prototype, \"get\$completeError\", 0, 1, null, [\"call\$2\", \"call\$1\"], [\"completeError\$2\", \"completeError\$1\"], 55, 0, 0);\n"
 "    _instance_2_u(A._Future.prototype, \"get\$_completeError\", \"_completeError\$2\", 7);\n"
 "    var _;\n"
 "    _instance_0_u(_ = A._ControllerSubscription.prototype, \"get\$_onPause\", \"_onPause\$0\", 0);\n"
@@ -22191,28 +21792,28 @@
 "    _instance_0_u(_ = A._ForwardingStreamSubscription.prototype, \"get\$_onPause\", \"_onPause\$0\", 0);\n"
 "    _instance_0_u(_, \"get\$_onResume\", \"_onResume\$0\", 0);\n"
 "    _instance_1_u(_, \"get\$_handleData\", \"_handleData\$1\", 11);\n"
-"    _instance_2_u(_, \"get\$_handleError\", \"_handleError\$2\", 92);\n"
+"    _instance_2_u(_, \"get\$_handleError\", \"_handleError\$2\", 67);\n"
 "    _instance_0_u(_, \"get\$_handleDone\", \"_handleDone\$0\", 0);\n"
-"    _static_2(A, \"collection___defaultEquals\$closure\", \"_defaultEquals0\", 28);\n"
+"    _static_2(A, \"collection___defaultEquals\$closure\", \"_defaultEquals0\", 29);\n"
 "    _static_1(A, \"collection___defaultHashCode\$closure\", \"_defaultHashCode\", 15);\n"
-"    _static_2(A, \"collection_ListBase__compareAny\$closure\", \"ListBase__compareAny\", 27);\n"
+"    _static_2(A, \"collection_ListBase__compareAny\$closure\", \"ListBase__compareAny\", 28);\n"
 "    _static_1(A, \"convert___defaultToEncodable\$closure\", \"_defaultToEncodable\", 16);\n"
 "    _instance_1_i(_ = A._ByteCallbackSink.prototype, \"get\$add\", \"add\$1\", 11);\n"
 "    _instance_0_u(_, \"get\$close\", \"close\$0\", 0);\n"
 "    _static_1(A, \"core__identityHashCode\$closure\", \"identityHashCode\", 15);\n"
-"    _static_2(A, \"core__identical\$closure\", \"identical\", 28);\n"
+"    _static_2(A, \"core__identical\$closure\", \"identical\", 29);\n"
 "    _static_1(A, \"core_Uri_decodeComponent\$closure\", \"Uri_decodeComponent\", 9);\n"
 "    _static(A, \"math__max\$closure\", 2, null, [\"call\$1\$2\", \"call\$2\"], [\"max\", function(a, b) {\n"
 "      return A.max(a, b, type\$.num);\n"
-"    }], 91, 0);\n"
-"    _instance_1_u(_ = A.PersistentWebSocket.prototype, \"get\$_writeToWebSocket\", \"_writeToWebSocket\$1\", 4);\n"
+"    }], 77, 0);\n"
+"    _instance_1_u(_ = A.PersistentWebSocket.prototype, \"get\$_writeToWebSocket\", \"_writeToWebSocket\$1\", 3);\n"
 "    _instance_0_u(_, \"get\$_listenWithRetry\", \"_listenWithRetry\$0\", 6);\n"
 "    _static_1(A, \"case_insensitive_map_CaseInsensitiveMap__canonicalizer\$closure\", \"CaseInsensitiveMap__canonicalizer\", 9);\n"
 "    _instance_1_u(_ = A.SseClient.prototype, \"get\$_onIncomingControlMessage\", \"_onIncomingControlMessage\$1\", 2);\n"
 "    _instance_1_u(_, \"get\$_onIncomingMessage\", \"_onIncomingMessage\$1\", 2);\n"
 "    _instance_0_u(_, \"get\$_onOutgoingDone\", \"_onOutgoingDone\$0\", 0);\n"
 "    _instance_1_u(_, \"get\$_onOutgoingMessage\", \"_onOutgoingMessage\$1\", 56);\n"
-"    _static_1(A, \"client__initializeConnection\$closure\", \"initializeConnection\", 61);\n"
+"    _static_1(A, \"client__initializeConnection\$closure\", \"initializeConnection\", 52);\n"
 "    _static_1(A, \"client___handleAuthRequest\$closure\", \"_handleAuthRequest\", 2);\n"
 "    _instance_0_u(A.ReloadingManager.prototype, \"get\$hotRestartEnd\", \"hotRestartEnd\$0\", 0);\n"
 "    _instance_1_u(_ = A.RequireRestarter.prototype, \"get\$_moduleParents\", \"_moduleParents\$1\", 69);\n"
@@ -22223,7 +21824,7 @@
 "      _inherit = hunkHelpers.inherit,\n"
 "      _inheritMany = hunkHelpers.inheritMany;\n"
 "    _inherit(A.Object, null);\n"
-"    _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, A.SafeToStringHook, J.ArrayIterator, A.Stream, A.CastStreamSubscription, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A._Record, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.LinkedHashMapEntryIterator, 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._StreamController, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._StreamIterator, A._ZoneFunction, A._Zone, A._ZoneDelegate, A._ZoneSpecification, A._HashMapKeyIterator, A.SetBase, A._HashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A.DateTime, A.Duration, A._Enum, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A._JSSecureRandom, A.AsyncMemoizer, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.CanonicalizedMap, A._QueueList_Object_ListMixin, A.BuildResult, A.ConnectRequest, A.DebugEvent, A.BatchedDebugEvents, A.DebugInfo, A.DevToolsRequest, A.DevToolsResponse, A.ErrorResponse, A.HotReloadRequest, A.HotReloadResponse, A.HotRestartRequest, A.HotRestartResponse, A.PingRequest, A.RegisterEvent, A.RunRequest, A.ServiceExtensionRequest, A.ServiceExtensionResponse, A.BatchedStreamController, A.SocketClient, A._PersistentWebSocket_Object_StreamChannelMixin, A.Uuid, A._StackState, A.ClientException, A.BaseClient, A.BaseRequest, A.BaseResponse, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A.StringScanner, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]);\n"
+"    _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, A.SafeToStringHook, J.ArrayIterator, A.Stream, A.CastStreamSubscription, A.Iterable, A.CastIterator, A.Closure, A.MapBase, A.Error, A.ListBase, A.SentinelValue, A.ListIterator, A.MappedIterator, A.WhereIterator, A.ExpandIterator, A.TakeIterator, A.SkipIterator, A.EmptyIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A._Record, A.ConstantMap, A._KeysOrValuesOrElementsIterator, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, A.LinkedHashMapValueIterator, A.LinkedHashMapEntryIterator, 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._StreamController, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._DelayedEvent, A._DelayedDone, A._PendingEvents, A._DoneStreamSubscription, A._StreamIterator, A._ZoneHandleUncaughtError, A.Zone, A.ZoneDelegate, A.ZoneSpecification, A._HashMapKeyIterator, A.SetBase, A._HashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A.DateTime, A.Duration, A._Enum, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A._JSSecureRandom, A.AsyncMemoizer, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.CanonicalizedMap, A._QueueList_Object_ListMixin, A.BuildResult, A.ConnectRequest, A.DebugEvent, A.BatchedDebugEvents, A.DebugInfo, A.DevToolsRequest, A.DevToolsResponse, A.ErrorResponse, A.HotReloadRequest, A.HotReloadResponse, A.HotRestartRequest, A.HotRestartResponse, A.PingRequest, A.RegisterEvent, A.RunRequest, A.ServiceExtensionRequest, A.ServiceExtensionResponse, A.BatchedStreamController, A.SocketClient, A._PersistentWebSocket_Object_StreamChannelMixin, A.Uuid, A._StackState, A.ClientException, A.BaseClient, A.BaseRequest, A.BaseResponse, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A.StringScanner, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]);\n"
 "    _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JavaScriptBigInt, J.JavaScriptSymbol, J.JSNumber, J.JSString]);\n"
 "    _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]);\n"
 "    _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]);\n"
@@ -22235,14 +21836,14 @@
 "    _inheritMany(A._CastIterableBase, [A.CastIterable, A.__CastListBase__CastIterableBase_ListMixin]);\n"
 "    _inherit(A._EfficientLengthCastIterable, A.CastIterable);\n"
 "    _inherit(A._CastListBase, A.__CastListBase__CastIterableBase_ListMixin);\n"
-"    _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._LinkedCustomHashMap_closure, A._Uri__makePath_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure, A.FutureOfVoidToJSPromise_get_toJS__closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.CanonicalizedMap_keys_closure, A.BuildStatus_BuildStatus\$fromJson_closure, A.BatchedDebugEvents_toJson_closure, A.WebSocketClient_stream_closure, A.PersistentWebSocket_connect_closure, A.PersistentWebSocket__listenWithRetry_attemptRetry, A.PersistentWebSocket__listenWithRetry_closure, A.BaseRequest_closure0, A.BrowserClient_send_closure, A._bodyToStream_closure, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter\$__closure, A.Highlighter\$___closure, A.Highlighter\$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.main__closure2, A.main__closure3, A.main__closure5, A.main__closure7, A.main__closure9, A.main__closure10, A.main__closure11, A._handleAuthRequest_closure, A._sendHotReloadResponse_closure, A._sendHotRestartResponse_closure, A.DdcLibraryBundleRestarter_restart_closure, A.DdcLibraryBundleRestarter_hotReloadStart_closure, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.RequireRestarter__reloadModule_closure0, A.JSArrayExtension_toDartIterable_closure]);\n"
+"    _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A.Zone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_errorHandler, A._LinkedCustomHashMap_closure, A._Uri__makePath_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure, A.FutureOfVoidToJSPromise_get_toJS__closure, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.CanonicalizedMap_keys_closure, A.BuildStatus_BuildStatus\$fromJson_closure, A.BatchedDebugEvents_toJson_closure, A.WebSocketClient_stream_closure, A.PersistentWebSocket_connect_closure, A.PersistentWebSocket__listenWithRetry_attemptRetry, A.PersistentWebSocket__listenWithRetry_closure, A.BaseRequest_closure0, A.BrowserClient_send_closure, A._bodyToStream_closure, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter\$__closure, A.Highlighter\$___closure, A.Highlighter\$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.main__closure2, A.main__closure3, A.main__closure5, A.main__closure7, A.main__closure9, A.main__closure10, A.main__closure11, A._handleAuthRequest_closure, A._sendHotReloadResponse_closure, A._sendHotRestartResponse_closure, A.DdcLibraryBundleRestarter_restart_closure, A.DdcLibraryBundleRestarter_hotReloadStart_closure, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.RequireRestarter__reloadModule_closure0, A.JSArrayExtension_toDartIterable_closure]);\n"
 "    _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A._Future_timeout_closure1, A._BufferingStreamSubscription_asFuture_closure0, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A.Uri_parseIPv6Address_error, A.FutureOfJSAnyToJSPromise_get_toJS_closure, A.FutureOfJSAnyToJSPromise_get_toJS__closure0, A.FutureOfVoidToJSPromise_get_toJS_closure, A.FutureOfVoidToJSPromise_get_toJS__closure0, A.StreamQueue__ensureListening_closure1, A.CanonicalizedMap_addAll_closure, A.CanonicalizedMap_forEach_closure, A.safeUnawaited_closure, A.BaseRequest_closure, A.MediaType_toString_closure, A.Pool__runOnRelease_closure0, A.Highlighter__collateLines_closure0, A.main__closure6, A.main_closure0]);\n"
 "    _inherit(A.CastList, A._CastListBase);\n"
 "    _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A._JsonMap]);\n"
 "    _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A.RuntimeError, A._Error, A.JsonUnsupportedObjectError, A.AssertionError, A.ArgumentError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError]);\n"
 "    _inherit(A.UnmodifiableListBase, A.ListBase);\n"
 "    _inherit(A.CodeUnits, A.UnmodifiableListBase);\n"
-"    _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_Future\$delayed_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._Future_timeout_closure, A.Stream_length_closure0, A.Stream_first_closure, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._BufferingStreamSubscription_asFuture_closure, A._BufferingStreamSubscription_asFuture__closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._MultiStream_listen_closure, A._cancelAndValue_closure, A._CustomZone_bindCallback_closure, A._CustomZone_bindCallbackGuarded_closure, A._RootZone_bindCallback_closure, A._RootZone_bindCallbackGuarded_closure, A._rootHandleError_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.StreamQueue__ensureListening_closure0, A.BuildStatus_BuildStatus\$fromJson_closure0, A.BatchedStreamController__hasEventOrTimeOut_closure, A.BatchedStreamController__hasEventDuring_closure, A._readStreamBody_closure, A._readStreamBody_closure0, A.MediaType_MediaType\$parse_closure, A.Logger_Logger_closure, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.main_closure, A.main__closure, A.main__closure0, A.main__closure1, A.main__closure4, A.main__closure8, A.DdcLibraryBundleRestarter__getSrcModuleLibraries_closure, A.RequireRestarter__reload_closure, A.RequireRestarter__reloadModule_closure, A._createScript_closure, A._createScript__closure, A._createScript__closure0, A.runMain_closure]);\n"
+"    _inheritMany(A.Closure0Args, [A.nullFuture_closure, A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A.Future_Future\$microtask_closure, A.Future_Future\$delayed_closure, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainCoreFuture_closure, A._Future__asyncCompleteWithValue_closure, A._Future__asyncCompleteErrorObject_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._Future_timeout_closure, A.Stream_length_closure0, A.Stream_first_closure, A._StreamController__subscribe_closure, A._StreamController__recordCancel_complete, A._BufferingStreamSubscription_asFuture_closure, A._BufferingStreamSubscription_asFuture__closure, A._BufferingStreamSubscription__sendError_sendError, A._BufferingStreamSubscription__sendDone_sendDone, A._PendingEvents_schedule_closure, A._MultiStream_listen_closure, A._cancelAndValue_closure, A.Zone_bindCallback_closure, A.Zone_bindCallbackGuarded_closure, A._rootHandleUncaughtError_closure, A._Utf8Decoder__decoder_closure, A._Utf8Decoder__decoderNonfatal_closure, A.StreamQueue__ensureListening_closure0, A.BuildStatus_BuildStatus\$fromJson_closure0, A.BatchedStreamController__hasEventOrTimeOut_closure, A.BatchedStreamController__hasEventDuring_closure, A._readStreamBody_closure, A._readStreamBody_closure0, A.MediaType_MediaType\$parse_closure, A.Logger_Logger_closure, A.Highlighter_closure, A.Highlighter__writeFileStart_closure, A.Highlighter__writeMultilineHighlights_closure, A.Highlighter__writeMultilineHighlights_closure0, A.Highlighter__writeMultilineHighlights_closure1, A.Highlighter__writeMultilineHighlights_closure2, A.Highlighter__writeMultilineHighlights__closure, A.Highlighter__writeMultilineHighlights__closure0, A.Highlighter__writeHighlightedText_closure, A.Highlighter__writeIndicator_closure, A.Highlighter__writeIndicator_closure0, A.Highlighter__writeIndicator_closure1, A.Highlighter__writeSidebar_closure, A._Highlight_closure, A.SseClient_closure, A.SseClient__closure, A.SseClient__onOutgoingMessage_closure, A.main_closure, A.main__closure, A.main__closure0, A.main__closure1, A.main__closure4, A.main__closure8, A.DdcLibraryBundleRestarter__getSrcModuleLibraries_closure, A.RequireRestarter__reload_closure, A.RequireRestarter__reloadModule_closure, A._createScript_closure, A._createScript__closure, A._createScript__closure0, A.runMain_closure]);\n"
 "    _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.EmptyIterable, A.LinkedHashMapKeysIterable, A.LinkedHashMapValuesIterable, A.LinkedHashMapEntriesIterable, A._HashMapKeyIterable]);\n"
 "    _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable, A.ReversedListIterable, A.ListQueue, A._JsonMapKeyIterable]);\n"
 "    _inherit(A.EfficientLengthMappedIterable, A.MappedIterable);\n"
@@ -22272,7 +21873,6 @@
 "    _inheritMany(A._DelayedEvent, [A._DelayedData, A._DelayedError]);\n"
 "    _inherit(A._MultiStreamController, A._AsyncStreamController);\n"
 "    _inherit(A._MapStream, A._ForwardingStream);\n"
-"    _inheritMany(A._Zone, [A._CustomZone, A._RootZone]);\n"
 "    _inherit(A._IdentityHashMap, A._HashMap);\n"
 "    _inherit(A._SetBase, A.SetBase);\n"
 "    _inherit(A._HashSet, A._SetBase);\n"
@@ -22333,7 +21933,7 @@
 "    typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []},\n"
 "    mangledGlobalNames: {int: \"int\", double: \"double\", num: \"num\", String: \"String\", bool: \"bool\", Null: \"Null\", List: \"List\", Object: \"Object\", Map: \"Map\", JSObject: \"JSObject\"},\n"
 "    mangledNames: {},\n"
-"    types: [\"~()\", \"Null()\", \"~(JSObject)\", \"Null(Object,StackTrace)\", \"~(@)\", \"JSObject()\", \"Future<~>()\", \"~(Object,StackTrace)\", \"Null(@)\", \"String(String)\", \"Object?(Object?)\", \"~(Object?)\", \"bool(_Highlight)\", \"Null(JSObject)\", \"~(~())\", \"int(Object?)\", \"@(@)\", \"Null(String)\", \"~(Object?,Object?)\", \"@()\", \"Null(JavaScriptFunction,JavaScriptFunction)\", \"bool()\", \"Future<~>(String)\", \"String(Match)\", \"bool(String)\", \"int()\", \"Null(JavaScriptFunction)\", \"int(@,@)\", \"bool(Object?,Object?)\", \"PersistentWebSocket(WebSocket)\", \"String(@)\", \"~(Zone,ZoneDelegate,Zone,Object,StackTrace)\", \"bool(Object?)\", \"Future<~>(WebSocketEvent)\", \"bool(String,String)\", \"int(String)\", \"Null(String,String[Object?])\", \"~(MultiStreamController<List<int>>)\", \"~(List<int>)\", \"MediaType()\", \"~(String,String)\", \"Null(@,StackTrace)\", \"Logger()\", \"~(int,@)\", \"String(String?)\", \"Null(~)\", \"String?()\", \"int(_Line)\", \"0&(String,int?)\", \"Object(_Line)\", \"Object(_Highlight)\", \"int(_Highlight,_Highlight)\", \"List<_Line>(MapEntry<Object,List<_Highlight>>)\", \"~(Object[StackTrace?])\", \"SourceSpanWithContext()\", \"@(String)\", \"~(String?)\", \"Future<Null>()\", \"@(@,String)\", \"JSObject(Object,StackTrace)\", \"JSObject(String[bool?])\", \"~(StreamSink<@>)\", \"~(List<DebugEvent>)\", \"Null(String,String)\", \"~(bool)\", \"HotReloadResponse(String,bool,String?)\", \"HotRestartResponse(String,bool,String?)\", \"Object?(~)\", \"bool(bool)\", \"List<String>(String)\", \"int(String,String)\", \"Null(JavaScriptObject)\", \"JSObject()()\", \"bool(BuildStatus)\", \"0&()\", \"~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)\", \"0^(Zone?,ZoneDelegate?,Zone,0^())<Object?>\", \"0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)<Object?,Object?>\", \"0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)<Object?,Object?,Object?>\", \"0^()(Zone,ZoneDelegate,Zone,0^())<Object?>\", \"0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>\", \"0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))<Object?,Object?,Object?>\", \"AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)\", \"~(Zone?,ZoneDelegate?,Zone,~())\", \"Timer(Zone,ZoneDelegate,Zone,Duration,~())\", \"Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))\", \"~(Zone,ZoneDelegate,Zone,String)\", \"~(String)\", \"Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map<Object?,Object?>?)\", \"Map<String,@>(DebugEvent)\", \"Null(~())\", \"0^(0^,0^)<num>\", \"~(@,StackTrace)\"],\n"
+"    types: [\"~()\", \"Null()\", \"~(JSObject)\", \"~(@)\", \"Null(Object,StackTrace)\", \"JSObject()\", \"Future<~>()\", \"~(Object,StackTrace)\", \"Null(@)\", \"String(String)\", \"Object?(Object?)\", \"~(Object?)\", \"bool(_Highlight)\", \"Null(JSObject)\", \"~(~())\", \"int(Object?)\", \"@(@)\", \"~(Object?,Object?)\", \"@()\", \"Null(JavaScriptFunction,JavaScriptFunction)\", \"Object(Object,StackTrace)\", \"bool()\", \"Future<~>(String)\", \"String(Match)\", \"bool(String)\", \"int()\", \"Null(String)\", \"Null(JavaScriptFunction)\", \"int(@,@)\", \"bool(Object?,Object?)\", \"bool(BuildStatus)\", \"PersistentWebSocket(WebSocket)\", \"bool(Object?)\", \"Future<~>(WebSocketEvent)\", \"bool(String,String)\", \"int(String)\", \"Null(String,String[Object?])\", \"~(MultiStreamController<List<int>>)\", \"~(List<int>)\", \"MediaType()\", \"~(String,String)\", \"Null(~())\", \"Logger()\", \"Null(@,StackTrace)\", \"String(String?)\", \"Null(~)\", \"String?()\", \"int(_Line)\", \"0&(String,int?)\", \"Object(_Line)\", \"Object(_Highlight)\", \"int(_Highlight,_Highlight)\", \"~(StreamSink<@>)\", \"~(int,@)\", \"SourceSpanWithContext()\", \"~(Object[StackTrace?])\", \"~(String?)\", \"Future<Null>()\", \"@(String)\", \"@(@,String)\", \"JSObject(String[bool?])\", \"Object?(~)\", \"~(List<DebugEvent>)\", \"Null(String,String)\", \"~(bool)\", \"HotReloadResponse(String,bool,String?)\", \"HotRestartResponse(String,bool,String?)\", \"~(@,StackTrace)\", \"bool(bool)\", \"List<String>(String)\", \"int(String,String)\", \"Null(JavaScriptObject)\", \"JSObject()()\", \"0&()\", \"Map<String,@>(DebugEvent)\", \"~(Zone,ZoneDelegate,Zone,Object,StackTrace)\", \"String(@)\", \"0^(0^,0^)<num>\", \"List<_Line>(MapEntry<Object,List<_Highlight>>)\"],\n"
 "    interceptorsByTag: null,\n"
 "    leafTags: null,\n"
 "    arrayRti: Symbol(\"\$ti\"),\n"
@@ -22341,7 +21941,7 @@
 "      \"2;\": (t1, t2) => o => o instanceof A._Record_2 && t1._is(o._0) && t2._is(o._1)\n"
 "    }\n"
 "  };\n"
-"  A._Universe_addRules(init.typeUniverse, JSON.parse('{\"JavaScriptFunction\":\"LegacyJavaScriptObject\",\"PlainJavaScriptObject\":\"LegacyJavaScriptObject\",\"UnknownJavaScriptObject\":\"LegacyJavaScriptObject\",\"NativeSharedArrayBuffer\":\"NativeByteBuffer\",\"JavaScriptObject\":{\"JSObject\":[]},\"JSArray\":{\"List\":[\"1\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"1\"],\"JSObject\":[],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"JSBool\":{\"bool\":[],\"TrustedGetRuntimeType\":[]},\"JSNull\":{\"Null\":[],\"TrustedGetRuntimeType\":[]},\"LegacyJavaScriptObject\":{\"JavaScriptObject\":[],\"JSObject\":[]},\"JSArraySafeToStringHook\":{\"SafeToStringHook\":[]},\"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\":[]},\"CastStream\":{\"Stream\":[\"2\"],\"Stream.T\":\"2\"},\"CastStreamSubscription\":{\"StreamSubscription\":[\"2\"]},\"_CastIterableBase\":{\"Iterable\":[\"2\"]},\"CastIterator\":{\"Iterator\":[\"2\"]},\"CastIterable\":{\"_CastIterableBase\":[\"1\",\"2\"],\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"_EfficientLengthCastIterable\":{\"CastIterable\":[\"1\",\"2\"],\"_CastIterableBase\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"_CastListBase\":{\"ListBase\":[\"2\"],\"List\":[\"2\"],\"_CastIterableBase\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"]},\"CastList\":{\"_CastListBase\":[\"1\",\"2\"],\"ListBase\":[\"2\"],\"List\":[\"2\"],\"_CastIterableBase\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"ListBase.E\":\"2\",\"Iterable.E\":\"2\"},\"CastMap\":{\"MapBase\":[\"3\",\"4\"],\"Map\":[\"3\",\"4\"],\"MapBase.K\":\"3\",\"MapBase.V\":\"4\"},\"LateError\":{\"Error\":[]},\"CodeUnits\":{\"ListBase\":[\"int\"],\"UnmodifiableListMixin\":[\"int\"],\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"UnmodifiableListMixin.E\":\"int\"},\"EfficientLengthIterable\":{\"Iterable\":[\"1\"]},\"ListIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"SubListIterable\":{\"ListIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"ListIterable.E\":\"1\",\"Iterable.E\":\"1\"},\"ListIterator\":{\"Iterator\":[\"1\"]},\"MappedIterable\":{\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"EfficientLengthMappedIterable\":{\"MappedIterable\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"MappedIterator\":{\"Iterator\":[\"2\"]},\"MappedListIterable\":{\"ListIterable\":[\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"ListIterable.E\":\"2\",\"Iterable.E\":\"2\"},\"WhereIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"WhereIterator\":{\"Iterator\":[\"1\"]},\"ExpandIterable\":{\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"ExpandIterator\":{\"Iterator\":[\"2\"]},\"TakeIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"EfficientLengthTakeIterable\":{\"TakeIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"TakeIterator\":{\"Iterator\":[\"1\"]},\"SkipIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"EfficientLengthSkipIterable\":{\"SkipIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"SkipIterator\":{\"Iterator\":[\"1\"]},\"EmptyIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"EmptyIterator\":{\"Iterator\":[\"1\"]},\"WhereTypeIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"WhereTypeIterator\":{\"Iterator\":[\"1\"]},\"UnmodifiableListBase\":{\"ListBase\":[\"1\"],\"UnmodifiableListMixin\":[\"1\"],\"List\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"ReversedListIterable\":{\"ListIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"ListIterable.E\":\"1\",\"Iterable.E\":\"1\"},\"_Record_2\":{\"_Record2\":[],\"_Record\":[]},\"ConstantMap\":{\"Map\":[\"1\",\"2\"]},\"ConstantStringMap\":{\"ConstantMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"]},\"_KeysOrValues\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"_KeysOrValuesOrElementsIterator\":{\"Iterator\":[\"1\"]},\"Instantiation\":{\"Closure\":[],\"Function\":[]},\"Instantiation1\":{\"Closure\":[],\"Function\":[]},\"NullError\":{\"TypeError\":[],\"Error\":[]},\"JsNoSuchMethodError\":{\"Error\":[]},\"UnknownJsTypeError\":{\"Error\":[]},\"NullThrownFromJavaScriptException\":{\"Exception\":[]},\"_StackTrace\":{\"StackTrace\":[]},\"Closure\":{\"Function\":[]},\"Closure0Args\":{\"Closure\":[],\"Function\":[]},\"Closure2Args\":{\"Closure\":[],\"Function\":[]},\"TearOffClosure\":{\"Closure\":[],\"Function\":[]},\"StaticClosure\":{\"Closure\":[],\"Function\":[]},\"BoundClosure\":{\"Closure\":[],\"Function\":[]},\"RuntimeError\":{\"Error\":[]},\"JsLinkedHashMap\":{\"MapBase\":[\"1\",\"2\"],\"LinkedHashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"LinkedHashMapKeysIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"LinkedHashMapKeyIterator\":{\"Iterator\":[\"1\"]},\"LinkedHashMapValuesIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"LinkedHashMapValueIterator\":{\"Iterator\":[\"1\"]},\"LinkedHashMapEntriesIterable\":{\"EfficientLengthIterable\":[\"MapEntry<1,2>\"],\"Iterable\":[\"MapEntry<1,2>\"],\"Iterable.E\":\"MapEntry<1,2>\"},\"LinkedHashMapEntryIterator\":{\"Iterator\":[\"MapEntry<1,2>\"]},\"JsIdentityLinkedHashMap\":{\"JsLinkedHashMap\":[\"1\",\"2\"],\"MapBase\":[\"1\",\"2\"],\"LinkedHashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_Record2\":{\"_Record\":[]},\"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\":[]},\"NativeArrayBuffer\":{\"NativeByteBuffer\":[],\"JavaScriptObject\":[],\"JSObject\":[],\"ByteBuffer\":[],\"TrustedGetRuntimeType\":[]},\"NativeTypedData\":{\"JavaScriptObject\":[],\"JSObject\":[]},\"_UnmodifiableNativeByteBufferView\":{\"ByteBuffer\":[]},\"NativeByteData\":{\"JavaScriptObject\":[],\"ByteData\":[],\"JSObject\":[],\"TrustedGetRuntimeType\":[]},\"NativeTypedArray\":{\"JavaScriptIndexingBehavior\":[\"1\"],\"JavaScriptObject\":[],\"JSObject\":[]},\"NativeTypedArrayOfDouble\":{\"ListBase\":[\"double\"],\"NativeTypedArray\":[\"double\"],\"List\":[\"double\"],\"JavaScriptIndexingBehavior\":[\"double\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"double\"],\"JSObject\":[],\"Iterable\":[\"double\"],\"FixedLengthListMixin\":[\"double\"]},\"NativeTypedArrayOfInt\":{\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"]},\"NativeFloat32List\":{\"Float32List\":[],\"ListBase\":[\"double\"],\"NativeTypedArray\":[\"double\"],\"List\":[\"double\"],\"JavaScriptIndexingBehavior\":[\"double\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"double\"],\"JSObject\":[],\"Iterable\":[\"double\"],\"FixedLengthListMixin\":[\"double\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"double\",\"Iterable.E\":\"double\",\"FixedLengthListMixin.E\":\"double\"},\"NativeFloat64List\":{\"Float64List\":[],\"ListBase\":[\"double\"],\"NativeTypedArray\":[\"double\"],\"List\":[\"double\"],\"JavaScriptIndexingBehavior\":[\"double\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"double\"],\"JSObject\":[],\"Iterable\":[\"double\"],\"FixedLengthListMixin\":[\"double\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"double\",\"Iterable.E\":\"double\",\"FixedLengthListMixin.E\":\"double\"},\"NativeInt16List\":{\"NativeTypedArrayOfInt\":[],\"Int16List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeInt32List\":{\"NativeTypedArrayOfInt\":[],\"Int32List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeInt8List\":{\"NativeTypedArrayOfInt\":[],\"Int8List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint16List\":{\"NativeTypedArrayOfInt\":[],\"Uint16List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint32List\":{\"NativeTypedArrayOfInt\":[],\"Uint32List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint8ClampedList\":{\"NativeTypedArrayOfInt\":[],\"Uint8ClampedList\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint8List\":{\"NativeTypedArrayOfInt\":[],\"Uint8List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"_Error\":{\"Error\":[]},\"_TypeError\":{\"TypeError\":[],\"Error\":[]},\"AsyncError\":{\"Error\":[]},\"MultiStreamController\":{\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"]},\"_TimerImpl\":{\"Timer\":[]},\"_AsyncAwaitCompleter\":{\"Completer\":[\"1\"]},\"_Completer\":{\"Completer\":[\"1\"]},\"_AsyncCompleter\":{\"_Completer\":[\"1\"],\"Completer\":[\"1\"]},\"_SyncCompleter\":{\"_Completer\":[\"1\"],\"Completer\":[\"1\"]},\"_Future\":{\"Future\":[\"1\"]},\"StreamView\":{\"Stream\":[\"1\"]},\"_StreamController\":{\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"],\"_StreamControllerLifecycle\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"]},\"_AsyncStreamController\":{\"_AsyncStreamControllerDispatch\":[\"1\"],\"_StreamController\":[\"1\"],\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"],\"_StreamControllerLifecycle\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"]},\"_ControllerStream\":{\"_StreamImpl\":[\"1\"],\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_ControllerSubscription\":{\"_BufferingStreamSubscription\":[\"1\"],\"StreamSubscription\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"],\"_BufferingStreamSubscription.T\":\"1\"},\"_StreamSinkWrapper\":{\"StreamSink\":[\"1\"]},\"_BufferingStreamSubscription\":{\"StreamSubscription\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"],\"_BufferingStreamSubscription.T\":\"1\"},\"_StreamImpl\":{\"Stream\":[\"1\"]},\"_DelayedData\":{\"_DelayedEvent\":[\"1\"]},\"_DelayedError\":{\"_DelayedEvent\":[\"@\"]},\"_DelayedDone\":{\"_DelayedEvent\":[\"@\"]},\"_DoneStreamSubscription\":{\"StreamSubscription\":[\"1\"]},\"_EmptyStream\":{\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_MultiStream\":{\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_MultiStreamController\":{\"_AsyncStreamController\":[\"1\"],\"_AsyncStreamControllerDispatch\":[\"1\"],\"_StreamController\":[\"1\"],\"MultiStreamController\":[\"1\"],\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"],\"_StreamControllerLifecycle\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"]},\"_ForwardingStream\":{\"Stream\":[\"2\"]},\"_ForwardingStreamSubscription\":{\"_BufferingStreamSubscription\":[\"2\"],\"StreamSubscription\":[\"2\"],\"_EventSink\":[\"2\"],\"_EventDispatch\":[\"2\"],\"_BufferingStreamSubscription.T\":\"2\"},\"_MapStream\":{\"_ForwardingStream\":[\"1\",\"2\"],\"Stream\":[\"2\"],\"Stream.T\":\"2\"},\"_Zone\":{\"Zone\":[]},\"_CustomZone\":{\"_Zone\":[],\"Zone\":[]},\"_RootZone\":{\"_Zone\":[],\"Zone\":[]},\"_ZoneDelegate\":{\"ZoneDelegate\":[]},\"_ZoneSpecification\":{\"ZoneSpecification\":[]},\"_SplayTreeSetNode\":{\"_SplayTreeNode\":[\"1\",\"_SplayTreeSetNode<1>\"],\"_SplayTreeNode.K\":\"1\",\"_SplayTreeNode.1\":\"_SplayTreeSetNode<1>\"},\"_HashMap\":{\"MapBase\":[\"1\",\"2\"],\"HashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_IdentityHashMap\":{\"_HashMap\":[\"1\",\"2\"],\"MapBase\":[\"1\",\"2\"],\"HashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_HashMapKeyIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"_HashMapKeyIterator\":{\"Iterator\":[\"1\"]},\"_LinkedCustomHashMap\":{\"JsLinkedHashMap\":[\"1\",\"2\"],\"MapBase\":[\"1\",\"2\"],\"LinkedHashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_HashSet\":{\"SetBase\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"_HashSetIterator\":{\"Iterator\":[\"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\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"_SetBase\":{\"SetBase\":[\"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\"],\"EfficientLengthIterable\":[\"1\"],\"_SplayTree\":[\"1\",\"_SplayTreeSetNode<1>\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\",\"_SplayTree.1\":\"_SplayTreeSetNode<1>\",\"_SplayTree.K\":\"1\"},\"Encoding\":{\"Codec\":[\"String\",\"List<int>\"]},\"_JsonMap\":{\"MapBase\":[\"String\",\"@\"],\"Map\":[\"String\",\"@\"],\"MapBase.K\":\"String\",\"MapBase.V\":\"@\"},\"_JsonMapKeyIterable\":{\"ListIterable\":[\"String\"],\"EfficientLengthIterable\":[\"String\"],\"Iterable\":[\"String\"],\"ListIterable.E\":\"String\",\"Iterable.E\":\"String\"},\"AsciiCodec\":{\"Encoding\":[],\"Codec\":[\"String\",\"List<int>\"]},\"_UnicodeSubsetEncoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"AsciiEncoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"_UnicodeSubsetDecoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"AsciiDecoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"Base64Codec\":{\"Codec\":[\"List<int>\",\"String\"]},\"Base64Encoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"JsonUnsupportedObjectError\":{\"Error\":[]},\"JsonCyclicError\":{\"Error\":[]},\"JsonCodec\":{\"Codec\":[\"Object?\",\"String\"]},\"JsonEncoder\":{\"Converter\":[\"Object?\",\"String\"]},\"JsonDecoder\":{\"Converter\":[\"String\",\"Object?\"]},\"Latin1Codec\":{\"Encoding\":[],\"Codec\":[\"String\",\"List<int>\"]},\"Latin1Encoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"Latin1Decoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"Utf8Codec\":{\"Encoding\":[],\"Codec\":[\"String\",\"List<int>\"]},\"Utf8Encoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"Utf8Decoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"DateTime\":{\"Comparable\":[\"DateTime\"]},\"double\":{\"num\":[],\"Comparable\":[\"num\"]},\"Duration\":{\"Comparable\":[\"Duration\"]},\"int\":{\"num\":[],\"Comparable\":[\"num\"]},\"List\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"num\":{\"Comparable\":[\"num\"]},\"RegExpMatch\":{\"Match\":[]},\"String\":{\"Comparable\":[\"String\"],\"Pattern\":[]},\"AssertionError\":{\"Error\":[]},\"TypeError\":{\"Error\":[]},\"ArgumentError\":{\"Error\":[]},\"RangeError\":{\"Error\":[]},\"IndexError\":{\"Error\":[]},\"UnsupportedError\":{\"Error\":[]},\"UnimplementedError\":{\"Error\":[]},\"StateError\":{\"Error\":[]},\"ConcurrentModificationError\":{\"Error\":[]},\"OutOfMemoryError\":{\"Error\":[]},\"StackOverflowError\":{\"Error\":[]},\"_Exception\":{\"Exception\":[]},\"FormatException\":{\"Exception\":[]},\"_StringStackTrace\":{\"StackTrace\":[]},\"StringBuffer\":{\"StringSink\":[]},\"_Uri\":{\"Uri\":[]},\"_SimpleUri\":{\"Uri\":[]},\"_DataUri\":{\"Uri\":[]},\"NullRejectionException\":{\"Exception\":[]},\"ErrorResult\":{\"Result\":[\"0&\"]},\"ValueResult\":{\"Result\":[\"1\"]},\"_NextRequest\":{\"_EventRequest\":[\"1\"]},\"_HasNextRequest\":{\"_EventRequest\":[\"1\"]},\"CanonicalizedMap\":{\"Map\":[\"2\",\"3\"]},\"QueueList\":{\"ListBase\":[\"1\"],\"List\":[\"1\"],\"Queue\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"ListBase.E\":\"1\",\"QueueList.E\":\"1\",\"Iterable.E\":\"1\"},\"_CastQueueList\":{\"QueueList\":[\"2\"],\"ListBase\":[\"2\"],\"List\":[\"2\"],\"Queue\":[\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"ListBase.E\":\"2\",\"QueueList.E\":\"2\",\"Iterable.E\":\"2\"},\"PersistentWebSocket\":{\"StreamChannelMixin\":[\"@\"]},\"SseSocketClient\":{\"SocketClient\":[]},\"WebSocketClient\":{\"SocketClient\":[]},\"RequestAbortedException\":{\"Exception\":[]},\"ByteStream\":{\"StreamView\":[\"List<int>\"],\"Stream\":[\"List<int>\"],\"Stream.T\":\"List<int>\",\"StreamView.T\":\"List<int>\"},\"ClientException\":{\"Exception\":[]},\"Request\":{\"BaseRequest\":[]},\"StreamedResponseV2\":{\"StreamedResponse\":[]},\"CaseInsensitiveMap\":{\"CanonicalizedMap\":[\"String\",\"String\",\"1\"],\"Map\":[\"String\",\"1\"],\"CanonicalizedMap.K\":\"String\",\"CanonicalizedMap.V\":\"1\",\"CanonicalizedMap.C\":\"String\"},\"Level\":{\"Comparable\":[\"Level\"]},\"PathException\":{\"Exception\":[]},\"PosixStyle\":{\"InternalStyle\":[]},\"UrlStyle\":{\"InternalStyle\":[]},\"WindowsStyle\":{\"InternalStyle\":[]},\"FileLocation\":{\"SourceLocation\":[],\"Comparable\":[\"SourceLocation\"]},\"_FileSpan\":{\"SourceSpanWithContext\":[],\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SourceLocation\":{\"Comparable\":[\"SourceLocation\"]},\"SourceLocationMixin\":{\"SourceLocation\":[],\"Comparable\":[\"SourceLocation\"]},\"SourceSpan\":{\"Comparable\":[\"SourceSpan\"]},\"SourceSpanBase\":{\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SourceSpanException\":{\"Exception\":[]},\"SourceSpanFormatException\":{\"FormatException\":[],\"Exception\":[]},\"SourceSpanMixin\":{\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SourceSpanWithContext\":{\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SseClient\":{\"StreamChannelMixin\":[\"String?\"]},\"StringScannerException\":{\"FormatException\":[],\"Exception\":[]},\"_EventStream\":{\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_EventStreamSubscription\":{\"StreamSubscription\":[\"1\"]},\"BrowserWebSocket\":{\"WebSocket\":[]},\"TextDataReceived\":{\"WebSocketEvent\":[]},\"BinaryDataReceived\":{\"WebSocketEvent\":[]},\"CloseReceived\":{\"WebSocketEvent\":[]},\"WebSocketException\":{\"Exception\":[]},\"WebSocketConnectionClosed\":{\"Exception\":[]},\"DdcLibraryBundleRestarter\":{\"TwoPhaseRestarter\":[],\"Restarter\":[]},\"DdcRestarter\":{\"Restarter\":[]},\"RequireRestarter\":{\"Restarter\":[]},\"HotReloadFailedException\":{\"Exception\":[]},\"Int8List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint8List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint8ClampedList\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Int16List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint16List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Int32List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint32List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Float32List\":{\"List\":[\"double\"],\"EfficientLengthIterable\":[\"double\"],\"Iterable\":[\"double\"]},\"Float64List\":{\"List\":[\"double\"],\"EfficientLengthIterable\":[\"double\"],\"Iterable\":[\"double\"]}}'));\n"
+"  A._Universe_addRules(init.typeUniverse, JSON.parse('{\"JavaScriptFunction\":\"LegacyJavaScriptObject\",\"PlainJavaScriptObject\":\"LegacyJavaScriptObject\",\"UnknownJavaScriptObject\":\"LegacyJavaScriptObject\",\"NativeSharedArrayBuffer\":\"NativeByteBuffer\",\"JavaScriptObject\":{\"Interceptor\":[],\"JSObject\":[]},\"JSArray\":{\"List\":[\"1\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"1\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"JSBool\":{\"Interceptor\":[],\"bool\":[],\"TrustedGetRuntimeType\":[]},\"JSNull\":{\"Interceptor\":[],\"Null\":[],\"TrustedGetRuntimeType\":[]},\"LegacyJavaScriptObject\":{\"JavaScriptObject\":[],\"Interceptor\":[],\"JSObject\":[]},\"JavaScriptBigInt\":{\"Interceptor\":[]},\"JavaScriptSymbol\":{\"Interceptor\":[]},\"JSArraySafeToStringHook\":{\"SafeToStringHook\":[]},\"JSUnmodifiableArray\":{\"JSArray\":[\"1\"],\"List\":[\"1\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"1\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"ArrayIterator\":{\"Iterator\":[\"1\"]},\"JSNumber\":{\"double\":[],\"num\":[],\"Interceptor\":[],\"Comparable\":[\"num\"]},\"JSInt\":{\"double\":[],\"int\":[],\"num\":[],\"Interceptor\":[],\"Comparable\":[\"num\"],\"TrustedGetRuntimeType\":[]},\"JSNumNotInt\":{\"double\":[],\"num\":[],\"Interceptor\":[],\"Comparable\":[\"num\"],\"TrustedGetRuntimeType\":[]},\"JSString\":{\"String\":[],\"Interceptor\":[],\"Comparable\":[\"String\"],\"Pattern\":[],\"TrustedGetRuntimeType\":[]},\"CastStream\":{\"Stream\":[\"2\"],\"Stream.T\":\"2\"},\"CastStreamSubscription\":{\"StreamSubscription\":[\"2\"]},\"_CastIterableBase\":{\"Iterable\":[\"2\"]},\"CastIterator\":{\"Iterator\":[\"2\"]},\"CastIterable\":{\"_CastIterableBase\":[\"1\",\"2\"],\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"_EfficientLengthCastIterable\":{\"CastIterable\":[\"1\",\"2\"],\"_CastIterableBase\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"_CastListBase\":{\"ListBase\":[\"2\"],\"List\":[\"2\"],\"_CastIterableBase\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"]},\"CastList\":{\"_CastListBase\":[\"1\",\"2\"],\"ListBase\":[\"2\"],\"List\":[\"2\"],\"_CastIterableBase\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"ListBase.E\":\"2\",\"Iterable.E\":\"2\"},\"CastMap\":{\"MapBase\":[\"3\",\"4\"],\"Map\":[\"3\",\"4\"],\"MapBase.K\":\"3\",\"MapBase.V\":\"4\"},\"LateError\":{\"Error\":[]},\"CodeUnits\":{\"ListBase\":[\"int\"],\"UnmodifiableListMixin\":[\"int\"],\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"UnmodifiableListMixin.E\":\"int\"},\"EfficientLengthIterable\":{\"Iterable\":[\"1\"]},\"ListIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"SubListIterable\":{\"ListIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"ListIterable.E\":\"1\",\"Iterable.E\":\"1\"},\"ListIterator\":{\"Iterator\":[\"1\"]},\"MappedIterable\":{\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"EfficientLengthMappedIterable\":{\"MappedIterable\":[\"1\",\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"MappedIterator\":{\"Iterator\":[\"2\"]},\"MappedListIterable\":{\"ListIterable\":[\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"ListIterable.E\":\"2\",\"Iterable.E\":\"2\"},\"WhereIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"WhereIterator\":{\"Iterator\":[\"1\"]},\"ExpandIterable\":{\"Iterable\":[\"2\"],\"Iterable.E\":\"2\"},\"ExpandIterator\":{\"Iterator\":[\"2\"]},\"TakeIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"EfficientLengthTakeIterable\":{\"TakeIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"TakeIterator\":{\"Iterator\":[\"1\"]},\"SkipIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"EfficientLengthSkipIterable\":{\"SkipIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"SkipIterator\":{\"Iterator\":[\"1\"]},\"EmptyIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"EmptyIterator\":{\"Iterator\":[\"1\"]},\"WhereTypeIterable\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"WhereTypeIterator\":{\"Iterator\":[\"1\"]},\"UnmodifiableListBase\":{\"ListBase\":[\"1\"],\"UnmodifiableListMixin\":[\"1\"],\"List\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"ReversedListIterable\":{\"ListIterable\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"ListIterable.E\":\"1\",\"Iterable.E\":\"1\"},\"_Record_2\":{\"_Record2\":[],\"_Record\":[]},\"ConstantMap\":{\"Map\":[\"1\",\"2\"]},\"ConstantStringMap\":{\"ConstantMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"]},\"_KeysOrValues\":{\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"_KeysOrValuesOrElementsIterator\":{\"Iterator\":[\"1\"]},\"Instantiation\":{\"Closure\":[],\"Function\":[]},\"Instantiation1\":{\"Closure\":[],\"Function\":[]},\"NullError\":{\"TypeError\":[],\"Error\":[]},\"JsNoSuchMethodError\":{\"Error\":[]},\"UnknownJsTypeError\":{\"Error\":[]},\"NullThrownFromJavaScriptException\":{\"Exception\":[]},\"_StackTrace\":{\"StackTrace\":[]},\"Closure\":{\"Function\":[]},\"Closure0Args\":{\"Closure\":[],\"Function\":[]},\"Closure2Args\":{\"Closure\":[],\"Function\":[]},\"TearOffClosure\":{\"Closure\":[],\"Function\":[]},\"StaticClosure\":{\"Closure\":[],\"Function\":[]},\"BoundClosure\":{\"Closure\":[],\"Function\":[]},\"RuntimeError\":{\"Error\":[]},\"JsLinkedHashMap\":{\"MapBase\":[\"1\",\"2\"],\"LinkedHashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"LinkedHashMapKeysIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"LinkedHashMapKeyIterator\":{\"Iterator\":[\"1\"]},\"LinkedHashMapValuesIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"LinkedHashMapValueIterator\":{\"Iterator\":[\"1\"]},\"LinkedHashMapEntriesIterable\":{\"EfficientLengthIterable\":[\"MapEntry<1,2>\"],\"Iterable\":[\"MapEntry<1,2>\"],\"Iterable.E\":\"MapEntry<1,2>\"},\"LinkedHashMapEntryIterator\":{\"Iterator\":[\"MapEntry<1,2>\"]},\"JsIdentityLinkedHashMap\":{\"JsLinkedHashMap\":[\"1\",\"2\"],\"MapBase\":[\"1\",\"2\"],\"LinkedHashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_Record2\":{\"_Record\":[]},\"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\":[],\"Interceptor\":[],\"JSObject\":[],\"ByteBuffer\":[],\"TrustedGetRuntimeType\":[]},\"NativeArrayBuffer\":{\"NativeByteBuffer\":[],\"JavaScriptObject\":[],\"Interceptor\":[],\"JSObject\":[],\"ByteBuffer\":[],\"TrustedGetRuntimeType\":[]},\"NativeTypedData\":{\"JavaScriptObject\":[],\"Interceptor\":[],\"JSObject\":[]},\"_UnmodifiableNativeByteBufferView\":{\"ByteBuffer\":[]},\"NativeByteData\":{\"JavaScriptObject\":[],\"ByteData\":[],\"Interceptor\":[],\"JSObject\":[],\"TrustedGetRuntimeType\":[]},\"NativeTypedArray\":{\"JavaScriptIndexingBehavior\":[\"1\"],\"JavaScriptObject\":[],\"Interceptor\":[],\"JSObject\":[]},\"NativeTypedArrayOfDouble\":{\"ListBase\":[\"double\"],\"NativeTypedArray\":[\"double\"],\"List\":[\"double\"],\"JavaScriptIndexingBehavior\":[\"double\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"double\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"double\"],\"FixedLengthListMixin\":[\"double\"]},\"NativeTypedArrayOfInt\":{\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"]},\"NativeFloat32List\":{\"Float32List\":[],\"ListBase\":[\"double\"],\"NativeTypedArray\":[\"double\"],\"List\":[\"double\"],\"JavaScriptIndexingBehavior\":[\"double\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"double\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"double\"],\"FixedLengthListMixin\":[\"double\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"double\",\"Iterable.E\":\"double\",\"FixedLengthListMixin.E\":\"double\"},\"NativeFloat64List\":{\"Float64List\":[],\"ListBase\":[\"double\"],\"NativeTypedArray\":[\"double\"],\"List\":[\"double\"],\"JavaScriptIndexingBehavior\":[\"double\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"double\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"double\"],\"FixedLengthListMixin\":[\"double\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"double\",\"Iterable.E\":\"double\",\"FixedLengthListMixin.E\":\"double\"},\"NativeInt16List\":{\"NativeTypedArrayOfInt\":[],\"Int16List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeInt32List\":{\"NativeTypedArrayOfInt\":[],\"Int32List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeInt8List\":{\"NativeTypedArrayOfInt\":[],\"Int8List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint16List\":{\"NativeTypedArrayOfInt\":[],\"Uint16List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint32List\":{\"NativeTypedArrayOfInt\":[],\"Uint32List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint8ClampedList\":{\"NativeTypedArrayOfInt\":[],\"Uint8ClampedList\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"NativeUint8List\":{\"NativeTypedArrayOfInt\":[],\"Uint8List\":[],\"ListBase\":[\"int\"],\"NativeTypedArray\":[\"int\"],\"List\":[\"int\"],\"JavaScriptIndexingBehavior\":[\"int\"],\"JavaScriptObject\":[],\"EfficientLengthIterable\":[\"int\"],\"Interceptor\":[],\"JSObject\":[],\"Iterable\":[\"int\"],\"FixedLengthListMixin\":[\"int\"],\"TrustedGetRuntimeType\":[],\"ListBase.E\":\"int\",\"Iterable.E\":\"int\",\"FixedLengthListMixin.E\":\"int\"},\"_Error\":{\"Error\":[]},\"_TypeError\":{\"TypeError\":[],\"Error\":[]},\"AsyncError\":{\"Error\":[]},\"MultiStreamController\":{\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"]},\"_TimerImpl\":{\"Timer\":[]},\"_AsyncAwaitCompleter\":{\"Completer\":[\"1\"]},\"_Completer\":{\"Completer\":[\"1\"]},\"_AsyncCompleter\":{\"_Completer\":[\"1\"],\"Completer\":[\"1\"]},\"_SyncCompleter\":{\"_Completer\":[\"1\"],\"Completer\":[\"1\"]},\"_Future\":{\"Future\":[\"1\"]},\"StreamView\":{\"Stream\":[\"1\"]},\"_StreamController\":{\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"],\"_StreamControllerLifecycle\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"]},\"_AsyncStreamController\":{\"_AsyncStreamControllerDispatch\":[\"1\"],\"_StreamController\":[\"1\"],\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"],\"_StreamControllerLifecycle\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"]},\"_ControllerStream\":{\"_StreamImpl\":[\"1\"],\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_ControllerSubscription\":{\"_BufferingStreamSubscription\":[\"1\"],\"StreamSubscription\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"],\"_BufferingStreamSubscription.T\":\"1\"},\"_StreamSinkWrapper\":{\"StreamSink\":[\"1\"]},\"_BufferingStreamSubscription\":{\"StreamSubscription\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"],\"_BufferingStreamSubscription.T\":\"1\"},\"_StreamImpl\":{\"Stream\":[\"1\"]},\"_DelayedData\":{\"_DelayedEvent\":[\"1\"]},\"_DelayedError\":{\"_DelayedEvent\":[\"@\"]},\"_DelayedDone\":{\"_DelayedEvent\":[\"@\"]},\"_DoneStreamSubscription\":{\"StreamSubscription\":[\"1\"]},\"_EmptyStream\":{\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_MultiStream\":{\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_MultiStreamController\":{\"_AsyncStreamController\":[\"1\"],\"_AsyncStreamControllerDispatch\":[\"1\"],\"_StreamController\":[\"1\"],\"MultiStreamController\":[\"1\"],\"StreamController\":[\"1\"],\"StreamSink\":[\"1\"],\"_StreamControllerLifecycle\":[\"1\"],\"_EventSink\":[\"1\"],\"_EventDispatch\":[\"1\"]},\"_ForwardingStream\":{\"Stream\":[\"2\"]},\"_ForwardingStreamSubscription\":{\"_BufferingStreamSubscription\":[\"2\"],\"StreamSubscription\":[\"2\"],\"_EventSink\":[\"2\"],\"_EventDispatch\":[\"2\"],\"_BufferingStreamSubscription.T\":\"2\"},\"_MapStream\":{\"_ForwardingStream\":[\"1\",\"2\"],\"Stream\":[\"2\"],\"Stream.T\":\"2\"},\"_SplayTreeSetNode\":{\"_SplayTreeNode\":[\"1\",\"_SplayTreeSetNode<1>\"],\"_SplayTreeNode.K\":\"1\",\"_SplayTreeNode.1\":\"_SplayTreeSetNode<1>\"},\"_HashMap\":{\"MapBase\":[\"1\",\"2\"],\"HashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_IdentityHashMap\":{\"_HashMap\":[\"1\",\"2\"],\"MapBase\":[\"1\",\"2\"],\"HashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_HashMapKeyIterable\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"_HashMapKeyIterator\":{\"Iterator\":[\"1\"]},\"_LinkedCustomHashMap\":{\"JsLinkedHashMap\":[\"1\",\"2\"],\"MapBase\":[\"1\",\"2\"],\"LinkedHashMap\":[\"1\",\"2\"],\"Map\":[\"1\",\"2\"],\"MapBase.K\":\"1\",\"MapBase.V\":\"2\"},\"_HashSet\":{\"SetBase\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\"},\"_HashSetIterator\":{\"Iterator\":[\"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\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"_SetBase\":{\"SetBase\":[\"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\"],\"EfficientLengthIterable\":[\"1\"],\"_SplayTree\":[\"1\",\"_SplayTreeSetNode<1>\"],\"Iterable\":[\"1\"],\"Iterable.E\":\"1\",\"_SplayTree.1\":\"_SplayTreeSetNode<1>\",\"_SplayTree.K\":\"1\"},\"Encoding\":{\"Codec\":[\"String\",\"List<int>\"]},\"_JsonMap\":{\"MapBase\":[\"String\",\"@\"],\"Map\":[\"String\",\"@\"],\"MapBase.K\":\"String\",\"MapBase.V\":\"@\"},\"_JsonMapKeyIterable\":{\"ListIterable\":[\"String\"],\"EfficientLengthIterable\":[\"String\"],\"Iterable\":[\"String\"],\"ListIterable.E\":\"String\",\"Iterable.E\":\"String\"},\"AsciiCodec\":{\"Encoding\":[],\"Codec\":[\"String\",\"List<int>\"]},\"_UnicodeSubsetEncoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"AsciiEncoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"_UnicodeSubsetDecoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"AsciiDecoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"Base64Codec\":{\"Codec\":[\"List<int>\",\"String\"]},\"Base64Encoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"JsonUnsupportedObjectError\":{\"Error\":[]},\"JsonCyclicError\":{\"Error\":[]},\"JsonCodec\":{\"Codec\":[\"Object?\",\"String\"]},\"JsonEncoder\":{\"Converter\":[\"Object?\",\"String\"]},\"JsonDecoder\":{\"Converter\":[\"String\",\"Object?\"]},\"Latin1Codec\":{\"Encoding\":[],\"Codec\":[\"String\",\"List<int>\"]},\"Latin1Encoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"Latin1Decoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"Utf8Codec\":{\"Encoding\":[],\"Codec\":[\"String\",\"List<int>\"]},\"Utf8Encoder\":{\"Converter\":[\"String\",\"List<int>\"]},\"Utf8Decoder\":{\"Converter\":[\"List<int>\",\"String\"]},\"DateTime\":{\"Comparable\":[\"DateTime\"]},\"double\":{\"num\":[],\"Comparable\":[\"num\"]},\"Duration\":{\"Comparable\":[\"Duration\"]},\"int\":{\"num\":[],\"Comparable\":[\"num\"]},\"List\":{\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"]},\"num\":{\"Comparable\":[\"num\"]},\"RegExpMatch\":{\"Match\":[]},\"String\":{\"Comparable\":[\"String\"],\"Pattern\":[]},\"AssertionError\":{\"Error\":[]},\"TypeError\":{\"Error\":[]},\"ArgumentError\":{\"Error\":[]},\"RangeError\":{\"Error\":[]},\"IndexError\":{\"Error\":[]},\"UnsupportedError\":{\"Error\":[]},\"UnimplementedError\":{\"Error\":[]},\"StateError\":{\"Error\":[]},\"ConcurrentModificationError\":{\"Error\":[]},\"OutOfMemoryError\":{\"Error\":[]},\"StackOverflowError\":{\"Error\":[]},\"_Exception\":{\"Exception\":[]},\"FormatException\":{\"Exception\":[]},\"_StringStackTrace\":{\"StackTrace\":[]},\"StringBuffer\":{\"StringSink\":[]},\"_Uri\":{\"Uri\":[]},\"_SimpleUri\":{\"Uri\":[]},\"_DataUri\":{\"Uri\":[]},\"NullRejectionException\":{\"Exception\":[]},\"ErrorResult\":{\"Result\":[\"0&\"]},\"ValueResult\":{\"Result\":[\"1\"]},\"_NextRequest\":{\"_EventRequest\":[\"1\"]},\"_HasNextRequest\":{\"_EventRequest\":[\"1\"]},\"CanonicalizedMap\":{\"Map\":[\"2\",\"3\"]},\"QueueList\":{\"ListBase\":[\"1\"],\"List\":[\"1\"],\"Queue\":[\"1\"],\"EfficientLengthIterable\":[\"1\"],\"Iterable\":[\"1\"],\"ListBase.E\":\"1\",\"QueueList.E\":\"1\",\"Iterable.E\":\"1\"},\"_CastQueueList\":{\"QueueList\":[\"2\"],\"ListBase\":[\"2\"],\"List\":[\"2\"],\"Queue\":[\"2\"],\"EfficientLengthIterable\":[\"2\"],\"Iterable\":[\"2\"],\"ListBase.E\":\"2\",\"QueueList.E\":\"2\",\"Iterable.E\":\"2\"},\"PersistentWebSocket\":{\"StreamChannelMixin\":[\"@\"]},\"SseSocketClient\":{\"SocketClient\":[]},\"WebSocketClient\":{\"SocketClient\":[]},\"RequestAbortedException\":{\"Exception\":[]},\"ByteStream\":{\"StreamView\":[\"List<int>\"],\"Stream\":[\"List<int>\"],\"Stream.T\":\"List<int>\",\"StreamView.T\":\"List<int>\"},\"ClientException\":{\"Exception\":[]},\"Request\":{\"BaseRequest\":[]},\"StreamedResponseV2\":{\"StreamedResponse\":[]},\"CaseInsensitiveMap\":{\"CanonicalizedMap\":[\"String\",\"String\",\"1\"],\"Map\":[\"String\",\"1\"],\"CanonicalizedMap.K\":\"String\",\"CanonicalizedMap.V\":\"1\",\"CanonicalizedMap.C\":\"String\"},\"Level\":{\"Comparable\":[\"Level\"]},\"PathException\":{\"Exception\":[]},\"PosixStyle\":{\"InternalStyle\":[]},\"UrlStyle\":{\"InternalStyle\":[]},\"WindowsStyle\":{\"InternalStyle\":[]},\"FileLocation\":{\"SourceLocation\":[],\"Comparable\":[\"SourceLocation\"]},\"_FileSpan\":{\"SourceSpanWithContext\":[],\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SourceLocation\":{\"Comparable\":[\"SourceLocation\"]},\"SourceLocationMixin\":{\"SourceLocation\":[],\"Comparable\":[\"SourceLocation\"]},\"SourceSpan\":{\"Comparable\":[\"SourceSpan\"]},\"SourceSpanBase\":{\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SourceSpanException\":{\"Exception\":[]},\"SourceSpanFormatException\":{\"FormatException\":[],\"Exception\":[]},\"SourceSpanMixin\":{\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SourceSpanWithContext\":{\"SourceSpan\":[],\"Comparable\":[\"SourceSpan\"]},\"SseClient\":{\"StreamChannelMixin\":[\"String?\"]},\"StringScannerException\":{\"FormatException\":[],\"Exception\":[]},\"_EventStream\":{\"Stream\":[\"1\"],\"Stream.T\":\"1\"},\"_EventStreamSubscription\":{\"StreamSubscription\":[\"1\"]},\"BrowserWebSocket\":{\"WebSocket\":[]},\"TextDataReceived\":{\"WebSocketEvent\":[]},\"BinaryDataReceived\":{\"WebSocketEvent\":[]},\"CloseReceived\":{\"WebSocketEvent\":[]},\"WebSocketException\":{\"Exception\":[]},\"WebSocketConnectionClosed\":{\"Exception\":[]},\"DdcLibraryBundleRestarter\":{\"TwoPhaseRestarter\":[],\"Restarter\":[]},\"DdcRestarter\":{\"Restarter\":[]},\"RequireRestarter\":{\"Restarter\":[]},\"HotReloadFailedException\":{\"Exception\":[]},\"Int8List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint8List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint8ClampedList\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Int16List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint16List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Int32List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Uint32List\":{\"List\":[\"int\"],\"EfficientLengthIterable\":[\"int\"],\"Iterable\":[\"int\"]},\"Float32List\":{\"List\":[\"double\"],\"EfficientLengthIterable\":[\"double\"],\"Iterable\":[\"double\"]},\"Float64List\":{\"List\":[\"double\"],\"EfficientLengthIterable\":[\"double\"],\"Iterable\":[\"double\"]}}'));\n"
 "  A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{\"UnmodifiableListBase\":1,\"__CastListBase__CastIterableBase_ListMixin\":2,\"NativeTypedArray\":1,\"_DelayedEvent\":1,\"_SetBase\":1,\"_SplayTreeSet__SplayTree_Iterable\":1,\"_SplayTreeSet__SplayTree_Iterable_SetMixin\":1,\"_QueueList_Object_ListMixin\":1,\"StreamChannelMixin\":1}'));\n"
 "  var string\$ = {\n"
 "    x00_____: \"\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\x00\\u03f6\\x00\\u0404\\u03f4 \\u03f4\\u03f6\\u01f6\\u01f6\\u03f6\\u03fc\\u01f4\\u03ff\\u03ff\\u0584\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u05d4\\u01f4\\x00\\u01f4\\x00\\u0504\\u05c4\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u0400\\x00\\u0400\\u0200\\u03f7\\u0200\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u03ff\\u0200\\u0200\\u0200\\u03f7\\x00\",\n"
@@ -22350,7 +21950,6 @@
 "    Cannotff: \"Cannot extract a file path from a URI with a fragment component\",\n"
 "    Cannotfq: \"Cannot extract a file path from a URI with a query component\",\n"
 "    Cannotn: \"Cannot extract a non-Windows file path from a file URI with an authority\",\n"
-"    Dart_e: \"Dart exception thrown from converted Future. Use the properties 'error' to fetch the boxed error and 'stack' to recover the stack trace.\",\n"
 "    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\",\n"
 "    Hot_reA: \"Hot reload is not supported for the AMD module format.\",\n"
 "    Hot_reD: \"Hot reload is not supported for the DDC module format.\",\n"
@@ -22360,6 +21959,8 @@
 "  var type\$ = (function rtii() {\n"
 "    var findType = A.findType;\n"
 "    return {\n"
+"      \$env_1_1_dynamic: findType(\"@<@>\"),\n"
+"      \$env_1_1_void: findType(\"@<~>\"),\n"
 "      AsyncError: findType(\"AsyncError\"),\n"
 "      BatchedStreamController_DebugEvent: findType(\"BatchedStreamController<DebugEvent>\"),\n"
 "      BrowserWebSocket: findType(\"BrowserWebSocket\"),\n"
@@ -22385,6 +21986,7 @@
 "      Int16List: findType(\"Int16List\"),\n"
 "      Int32List: findType(\"Int32List\"),\n"
 "      Int8List: findType(\"Int8List\"),\n"
+"      Interceptor: findType(\"Interceptor\"),\n"
 "      Iterable_String: findType(\"Iterable<String>\"),\n"
 "      Iterable_dynamic: findType(\"Iterable<@>\"),\n"
 "      Iterable_int: findType(\"Iterable<int>\"),\n"
@@ -22442,7 +22044,6 @@
 "      StreamedResponse: findType(\"StreamedResponse\"),\n"
 "      String: findType(\"String\"),\n"
 "      String_Function_Match: findType(\"String(Match)\"),\n"
-"      Timer: findType(\"Timer\"),\n"
 "      TrustedGetRuntimeType: findType(\"TrustedGetRuntimeType\"),\n"
 "      TwoPhaseRestarter: findType(\"TwoPhaseRestarter\"),\n"
 "      TypeError: findType(\"TypeError\"),\n"
@@ -22456,7 +22057,6 @@
 "      WebSocket: findType(\"WebSocket\"),\n"
 "      WebSocketEvent: findType(\"WebSocketEvent\"),\n"
 "      WhereTypeIterable_String: findType(\"WhereTypeIterable<String>\"),\n"
-"      Zone: findType(\"Zone\"),\n"
 "      _AsyncCompleter_BrowserWebSocket: findType(\"_AsyncCompleter<BrowserWebSocket>\"),\n"
 "      _AsyncCompleter_PoolResource: findType(\"_AsyncCompleter<PoolResource>\"),\n"
 "      _AsyncCompleter_String: findType(\"_AsyncCompleter<String>\"),\n"
@@ -22481,7 +22081,6 @@
 "      _MultiStream_List_int: findType(\"_MultiStream<List<int>>\"),\n"
 "      _StreamControllerAddStreamState_nullable_Object: findType(\"_StreamControllerAddStreamState<Object?>\"),\n"
 "      _SyncCompleter_PoolResource: findType(\"_SyncCompleter<PoolResource>\"),\n"
-"      _ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace: findType(\"_ZoneFunction<~(Zone,ZoneDelegate,Zone,Object,StackTrace)>\"),\n"
 "      bool: findType(\"bool\"),\n"
 "      bool_Function_Object: findType(\"bool(Object)\"),\n"
 "      bool_Function__Highlight: findType(\"bool(_Highlight)\"),\n"
@@ -22498,15 +22097,11 @@
 "      nullable_List_dynamic: findType(\"List<@>?\"),\n"
 "      nullable_Map_String_dynamic: findType(\"Map<String,@>?\"),\n"
 "      nullable_Map_dynamic_dynamic: findType(\"Map<@,@>?\"),\n"
-"      nullable_Map_of_nullable_Object_and_nullable_Object: findType(\"Map<Object?,Object?>?\"),\n"
 "      nullable_Object: findType(\"Object?\"),\n"
 "      nullable_Result_DebugEvent: findType(\"Result<DebugEvent>?\"),\n"
 "      nullable_StackTrace: findType(\"StackTrace?\"),\n"
 "      nullable_String: findType(\"String?\"),\n"
 "      nullable_String_Function_Match: findType(\"String(Match)?\"),\n"
-"      nullable_Zone: findType(\"Zone?\"),\n"
-"      nullable_ZoneDelegate: findType(\"ZoneDelegate?\"),\n"
-"      nullable_ZoneSpecification: findType(\"ZoneSpecification?\"),\n"
 "      nullable__DelayedEvent_dynamic: findType(\"_DelayedEvent<@>?\"),\n"
 "      nullable__FutureListener_dynamic_dynamic: findType(\"_FutureListener<@,@>?\"),\n"
 "      nullable__Highlight: findType(\"_Highlight?\"),\n"
@@ -22523,7 +22118,7 @@
 "      void_Function_Object: findType(\"~(Object)\"),\n"
 "      void_Function_Object_StackTrace: findType(\"~(Object,StackTrace)\"),\n"
 "      void_Function_String_dynamic: findType(\"~(String,@)\"),\n"
-"      void_Function_Timer: findType(\"~(Timer)\")\n"
+"      void_Function_int_dynamic: findType(\"~(int,@)\")\n"
 "    };\n"
 "  })();\n"
 "  (function constants() {\n"
@@ -22682,7 +22277,6 @@
 "    B.C_Uuid = new A.Uuid();\n"
 "    B.C__DelayedDone = new A._DelayedDone();\n"
 "    B.C__JSRandom = new A._JSRandom();\n"
-"    B.C__RootZone = new A._RootZone();\n"
 "    B.Duration_0 = new A.Duration(0);\n"
 "    B.Duration_5000000 = new A.Duration(5000000);\n"
 "    B.JsonDecoder_null = new A.JsonDecoder(null);\n"
@@ -22718,20 +22312,8 @@
 "    B.Type_Uint8ClampedList_04U = A.typeLiteral(\"Uint8ClampedList\");\n"
 "    B.Type_Uint8List_8Eb = A.typeLiteral(\"Uint8List\");\n"
 "    B.Utf8Decoder_false = new A.Utf8Decoder(false);\n"
+"    B.Zone_jYP = new A.Zone(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);\n"
 "    B._StringStackTrace_OdL = new A._StringStackTrace(\"\");\n"
-"    B._ZoneFunction_KjJ = new A._ZoneFunction(B.C__RootZone, A.async___rootHandleUncaughtError\$closure(), type\$._ZoneFunction_of_void_Function_Zone_ZoneDelegate_Zone_Object_StackTrace);\n"
-"    B._ZoneFunction_PAY = new A._ZoneFunction(B.C__RootZone, A.async___rootCreatePeriodicTimer\$closure(), A.findType(\"_ZoneFunction<Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))>\"));\n"
-"    B._ZoneFunction_Xkh = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterUnaryCallback\$closure(), A.findType(\"_ZoneFunction<0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))<Object?,Object?>>\"));\n"
-"    B._ZoneFunction__RootZone__rootCreateTimer = new A._ZoneFunction(B.C__RootZone, A.async___rootCreateTimer\$closure(), A.findType(\"_ZoneFunction<Timer(Zone,ZoneDelegate,Zone,Duration,~())>\"));\n"
-"    B._ZoneFunction__RootZone__rootErrorCallback = new A._ZoneFunction(B.C__RootZone, A.async___rootErrorCallback\$closure(), A.findType(\"_ZoneFunction<AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)>\"));\n"
-"    B._ZoneFunction__RootZone__rootFork = new A._ZoneFunction(B.C__RootZone, A.async___rootFork\$closure(), A.findType(\"_ZoneFunction<Zone(Zone,ZoneDelegate,Zone,ZoneSpecification?,Map<Object?,Object?>?)>\"));\n"
-"    B._ZoneFunction__RootZone__rootPrint = new A._ZoneFunction(B.C__RootZone, A.async___rootPrint\$closure(), A.findType(\"_ZoneFunction<~(Zone,ZoneDelegate,Zone,String)>\"));\n"
-"    B._ZoneFunction__RootZone__rootRegisterCallback = new A._ZoneFunction(B.C__RootZone, A.async___rootRegisterCallback\$closure(), A.findType(\"_ZoneFunction<0^()(Zone,ZoneDelegate,Zone,0^())<Object?>>\"));\n"
-"    B._ZoneFunction__RootZone__rootRun = new A._ZoneFunction(B.C__RootZone, A.async___rootRun\$closure(), A.findType(\"_ZoneFunction<0^(Zone,ZoneDelegate,Zone,0^())<Object?>>\"));\n"
-"    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^)<Object?,Object?,Object?>>\"));\n"
-"    B._ZoneFunction__RootZone__rootRunUnary = new A._ZoneFunction(B.C__RootZone, A.async___rootRunUnary\$closure(), A.findType(\"_ZoneFunction<0^(Zone,ZoneDelegate,Zone,0^(1^),1^)<Object?,Object?>>\"));\n"
-"    B._ZoneFunction__RootZone__rootScheduleMicrotask = new A._ZoneFunction(B.C__RootZone, A.async___rootScheduleMicrotask\$closure(), A.findType(\"_ZoneFunction<~(Zone,ZoneDelegate,Zone,~())>\"));\n"
-"    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^))<Object?,Object?,Object?>>\"));\n"
 "  })();\n"
 "  (function staticFields() {\n"
 "    \$._JS_INTEROP_INTERCEPTOR_TAG = null;\n"
@@ -22751,8 +22333,7 @@
 "    \$._lastCallback = null;\n"
 "    \$._lastPriorityCallback = null;\n"
 "    \$._isInCallbackLoop = false;\n"
-"    \$.Zone__current = B.C__RootZone;\n"
-"    \$._RootZone__rootDelegate = null;\n"
+"    \$.Zone__current = B.Zone_jYP;\n"
 "    \$.Uri__cachedBaseString = \"\";\n"
 "    \$.Uri__cachedBaseUri = null;\n"
 "    \$.LogRecord__nextNumber = 0;\n"
@@ -22765,7 +22346,7 @@
 "    var _lazyFinal = hunkHelpers.lazyFinal;\n"
 "    _lazyFinal(\$, \"DART_CLOSURE_PROPERTY_NAME\", \"\$get\$DART_CLOSURE_PROPERTY_NAME\", () => A.getIsolateAffinityTag(\"_\$dart_dartClosure\"));\n"
 "    _lazyFinal(\$, \"DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME\", \"\$get\$DART_CLOSURE_DART_JSINTEROP_PROPERTY_NAME\", () => A.getIsolateAffinityTag(\"_\$dart_dartClosure_dartJSInterop\"));\n"
-"    _lazyFinal(\$, \"nullFuture\", \"\$get\$nullFuture\", () => B.C__RootZone.run\$1\$1(new A.nullFuture_closure(), type\$.Future_void));\n"
+"    _lazyFinal(\$, \"nullFuture\", \"\$get\$nullFuture\", () => B.Zone_jYP.run\$1\$1(new A.nullFuture_closure(), type\$.Future_void));\n"
 "    _lazyFinal(\$, \"_safeToStringHooks\", \"\$get\$_safeToStringHooks\", () => A._setArrayType([new J.JSArraySafeToStringHook()], A.findType(\"JSArray<SafeToStringHook>\")));\n"
 "    _lazyFinal(\$, \"TypeErrorDecoder_noSuchMethodPattern\", \"\$get\$TypeErrorDecoder_noSuchMethodPattern\", () => A.TypeErrorDecoder_extractPattern(A.TypeErrorDecoder_provokeCallErrorOn({\n"
 "      toString: function() {\n"
@@ -22813,10 +22394,7 @@
 "    }()));\n"
 "    _lazyFinal(\$, \"_AsyncRun__scheduleImmediateClosure\", \"\$get\$_AsyncRun__scheduleImmediateClosure\", () => A._AsyncRun__initializeScheduleImmediate());\n"
 "    _lazyFinal(\$, \"Future__nullFuture\", \"\$get\$Future__nullFuture\", () => \$.\$get\$nullFuture());\n"
-"    _lazyFinal(\$, \"_RootZone__rootMap\", \"\$get\$_RootZone__rootMap\", () => {\n"
-"      var t1 = type\$.dynamic;\n"
-"      return A.HashMap_HashMap(null, null, t1, t1);\n"
-"    });\n"
+"    _lazyFinal(\$, \"_rootDelegate\", \"\$get\$_rootDelegate\", () => A.ZoneDelegate\$_());\n"
 "    _lazyFinal(\$, \"_Utf8Decoder__reusableBuffer\", \"\$get\$_Utf8Decoder__reusableBuffer\", () => A.NativeUint8List_NativeUint8List(4096));\n"
 "    _lazyFinal(\$, \"_Utf8Decoder__decoder\", \"\$get\$_Utf8Decoder__decoder\", () => new A._Utf8Decoder__decoder_closure().call\$0());\n"
 "    _lazyFinal(\$, \"_Utf8Decoder__decoderNonfatal\", \"\$get\$_Utf8Decoder__decoderNonfatal\", () => new A._Utf8Decoder__decoderNonfatal_closure().call\$0());\n"
@@ -22906,11 +22484,8 @@
 "  Function.prototype.call\$0 = function() {\n"
 "    return this();\n"
 "  };\n"
-"  Function.prototype.call\$1\$1 = function(a) {\n"
-"    return this(a);\n"
-"  };\n"
-"  Function.prototype.call\$3\$3 = function(a, b, c) {\n"
-"    return this(a, b, c);\n"
+"  Function.prototype.call\$1\$4 = function(a, b, c, d) {\n"
+"    return this(a, b, c, d);\n"
 "  };\n"
 "  Function.prototype.call\$5 = function(a, b, c, d, e) {\n"
 "    return this(a, b, c, d, e);\n"
@@ -22924,33 +22499,18 @@
 "  Function.prototype.call\$3\$6 = function(a, b, c, d, e, f) {\n"
 "    return this(a, b, c, d, e, f);\n"
 "  };\n"
-"  Function.prototype.call\$1\$4 = function(a, b, c, d) {\n"
+"  Function.prototype.call\$3\$4 = function(a, b, c, d) {\n"
 "    return this(a, b, c, d);\n"
 "  };\n"
-"  Function.prototype.call\$2\$1 = function(a) {\n"
-"    return this(a);\n"
-"  };\n"
 "  Function.prototype.call\$2\$5 = function(a, b, c, d, e) {\n"
 "    return this(a, b, c, d, e);\n"
 "  };\n"
 "  Function.prototype.call\$2\$4 = function(a, b, c, d) {\n"
 "    return this(a, b, c, d);\n"
 "  };\n"
-"  Function.prototype.call\$3\$1 = function(a) {\n"
+"  Function.prototype.call\$1\$1 = function(a) {\n"
 "    return this(a);\n"
 "  };\n"
-"  Function.prototype.call\$3\$4 = function(a, b, c, d) {\n"
-"    return this(a, b, c, d);\n"
-"  };\n"
-"  Function.prototype.call\$2\$2 = function(a, b) {\n"
-"    return this(a, b);\n"
-"  };\n"
-"  Function.prototype.call\$2\$3 = function(a, b, c) {\n"
-"    return this(a, b, c);\n"
-"  };\n"
-"  Function.prototype.call\$1\$2 = function(a, b) {\n"
-"    return this(a, b);\n"
-"  };\n"
 "  Function.prototype.call\$2\$0 = function() {\n"
 "    return this();\n"
 "  };\n"
@@ -22990,4 +22550,4 @@
 "})();\n"
 "";
 
-const clientDartHash = 'eb87fbfbfd5a1d956d883131177756f74503b621509846fb09367d3ab94173eb';
+const clientDartHash = '01a814a59afd26ac1306d9ad96c59b412aab1f9a643eba9589e27d77361d93e8';
diff --git a/dwds/lib/src/utilities/fix_protocol.dart b/dwds/lib/src/utilities/fix_protocol.dart
new file mode 100644
index 0000000..80922bf
--- /dev/null
+++ b/dwds/lib/src/utilities/fix_protocol.dart
@@ -0,0 +1,20 @@
+// Copyright (c) 2026, 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.
+
+/// Returns [url] modified if necessary so that, if the current page is served
+/// over `https`, then the URL is converted to `https` (or `wss`).
+String fixProtocol(String url, {required String windowLocationProtocol}) {
+  var uri = Uri.parse(url);
+  if (windowLocationProtocol == 'https:' &&
+      // Chrome allows mixed content on localhost. It is not safe to assume the
+      // server is also listening on https.
+      uri.host != 'localhost') {
+    if (uri.scheme == 'http') {
+      uri = uri.replace(scheme: 'https');
+    } else if (uri.scheme == 'ws') {
+      uri = uri.replace(scheme: 'wss');
+    }
+  }
+  return uri.toString();
+}
diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart
index 7a70c98..3717192 100644
--- a/dwds/lib/src/version.dart
+++ b/dwds/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '27.1.2';
+const packageVersion = '27.1.3';
diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml
index 42a1b30..b0f062d 100644
--- a/dwds/pubspec.yaml
+++ b/dwds/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dwds
 # Every time this changes you need to run `dart run tool/build.dart`.
-version: 27.1.2
+version: 27.1.3
 
 description: >-
   A service that proxies between the Chrome debug protocol and the Dart VM
diff --git a/dwds/test/utilities/fix_protocol_test.dart b/dwds/test/utilities/fix_protocol_test.dart
new file mode 100644
index 0000000..99764f5
--- /dev/null
+++ b/dwds/test/utilities/fix_protocol_test.dart
@@ -0,0 +1,134 @@
+// Copyright (c) 2026, 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 'package:dwds/src/utilities/fix_protocol.dart';
+import 'package:test/test.dart';
+
+void main() {
+  group('fixProtocol', () {
+    group('when window location protocol is https:', () {
+      const windowProtocol = 'https:';
+
+      test('upgrades http to https for non-localhost hosts', () {
+        expect(
+          fixProtocol(
+            'http://example.com/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'https://example.com/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('upgrades ws to wss for non-localhost hosts', () {
+        expect(
+          fixProtocol(
+            'ws://example.com/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'wss://example.com/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('does not modify http on localhost', () {
+        expect(
+          fixProtocol(
+            'http://localhost:8080/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'http://localhost:8080/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('does not modify ws on localhost', () {
+        expect(
+          fixProtocol(
+            'ws://localhost:8080/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'ws://localhost:8080/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('leaves https unchanged for non-localhost hosts', () {
+        expect(
+          fixProtocol(
+            'https://example.com/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'https://example.com/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('leaves wss unchanged for non-localhost hosts', () {
+        expect(
+          fixProtocol(
+            'wss://example.com/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'wss://example.com/foo/\$dwdsSseHandler',
+        );
+      });
+    });
+
+    group('when window location protocol is http:', () {
+      const windowProtocol = 'http:';
+
+      test('does not modify http for non-localhost hosts', () {
+        expect(
+          fixProtocol(
+            'http://example.com/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'http://example.com/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('does not modify ws for non-localhost hosts', () {
+        expect(
+          fixProtocol(
+            'ws://example.com/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'ws://example.com/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('does not modify http on localhost', () {
+        expect(
+          fixProtocol(
+            'http://localhost:8080/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'http://localhost:8080/foo/\$dwdsSseHandler',
+        );
+      });
+
+      test('does not modify ws on localhost', () {
+        expect(
+          fixProtocol(
+            'ws://localhost:8080/foo/\$dwdsSseHandler',
+            windowLocationProtocol: windowProtocol,
+          ),
+          'ws://localhost:8080/foo/\$dwdsSseHandler',
+        );
+      });
+    });
+
+    group('when window location protocol is not https: (e.g. file:)', () {
+      test('does not modify urls', () {
+        expect(
+          fixProtocol(
+            'http://example.com/foo',
+            windowLocationProtocol: 'file:',
+          ),
+          'http://example.com/foo',
+        );
+        expect(
+          fixProtocol('ws://example.com/foo', windowLocationProtocol: 'file:'),
+          'ws://example.com/foo',
+        );
+      });
+    });
+  });
+}
diff --git a/dwds/web/client.dart b/dwds/web/client.dart
index 89a91b8..601f47c 100644
--- a/dwds/web/client.dart
+++ b/dwds/web/client.dart
@@ -24,6 +24,7 @@
 import 'package:dwds/data/service_extension_response.dart';
 import 'package:dwds/shared/batched_stream.dart';
 import 'package:dwds/src/sockets.dart';
+import 'package:dwds/src/utilities/fix_protocol.dart';
 import 'package:dwds/src/utilities/uuid.dart';
 import 'package:http/browser_client.dart';
 import 'package:sse/client/sse_client.dart';
@@ -62,7 +63,10 @@
         }
       }
 
-      final fixedPath = _fixProtocol(dwdsDevHandlerPath);
+      final fixedPath = fixProtocol(
+        dwdsDevHandlerPath,
+        windowLocationProtocol: window.location.protocol,
+      );
       final fixedUri = Uri.parse(fixedPath);
       final client = fixedUri.isScheme('ws') || fixedUri.isScheme('wss')
           ? WebSocketClient(
@@ -359,24 +363,6 @@
   _trySendEvent(clientSink, jsonEncode(['ConnectRequest', request.toJson()]));
 }
 
-/// Returns [url] modified if necessary so that, if the current page is served
-/// over `https`, then the URL is converted to `https`.
-String _fixProtocol(String url) {
-  var uri = Uri.parse(url);
-  if (window.location.protocol == 'https:' &&
-      uri.scheme == 'http' &&
-      // Chrome allows mixed content on localhost. It is not safe to assume the
-      // server is also listening on https.
-      uri.host != 'localhost') {
-    uri = uri.replace(scheme: 'https');
-  } else if (window.location.protocol == 'wss:' &&
-      uri.scheme == 'ws' &&
-      uri.host != 'localhost') {
-    uri = uri.replace(scheme: 'wss');
-  }
-  return uri.toString();
-}
-
 void _launchCommunicationWithDebugExtension() {
   // Listen for an event from the Dart Debug Extension to authenticate the
   // user (sent once the extension receives the dart-app-read event):