diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index 18750adce..d71b673db 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,6 +1,6 @@ ## 26.2.4-wip -- Remove `package:built_value` dependency from `ConnectRequest`, `RunRequest`, `HotReloadRequest`, `HotReloadResponse`, `HotRestartRequest`, `HotRestartResponse`, `ServiceExtensionRequest`, and `ServiceExtensionResponse`; switch to standard Dart JSON serialization. +- Remove `package:built_value` dependency from `ConnectRequest`, `RunRequest`, `DebugInfo`, `HotReloadRequest`, `HotReloadResponse`, `HotRestartRequest`, `HotRestartResponse`, `ServiceExtensionRequest`, and `ServiceExtensionResponse`; switch to standard Dart JSON serialization. ## 26.2.3 diff --git a/dwds/debug_extension/web/background.dart b/dwds/debug_extension/web/background.dart index 22dc2a9d7..a384638da 100644 --- a/dwds/debug_extension/web/background.dart +++ b/dwds/debug_extension/web/background.dart @@ -217,19 +217,19 @@ bool _isInternalNavigation(NavigationInfo navigationInfo) { DebugInfo _addTabInfo(DebugInfo debugInfo, {required Tab tab}) { return DebugInfo( - (b) => b - ..appEntrypointPath = debugInfo.appEntrypointPath - ..appId = debugInfo.appId - ..appInstanceId = debugInfo.appInstanceId - ..appOrigin = debugInfo.appOrigin - ..appUrl = debugInfo.appUrl - ..authUrl = debugInfo.authUrl - ..extensionUrl = debugInfo.extensionUrl - ..isInternalBuild = debugInfo.isInternalBuild - ..isFlutterApp = debugInfo.isFlutterApp - ..workspaceName = debugInfo.workspaceName - ..tabUrl = tab.url - ..tabId = tab.id, + appEntrypointPath: debugInfo.appEntrypointPath, + appId: debugInfo.appId, + appInstanceId: debugInfo.appInstanceId, + appOrigin: debugInfo.appOrigin, + appUrl: debugInfo.appUrl, + authUrl: debugInfo.authUrl, + dwdsVersion: debugInfo.dwdsVersion, + extensionUrl: debugInfo.extensionUrl, + isInternalBuild: debugInfo.isInternalBuild, + isFlutterApp: debugInfo.isFlutterApp, + workspaceName: debugInfo.workspaceName, + tabUrl: tab.url, + tabId: tab.id, ); } diff --git a/dwds/debug_extension/web/data_serializers.dart b/dwds/debug_extension/web/data_serializers.dart index 9c4e31460..868b62d5e 100644 --- a/dwds/debug_extension/web/data_serializers.dart +++ b/dwds/debug_extension/web/data_serializers.dart @@ -4,7 +4,6 @@ import 'package:built_collection/built_collection.dart'; import 'package:built_value/serializer.dart'; -import 'package:dwds/data/debug_info.dart'; import 'package:dwds/data/devtools_request.dart'; import 'package:dwds/data/extension_request.dart'; @@ -16,7 +15,6 @@ part 'data_serializers.g.dart'; @SerializersFor([ BatchedEvents, ConnectFailure, - DebugInfo, DebugStateChange, DevToolsOpener, DevToolsUrl, diff --git a/dwds/debug_extension/web/data_serializers.g.dart b/dwds/debug_extension/web/data_serializers.g.dart index dd746a8d5..3eb23f559 100644 --- a/dwds/debug_extension/web/data_serializers.g.dart +++ b/dwds/debug_extension/web/data_serializers.g.dart @@ -7,10 +7,9 @@ part of 'data_serializers.dart'; // ************************************************************************** Serializers _$serializers = - (new Serializers().toBuilder() + (Serializers().toBuilder() ..add(BatchedEvents.serializer) ..add(ConnectFailure.serializer) - ..add(DebugInfo.serializer) ..add(DebugStateChange.serializer) ..add(DevToolsOpener.serializer) ..add(DevToolsRequest.serializer) @@ -20,7 +19,7 @@ Serializers _$serializers = ..add(ExtensionResponse.serializer) ..addBuilderFactory( const FullType(BuiltList, const [const FullType(ExtensionEvent)]), - () => new ListBuilder(), + () => ListBuilder(), )) .build(); diff --git a/dwds/debug_extension/web/data_types.g.dart b/dwds/debug_extension/web/data_types.g.dart index 4a2c569e1..97646e023 100644 --- a/dwds/debug_extension/web/data_types.g.dart +++ b/dwds/debug_extension/web/data_types.g.dart @@ -7,12 +7,12 @@ part of 'data_types.dart'; // ************************************************************************** Serializer _$connectFailureSerializer = - new _$ConnectFailureSerializer(); + _$ConnectFailureSerializer(); Serializer _$devToolsOpenerSerializer = - new _$DevToolsOpenerSerializer(); -Serializer _$devToolsUrlSerializer = new _$DevToolsUrlSerializer(); + _$DevToolsOpenerSerializer(); +Serializer _$devToolsUrlSerializer = _$DevToolsUrlSerializer(); Serializer _$debugStateChangeSerializer = - new _$DebugStateChangeSerializer(); + _$DebugStateChangeSerializer(); class _$ConnectFailureSerializer implements StructuredSerializer { @@ -49,7 +49,7 @@ class _$ConnectFailureSerializer Iterable serialized, { FullType specifiedType = FullType.unspecified, }) { - final result = new ConnectFailureBuilder(); + final result = ConnectFailureBuilder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -110,7 +110,7 @@ class _$DevToolsOpenerSerializer Iterable serialized, { FullType specifiedType = FullType.unspecified, }) { - final result = new DevToolsOpenerBuilder(); + final result = DevToolsOpenerBuilder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -161,7 +161,7 @@ class _$DevToolsUrlSerializer implements StructuredSerializer { Iterable serialized, { FullType specifiedType = FullType.unspecified, }) { - final result = new DevToolsUrlBuilder(); + final result = DevToolsUrlBuilder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -232,7 +232,7 @@ class _$DebugStateChangeSerializer Iterable serialized, { FullType specifiedType = FullType.unspecified, }) { - final result = new DebugStateChangeBuilder(); + final result = DebugStateChangeBuilder(); final iterator = serialized.iterator; while (iterator.moveNext()) { @@ -278,19 +278,15 @@ class _$ConnectFailure extends ConnectFailure { final String? reason; factory _$ConnectFailure([void Function(ConnectFailureBuilder)? updates]) => - (new ConnectFailureBuilder()..update(updates))._build(); - - _$ConnectFailure._({required this.tabId, this.reason}) : super._() { - BuiltValueNullFieldError.checkNotNull(tabId, r'ConnectFailure', 'tabId'); - } + (ConnectFailureBuilder()..update(updates))._build(); + _$ConnectFailure._({required this.tabId, this.reason}) : super._(); @override ConnectFailure rebuild(void Function(ConnectFailureBuilder) updates) => (toBuilder()..update(updates)).build(); @override - ConnectFailureBuilder toBuilder() => - new ConnectFailureBuilder()..replace(this); + ConnectFailureBuilder toBuilder() => ConnectFailureBuilder()..replace(this); @override bool operator ==(Object other) { @@ -344,7 +340,6 @@ class ConnectFailureBuilder @override void replace(ConnectFailure other) { - ArgumentError.checkNotNull(other, 'other'); _$v = other as _$ConnectFailure; } @@ -359,7 +354,7 @@ class ConnectFailureBuilder _$ConnectFailure _build() { final _$result = _$v ?? - new _$ConnectFailure._( + _$ConnectFailure._( tabId: BuiltValueNullFieldError.checkNotNull( tabId, r'ConnectFailure', @@ -377,23 +372,15 @@ class _$DevToolsOpener extends DevToolsOpener { final bool newWindow; factory _$DevToolsOpener([void Function(DevToolsOpenerBuilder)? updates]) => - (new DevToolsOpenerBuilder()..update(updates))._build(); - - _$DevToolsOpener._({required this.newWindow}) : super._() { - BuiltValueNullFieldError.checkNotNull( - newWindow, - r'DevToolsOpener', - 'newWindow', - ); - } + (DevToolsOpenerBuilder()..update(updates))._build(); + _$DevToolsOpener._({required this.newWindow}) : super._(); @override DevToolsOpener rebuild(void Function(DevToolsOpenerBuilder) updates) => (toBuilder()..update(updates)).build(); @override - DevToolsOpenerBuilder toBuilder() => - new DevToolsOpenerBuilder()..replace(this); + DevToolsOpenerBuilder toBuilder() => DevToolsOpenerBuilder()..replace(this); @override bool operator ==(Object other) { @@ -438,7 +425,6 @@ class DevToolsOpenerBuilder @override void replace(DevToolsOpener other) { - ArgumentError.checkNotNull(other, 'other'); _$v = other as _$DevToolsOpener; } @@ -453,7 +439,7 @@ class DevToolsOpenerBuilder _$DevToolsOpener _build() { final _$result = _$v ?? - new _$DevToolsOpener._( + _$DevToolsOpener._( newWindow: BuiltValueNullFieldError.checkNotNull( newWindow, r'DevToolsOpener', @@ -472,19 +458,15 @@ class _$DevToolsUrl extends DevToolsUrl { final String url; factory _$DevToolsUrl([void Function(DevToolsUrlBuilder)? updates]) => - (new DevToolsUrlBuilder()..update(updates))._build(); - - _$DevToolsUrl._({required this.tabId, required this.url}) : super._() { - BuiltValueNullFieldError.checkNotNull(tabId, r'DevToolsUrl', 'tabId'); - BuiltValueNullFieldError.checkNotNull(url, r'DevToolsUrl', 'url'); - } + (DevToolsUrlBuilder()..update(updates))._build(); + _$DevToolsUrl._({required this.tabId, required this.url}) : super._(); @override DevToolsUrl rebuild(void Function(DevToolsUrlBuilder) updates) => (toBuilder()..update(updates)).build(); @override - DevToolsUrlBuilder toBuilder() => new DevToolsUrlBuilder()..replace(this); + DevToolsUrlBuilder toBuilder() => DevToolsUrlBuilder()..replace(this); @override bool operator ==(Object other) { @@ -535,7 +517,6 @@ class DevToolsUrlBuilder implements Builder { @override void replace(DevToolsUrl other) { - ArgumentError.checkNotNull(other, 'other'); _$v = other as _$DevToolsUrl; } @@ -550,7 +531,7 @@ class DevToolsUrlBuilder implements Builder { _$DevToolsUrl _build() { final _$result = _$v ?? - new _$DevToolsUrl._( + _$DevToolsUrl._( tabId: BuiltValueNullFieldError.checkNotNull( tabId, r'DevToolsUrl', @@ -577,28 +558,20 @@ class _$DebugStateChange extends DebugStateChange { factory _$DebugStateChange([ void Function(DebugStateChangeBuilder)? updates, - ]) => (new DebugStateChangeBuilder()..update(updates))._build(); + ]) => (DebugStateChangeBuilder()..update(updates))._build(); _$DebugStateChange._({ required this.tabId, required this.newState, this.reason, - }) : super._() { - BuiltValueNullFieldError.checkNotNull(tabId, r'DebugStateChange', 'tabId'); - BuiltValueNullFieldError.checkNotNull( - newState, - r'DebugStateChange', - 'newState', - ); - } - + }) : super._(); @override DebugStateChange rebuild(void Function(DebugStateChangeBuilder) updates) => (toBuilder()..update(updates)).build(); @override DebugStateChangeBuilder toBuilder() => - new DebugStateChangeBuilder()..replace(this); + DebugStateChangeBuilder()..replace(this); @override bool operator ==(Object other) { @@ -660,7 +633,6 @@ class DebugStateChangeBuilder @override void replace(DebugStateChange other) { - ArgumentError.checkNotNull(other, 'other'); _$v = other as _$DebugStateChange; } @@ -675,7 +647,7 @@ class DebugStateChangeBuilder _$DebugStateChange _build() { final _$result = _$v ?? - new _$DebugStateChange._( + _$DebugStateChange._( tabId: BuiltValueNullFieldError.checkNotNull( tabId, r'DebugStateChange', diff --git a/dwds/debug_extension/web/debug_info.dart b/dwds/debug_extension/web/debug_info.dart index 24d66fd5c..5be9ba622 100644 --- a/dwds/debug_extension/web/debug_info.dart +++ b/dwds/debug_extension/web/debug_info.dart @@ -14,7 +14,6 @@ import 'dart:html'; import 'dart:js'; import 'package:dwds/data/debug_info.dart'; -import 'package:dwds/data/serializers.dart'; // TODO: https://github.com/dart-lang/webdev/issues/2508 // ignore: deprecated_member_use import 'package:js/js.dart'; @@ -28,18 +27,15 @@ String _readDartDebugInfo() { final windowContext = JsObject.fromBrowserObject(window); return jsonEncode( - serializers.serialize( - DebugInfo( - (b) => b - ..appEntrypointPath = windowContext['\$dartEntrypointPath'] as String? - ..appId = windowContext['\$dartAppId'] as String? - ..appInstanceId = windowContext['\$dartAppInstanceId'] as String? - ..appOrigin = window.location.origin - ..appUrl = window.location.href - ..extensionUrl = windowContext['\$dartExtensionUri'] as String? - ..isInternalBuild = windowContext['\$isInternalBuild'] as bool? - ..isFlutterApp = windowContext['\$isFlutterApp'] as bool?, - ), + DebugInfo( + appEntrypointPath: windowContext['\$dartEntrypointPath'] as String?, + appId: windowContext['\$dartAppId'] as String?, + appInstanceId: windowContext['\$dartAppInstanceId'] as String?, + appOrigin: window.location.origin, + appUrl: window.location.href, + extensionUrl: windowContext['\$dartExtensionUri'] as String?, + isInternalBuild: windowContext['\$isInternalBuild'] as bool?, + isFlutterApp: windowContext['\$isFlutterApp'] as bool?, ), ); } diff --git a/dwds/debug_extension/web/detector.dart b/dwds/debug_extension/web/detector.dart index 4c482de26..4e9d8127b 100644 --- a/dwds/debug_extension/web/detector.dart +++ b/dwds/debug_extension/web/detector.dart @@ -19,7 +19,6 @@ import 'package:dwds/data/debug_info.dart'; import 'package:js/js.dart'; import 'chrome_api.dart'; -import 'data_serializers.dart'; import 'logger.dart'; import 'messaging.dart'; @@ -131,9 +130,10 @@ Future _sendMessageToBackgroundScript({ } void _sendAuthRequest(String debugInfoJson) { - final debugInfo = - serializers.deserialize(jsonDecode(debugInfoJson)) as DebugInfo?; - final appOrigin = debugInfo?.appOrigin; + final debugInfo = DebugInfo.fromJson( + jsonDecode(debugInfoJson) as Map, + ); + final appOrigin = debugInfo.appOrigin; if (appOrigin != null) { window.postMessage('dart-auth-request', appOrigin); } diff --git a/dwds/debug_extension/web/messaging.dart b/dwds/debug_extension/web/messaging.dart index 8d84ca924..ae97c232a 100644 --- a/dwds/debug_extension/web/messaging.dart +++ b/dwds/debug_extension/web/messaging.dart @@ -11,6 +11,7 @@ import 'dart:convert'; // ignore: deprecated_member_use import 'dart:js_util'; +import 'package:dwds/data/debug_info.dart'; // TODO: https://github.com/dart-lang/webdev/issues/2508 // ignore: deprecated_member_use import 'package:js/js.dart'; @@ -110,6 +111,13 @@ void interceptMessage({ } if (T == String) { messageHandler(decodedMessage.body as T); + } else if (T == DebugInfo) { + messageHandler( + DebugInfo.fromJson( + jsonDecode(decodedMessage.body) as Map, + ) + as T, + ); } else { messageHandler( serializers.deserialize(jsonDecode(decodedMessage.body)) as T, diff --git a/dwds/debug_extension/web/storage.dart b/dwds/debug_extension/web/storage.dart index 3413f0302..48b5d8679 100644 --- a/dwds/debug_extension/web/storage.dart +++ b/dwds/debug_extension/web/storage.dart @@ -11,6 +11,7 @@ import 'dart:convert'; // ignore: deprecated_member_use import 'dart:js_util'; +import 'package:dwds/data/debug_info.dart'; // TODO: https://github.com/dart-lang/webdev/issues/2508 // ignore: deprecated_member_use import 'package:js/js.dart'; @@ -49,6 +50,8 @@ Future setStorageObject({ final storageKey = _createStorageKey(type, tabId); final json = value is String ? value + : value is DebugInfo + ? jsonEncode(value) : jsonEncode(serializers.serialize(value)); final storageObj = {storageKey: json}; final completer = Completer(); @@ -86,6 +89,10 @@ Future fetchStorageObject({required StorageObject type, int? tabId}) { debugLog('Fetched: $json', prefix: storageKey); if (T == String) { completer.complete(json as T); + } else if (T == DebugInfo) { + final value = + DebugInfo.fromJson(jsonDecode(json) as Map) as T; + completer.complete(value); } else { final value = serializers.deserialize(jsonDecode(json)) as T; completer.complete(value); @@ -115,6 +122,10 @@ Future> fetchAllStorageObjectsOfType({required StorageObject type}) { if (json != null) { if (T == String) { result.add(json as T); + } else if (T == DebugInfo) { + result.add( + DebugInfo.fromJson(jsonDecode(json) as Map) as T, + ); } else { result.add(serializers.deserialize(jsonDecode(json)) as T); } @@ -156,6 +167,9 @@ void interceptStorageChange({ T? decodedObj; if (json == null || T == String) { decodedObj = json as T?; + } else if (T == DebugInfo) { + decodedObj = + DebugInfo.fromJson(jsonDecode(json) as Map) as T?; } else { decodedObj = serializers.deserialize(jsonDecode(json)) as T?; } diff --git a/dwds/lib/data/debug_info.dart b/dwds/lib/data/debug_info.dart index fa0132bff..09346c19e 100644 --- a/dwds/lib/data/debug_info.dart +++ b/dwds/lib/data/debug_info.dart @@ -2,29 +2,68 @@ // 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:built_value/built_value.dart'; -import 'package:built_value/serializer.dart'; +class DebugInfo { + final String? appEntrypointPath; + final String? appId; + final String? appInstanceId; + final String? appOrigin; + final String? appUrl; + final String? authUrl; + final String? dwdsVersion; + final String? extensionUrl; + final bool? isInternalBuild; + final bool? isFlutterApp; + final String? workspaceName; + final String? tabUrl; + final int? tabId; -part 'debug_info.g.dart'; + DebugInfo({ + this.appEntrypointPath, + this.appId, + this.appInstanceId, + this.appOrigin, + this.appUrl, + this.authUrl, + this.dwdsVersion, + this.extensionUrl, + this.isInternalBuild, + this.isFlutterApp, + this.workspaceName, + this.tabUrl, + this.tabId, + }); -abstract class DebugInfo implements Built { - static Serializer get serializer => _$debugInfoSerializer; + Map toJson() => { + if (appEntrypointPath != null) 'appEntrypointPath': appEntrypointPath, + if (appId != null) 'appId': appId, + if (appInstanceId != null) 'appInstanceId': appInstanceId, + if (appOrigin != null) 'appOrigin': appOrigin, + if (appUrl != null) 'appUrl': appUrl, + if (authUrl != null) 'authUrl': authUrl, + if (dwdsVersion != null) 'dwdsVersion': dwdsVersion, + if (extensionUrl != null) 'extensionUrl': extensionUrl, + if (isInternalBuild != null) 'isInternalBuild': isInternalBuild, + if (isFlutterApp != null) 'isFlutterApp': isFlutterApp, + if (workspaceName != null) 'workspaceName': workspaceName, + if (tabUrl != null) 'tabUrl': tabUrl, + if (tabId != null) 'tabId': tabId, + }; - factory DebugInfo([Function(DebugInfoBuilder) updates]) = _$DebugInfo; - - DebugInfo._(); - - String? get appEntrypointPath; - String? get appId; - String? get appInstanceId; - String? get appOrigin; - String? get appUrl; - String? get authUrl; - String? get dwdsVersion; - String? get extensionUrl; - bool? get isInternalBuild; - bool? get isFlutterApp; - String? get workspaceName; - String? get tabUrl; - int? get tabId; + factory DebugInfo.fromJson(Map json) { + return DebugInfo( + appEntrypointPath: json['appEntrypointPath'] as String?, + appId: json['appId'] as String?, + appInstanceId: json['appInstanceId'] as String?, + appOrigin: json['appOrigin'] as String?, + appUrl: json['appUrl'] as String?, + authUrl: json['authUrl'] as String?, + dwdsVersion: json['dwdsVersion'] as String?, + extensionUrl: json['extensionUrl'] as String?, + isInternalBuild: json['isInternalBuild'] as bool?, + isFlutterApp: json['isFlutterApp'] as bool?, + workspaceName: json['workspaceName'] as String?, + tabUrl: json['tabUrl'] as String?, + tabId: json['tabId'] as int?, + ); + } } diff --git a/dwds/lib/data/debug_info.g.dart b/dwds/lib/data/debug_info.g.dart deleted file mode 100644 index b1d0d5ad6..000000000 --- a/dwds/lib/data/debug_info.g.dart +++ /dev/null @@ -1,482 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'debug_info.dart'; - -// ************************************************************************** -// BuiltValueGenerator -// ************************************************************************** - -Serializer _$debugInfoSerializer = _$DebugInfoSerializer(); - -class _$DebugInfoSerializer implements StructuredSerializer { - @override - final Iterable types = const [DebugInfo, _$DebugInfo]; - @override - final String wireName = 'DebugInfo'; - - @override - Iterable serialize( - Serializers serializers, - DebugInfo object, { - FullType specifiedType = FullType.unspecified, - }) { - final result = []; - Object? value; - value = object.appEntrypointPath; - if (value != null) { - result - ..add('appEntrypointPath') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.appId; - if (value != null) { - result - ..add('appId') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.appInstanceId; - if (value != null) { - result - ..add('appInstanceId') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.appOrigin; - if (value != null) { - result - ..add('appOrigin') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.appUrl; - if (value != null) { - result - ..add('appUrl') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.authUrl; - if (value != null) { - result - ..add('authUrl') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.dwdsVersion; - if (value != null) { - result - ..add('dwdsVersion') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.extensionUrl; - if (value != null) { - result - ..add('extensionUrl') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.isInternalBuild; - if (value != null) { - result - ..add('isInternalBuild') - ..add( - serializers.serialize(value, specifiedType: const FullType(bool)), - ); - } - value = object.isFlutterApp; - if (value != null) { - result - ..add('isFlutterApp') - ..add( - serializers.serialize(value, specifiedType: const FullType(bool)), - ); - } - value = object.workspaceName; - if (value != null) { - result - ..add('workspaceName') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.tabUrl; - if (value != null) { - result - ..add('tabUrl') - ..add( - serializers.serialize(value, specifiedType: const FullType(String)), - ); - } - value = object.tabId; - if (value != null) { - result - ..add('tabId') - ..add(serializers.serialize(value, specifiedType: const FullType(int))); - } - return result; - } - - @override - DebugInfo deserialize( - Serializers serializers, - Iterable serialized, { - FullType specifiedType = FullType.unspecified, - }) { - final result = DebugInfoBuilder(); - - final iterator = serialized.iterator; - while (iterator.moveNext()) { - final key = iterator.current! as String; - iterator.moveNext(); - final Object? value = iterator.current; - switch (key) { - case 'appEntrypointPath': - result.appEntrypointPath = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'appId': - result.appId = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'appInstanceId': - result.appInstanceId = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'appOrigin': - result.appOrigin = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'appUrl': - result.appUrl = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'authUrl': - result.authUrl = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'dwdsVersion': - result.dwdsVersion = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'extensionUrl': - result.extensionUrl = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'isInternalBuild': - result.isInternalBuild = - serializers.deserialize( - value, - specifiedType: const FullType(bool), - ) - as bool?; - break; - case 'isFlutterApp': - result.isFlutterApp = - serializers.deserialize( - value, - specifiedType: const FullType(bool), - ) - as bool?; - break; - case 'workspaceName': - result.workspaceName = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'tabUrl': - result.tabUrl = - serializers.deserialize( - value, - specifiedType: const FullType(String), - ) - as String?; - break; - case 'tabId': - result.tabId = - serializers.deserialize(value, specifiedType: const FullType(int)) - as int?; - break; - } - } - - return result.build(); - } -} - -class _$DebugInfo extends DebugInfo { - @override - final String? appEntrypointPath; - @override - final String? appId; - @override - final String? appInstanceId; - @override - final String? appOrigin; - @override - final String? appUrl; - @override - final String? authUrl; - @override - final String? dwdsVersion; - @override - final String? extensionUrl; - @override - final bool? isInternalBuild; - @override - final bool? isFlutterApp; - @override - final String? workspaceName; - @override - final String? tabUrl; - @override - final int? tabId; - - factory _$DebugInfo([void Function(DebugInfoBuilder)? updates]) => - (DebugInfoBuilder()..update(updates))._build(); - - _$DebugInfo._({ - this.appEntrypointPath, - this.appId, - this.appInstanceId, - this.appOrigin, - this.appUrl, - this.authUrl, - this.dwdsVersion, - this.extensionUrl, - this.isInternalBuild, - this.isFlutterApp, - this.workspaceName, - this.tabUrl, - this.tabId, - }) : super._(); - @override - DebugInfo rebuild(void Function(DebugInfoBuilder) updates) => - (toBuilder()..update(updates)).build(); - - @override - DebugInfoBuilder toBuilder() => DebugInfoBuilder()..replace(this); - - @override - bool operator ==(Object other) { - if (identical(other, this)) return true; - return other is DebugInfo && - appEntrypointPath == other.appEntrypointPath && - appId == other.appId && - appInstanceId == other.appInstanceId && - appOrigin == other.appOrigin && - appUrl == other.appUrl && - authUrl == other.authUrl && - dwdsVersion == other.dwdsVersion && - extensionUrl == other.extensionUrl && - isInternalBuild == other.isInternalBuild && - isFlutterApp == other.isFlutterApp && - workspaceName == other.workspaceName && - tabUrl == other.tabUrl && - tabId == other.tabId; - } - - @override - int get hashCode { - var _$hash = 0; - _$hash = $jc(_$hash, appEntrypointPath.hashCode); - _$hash = $jc(_$hash, appId.hashCode); - _$hash = $jc(_$hash, appInstanceId.hashCode); - _$hash = $jc(_$hash, appOrigin.hashCode); - _$hash = $jc(_$hash, appUrl.hashCode); - _$hash = $jc(_$hash, authUrl.hashCode); - _$hash = $jc(_$hash, dwdsVersion.hashCode); - _$hash = $jc(_$hash, extensionUrl.hashCode); - _$hash = $jc(_$hash, isInternalBuild.hashCode); - _$hash = $jc(_$hash, isFlutterApp.hashCode); - _$hash = $jc(_$hash, workspaceName.hashCode); - _$hash = $jc(_$hash, tabUrl.hashCode); - _$hash = $jc(_$hash, tabId.hashCode); - _$hash = $jf(_$hash); - return _$hash; - } - - @override - String toString() { - return (newBuiltValueToStringHelper(r'DebugInfo') - ..add('appEntrypointPath', appEntrypointPath) - ..add('appId', appId) - ..add('appInstanceId', appInstanceId) - ..add('appOrigin', appOrigin) - ..add('appUrl', appUrl) - ..add('authUrl', authUrl) - ..add('dwdsVersion', dwdsVersion) - ..add('extensionUrl', extensionUrl) - ..add('isInternalBuild', isInternalBuild) - ..add('isFlutterApp', isFlutterApp) - ..add('workspaceName', workspaceName) - ..add('tabUrl', tabUrl) - ..add('tabId', tabId)) - .toString(); - } -} - -class DebugInfoBuilder implements Builder { - _$DebugInfo? _$v; - - String? _appEntrypointPath; - String? get appEntrypointPath => _$this._appEntrypointPath; - set appEntrypointPath(String? appEntrypointPath) => - _$this._appEntrypointPath = appEntrypointPath; - - String? _appId; - String? get appId => _$this._appId; - set appId(String? appId) => _$this._appId = appId; - - String? _appInstanceId; - String? get appInstanceId => _$this._appInstanceId; - set appInstanceId(String? appInstanceId) => - _$this._appInstanceId = appInstanceId; - - String? _appOrigin; - String? get appOrigin => _$this._appOrigin; - set appOrigin(String? appOrigin) => _$this._appOrigin = appOrigin; - - String? _appUrl; - String? get appUrl => _$this._appUrl; - set appUrl(String? appUrl) => _$this._appUrl = appUrl; - - String? _authUrl; - String? get authUrl => _$this._authUrl; - set authUrl(String? authUrl) => _$this._authUrl = authUrl; - - String? _dwdsVersion; - String? get dwdsVersion => _$this._dwdsVersion; - set dwdsVersion(String? dwdsVersion) => _$this._dwdsVersion = dwdsVersion; - - String? _extensionUrl; - String? get extensionUrl => _$this._extensionUrl; - set extensionUrl(String? extensionUrl) => _$this._extensionUrl = extensionUrl; - - bool? _isInternalBuild; - bool? get isInternalBuild => _$this._isInternalBuild; - set isInternalBuild(bool? isInternalBuild) => - _$this._isInternalBuild = isInternalBuild; - - bool? _isFlutterApp; - bool? get isFlutterApp => _$this._isFlutterApp; - set isFlutterApp(bool? isFlutterApp) => _$this._isFlutterApp = isFlutterApp; - - String? _workspaceName; - String? get workspaceName => _$this._workspaceName; - set workspaceName(String? workspaceName) => - _$this._workspaceName = workspaceName; - - String? _tabUrl; - String? get tabUrl => _$this._tabUrl; - set tabUrl(String? tabUrl) => _$this._tabUrl = tabUrl; - - int? _tabId; - int? get tabId => _$this._tabId; - set tabId(int? tabId) => _$this._tabId = tabId; - - DebugInfoBuilder(); - - DebugInfoBuilder get _$this { - final $v = _$v; - if ($v != null) { - _appEntrypointPath = $v.appEntrypointPath; - _appId = $v.appId; - _appInstanceId = $v.appInstanceId; - _appOrigin = $v.appOrigin; - _appUrl = $v.appUrl; - _authUrl = $v.authUrl; - _dwdsVersion = $v.dwdsVersion; - _extensionUrl = $v.extensionUrl; - _isInternalBuild = $v.isInternalBuild; - _isFlutterApp = $v.isFlutterApp; - _workspaceName = $v.workspaceName; - _tabUrl = $v.tabUrl; - _tabId = $v.tabId; - _$v = null; - } - return this; - } - - @override - void replace(DebugInfo other) { - _$v = other as _$DebugInfo; - } - - @override - void update(void Function(DebugInfoBuilder)? updates) { - if (updates != null) updates(this); - } - - @override - DebugInfo build() => _build(); - - _$DebugInfo _build() { - final _$result = - _$v ?? - _$DebugInfo._( - appEntrypointPath: appEntrypointPath, - appId: appId, - appInstanceId: appInstanceId, - appOrigin: appOrigin, - appUrl: appUrl, - authUrl: authUrl, - dwdsVersion: dwdsVersion, - extensionUrl: extensionUrl, - isInternalBuild: isInternalBuild, - isFlutterApp: isFlutterApp, - workspaceName: workspaceName, - tabUrl: tabUrl, - tabId: tabId, - ); - replace(_$result); - return _$result; - } -} - -// ignore_for_file: deprecated_member_use_from_same_package,type=lint diff --git a/dwds/lib/data/serializers.dart b/dwds/lib/data/serializers.dart index 460fd47d8..32bf0336a 100644 --- a/dwds/lib/data/serializers.dart +++ b/dwds/lib/data/serializers.dart @@ -23,7 +23,6 @@ part 'serializers.g.dart'; BatchedDebugEvents, BuildResult, DebugEvent, - DebugInfo, DevToolsRequest, DevToolsResponse, IsolateExit, diff --git a/dwds/lib/data/serializers.g.dart b/dwds/lib/data/serializers.g.dart index fec3811a1..3edfb4dcd 100644 --- a/dwds/lib/data/serializers.g.dart +++ b/dwds/lib/data/serializers.g.dart @@ -13,7 +13,6 @@ Serializers _$serializers = ..add(BuildResult.serializer) ..add(BuildStatus.serializer) ..add(DebugEvent.serializer) - ..add(DebugInfo.serializer) ..add(DevToolsRequest.serializer) ..add(DevToolsResponse.serializer) ..add(ErrorResponse.serializer) diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index 194364456..8f7465d6f 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -8534,11 +8534,7 @@ BatchedDebugEventsBuilder: function BatchedDebugEventsBuilder() { this._events = this._debug_event$_$v = null; }, - DebugInfo: function DebugInfo() { - }, - _$DebugInfoSerializer: function _$DebugInfoSerializer() { - }, - _$DebugInfo: function _$DebugInfo(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12) { + DebugInfo: function DebugInfo(t0, t1, t2, t3, t4, t5, t6, t7, t8, t9) { var _ = this; _.appEntrypointPath = t0; _.appId = t1; @@ -8546,17 +8542,10 @@ _.appOrigin = t3; _.appUrl = t4; _.authUrl = t5; - _.dwdsVersion = t6; - _.extensionUrl = t7; - _.isInternalBuild = t8; - _.isFlutterApp = t9; - _.workspaceName = t10; - _.tabUrl = t11; - _.tabId = t12; - }, - DebugInfoBuilder: function DebugInfoBuilder() { - var _ = this; - _._tabId = _._tabUrl = _._workspaceName = _._isFlutterApp = _._isInternalBuild = _._extensionUrl = _._dwdsVersion = _._authUrl = _._appUrl = _._appOrigin = _._appInstanceId = _._appId = _._appEntrypointPath = _._$v = null; + _.extensionUrl = t6; + _.isInternalBuild = t7; + _.isFlutterApp = t8; + _.workspaceName = t9; }, DevToolsRequest: function DevToolsRequest() { }, @@ -8577,7 +8566,7 @@ }, DevToolsRequestBuilder: function DevToolsRequestBuilder() { var _ = this; - _._devtools_request$_client = _._uriOnly = _._devtools_request$_tabUrl = _._contextId = _._instanceId = _._devtools_request$_appId = _._devtools_request$_$v = null; + _._devtools_request$_client = _._uriOnly = _._tabUrl = _._contextId = _._instanceId = _._appId = _._devtools_request$_$v = null; }, _$DevToolsResponse: function _$DevToolsResponse(t0, t1, t2) { this.success = t0; @@ -8675,12 +8664,12 @@ _$IsolateExit: function _$IsolateExit() { }, IsolateExitBuilder: function IsolateExitBuilder() { - this._isolate_events$_$v = null; + this._$v = null; }, _$IsolateStart: function _$IsolateStart() { }, IsolateStartBuilder: function IsolateStartBuilder() { - this._isolate_events$_$v = null; + this._$v = null; }, RegisterEvent: function RegisterEvent() { }, @@ -9891,14 +9880,18 @@ return A.runZonedGuarded(new A.main_closure(), new A.main_closure0(), type$.Future_void); }, initializeConnection(clientSink) { - if (A._asString(init.G.$dartModuleStrategy) !== "ddc-library-bundle") + var t2, + t1 = init.G; + if (A._asString(t1.$dartModuleStrategy) !== "ddc-library-bundle") if (A._isChromium()) A._sendConnectRequest(clientSink); else A.runMain(); else A._sendConnectRequest(clientSink); - A._launchCommunicationWithDebugExtension(); + A._asJSObject(t1.window).addEventListener("message", A._functionToJS1(A.client___handleAuthRequest$closure())); + t2 = type$.JavaScriptObject; + A._dispatchEvent("dart-app-ready", B.C_JsonCodec.encode$2$toEncodable(new A.DebugInfo(A._asString(t1.$dartEntrypointPath), A._asStringQ(t2._as(t1.window).$dartAppId), A._asStringQ(t1.$dartAppInstanceId), A._asString(A._asJSObject(A._asJSObject(t1.window).location).origin), A._asString(A._asJSObject(A._asJSObject(t1.window).location).href), A._authUrl(), A._asStringQ(t2._as(t1.window).$dartExtensionUri), A._asBoolQ(t2._as(t1.window).$isInternalBuild), A._asBoolQ(t2._as(t1.window).$isFlutterApp), A._asStringQ(t1.$dartWorkspaceName)), null)); }, _trySendEvent(sink, serialized, $T) { var exception; @@ -9952,14 +9945,6 @@ t3.toString; A._trySendEvent(clientSink, B.C_JsonCodec.encode$2$toEncodable(A._setArrayType(["ConnectRequest", new A.ConnectRequest(t2, t3, A._asString(t1.$dartEntrypointPath)).toJson$0()], type$.JSArray_Object), null), type$.dynamic); }, - _launchCommunicationWithDebugExtension() { - var t1, t2; - A._asJSObject(init.G.window).addEventListener("message", A._functionToJS1(A.client___handleAuthRequest$closure())); - t1 = $.$get$serializers(); - t2 = new A.DebugInfoBuilder(); - type$.nullable_void_Function_DebugInfoBuilder._as(new A._launchCommunicationWithDebugExtension_closure()).call$1(t2); - A._dispatchEvent("dart-app-ready", B.C_JsonCodec.encode$2$toEncodable(t1.serialize$1(t2._build$0()), null)); - }, _dispatchEvent(message, detail) { var t1 = init.G, $event = A._asJSObject(new t1.CustomEvent(message, {detail: detail})); @@ -10288,8 +10273,6 @@ }, main_closure0: function main_closure0() { }, - _launchCommunicationWithDebugExtension_closure: function _launchCommunicationWithDebugExtension_closure() { - }, _handleAuthRequest_closure: function _handleAuthRequest_closure() { }, _sendHotReloadResponse_closure: function _sendHotReloadResponse_closure() { @@ -11847,7 +11830,7 @@ call$0() { return A.Future_Future$value(null, type$.void); }, - $signature: 14 + $signature: 13 }; A.SentinelValue.prototype = {}; A.EfficientLengthIterable.prototype = {}; @@ -12954,13 +12937,13 @@ call$2(o, tag) { return this.getUnknownTag(o, tag); }, - $signature: 84 + $signature: 38 }; A.initHooks_closure1.prototype = { call$1(tag) { return this.prototypeForTag(A._asString(tag)); }, - $signature: 70 + $signature: 37 }; A._Record.prototype = { get$runtimeType(_) { @@ -13548,7 +13531,7 @@ t2 = this.span; t1.firstChild ? t1.removeChild(t2) : t1.appendChild(t2); }, - $signature: 90 + $signature: 60 }; A._AsyncRun__scheduleImmediateJsOverride_internalCallback.prototype = { call$0() { @@ -13654,13 +13637,13 @@ call$2(error, stackTrace) { this.bodyFunction.call$2(1, new A.ExceptionAndStackTrace(error, type$.StackTrace._as(stackTrace))); }, - $signature: 35 + $signature: 67 }; A._wrapJsFunctionForAsync_closure.prototype = { call$2(errorCode, result) { this.$protected(A._asInt(errorCode), result); }, - $signature: 37 + $signature: 45 }; A._asyncStarHelper_closure.prototype = { call$0() { @@ -13734,7 +13717,7 @@ return t1.cancelationFuture; } }, - $signature: 67 + $signature: 54 }; A._AsyncStarStreamController__closure.prototype = { call$0() { @@ -15634,7 +15617,7 @@ t2._processUncaughtError$3(zone, A._asObject(e), t1._as(s)); } }, - $signature: 73 + $signature: 106 }; A._ZoneDelegate.prototype = {$isZoneDelegate: 1}; A._rootHandleError_closure.prototype = { @@ -15867,7 +15850,7 @@ call$1(v) { return this.K._is(v); }, - $signature: 12 + $signature: 15 }; A._HashMapKeyIterable.prototype = { get$length(_) { @@ -15948,7 +15931,7 @@ call$1(v) { return this.K._is(v); }, - $signature: 12 + $signature: 15 }; A._HashSet.prototype = { get$iterator(_) { @@ -16274,7 +16257,7 @@ call$2(k, v) { this.result.$indexSet(0, this.K._as(k), this.V._as(v)); }, - $signature: 23 + $signature: 30 }; A.ListBase.prototype = { get$iterator(receiver) { @@ -16470,7 +16453,7 @@ t2 = A.S(v); t1._contents += t2; }, - $signature: 24 + $signature: 21 }; A._UnmodifiableMapMixin.prototype = { $indexSet(_, key, value) { @@ -17128,7 +17111,7 @@ } return null; }, - $signature: 25 + $signature: 26 }; A._Utf8Decoder__decoderNonfatal_closure.prototype = { call$0() { @@ -17140,7 +17123,7 @@ } return null; }, - $signature: 25 + $signature: 26 }; A.AsciiCodec.prototype = { encode$1(source) { @@ -17638,7 +17621,7 @@ B.JSArray_methods.$indexSet(t1, t2.i++, key); B.JSArray_methods.$indexSet(t1, t2.i++, value); }, - $signature: 24 + $signature: 21 }; A._JsonStringStringifier.prototype = { get$_partialResult() { @@ -18322,7 +18305,7 @@ hash = hash + ((hash & 524287) << 10) & 536870911; return hash ^ hash >>> 6; }, - $signature: 65 + $signature: 49 }; A._BigIntImpl_hashCode_finish.prototype = { call$1(hash) { @@ -18330,7 +18313,7 @@ hash ^= hash >>> 11; return hash + ((hash & 16383) << 15) & 536870911; }, - $signature: 60 + $signature: 39 }; A.DateTime.prototype = { $eq(_, other) { @@ -18740,7 +18723,7 @@ call$2(msg, position) { throw A.wrapException(A.FormatException$("Illegal IPv6 address, " + msg, this.host, position)); }, - $signature: 56 + $signature: 42 }; A._Uri.prototype = { get$_text() { @@ -19040,7 +19023,7 @@ call$1(s) { return A._Uri__uriEncode(64, A._asString(s), B.C_Utf8Codec, false); }, - $signature: 13 + $signature: 16 }; A.UriData.prototype = { get$uri() { @@ -19372,7 +19355,7 @@ var t1 = type$.JavaScriptFunction; 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); }, - $signature: 28 + $signature: 22 }; A.FutureOfJSAnyToJSPromise_get_toJS__closure.prototype = { call$1(value) { @@ -19380,7 +19363,7 @@ t1.call(t1, value); return value; }, - $signature: 10 + $signature: 9 }; A.FutureOfJSAnyToJSPromise_get_toJS__closure0.prototype = { call$2(error, stackTrace) { @@ -19398,21 +19381,21 @@ t1.call(t1, wrapper); return wrapper; }, - $signature: 54 + $signature: 56 }; A.FutureOfVoidToJSPromise_get_toJS_closure.prototype = { call$2(resolve, reject) { var t1 = type$.JavaScriptFunction; this._this.then$1$2$onError(new A.FutureOfVoidToJSPromise_get_toJS__closure(t1._as(resolve)), new A.FutureOfVoidToJSPromise_get_toJS__closure0(t1._as(reject)), type$.nullable_Object); }, - $signature: 28 + $signature: 22 }; A.FutureOfVoidToJSPromise_get_toJS__closure.prototype = { call$1(__wc0_formal) { var t1 = this.resolve; return t1.call(t1); }, - $signature: 45 + $signature: 65 }; A.FutureOfVoidToJSPromise_get_toJS__closure0.prototype = { call$2(error, stackTrace) { @@ -19455,7 +19438,7 @@ } else return o; }, - $signature: 10 + $signature: 9 }; A.promiseToFuture_closure.prototype = { call$1(r) { @@ -19521,7 +19504,7 @@ } return o; }, - $signature: 10 + $signature: 9 }; A._JSRandom.prototype = { nextInt$1(max) { @@ -19720,7 +19703,7 @@ call$2(h, i) { return A._combine(A._asInt(h), J.get$hashCode$(i)); }, - $signature: 42 + $signature: 71 }; A.BuiltList.prototype = { toBuilder$0() { @@ -20272,7 +20255,7 @@ var t1 = this.$this.$ti; this.replacement.$indexSet(0, t1._precomputed1._as(key), t1._rest[1]._as(value)); }, - $signature: 23 + $signature: 30 }; A.BuiltSet.prototype = { get$hashCode(_) { @@ -20651,7 +20634,7 @@ $._indentingBuiltValueToStringHelperIndent = $._indentingBuiltValueToStringHelperIndent + 2; return new A.IndentingBuiltValueToStringHelper(t1); }, - $signature: 39 + $signature: 73 }; A.IndentingBuiltValueToStringHelper.prototype = { add$2(_, field, value) { @@ -20782,14 +20765,14 @@ call$0() { return A.ListBuilder_ListBuilder(B.List_empty0, type$.Object); }, - $signature: 38 + $signature: 83 }; A.Serializers_Serializers_closure0.prototype = { call$0() { var t1 = type$.Object; return A.ListMultimapBuilder_ListMultimapBuilder(t1, t1); }, - $signature: 33 + $signature: 90 }; A.Serializers_Serializers_closure1.prototype = { call$0() { @@ -20802,14 +20785,14 @@ call$0() { return A.SetBuilder_SetBuilder(type$.Object); }, - $signature: 53 + $signature: 35 }; A.Serializers_Serializers_closure3.prototype = { call$0() { var t1 = type$.Object; return A.SetMultimapBuilder_SetMultimapBuilder(t1, t1); }, - $signature: 36 + $signature: 89 }; A.FullType.prototype = { $eq(_, other) { @@ -21230,7 +21213,7 @@ call$1(value) { return this.serializers.deserialize$2$specifiedType(value, this.valueType); }, - $signature: 10 + $signature: 9 }; A.BuiltListSerializer.prototype = { serialize$3$specifiedType(serializers, builtList, specifiedType) { @@ -22648,19 +22631,19 @@ t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); - result.get$_debug_event$_$this()._debug_event$_kind = t1; + result.get$_$this()._debug_event$_kind = t1; break; case "eventData": t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); - result.get$_debug_event$_$this()._eventData = t1; + result.get$_$this()._eventData = t1; break; case "timestamp": t1 = serializers.deserialize$2$specifiedType(value, B.FullType_rTD); t1.toString; A._asInt(t1); - result.get$_debug_event$_$this()._timestamp = t1; + result.get$_$this()._timestamp = t1; break; } } @@ -22772,7 +22755,7 @@ } }; A.DebugEventBuilder.prototype = { - get$_debug_event$_$this() { + get$_$this() { var _this = this, $$v = _this._debug_event$_$v; if ($$v != null) { @@ -22789,7 +22772,7 @@ _$result = _this._debug_event$_$v; if (_$result == null) { t1 = type$.String; - _$result = new A._$DebugEvent(A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._debug_event$_kind, _s10_, "kind", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._eventData, _s10_, "eventData", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_debug_event$_$this()._timestamp, _s10_, "timestamp", type$.int)); + _$result = new A._$DebugEvent(A.BuiltValueNullFieldError_checkNotNull(_this.get$_$this()._debug_event$_kind, _s10_, "kind", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_$this()._eventData, _s10_, "eventData", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_$this()._timestamp, _s10_, "timestamp", type$.int)); } return _this._debug_event$_$v = _$result; } @@ -22814,7 +22797,7 @@ }; A.BatchedDebugEventsBuilder.prototype = { get$events() { - var t1 = this.get$_debug_event$_$this(), + var t1 = this.get$_$this(), t2 = t1._events; if (t2 == null) { t2 = A.ListBuilder_ListBuilder(B.List_empty0, type$.DebugEvent); @@ -22824,7 +22807,7 @@ t1 = t2; return t1; }, - get$_debug_event$_$this() { + get$_$this() { var t1, _this = this, $$v = _this._debug_event$_$v; if ($$v != null) { @@ -22858,220 +22841,35 @@ this._events = type$.nullable_ListBuilder_DebugEvent._as(_events); } }; - A.DebugInfo.prototype = {}; - A._$DebugInfoSerializer.prototype = { - serialize$3$specifiedType(serializers, object, specifiedType) { - var result, value; - type$.DebugInfo._as(object); - result = []; - value = object.appEntrypointPath; - if (value != null) { - result.push("appEntrypointPath"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.appId; - if (value != null) { - result.push("appId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.appInstanceId; - if (value != null) { - result.push("appInstanceId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.appOrigin; - if (value != null) { - result.push("appOrigin"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.appUrl; - if (value != null) { - result.push("appUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.authUrl; - if (value != null) { - result.push("authUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.dwdsVersion; - if (value != null) { - result.push("dwdsVersion"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.extensionUrl; - if (value != null) { - result.push("extensionUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.isInternalBuild; - if (value != null) { - result.push("isInternalBuild"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_R6B)); - } - value = object.isFlutterApp; - if (value != null) { - result.push("isFlutterApp"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_R6B)); - } - value = object.workspaceName; - if (value != null) { - result.push("workspaceName"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.tabUrl; - if (value != null) { - result.push("tabUrl"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_PT1)); - } - value = object.tabId; - if (value != null) { - result.push("tabId"); - result.push(serializers.serialize$2$specifiedType(value, B.FullType_rTD)); - } - return result; - }, - serialize$2(serializers, object) { - return this.serialize$3$specifiedType(serializers, object, B.FullType_null_List_empty_false); - }, - deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var t1, value, - result = new A.DebugInfoBuilder(), - iterator = J.get$iterator$ax(type$.Iterable_nullable_Object._as(serialized)); - while (iterator.moveNext$0()) { - t1 = iterator.get$current(); - t1.toString; - A._asString(t1); - iterator.moveNext$0(); - value = iterator.get$current(); - switch (t1) { - case "appEntrypointPath": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._appEntrypointPath = t1; - break; - case "appId": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._appId = t1; - break; - case "appInstanceId": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._appInstanceId = t1; - break; - case "appOrigin": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._appOrigin = t1; - break; - case "appUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._appUrl = t1; - break; - case "authUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._authUrl = t1; - break; - case "dwdsVersion": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._dwdsVersion = t1; - break; - case "extensionUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._extensionUrl = t1; - break; - case "isInternalBuild": - t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_R6B)); - result.get$_$this()._isInternalBuild = t1; - break; - case "isFlutterApp": - t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_R6B)); - result.get$_$this()._isFlutterApp = t1; - break; - case "workspaceName": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._workspaceName = t1; - break; - case "tabUrl": - t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_$this()._tabUrl = t1; - break; - case "tabId": - t1 = A._asIntQ(serializers.deserialize$2$specifiedType(value, B.FullType_rTD)); - result.get$_$this()._tabId = t1; - break; - } - } - return result._build$0(); - }, - deserialize$2(serializers, serialized) { - return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); - }, - $isSerializer: 1, - $isStructuredSerializer: 1, - get$types() { - return B.List_55I; - }, - get$wireName() { - return "DebugInfo"; - } - }; - A._$DebugInfo.prototype = { - $eq(_, other) { - var _this = this; - if (other == null) - return false; - if (other === _this) - return true; - return other instanceof A._$DebugInfo && _this.appEntrypointPath == other.appEntrypointPath && _this.appId == other.appId && _this.appInstanceId == other.appInstanceId && _this.appOrigin == other.appOrigin && _this.appUrl == other.appUrl && _this.authUrl == other.authUrl && _this.dwdsVersion == other.dwdsVersion && _this.extensionUrl == other.extensionUrl && _this.isInternalBuild == other.isInternalBuild && _this.isFlutterApp == other.isFlutterApp && _this.workspaceName == other.workspaceName && _this.tabUrl == other.tabUrl && _this.tabId == other.tabId; - }, - get$hashCode(_) { - var _this = this; - return A.$jf(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(A.$jc(0, J.get$hashCode$(_this.appEntrypointPath)), J.get$hashCode$(_this.appId)), J.get$hashCode$(_this.appInstanceId)), J.get$hashCode$(_this.appOrigin)), J.get$hashCode$(_this.appUrl)), J.get$hashCode$(_this.authUrl)), J.get$hashCode$(_this.dwdsVersion)), J.get$hashCode$(_this.extensionUrl)), J.get$hashCode$(_this.isInternalBuild)), J.get$hashCode$(_this.isFlutterApp)), J.get$hashCode$(_this.workspaceName)), J.get$hashCode$(_this.tabUrl)), J.get$hashCode$(_this.tabId))); - }, - toString$0(_) { - var _this = this, - t1 = $.$get$newBuiltValueToStringHelper().call$1("DebugInfo"), - t2 = J.getInterceptor$ax(t1); - t2.add$2(t1, "appEntrypointPath", _this.appEntrypointPath); - t2.add$2(t1, "appId", _this.appId); - t2.add$2(t1, "appInstanceId", _this.appInstanceId); - t2.add$2(t1, "appOrigin", _this.appOrigin); - t2.add$2(t1, "appUrl", _this.appUrl); - t2.add$2(t1, "authUrl", _this.authUrl); - t2.add$2(t1, "dwdsVersion", _this.dwdsVersion); - t2.add$2(t1, "extensionUrl", _this.extensionUrl); - t2.add$2(t1, "isInternalBuild", _this.isInternalBuild); - t2.add$2(t1, "isFlutterApp", _this.isFlutterApp); - t2.add$2(t1, "workspaceName", _this.workspaceName); - t2.add$2(t1, "tabUrl", _this.tabUrl); - t2.add$2(t1, "tabId", _this.tabId); - return t2.toString$0(t1); - } - }; - A.DebugInfoBuilder.prototype = { - get$_$this() { - var _this = this, - $$v = _this._$v; - if ($$v != null) { - _this._appEntrypointPath = $$v.appEntrypointPath; - _this._appId = $$v.appId; - _this._appInstanceId = $$v.appInstanceId; - _this._appOrigin = $$v.appOrigin; - _this._appUrl = $$v.appUrl; - _this._authUrl = $$v.authUrl; - _this._dwdsVersion = $$v.dwdsVersion; - _this._extensionUrl = $$v.extensionUrl; - _this._isInternalBuild = $$v.isInternalBuild; - _this._isFlutterApp = $$v.isFlutterApp; - _this._workspaceName = $$v.workspaceName; - _this._tabUrl = $$v.tabUrl; - _this._tabId = $$v.tabId; - _this._$v = null; - } - return _this; - }, - _build$0() { - var _this = this, - _$result = _this._$v; - return _this._$v = _$result == null ? new A._$DebugInfo(_this.get$_$this()._appEntrypointPath, _this.get$_$this()._appId, _this.get$_$this()._appInstanceId, _this.get$_$this()._appOrigin, _this.get$_$this()._appUrl, _this.get$_$this()._authUrl, _this.get$_$this()._dwdsVersion, _this.get$_$this()._extensionUrl, _this.get$_$this()._isInternalBuild, _this.get$_$this()._isFlutterApp, _this.get$_$this()._workspaceName, _this.get$_$this()._tabUrl, _this.get$_$this()._tabId) : _$result; + A.DebugInfo.prototype = { + toJson$0() { + var t2, _this = this, + t1 = A.LinkedHashMap_LinkedHashMap$_empty(type$.String, type$.dynamic); + t1.$indexSet(0, "appEntrypointPath", _this.appEntrypointPath); + t2 = _this.appId; + if (t2 != null) + t1.$indexSet(0, "appId", t2); + t2 = _this.appInstanceId; + if (t2 != null) + t1.$indexSet(0, "appInstanceId", t2); + t1.$indexSet(0, "appOrigin", _this.appOrigin); + t1.$indexSet(0, "appUrl", _this.appUrl); + t2 = _this.authUrl; + if (t2 != null) + t1.$indexSet(0, "authUrl", t2); + t2 = _this.extensionUrl; + if (t2 != null) + t1.$indexSet(0, "extensionUrl", t2); + t2 = _this.isInternalBuild; + if (t2 != null) + t1.$indexSet(0, "isInternalBuild", t2); + t2 = _this.isFlutterApp; + if (t2 != null) + t1.$indexSet(0, "isFlutterApp", t2); + t2 = _this.workspaceName; + if (t2 != null) + t1.$indexSet(0, "workspaceName", t2); + return t1; } }; A.DevToolsRequest.prototype = {}; @@ -23121,7 +22919,7 @@ t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); t1.toString; A._asString(t1); - result.get$_devtools_request$_$this()._devtools_request$_appId = t1; + result.get$_devtools_request$_$this()._appId = t1; break; case "instanceId": t1 = serializers.deserialize$2$specifiedType(value, B.FullType_PT1); @@ -23135,7 +22933,7 @@ break; case "tabUrl": t1 = A._asStringQ(serializers.deserialize$2$specifiedType(value, B.FullType_PT1)); - result.get$_devtools_request$_$this()._devtools_request$_tabUrl = t1; + result.get$_devtools_request$_$this()._tabUrl = t1; break; case "uriOnly": t1 = A._asBoolQ(serializers.deserialize$2$specifiedType(value, B.FullType_R6B)); @@ -23256,10 +23054,10 @@ var _this = this, $$v = _this._devtools_request$_$v; if ($$v != null) { - _this._devtools_request$_appId = $$v.appId; + _this._appId = $$v.appId; _this._instanceId = $$v.instanceId; _this._contextId = $$v.contextId; - _this._devtools_request$_tabUrl = $$v.tabUrl; + _this._tabUrl = $$v.tabUrl; _this._uriOnly = $$v.uriOnly; _this._devtools_request$_client = $$v.client; _this._devtools_request$_$v = null; @@ -23272,7 +23070,7 @@ _$result = _this._devtools_request$_$v; if (_$result == null) { t1 = type$.String; - _$result = new A._$DevToolsRequest(A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._devtools_request$_appId, _s15_, "appId", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._instanceId, _s15_, "instanceId", t1), _this.get$_devtools_request$_$this()._contextId, _this.get$_devtools_request$_$this()._devtools_request$_tabUrl, _this.get$_devtools_request$_$this()._uriOnly, _this.get$_devtools_request$_$this()._devtools_request$_client); + _$result = new A._$DevToolsRequest(A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._appId, _s15_, "appId", t1), A.BuiltValueNullFieldError_checkNotNull(_this.get$_devtools_request$_$this()._instanceId, _s15_, "instanceId", t1), _this.get$_devtools_request$_$this()._contextId, _this.get$_devtools_request$_$this()._tabUrl, _this.get$_devtools_request$_$this()._uriOnly, _this.get$_devtools_request$_$this()._devtools_request$_client); } return _this._devtools_request$_$v = _$result; } @@ -23930,7 +23728,7 @@ }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { type$.Iterable_nullable_Object._as(serialized); - return new A.IsolateExitBuilder()._isolate_events$_build$0(); + return new A.IsolateExitBuilder()._build$0(); }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -23954,7 +23752,7 @@ }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { type$.Iterable_nullable_Object._as(serialized); - return new A.IsolateStartBuilder()._isolate_events$_build$0(); + return new A.IsolateStartBuilder()._build$0(); }, deserialize$2(serializers, serialized) { return this.deserialize$3$specifiedType(serializers, serialized, B.FullType_null_List_empty_false); @@ -23984,9 +23782,9 @@ } }; A.IsolateExitBuilder.prototype = { - _isolate_events$_build$0() { - var _$result = this._isolate_events$_$v; - return this._isolate_events$_$v = _$result == null ? new A._$IsolateExit() : _$result; + _build$0() { + var _$result = this._$v; + return this._$v = _$result == null ? new A._$IsolateExit() : _$result; } }; A._$IsolateStart.prototype = { @@ -24005,9 +23803,9 @@ } }; A.IsolateStartBuilder.prototype = { - _isolate_events$_build$0() { - var _$result = this._isolate_events$_$v; - return this._isolate_events$_$v = _$result == null ? new A._$IsolateStart() : _$result; + _build$0() { + var _$result = this._$v; + return this._$v = _$result == null ? new A._$IsolateStart() : _$result; } }; A.RegisterEvent.prototype = {}; @@ -24253,13 +24051,13 @@ call$0() { return true; }, - $signature: 32 + $signature: 24 }; A.BatchedStreamController__hasEventDuring_closure.prototype = { call$0() { return false; }, - $signature: 32 + $signature: 24 }; A.SocketClient.prototype = {}; A.SseSocketClient.prototype = { @@ -24494,7 +24292,7 @@ }); return A._asyncStartSync($async$call$1, $async$completer); }, - $signature: 31 + $signature: 25 }; A.PersistentWebSocket__listenWithRetry_closure.prototype = { call$1(e) { @@ -24569,7 +24367,7 @@ type$.StackTrace._as(stackTrace); return $.$get$_logger().log$4(B.Level_WARNING_900, "Error in unawaited Future:", error, stackTrace); }, - $signature: 21 + $signature: 23 }; A.Int32.prototype = { _toInt$1(val) { @@ -24888,7 +24686,7 @@ $defaultValues() { return [null]; }, - $signature: 49 + $signature: 33 }; A._readBody_closure.prototype = { call$1(_) { @@ -25023,13 +24821,13 @@ } else t1._contents = t3 + value; }, - $signature: 107 + $signature: 53 }; A.MediaType_toString__closure.prototype = { call$1(match) { return "\\" + A.S(match.$index(0, 0)); }, - $signature: 30 + $signature: 27 }; A.expectQuotedString_closure.prototype = { call$1(match) { @@ -25037,7 +24835,7 @@ t1.toString; return t1; }, - $signature: 30 + $signature: 27 }; A.Level.prototype = { $eq(_, other) { @@ -25360,13 +25158,13 @@ call$1(part) { return A._asString(part) !== ""; }, - $signature: 27 + $signature: 28 }; A.Context_split_closure.prototype = { call$1(part) { return A._asString(part).length !== 0; }, - $signature: 27 + $signature: 28 }; A._validateArgList_closure.prototype = { call$1(arg) { @@ -26282,7 +26080,7 @@ var t1 = type$._Highlight._as(highlight).span; return t1.get$start().get$line() !== t1.get$end().get$line(); }, - $signature: 16 + $signature: 19 }; A.Highlighter$__closure0.prototype = { call$1(line) { @@ -26351,14 +26149,14 @@ call$1(highlight) { return type$._Highlight._as(highlight).span.get$end().get$line() < this.line.number; }, - $signature: 16 + $signature: 19 }; A.Highlighter_highlight_closure.prototype = { call$1(highlight) { type$._Highlight._as(highlight); return true; }, - $signature: 16 + $signature: 19 }; A.Highlighter__writeFileStart_closure.prototype = { call$0() { @@ -26456,7 +26254,7 @@ t2._contents = t4; return t4.length - t3.length; }, - $signature: 26 + $signature: 29 }; A.Highlighter__writeIndicator_closure0.prototype = { call$0() { @@ -26476,7 +26274,7 @@ t1._writeArrow$3$beginning(_this.line, Math.max(_this.highlight.span.get$end().get$column() - 1, 0), false); return t2._contents.length - t3.length; }, - $signature: 26 + $signature: 29 }; A.Highlighter__writeSidebar_closure.prototype = { call$0() { @@ -27165,7 +26963,7 @@ A._asJSObject(_); this.webSocketConnected.complete$1(this.browserSocket); }, - $signature: 15 + $signature: 14 }; A.BrowserWebSocket_connect_closure0.prototype = { call$1(e) { @@ -27177,7 +26975,7 @@ else this.browserSocket._closed$2(1006, "error"); }, - $signature: 15 + $signature: 14 }; A.BrowserWebSocket_connect_closure1.prototype = { call$1(e) { @@ -27207,7 +27005,7 @@ t1.complete$1(this.browserSocket); this.browserSocket._closed$2(A._asInt($event.code), A._asString($event.reason)); }, - $signature: 15 + $signature: 14 }; A.WebSocketEvent.prototype = {}; A.TextDataReceived.prototype = { @@ -27392,7 +27190,7 @@ }); return A._asyncStartSync($async$call$0, $async$completer); }, - $signature: 14 + $signature: 13 }; A.main__closure.prototype = { call$0() { @@ -27400,13 +27198,13 @@ path.toString; return A.FutureOfJSAnyToJSPromise_get_toJS(this.manager._restarter.hotReloadStart$1(path), type$.JSArray_nullable_Object); }, - $signature: 9 + $signature: 11 }; A.main__closure0.prototype = { call$0() { return A.FutureOfVoidToJSPromise_get_toJS(this.manager.hotReloadEnd$0()); }, - $signature: 9 + $signature: 11 }; A.main__closure1.prototype = { call$2(runId, pauseIsolatesOnStart) { @@ -27440,7 +27238,7 @@ t1 = type$.dynamic; 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); }, - $signature: 22 + $signature: 31 }; A.main__closure3.prototype = { call$0() { @@ -27473,7 +27271,7 @@ call$1(b) { var t1 = A.ListBuilder_ListBuilder(this.events, type$.DebugEvent); type$.nullable_ListBuilder_DebugEvent._as(t1); - b.get$_debug_event$_$this().set$_events(t1); + b.get$_$this().set$_events(t1); return t1; }, $signature: 75 @@ -27495,12 +27293,12 @@ A.main___closure1.prototype = { call$1(b) { var t1 = Date.now(); - b.get$_debug_event$_$this()._timestamp = t1; - b.get$_debug_event$_$this()._debug_event$_kind = this.kind; - b.get$_debug_event$_$this()._eventData = this.eventData; + b.get$_$this()._timestamp = t1; + b.get$_$this()._debug_event$_kind = this.kind; + b.get$_$this()._eventData = this.eventData; return b; }, - $signature: 77 + $signature: 105 }; A.main__closure6.prototype = { call$1(eventData) { @@ -27512,7 +27310,7 @@ type$.nullable_void_Function_RegisterEventBuilder._as(new A.main___closure0(eventData)).call$1(t3); A._trySendEvent(t1, B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(t3._register_event$_build$0()), null), type$.dynamic); }, - $signature: 22 + $signature: 31 }; A.main___closure0.prototype = { call$1(b) { @@ -27542,7 +27340,7 @@ call$1(b) { var t1 = init.G, t2 = A._asString(t1.$dartAppId); - b.get$_devtools_request$_$this()._devtools_request$_appId = t2; + b.get$_devtools_request$_$this()._appId = t2; t1 = A._asStringQ(t1.$dartAppInstanceId); b.get$_devtools_request$_$this()._instanceId = t1; return b; @@ -27715,7 +27513,7 @@ }); return A._asyncStartSync($async$call$1, $async$completer); }, - $signature: 31 + $signature: 25 }; A.main__closure9.prototype = { call$1(error) { @@ -27741,52 +27539,23 @@ }, $signature: 8 }; - A._launchCommunicationWithDebugExtension_closure.prototype = { - call$1(b) { - var t3, - t1 = init.G, - t2 = A._asString(t1.$dartEntrypointPath); - b.get$_$this()._appEntrypointPath = t2; - t2 = type$.JavaScriptObject; - t3 = A._asStringQ(t2._as(t1.window).$dartAppId); - b.get$_$this()._appId = t3; - t3 = A._asStringQ(t1.$dartAppInstanceId); - b.get$_$this()._appInstanceId = t3; - t3 = A._asString(A._asJSObject(A._asJSObject(t1.window).location).origin); - b.get$_$this()._appOrigin = t3; - t3 = A._asString(A._asJSObject(A._asJSObject(t1.window).location).href); - b.get$_$this()._appUrl = t3; - t3 = A._authUrl(); - b.get$_$this()._authUrl = t3; - t3 = A._asStringQ(t2._as(t1.window).$dartExtensionUri); - b.get$_$this()._extensionUrl = t3; - t3 = A._asBoolQ(t2._as(t1.window).$isInternalBuild); - b.get$_$this()._isInternalBuild = t3; - t2 = A._asBoolQ(t2._as(t1.window).$isFlutterApp); - b.get$_$this()._isFlutterApp = t2; - t1 = A._asStringQ(t1.$dartWorkspaceName); - b.get$_$this()._workspaceName = t1; - return b; - }, - $signature: 80 - }; A._handleAuthRequest_closure.prototype = { call$1(isAuthenticated) { return A._dispatchEvent("dart-auth-response", "" + A._asBool(isAuthenticated)); }, - $signature: 81 + $signature: 80 }; A._sendHotReloadResponse_closure.prototype = { call$3(id, success, errorMessage) { return new A.HotReloadResponse(id, success, errorMessage); }, - $signature: 82 + $signature: 81 }; A._sendHotRestartResponse_closure.prototype = { call$3(id, success, errorMessage) { return new A.HotRestartResponse(id, success, errorMessage); }, - $signature: 83 + $signature: 82 }; A.DdcLibraryBundleRestarter.prototype = { _runMainWhenReady$2(readyToRunMain, runMain) { @@ -28039,13 +27808,13 @@ A._asJSObject(A._asJSObject(init.G.dartDevEmbedder).config).capturedMainHandler = null; A.safeUnawaited(this.$this._runMainWhenReady$2(this.readyToRunMain, runMain)); }, - $signature: 20 + $signature: 32 }; A.DdcLibraryBundleRestarter_hotReloadStart_closure.prototype = { call$1(hotReloadEndCallback) { this.$this._capturedHotReloadEndCallback = type$.JavaScriptFunction._as(hotReloadEndCallback); }, - $signature: 20 + $signature: 32 }; A.DdcRestarter.prototype = { restart$3$readyToRunMain$reloadedSourcesPath$runId(readyToRunMain, reloadedSourcesPath, runId) { @@ -28103,7 +27872,7 @@ this.sub.cancel$0(); return value; }, - $signature: 85 + $signature: 84 }; A.ReloadingManager.prototype = { hotRestart$3$readyToRunMain$reloadedSourcesPath$runId(readyToRunMain, reloadedSourcesPath, runId) { @@ -28119,7 +27888,7 @@ // Function start t1 = $async$self._client.get$sink(); t2 = $.$get$serializers(); - t1._async$_target.add$1(0, t1.$ti._precomputed1._as(B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(new A.IsolateExitBuilder()._isolate_events$_build$0()), null))); + t1._async$_target.add$1(0, t1.$ti._precomputed1._as(B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(new A.IsolateExitBuilder()._build$0()), null))); $async$goto = 3; return A._asyncAwait($async$self._restarter.restart$3$readyToRunMain$reloadedSourcesPath$runId(readyToRunMain, reloadedSourcesPath, runId), $async$hotRestart$3$readyToRunMain$reloadedSourcesPath$runId); case 3: @@ -28210,7 +27979,7 @@ return; t1 = this._client.get$sink(); t2 = $.$get$serializers(); - t1._async$_target.add$1(0, t1.$ti._precomputed1._as(B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(new A.IsolateStartBuilder()._isolate_events$_build$0()), null))); + t1._async$_target.add$1(0, t1.$ti._precomputed1._as(B.C_JsonCodec.encode$2$toEncodable(t2.serialize$1(new A.IsolateStartBuilder()._build$0()), null))); } }; A.HotReloadFailedException.prototype = { @@ -28610,7 +28379,7 @@ call$1(e) { this.completer.completeError$2(new A.HotReloadFailedException(A._asString(type$.JavaScriptObject._as(e).message)), this.stackTrace); }, - $signature: 88 + $signature: 87 }; A._createScript_closure.prototype = { call$0() { @@ -28619,13 +28388,13 @@ return new A._createScript__closure(); return new A._createScript__closure0(nonce); }, - $signature: 89 + $signature: 88 }; A._createScript__closure.prototype = { call$0() { return A._asJSObject(A._asJSObject(init.G.document).createElement("script")); }, - $signature: 9 + $signature: 11 }; A._createScript__closure0.prototype = { call$0() { @@ -28633,7 +28402,7 @@ scriptElement.setAttribute("nonce", this.nonce); return scriptElement; }, - $signature: 9 + $signature: 11 }; A.runMain_closure.prototype = { call$0() { @@ -28682,51 +28451,51 @@ _instance_2_u = hunkHelpers._instance_2u, _instance_0_u = hunkHelpers._instance_0u, _instance_1_i = hunkHelpers._instance_1i; - _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 29); - _instance_1_u(A.CastStreamSubscription.prototype, "get$__internal$_onData", "__internal$_onData$1", 11); - _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 17); - _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 17); - _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 17); + _static_2(J, "_interceptors_JSArray__compareAny$closure", "JSArray__compareAny", 20); + _instance_1_u(A.CastStreamSubscription.prototype, "get$__internal$_onData", "__internal$_onData$1", 10); + _static_1(A, "async__AsyncRun__scheduleImmediateJsOverride$closure", "_AsyncRun__scheduleImmediateJsOverride", 12); + _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 12); + _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 12); _static_0(A, "async___startMicrotaskLoop$closure", "_startMicrotaskLoop", 0); _static_1(A, "async___nullDataHandler$closure", "_nullDataHandler", 7); _static_2(A, "async___nullErrorHandler$closure", "_nullErrorHandler", 8); _static_0(A, "async___nullDoneHandler$closure", "_nullDoneHandler", 0); - _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 92, 0); + _static(A, "async___rootHandleUncaughtError$closure", 5, null, ["call$5"], ["_rootHandleUncaughtError"], 91, 0); _static(A, "async___rootRun$closure", 4, null, ["call$1$4", "call$4"], ["_rootRun", function($self, $parent, zone, f) { return A._rootRun($self, $parent, zone, f, type$.dynamic); - }], 93, 1); + }], 92, 1); _static(A, "async___rootRunUnary$closure", 5, null, ["call$2$5", "call$5"], ["_rootRunUnary", function($self, $parent, zone, f, arg) { var t1 = type$.dynamic; return A._rootRunUnary($self, $parent, zone, f, arg, t1, t1); - }], 94, 1); + }], 93, 1); _static(A, "async___rootRunBinary$closure", 6, null, ["call$3$6", "call$6"], ["_rootRunBinary", function($self, $parent, zone, f, arg1, arg2) { var t1 = type$.dynamic; return A._rootRunBinary($self, $parent, zone, f, arg1, arg2, t1, t1, t1); - }], 95, 1); + }], 94, 1); _static(A, "async___rootRegisterCallback$closure", 4, null, ["call$1$4", "call$4"], ["_rootRegisterCallback", function($self, $parent, zone, f) { return A._rootRegisterCallback($self, $parent, zone, f, type$.dynamic); - }], 96, 0); + }], 95, 0); _static(A, "async___rootRegisterUnaryCallback$closure", 4, null, ["call$2$4", "call$4"], ["_rootRegisterUnaryCallback", function($self, $parent, zone, f) { var t1 = type$.dynamic; return A._rootRegisterUnaryCallback($self, $parent, zone, f, t1, t1); - }], 97, 0); + }], 96, 0); _static(A, "async___rootRegisterBinaryCallback$closure", 4, null, ["call$3$4", "call$4"], ["_rootRegisterBinaryCallback", function($self, $parent, zone, f) { var t1 = type$.dynamic; return A._rootRegisterBinaryCallback($self, $parent, zone, f, t1, t1, t1); - }], 98, 0); - _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 99, 0); - _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 100, 0); - _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 101, 0); - _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 102, 0); - _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 103, 0); - _static_1(A, "async___printToZone$closure", "_printToZone", 104); - _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 105, 0); + }], 97, 0); + _static(A, "async___rootErrorCallback$closure", 5, null, ["call$5"], ["_rootErrorCallback"], 98, 0); + _static(A, "async___rootScheduleMicrotask$closure", 4, null, ["call$4"], ["_rootScheduleMicrotask"], 99, 0); + _static(A, "async___rootCreateTimer$closure", 5, null, ["call$5"], ["_rootCreateTimer"], 100, 0); + _static(A, "async___rootCreatePeriodicTimer$closure", 5, null, ["call$5"], ["_rootCreatePeriodicTimer"], 101, 0); + _static(A, "async___rootPrint$closure", 4, null, ["call$4"], ["_rootPrint"], 102, 0); + _static_1(A, "async___printToZone$closure", "_printToZone", 103); + _static(A, "async___rootFork$closure", 5, null, ["call$5"], ["_rootFork"], 104, 0); _instance(A._Completer.prototype, "get$completeError", 0, 1, function() { return [null]; - }, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 91, 0, 0); + }, ["call$2", "call$1"], ["completeError$2", "completeError$1"], 36, 0, 0); _instance_2_u(A._Future.prototype, "get$_completeError", "_completeError$2", 8); var _; - _instance_1_u(_ = A._StreamController.prototype, "get$_add", "_add$1", 11); + _instance_1_u(_ = A._StreamController.prototype, "get$_add", "_add$1", 10); _instance_2_u(_, "get$_addError", "_addError$2", 8); _instance_0_u(_, "get$_close", "_close$0", 0); _instance_0_u(_ = A._ControllerSubscription.prototype, "get$_onPause", "_onPause$0", 0); @@ -28736,42 +28505,42 @@ _instance_0_u(A._DoneStreamSubscription.prototype, "get$_onMicrotask", "_onMicrotask$0", 0); _instance_0_u(_ = A._ForwardingStreamSubscription.prototype, "get$_onPause", "_onPause$0", 0); _instance_0_u(_, "get$_onResume", "_onResume$0", 0); - _instance_1_u(_, "get$_handleData", "_handleData$1", 11); - _instance_2_u(_, "get$_handleError", "_handleError$2", 21); + _instance_1_u(_, "get$_handleData", "_handleData$1", 10); + _instance_2_u(_, "get$_handleError", "_handleError$2", 23); _instance_0_u(_, "get$_handleDone", "_handleDone$0", 0); - _static_2(A, "collection___defaultEquals$closure", "_defaultEquals0", 19); + _static_2(A, "collection___defaultEquals$closure", "_defaultEquals0", 17); _static_1(A, "collection___defaultHashCode$closure", "_defaultHashCode", 18); - _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 29); + _static_2(A, "collection_ListBase__compareAny$closure", "ListBase__compareAny", 20); _static_1(A, "convert___defaultToEncodable$closure", "_defaultToEncodable", 5); - _instance_1_i(_ = A._ByteCallbackSink.prototype, "get$add", "add$1", 11); + _instance_1_i(_ = A._ByteCallbackSink.prototype, "get$add", "add$1", 10); _instance_0_u(_, "get$close", "close$0", 0); _static_1(A, "core__identityHashCode$closure", "identityHashCode", 18); - _static_2(A, "core__identical$closure", "identical", 19); - _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 13); + _static_2(A, "core__identical$closure", "identical", 17); + _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 16); _static(A, "math__max$closure", 2, null, ["call$1$2", "call$2"], ["max", function(a, b) { return A.max(a, b, type$.num); - }], 106, 1); - _instance_2_u(_ = A.DeepCollectionEquality.prototype, "get$equals", "equals$2", 19); + }], 77, 1); + _instance_2_u(_ = A.DeepCollectionEquality.prototype, "get$equals", "equals$2", 17); _instance_1_u(_, "get$hash", "hash$1", 18); - _instance_1_u(_, "get$isValidKey", "isValidKey$1", 12); + _instance_1_u(_, "get$isValidKey", "isValidKey$1", 15); _instance_1_u(_ = A.PersistentWebSocket.prototype, "get$_writeToWebSocket", "_writeToWebSocket$1", 7); - _instance_0_u(_, "get$_listenWithRetry", "_listenWithRetry$0", 14); - _static_1(A, "case_insensitive_map_CaseInsensitiveMap__canonicalizer$closure", "CaseInsensitiveMap__canonicalizer", 13); + _instance_0_u(_, "get$_listenWithRetry", "_listenWithRetry$0", 13); + _static_1(A, "case_insensitive_map_CaseInsensitiveMap__canonicalizer$closure", "CaseInsensitiveMap__canonicalizer", 16); _instance_1_u(_ = A.SseClient.prototype, "get$_onIncomingControlMessage", "_onIncomingControlMessage$1", 2); _instance_1_u(_, "get$_onIncomingMessage", "_onIncomingMessage$1", 2); _instance_0_u(_, "get$_onOutgoingDone", "_onOutgoingDone$0", 0); _instance_1_u(_, "get$_onOutgoingMessage", "_onOutgoingMessage$1", 68); - _static_1(A, "client__initializeConnection$closure", "initializeConnection", 71); + _static_1(A, "client__initializeConnection$closure", "initializeConnection", 70); _static_1(A, "client___handleAuthRequest$closure", "_handleAuthRequest", 2); - _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 86); - _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 87); + _instance_1_u(_ = A.RequireRestarter.prototype, "get$_moduleParents", "_moduleParents$1", 85); + _instance_2_u(_, "get$_moduleTopologicalCompare", "_moduleTopologicalCompare$2", 86); })(); (function inheritance() { var _mixin = hunkHelpers.mixin, _inherit = hunkHelpers.inherit, _inheritMany = hunkHelpers.inheritMany; _inherit(A.Object, null); - _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._AsyncStarStreamController, A._IterationMarker, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A._StreamController, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._AddStreamState, 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._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A._Base64Encoder, A._Base64Decoder, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A._JSSecureRandom, A.AsyncMemoizer, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.BuiltList, A.ListBuilder, A.BuiltListMultimap, A.ListMultimapBuilder, A.BuiltMap, A.MapBuilder, A.BuiltSet, A.SetBuilder, A.BuiltSetMultimap, A.SetMultimapBuilder, A.EnumClass, A.IndentingBuiltValueToStringHelper, A.JsonObject, A.FullType, A.BigIntSerializer, A.BoolSerializer, A.BuiltJsonSerializers, A.BuiltJsonSerializersBuilder, A.BuiltListMultimapSerializer, A.BuiltListSerializer, A.BuiltMapSerializer, A.BuiltSetMultimapSerializer, A.BuiltSetSerializer, A.DateTimeSerializer, A.DoubleSerializer, A.DurationSerializer, A.Int32Serializer, A.Int64Serializer, A.IntSerializer, A.JsonObjectSerializer, A.ListSerializer, A.MapSerializer, A.NullSerializer, A.NumSerializer, A.RegExpSerializer, A.SetSerializer, A.StringSerializer, A.Uint8ListSerializer, A.UriSerializer, A.CanonicalizedMap, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._UnorderedEquality, A._MapEntry, A.MapEquality, A.DeepCollectionEquality, A._QueueList_Object_ListMixin, A.BuildResult, A._$BuildStatusSerializer, A._$BuildResultSerializer, A.BuildResultBuilder, A.ConnectRequest, A.DebugEvent, A.BatchedDebugEvents, A._$DebugEventSerializer, A._$BatchedDebugEventsSerializer, A.DebugEventBuilder, A.BatchedDebugEventsBuilder, A.DebugInfo, A._$DebugInfoSerializer, A.DebugInfoBuilder, A.DevToolsRequest, A.DevToolsResponse, A._$DevToolsRequestSerializer, A._$DevToolsResponseSerializer, A.DevToolsRequestBuilder, A.DevToolsResponseBuilder, A.ErrorResponse, A._$ErrorResponseSerializer, A.ErrorResponseBuilder, A.ExtensionRequest, A.ExtensionResponse, A.ExtensionEvent, A.BatchedEvents, A._$ExtensionRequestSerializer, A._$ExtensionResponseSerializer, A._$ExtensionEventSerializer, A._$BatchedEventsSerializer, A.ExtensionRequestBuilder, A.ExtensionResponseBuilder, A.ExtensionEventBuilder, A.BatchedEventsBuilder, A.HotReloadRequest, A.HotReloadResponse, A.HotRestartRequest, A.HotRestartResponse, A.IsolateExit, A.IsolateStart, A._$IsolateExitSerializer, A._$IsolateStartSerializer, A.IsolateExitBuilder, A.IsolateStartBuilder, A.RegisterEvent, A._$RegisterEventSerializer, A.RegisterEventBuilder, A.RunRequest, A.ServiceExtensionRequest, A.ServiceExtensionResponse, A.BatchedStreamController, A.SocketClient, A._PersistentWebSocket_Object_StreamChannelMixin, A.Int32, A.Int64, A._StackState, A.BaseClient, A.BaseRequest, A.BaseResponse, A.ClientException, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A.StringScanner, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); + _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._AsyncStarStreamController, A._IterationMarker, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A._StreamController, A._AsyncStreamControllerDispatch, A._BufferingStreamSubscription, A._StreamSinkWrapper, A._AddStreamState, 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._LinkedHashSetCell, A._LinkedHashSetIterator, A._UnmodifiableMapMixin, A.MapView, A._ListQueueIterator, A._SplayTreeNode, A._SplayTree, A._SplayTreeIterator, A.Codec, A.Converter, A._Base64Encoder, A._Base64Decoder, A.ByteConversionSink, A._JsonStringifier, A._Utf8Encoder, A._Utf8Decoder, A._BigIntImpl, A.DateTime, A.Duration, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.IntegerDivisionByZeroException, A.MapEntry, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A._JSRandom, A._JSSecureRandom, A.AsyncMemoizer, A.ErrorResult, A.ValueResult, A.StreamQueue, A._NextRequest, A._HasNextRequest, A.BuiltList, A.ListBuilder, A.BuiltListMultimap, A.ListMultimapBuilder, A.BuiltMap, A.MapBuilder, A.BuiltSet, A.SetBuilder, A.BuiltSetMultimap, A.SetMultimapBuilder, A.EnumClass, A.IndentingBuiltValueToStringHelper, A.JsonObject, A.FullType, A.BigIntSerializer, A.BoolSerializer, A.BuiltJsonSerializers, A.BuiltJsonSerializersBuilder, A.BuiltListMultimapSerializer, A.BuiltListSerializer, A.BuiltMapSerializer, A.BuiltSetMultimapSerializer, A.BuiltSetSerializer, A.DateTimeSerializer, A.DoubleSerializer, A.DurationSerializer, A.Int32Serializer, A.Int64Serializer, A.IntSerializer, A.JsonObjectSerializer, A.ListSerializer, A.MapSerializer, A.NullSerializer, A.NumSerializer, A.RegExpSerializer, A.SetSerializer, A.StringSerializer, A.Uint8ListSerializer, A.UriSerializer, A.CanonicalizedMap, A.DefaultEquality, A.IterableEquality, A.ListEquality, A._UnorderedEquality, A._MapEntry, A.MapEquality, A.DeepCollectionEquality, A._QueueList_Object_ListMixin, A.BuildResult, A._$BuildStatusSerializer, A._$BuildResultSerializer, A.BuildResultBuilder, A.ConnectRequest, A.DebugEvent, A.BatchedDebugEvents, A._$DebugEventSerializer, A._$BatchedDebugEventsSerializer, A.DebugEventBuilder, A.BatchedDebugEventsBuilder, A.DebugInfo, A.DevToolsRequest, A.DevToolsResponse, A._$DevToolsRequestSerializer, A._$DevToolsResponseSerializer, A.DevToolsRequestBuilder, A.DevToolsResponseBuilder, A.ErrorResponse, A._$ErrorResponseSerializer, A.ErrorResponseBuilder, A.ExtensionRequest, A.ExtensionResponse, A.ExtensionEvent, A.BatchedEvents, A._$ExtensionRequestSerializer, A._$ExtensionResponseSerializer, A._$ExtensionEventSerializer, A._$BatchedEventsSerializer, A.ExtensionRequestBuilder, A.ExtensionResponseBuilder, A.ExtensionEventBuilder, A.BatchedEventsBuilder, A.HotReloadRequest, A.HotReloadResponse, A.HotRestartRequest, A.HotRestartResponse, A.IsolateExit, A.IsolateStart, A._$IsolateExitSerializer, A._$IsolateStartSerializer, A.IsolateExitBuilder, A.IsolateStartBuilder, A.RegisterEvent, A._$RegisterEventSerializer, A.RegisterEventBuilder, A.RunRequest, A.ServiceExtensionRequest, A.ServiceExtensionResponse, A.BatchedStreamController, A.SocketClient, A._PersistentWebSocket_Object_StreamChannelMixin, A.Int32, A.Int64, A._StackState, A.BaseClient, A.BaseRequest, A.BaseResponse, A.ClientException, A.MediaType, A.Level, A.LogRecord, A.Logger, A.Context, A.Style, A.ParsedPath, A.PathException, A.Pool, A.PoolResource, A.SourceFile, A.SourceLocationMixin, A.SourceSpanMixin, A.Highlighter, A._Highlight, A._Line, A.SourceLocation, A.SourceSpanException, A.StreamChannelMixin, A.StringScanner, A.RNG, A.UuidV1, A.EventStreamProvider, A._EventStreamSubscription, A.BrowserWebSocket, A.WebSocketEvent, A.WebSocketException, A.DdcLibraryBundleRestarter, A.DdcRestarter, A.ReloadingManager, A.HotReloadFailedException, A.RequireRestarter]); _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JavaScriptBigInt, J.JavaScriptSymbol, J.JSNumber, J.JSString]); _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]); _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]); @@ -28783,7 +28552,7 @@ _inheritMany(A._CastIterableBase, [A.CastIterable, A.__CastListBase__CastIterableBase_ListMixin]); _inherit(A._EfficientLengthCastIterable, A.CastIterable); _inherit(A._CastListBase, A.__CastListBase__CastIterableBase_ListMixin); - _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._asyncStarHelper_closure0, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A._LinkedCustomHashMap_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A.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.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.ListSerializer_serialize_closure, A.SetSerializer_serialize_closure, A.CanonicalizedMap_keys_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._readBody_closure, A._readBody_closure0, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.main__closure1, A.main__closure2, A.main__closure4, A.main___closure2, A.main___closure1, A.main__closure6, A.main___closure0, A.main___closure, A.main__closure8, A.main__closure9, A.main__closure10, A._launchCommunicationWithDebugExtension_closure, 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]); + _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.Instantiation, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._asyncStarHelper_closure0, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A._LinkedCustomHashMap_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A.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.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.ListSerializer_serialize_closure, A.SetSerializer_serialize_closure, A.CanonicalizedMap_keys_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._readBody_closure, A._readBody_closure0, A.ByteStream_toBytes_closure, A.MediaType_toString__closure, A.expectQuotedString_closure, A.Context_joinAll_closure, A.Context_split_closure, A._validateArgList_closure, A.Pool__runOnRelease_closure, A.Highlighter$__closure, A.Highlighter$___closure, A.Highlighter$__closure0, A.Highlighter__collateLines_closure, A.Highlighter__collateLines_closure1, A.Highlighter__collateLines__closure, A.Highlighter_highlight_closure, A.SseClient_closure0, A.SseClient_closure1, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure, A.BrowserWebSocket_connect_closure, A.BrowserWebSocket_connect_closure0, A.BrowserWebSocket_connect_closure1, A.BrowserWebSocket_connect_closure2, A.main__closure1, A.main__closure2, A.main__closure4, A.main___closure2, A.main___closure1, A.main__closure6, A.main___closure0, A.main___closure, A.main__closure8, A.main__closure9, A.main__closure10, 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]); _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure0, A._Future_timeout_closure1, A._AddStreamState_makeErrorHandler_closure, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A.Uri_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.hashObjects_closure, A.MapBuilder_replace_closure, A.CanonicalizedMap_addAll_closure, A.CanonicalizedMap_forEach_closure, A.CanonicalizedMap_map_closure, A.safeUnawaited_closure, A.BaseRequest_closure, A.MediaType_toString_closure, A.Pool__runOnRelease_closure0, A.Highlighter__collateLines_closure0, A.main__closure5, A.main_closure0]); _inherit(A.CastList, A._CastListBase); _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A._JsonMap]); @@ -28854,7 +28623,6 @@ _inherit(A._$BuildResult, A.BuildResult); _inherit(A._$DebugEvent, A.DebugEvent); _inherit(A._$BatchedDebugEvents, A.BatchedDebugEvents); - _inherit(A._$DebugInfo, A.DebugInfo); _inherit(A._$DevToolsRequest, A.DevToolsRequest); _inherit(A._$DevToolsResponse, A.DevToolsResponse); _inherit(A._$ErrorResponse, A.ErrorResponse); @@ -28902,7 +28670,7 @@ typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []}, mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List", Object: "Object", Map: "Map", JSObject: "JSObject"}, mangledNames: {}, - types: ["~()", "Null()", "~(JSObject)", "Object?(@)", "Null(Object,StackTrace)", "@(@)", "Null(@)", "~(@)", "~(Object,StackTrace)", "JSObject()", "Object?(Object?)", "~(Object?)", "bool(Object?)", "String(String)", "Future<~>()", "Null(JSObject)", "bool(_Highlight)", "~(~())", "int(Object?)", "bool(Object?,Object?)", "Null(JavaScriptFunction)", "~(@,StackTrace)", "Null(String)", "~(@,@)", "~(Object?,Object?)", "@()", "int()", "bool(String)", "Null(JavaScriptFunction,JavaScriptFunction)", "int(@,@)", "String(Match)", "Future<~>(String)", "bool()", "ListMultimapBuilder()", "MapBuilder()", "Null(@,StackTrace)", "SetMultimapBuilder()", "~(int,@)", "ListBuilder()", "IndentingBuiltValueToStringHelper(String)", "ListBuilder()", "ListBuilder()", "int(int,@)", "String(@)", "PersistentWebSocket(WebSocket)", "Object?(~)", "Future<~>(WebSocketEvent)", "bool(String,String)", "int(String)", "Null(String,String[Object?])", "bool(Object)", "~(List)", "MediaType()", "SetBuilder()", "JSObject(Object,StackTrace)", "Logger()", "0&(String,int?)", "String(String?)", "String?()", "int(_Line)", "int(int)", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry>)", "int(int,int)", "SourceSpanWithContext()", "_Future<@>?()", "~(String?)", "Future()", "@(String)", "~(StreamSink<@>)", "JSObject(String[bool?])", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "Null(String,String)", "DebugEventBuilder(DebugEventBuilder)", "RegisterEventBuilder(RegisterEventBuilder)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "~(bool)", "HotReloadResponse(String,bool,String?)", "HotRestartResponse(String,bool,String?)", "@(@,String)", "bool(bool)", "List(String)", "int(String,String)", "Null(JavaScriptObject)", "JSObject()()", "Null(~())", "~(Object[StackTrace?])", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)", "0^()(Zone,ZoneDelegate,Zone,0^())", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "~(String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "0^(0^,0^)", "~(String,String)"], + types: ["~()", "Null()", "~(JSObject)", "Object?(@)", "Null(Object,StackTrace)", "@(@)", "Null(@)", "~(@)", "~(Object,StackTrace)", "Object?(Object?)", "~(Object?)", "JSObject()", "~(~())", "Future<~>()", "Null(JSObject)", "bool(Object?)", "String(String)", "bool(Object?,Object?)", "int(Object?)", "bool(_Highlight)", "int(@,@)", "~(Object?,Object?)", "Null(JavaScriptFunction,JavaScriptFunction)", "~(@,StackTrace)", "bool()", "Future<~>(String)", "@()", "String(Match)", "bool(String)", "int()", "~(@,@)", "Null(String)", "Null(JavaScriptFunction)", "Null(String,String[Object?])", "MapBuilder()", "SetBuilder()", "~(Object[StackTrace?])", "@(String)", "@(@,String)", "int(int)", "ListBuilder()", "ListBuilder()", "0&(String,int?)", "String(@)", "PersistentWebSocket(WebSocket)", "~(int,@)", "Future<~>(WebSocketEvent)", "bool(String,String)", "int(String)", "int(int,int)", "bool(Object)", "~(List)", "MediaType()", "~(String,String)", "_Future<@>?()", "Logger()", "JSObject(Object,StackTrace)", "String(String?)", "String?()", "int(_Line)", "Null(~())", "Object(_Line)", "Object(_Highlight)", "int(_Highlight,_Highlight)", "List<_Line>(MapEntry>)", "Object?(~)", "SourceSpanWithContext()", "Null(@,StackTrace)", "~(String?)", "Future()", "~(StreamSink<@>)", "int(int,@)", "JSObject(String[bool?])", "IndentingBuiltValueToStringHelper(String)", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "Null(String,String)", "0^(0^,0^)", "RegisterEventBuilder(RegisterEventBuilder)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "~(bool)", "HotReloadResponse(String,bool,String?)", "HotRestartResponse(String,bool,String?)", "ListBuilder()", "bool(bool)", "List(String)", "int(String,String)", "Null(JavaScriptObject)", "JSObject()()", "SetMultimapBuilder()", "ListMultimapBuilder()", "~(Zone?,ZoneDelegate?,Zone,Object,StackTrace)", "0^(Zone?,ZoneDelegate?,Zone,0^())", "0^(Zone?,ZoneDelegate?,Zone,0^(1^),1^)", "0^(Zone?,ZoneDelegate?,Zone,0^(1^,2^),1^,2^)", "0^()(Zone,ZoneDelegate,Zone,0^())", "0^(1^)(Zone,ZoneDelegate,Zone,0^(1^))", "0^(1^,2^)(Zone,ZoneDelegate,Zone,0^(1^,2^))", "AsyncError?(Zone,ZoneDelegate,Zone,Object,StackTrace?)", "~(Zone?,ZoneDelegate?,Zone,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~())", "Timer(Zone,ZoneDelegate,Zone,Duration,~(Timer))", "~(Zone,ZoneDelegate,Zone,String)", "~(String)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "DebugEventBuilder(DebugEventBuilder)", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)"], interceptorsByTag: null, leafTags: null, arrayRti: Symbol("$ti"), @@ -28910,7 +28678,7 @@ "2;": (t1, t2) => o => o instanceof A._Record_2 && t1._is(o._0) && t2._is(o._1) } }; - 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"},"_Type":{"Type":[]},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_TimerImpl":{"Timer":[]},"_AsyncAwaitCompleter":{"Completer":["1"]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"StreamView":{"Stream":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_AsyncStreamController":{"_AsyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"]},"_StreamControllerAddStreamState":{"_AddStreamState":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_EventSink":["2"],"_EventDispatch":["2"],"_BufferingStreamSubscription.T":"2"},"_MapStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_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"},"_CustomHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashSetIterator":{"Iterator":["1"]},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedHashSetIterator":{"Iterator":["1"]},"UnmodifiableListView":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","Iterable.E":"1","UnmodifiableListMixin.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_ListQueueIterator":{"Iterator":["1"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SplayTreeIterator":{"Iterator":["3"]},"_SplayTreeKeyIterator":{"_SplayTreeIterator":["1","2","1"],"Iterator":["1"],"_SplayTreeIterator.K":"1","_SplayTreeIterator.T":"1","_SplayTreeIterator.1":"2"},"SplayTreeSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"_SplayTree":["1","_SplayTreeSetNode<1>"],"Iterable":["1"],"Iterable.E":"1","_SplayTree.1":"_SplayTreeSetNode<1>","_SplayTree.K":"1"},"Encoding":{"Codec":["String","List"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"_UnicodeSubsetEncoder":{"Converter":["String","List"]},"AsciiEncoder":{"Converter":["String","List"]},"_UnicodeSubsetDecoder":{"Converter":["List","String"]},"AsciiDecoder":{"Converter":["List","String"]},"Base64Codec":{"Codec":["List","String"],"Codec.S":"List"},"Base64Encoder":{"Converter":["List","String"]},"Base64Decoder":{"Converter":["String","List"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"],"Codec.S":"Object?"},"JsonEncoder":{"Converter":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"]},"Latin1Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Latin1Encoder":{"Converter":["String","List"]},"Latin1Decoder":{"Converter":["List","String"]},"Utf8Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"]},"Utf8Decoder":{"Converter":["List","String"]},"BigInt":{"Comparable":["BigInt"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExp":{"Pattern":[]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"],"Pattern":[]},"_BigIntImpl":{"BigInt":[],"Comparable":["BigInt"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"IntegerDivisionByZeroException":{"Exception":[],"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_NextRequest":{"_EventRequest":["1"]},"_HasNextRequest":{"_EventRequest":["1"]},"BuiltList":{"Iterable":["1"]},"_BuiltList":{"BuiltList":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltListMultimap":{"BuiltListMultimap":["1","2"]},"_BuiltMap":{"BuiltMap":["1","2"]},"BuiltSet":{"Iterable":["1"]},"_BuiltSet":{"BuiltSet":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltSetMultimap":{"BuiltSetMultimap":["1","2"]},"BuiltValueNullFieldError":{"Error":[]},"BuiltValueNestedFieldError":{"Error":[]},"BoolJsonObject":{"JsonObject":[]},"ListJsonObject":{"JsonObject":[]},"MapJsonObject":{"JsonObject":[]},"NumJsonObject":{"JsonObject":[]},"StringJsonObject":{"JsonObject":[]},"DeserializationError":{"Error":[]},"BigIntSerializer":{"PrimitiveSerializer":["BigInt"],"Serializer":["BigInt"]},"BoolSerializer":{"PrimitiveSerializer":["bool"],"Serializer":["bool"]},"BuiltJsonSerializers":{"Serializers":[]},"BuiltListMultimapSerializer":{"StructuredSerializer":["BuiltListMultimap<@,@>"],"Serializer":["BuiltListMultimap<@,@>"]},"BuiltListSerializer":{"StructuredSerializer":["BuiltList<@>"],"Serializer":["BuiltList<@>"]},"BuiltMapSerializer":{"StructuredSerializer":["BuiltMap<@,@>"],"Serializer":["BuiltMap<@,@>"]},"BuiltSetMultimapSerializer":{"StructuredSerializer":["BuiltSetMultimap<@,@>"],"Serializer":["BuiltSetMultimap<@,@>"]},"BuiltSetSerializer":{"StructuredSerializer":["BuiltSet<@>"],"Serializer":["BuiltSet<@>"]},"DateTimeSerializer":{"PrimitiveSerializer":["DateTime"],"Serializer":["DateTime"]},"DoubleSerializer":{"PrimitiveSerializer":["double"],"Serializer":["double"]},"DurationSerializer":{"PrimitiveSerializer":["Duration"],"Serializer":["Duration"]},"Int32Serializer":{"PrimitiveSerializer":["Int32"],"Serializer":["Int32"]},"Int64Serializer":{"PrimitiveSerializer":["Int64"],"Serializer":["Int64"]},"IntSerializer":{"PrimitiveSerializer":["int"],"Serializer":["int"]},"JsonObjectSerializer":{"PrimitiveSerializer":["JsonObject"],"Serializer":["JsonObject"]},"ListSerializer":{"StructuredSerializer":["List<@>"],"Serializer":["List<@>"]},"MapSerializer":{"StructuredSerializer":["Map<@,@>"],"Serializer":["Map<@,@>"]},"NullSerializer":{"PrimitiveSerializer":["Null"],"Serializer":["Null"]},"NumSerializer":{"PrimitiveSerializer":["num"],"Serializer":["num"]},"RegExpSerializer":{"PrimitiveSerializer":["RegExp"],"Serializer":["RegExp"]},"SetSerializer":{"StructuredSerializer":["Set<@>"],"Serializer":["Set<@>"]},"StringSerializer":{"PrimitiveSerializer":["String"],"Serializer":["String"]},"Uint8ListSerializer":{"PrimitiveSerializer":["Uint8List"],"Serializer":["Uint8List"]},"UriSerializer":{"PrimitiveSerializer":["Uri"],"Serializer":["Uri"]},"CanonicalizedMap":{"Map":["2","3"]},"DefaultEquality":{"Equality":["1"]},"IterableEquality":{"Equality":["Iterable<1>"]},"ListEquality":{"Equality":["List<1>"]},"_UnorderedEquality":{"Equality":["2"]},"SetEquality":{"_UnorderedEquality":["1","Set<1>"],"Equality":["Set<1>"],"_UnorderedEquality.E":"1","_UnorderedEquality.T":"Set<1>"},"MapEquality":{"Equality":["Map<1,2>"]},"DeepCollectionEquality":{"Equality":["@"]},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1","Iterable.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2","Iterable.E":"2"},"_$BuildStatusSerializer":{"PrimitiveSerializer":["BuildStatus"],"Serializer":["BuildStatus"]},"_$BuildResultSerializer":{"StructuredSerializer":["BuildResult"],"Serializer":["BuildResult"]},"_$BuildResult":{"BuildResult":[]},"_$DebugEventSerializer":{"StructuredSerializer":["DebugEvent"],"Serializer":["DebugEvent"]},"_$BatchedDebugEventsSerializer":{"StructuredSerializer":["BatchedDebugEvents"],"Serializer":["BatchedDebugEvents"]},"_$DebugEvent":{"DebugEvent":[]},"_$BatchedDebugEvents":{"BatchedDebugEvents":[]},"_$DebugInfoSerializer":{"StructuredSerializer":["DebugInfo"],"Serializer":["DebugInfo"]},"_$DebugInfo":{"DebugInfo":[]},"_$DevToolsRequestSerializer":{"StructuredSerializer":["DevToolsRequest"],"Serializer":["DevToolsRequest"]},"_$DevToolsResponseSerializer":{"StructuredSerializer":["DevToolsResponse"],"Serializer":["DevToolsResponse"]},"_$DevToolsRequest":{"DevToolsRequest":[]},"_$DevToolsResponse":{"DevToolsResponse":[]},"_$ErrorResponseSerializer":{"StructuredSerializer":["ErrorResponse"],"Serializer":["ErrorResponse"]},"_$ErrorResponse":{"ErrorResponse":[]},"_$ExtensionRequestSerializer":{"StructuredSerializer":["ExtensionRequest"],"Serializer":["ExtensionRequest"]},"_$ExtensionResponseSerializer":{"StructuredSerializer":["ExtensionResponse"],"Serializer":["ExtensionResponse"]},"_$ExtensionEventSerializer":{"StructuredSerializer":["ExtensionEvent"],"Serializer":["ExtensionEvent"]},"_$BatchedEventsSerializer":{"StructuredSerializer":["BatchedEvents"],"Serializer":["BatchedEvents"]},"_$ExtensionRequest":{"ExtensionRequest":[]},"_$ExtensionResponse":{"ExtensionResponse":[]},"_$ExtensionEvent":{"ExtensionEvent":[]},"_$BatchedEvents":{"BatchedEvents":[]},"_$IsolateExitSerializer":{"StructuredSerializer":["IsolateExit"],"Serializer":["IsolateExit"]},"_$IsolateStartSerializer":{"StructuredSerializer":["IsolateStart"],"Serializer":["IsolateStart"]},"_$IsolateExit":{"IsolateExit":[]},"_$IsolateStart":{"IsolateStart":[]},"_$RegisterEventSerializer":{"StructuredSerializer":["RegisterEvent"],"Serializer":["RegisterEvent"]},"_$RegisterEvent":{"RegisterEvent":[]},"PersistentWebSocket":{"StreamChannelMixin":["@"]},"SseSocketClient":{"SocketClient":[]},"WebSocketClient":{"SocketClient":[]},"Int32":{"Comparable":["Object"]},"Int64":{"Comparable":["Object"]},"ByteStream":{"StreamView":["List"],"Stream":["List"],"Stream.T":"List","StreamView.T":"List"},"ClientException":{"Exception":[]},"Request":{"BaseRequest":[]},"StreamedResponseV2":{"StreamedResponse":[]},"CaseInsensitiveMap":{"CanonicalizedMap":["String","String","1"],"Map":["String","1"],"CanonicalizedMap.K":"String","CanonicalizedMap.V":"1","CanonicalizedMap.C":"String"},"Level":{"Comparable":["Level"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"_FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SseClient":{"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":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"HotReloadFailedException":{"Exception":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); + A._Universe_addRules(init.typeUniverse, JSON.parse('{"JavaScriptFunction":"LegacyJavaScriptObject","PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","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"},"_Type":{"Type":[]},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"AsyncError":{"Error":[]},"_Future":{"Future":["1"]},"_TimerImpl":{"Timer":[]},"_AsyncAwaitCompleter":{"Completer":["1"]},"_Completer":{"Completer":["1"]},"_AsyncCompleter":{"_Completer":["1"],"Completer":["1"]},"_SyncCompleter":{"_Completer":["1"],"Completer":["1"]},"StreamView":{"Stream":["1"]},"_StreamController":{"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_AsyncStreamController":{"_AsyncStreamControllerDispatch":["1"],"_StreamController":["1"],"StreamController":["1"],"StreamSink":["1"],"_StreamControllerLifecycle":["1"],"_EventSink":["1"],"_EventDispatch":["1"]},"_ControllerStream":{"_StreamImpl":["1"],"Stream":["1"],"Stream.T":"1"},"_ControllerSubscription":{"_BufferingStreamSubscription":["1"],"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamSinkWrapper":{"StreamSink":["1"]},"_StreamControllerAddStreamState":{"_AddStreamState":["1"]},"_BufferingStreamSubscription":{"StreamSubscription":["1"],"_EventSink":["1"],"_EventDispatch":["1"],"_BufferingStreamSubscription.T":"1"},"_StreamImpl":{"Stream":["1"]},"_DelayedData":{"_DelayedEvent":["1"]},"_DelayedError":{"_DelayedEvent":["@"]},"_DelayedDone":{"_DelayedEvent":["@"]},"_DoneStreamSubscription":{"StreamSubscription":["1"]},"_EmptyStream":{"Stream":["1"],"Stream.T":"1"},"_ForwardingStream":{"Stream":["2"]},"_ForwardingStreamSubscription":{"_BufferingStreamSubscription":["2"],"StreamSubscription":["2"],"_EventSink":["2"],"_EventDispatch":["2"],"_BufferingStreamSubscription.T":"2"},"_MapStream":{"_ForwardingStream":["1","2"],"Stream":["2"],"Stream.T":"2"},"_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"},"_CustomHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"HashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"_LinkedCustomHashMap":{"JsLinkedHashMap":["1","2"],"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"],"MapBase.K":"1","MapBase.V":"2"},"_HashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashSetIterator":{"Iterator":["1"]},"_LinkedHashSet":{"_SetBase":["1"],"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_LinkedHashSetIterator":{"Iterator":["1"]},"UnmodifiableListView":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","Iterable.E":"1","UnmodifiableListMixin.E":"1"},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"MapView":{"Map":["1","2"]},"UnmodifiableMapView":{"_UnmodifiableMapView_MapView__UnmodifiableMapMixin":["1","2"],"MapView":["1","2"],"_UnmodifiableMapMixin":["1","2"],"Map":["1","2"]},"ListQueue":{"Queue":["1"],"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListIterable.E":"1","Iterable.E":"1"},"_ListQueueIterator":{"Iterator":["1"]},"SetBase":{"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SetBase":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"_SplayTreeIterator":{"Iterator":["3"]},"_SplayTreeKeyIterator":{"_SplayTreeIterator":["1","2","1"],"Iterator":["1"],"_SplayTreeIterator.K":"1","_SplayTreeIterator.T":"1","_SplayTreeIterator.1":"2"},"SplayTreeSet":{"SetBase":["1"],"Set":["1"],"EfficientLengthIterable":["1"],"_SplayTree":["1","_SplayTreeSetNode<1>"],"Iterable":["1"],"Iterable.E":"1","_SplayTree.1":"_SplayTreeSetNode<1>","_SplayTree.K":"1"},"Encoding":{"Codec":["String","List"]},"_JsonMap":{"MapBase":["String","@"],"Map":["String","@"],"MapBase.K":"String","MapBase.V":"@"},"_JsonMapKeyIterable":{"ListIterable":["String"],"EfficientLengthIterable":["String"],"Iterable":["String"],"ListIterable.E":"String","Iterable.E":"String"},"AsciiCodec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"_UnicodeSubsetEncoder":{"Converter":["String","List"]},"AsciiEncoder":{"Converter":["String","List"]},"_UnicodeSubsetDecoder":{"Converter":["List","String"]},"AsciiDecoder":{"Converter":["List","String"]},"Base64Codec":{"Codec":["List","String"],"Codec.S":"List"},"Base64Encoder":{"Converter":["List","String"]},"Base64Decoder":{"Converter":["String","List"]},"JsonUnsupportedObjectError":{"Error":[]},"JsonCyclicError":{"Error":[]},"JsonCodec":{"Codec":["Object?","String"],"Codec.S":"Object?"},"JsonEncoder":{"Converter":["Object?","String"]},"JsonDecoder":{"Converter":["String","Object?"]},"Latin1Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Latin1Encoder":{"Converter":["String","List"]},"Latin1Decoder":{"Converter":["List","String"]},"Utf8Codec":{"Encoding":[],"Codec":["String","List"],"Codec.S":"String"},"Utf8Encoder":{"Converter":["String","List"]},"Utf8Decoder":{"Converter":["List","String"]},"BigInt":{"Comparable":["BigInt"]},"DateTime":{"Comparable":["DateTime"]},"double":{"num":[],"Comparable":["num"]},"Duration":{"Comparable":["Duration"]},"int":{"num":[],"Comparable":["num"]},"List":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"num":{"Comparable":["num"]},"RegExp":{"Pattern":[]},"RegExpMatch":{"Match":[]},"Set":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"String":{"Comparable":["String"],"Pattern":[]},"_BigIntImpl":{"BigInt":[],"Comparable":["BigInt"]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_Exception":{"Exception":[]},"FormatException":{"Exception":[]},"IntegerDivisionByZeroException":{"Exception":[],"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"NullRejectionException":{"Exception":[]},"ErrorResult":{"Result":["0&"]},"ValueResult":{"Result":["1"]},"_NextRequest":{"_EventRequest":["1"]},"_HasNextRequest":{"_EventRequest":["1"]},"BuiltList":{"Iterable":["1"]},"_BuiltList":{"BuiltList":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltListMultimap":{"BuiltListMultimap":["1","2"]},"_BuiltMap":{"BuiltMap":["1","2"]},"BuiltSet":{"Iterable":["1"]},"_BuiltSet":{"BuiltSet":["1"],"Iterable":["1"],"Iterable.E":"1"},"_BuiltSetMultimap":{"BuiltSetMultimap":["1","2"]},"BuiltValueNullFieldError":{"Error":[]},"BuiltValueNestedFieldError":{"Error":[]},"BoolJsonObject":{"JsonObject":[]},"ListJsonObject":{"JsonObject":[]},"MapJsonObject":{"JsonObject":[]},"NumJsonObject":{"JsonObject":[]},"StringJsonObject":{"JsonObject":[]},"DeserializationError":{"Error":[]},"BigIntSerializer":{"PrimitiveSerializer":["BigInt"],"Serializer":["BigInt"]},"BoolSerializer":{"PrimitiveSerializer":["bool"],"Serializer":["bool"]},"BuiltJsonSerializers":{"Serializers":[]},"BuiltListMultimapSerializer":{"StructuredSerializer":["BuiltListMultimap<@,@>"],"Serializer":["BuiltListMultimap<@,@>"]},"BuiltListSerializer":{"StructuredSerializer":["BuiltList<@>"],"Serializer":["BuiltList<@>"]},"BuiltMapSerializer":{"StructuredSerializer":["BuiltMap<@,@>"],"Serializer":["BuiltMap<@,@>"]},"BuiltSetMultimapSerializer":{"StructuredSerializer":["BuiltSetMultimap<@,@>"],"Serializer":["BuiltSetMultimap<@,@>"]},"BuiltSetSerializer":{"StructuredSerializer":["BuiltSet<@>"],"Serializer":["BuiltSet<@>"]},"DateTimeSerializer":{"PrimitiveSerializer":["DateTime"],"Serializer":["DateTime"]},"DoubleSerializer":{"PrimitiveSerializer":["double"],"Serializer":["double"]},"DurationSerializer":{"PrimitiveSerializer":["Duration"],"Serializer":["Duration"]},"Int32Serializer":{"PrimitiveSerializer":["Int32"],"Serializer":["Int32"]},"Int64Serializer":{"PrimitiveSerializer":["Int64"],"Serializer":["Int64"]},"IntSerializer":{"PrimitiveSerializer":["int"],"Serializer":["int"]},"JsonObjectSerializer":{"PrimitiveSerializer":["JsonObject"],"Serializer":["JsonObject"]},"ListSerializer":{"StructuredSerializer":["List<@>"],"Serializer":["List<@>"]},"MapSerializer":{"StructuredSerializer":["Map<@,@>"],"Serializer":["Map<@,@>"]},"NullSerializer":{"PrimitiveSerializer":["Null"],"Serializer":["Null"]},"NumSerializer":{"PrimitiveSerializer":["num"],"Serializer":["num"]},"RegExpSerializer":{"PrimitiveSerializer":["RegExp"],"Serializer":["RegExp"]},"SetSerializer":{"StructuredSerializer":["Set<@>"],"Serializer":["Set<@>"]},"StringSerializer":{"PrimitiveSerializer":["String"],"Serializer":["String"]},"Uint8ListSerializer":{"PrimitiveSerializer":["Uint8List"],"Serializer":["Uint8List"]},"UriSerializer":{"PrimitiveSerializer":["Uri"],"Serializer":["Uri"]},"CanonicalizedMap":{"Map":["2","3"]},"DefaultEquality":{"Equality":["1"]},"IterableEquality":{"Equality":["Iterable<1>"]},"ListEquality":{"Equality":["List<1>"]},"_UnorderedEquality":{"Equality":["2"]},"SetEquality":{"_UnorderedEquality":["1","Set<1>"],"Equality":["Set<1>"],"_UnorderedEquality.E":"1","_UnorderedEquality.T":"Set<1>"},"MapEquality":{"Equality":["Map<1,2>"]},"DeepCollectionEquality":{"Equality":["@"]},"QueueList":{"ListBase":["1"],"List":["1"],"Queue":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"ListBase.E":"1","QueueList.E":"1","Iterable.E":"1"},"_CastQueueList":{"QueueList":["2"],"ListBase":["2"],"List":["2"],"Queue":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"ListBase.E":"2","QueueList.E":"2","Iterable.E":"2"},"_$BuildStatusSerializer":{"PrimitiveSerializer":["BuildStatus"],"Serializer":["BuildStatus"]},"_$BuildResultSerializer":{"StructuredSerializer":["BuildResult"],"Serializer":["BuildResult"]},"_$BuildResult":{"BuildResult":[]},"_$DebugEventSerializer":{"StructuredSerializer":["DebugEvent"],"Serializer":["DebugEvent"]},"_$BatchedDebugEventsSerializer":{"StructuredSerializer":["BatchedDebugEvents"],"Serializer":["BatchedDebugEvents"]},"_$DebugEvent":{"DebugEvent":[]},"_$BatchedDebugEvents":{"BatchedDebugEvents":[]},"_$DevToolsRequestSerializer":{"StructuredSerializer":["DevToolsRequest"],"Serializer":["DevToolsRequest"]},"_$DevToolsResponseSerializer":{"StructuredSerializer":["DevToolsResponse"],"Serializer":["DevToolsResponse"]},"_$DevToolsRequest":{"DevToolsRequest":[]},"_$DevToolsResponse":{"DevToolsResponse":[]},"_$ErrorResponseSerializer":{"StructuredSerializer":["ErrorResponse"],"Serializer":["ErrorResponse"]},"_$ErrorResponse":{"ErrorResponse":[]},"_$ExtensionRequestSerializer":{"StructuredSerializer":["ExtensionRequest"],"Serializer":["ExtensionRequest"]},"_$ExtensionResponseSerializer":{"StructuredSerializer":["ExtensionResponse"],"Serializer":["ExtensionResponse"]},"_$ExtensionEventSerializer":{"StructuredSerializer":["ExtensionEvent"],"Serializer":["ExtensionEvent"]},"_$BatchedEventsSerializer":{"StructuredSerializer":["BatchedEvents"],"Serializer":["BatchedEvents"]},"_$ExtensionRequest":{"ExtensionRequest":[]},"_$ExtensionResponse":{"ExtensionResponse":[]},"_$ExtensionEvent":{"ExtensionEvent":[]},"_$BatchedEvents":{"BatchedEvents":[]},"_$IsolateExitSerializer":{"StructuredSerializer":["IsolateExit"],"Serializer":["IsolateExit"]},"_$IsolateStartSerializer":{"StructuredSerializer":["IsolateStart"],"Serializer":["IsolateStart"]},"_$IsolateExit":{"IsolateExit":[]},"_$IsolateStart":{"IsolateStart":[]},"_$RegisterEventSerializer":{"StructuredSerializer":["RegisterEvent"],"Serializer":["RegisterEvent"]},"_$RegisterEvent":{"RegisterEvent":[]},"PersistentWebSocket":{"StreamChannelMixin":["@"]},"SseSocketClient":{"SocketClient":[]},"WebSocketClient":{"SocketClient":[]},"Int32":{"Comparable":["Object"]},"Int64":{"Comparable":["Object"]},"ByteStream":{"StreamView":["List"],"Stream":["List"],"Stream.T":"List","StreamView.T":"List"},"ClientException":{"Exception":[]},"Request":{"BaseRequest":[]},"StreamedResponseV2":{"StreamedResponse":[]},"CaseInsensitiveMap":{"CanonicalizedMap":["String","String","1"],"Map":["String","1"],"CanonicalizedMap.K":"String","CanonicalizedMap.V":"1","CanonicalizedMap.C":"String"},"Level":{"Comparable":["Level"]},"PathException":{"Exception":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"FileLocation":{"SourceLocation":[],"Comparable":["SourceLocation"]},"_FileSpan":{"SourceSpanWithContext":[],"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceLocation":{"Comparable":["SourceLocation"]},"SourceLocationMixin":{"SourceLocation":[],"Comparable":["SourceLocation"]},"SourceSpan":{"Comparable":["SourceSpan"]},"SourceSpanBase":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanException":{"Exception":[]},"SourceSpanFormatException":{"FormatException":[],"Exception":[]},"SourceSpanMixin":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SourceSpanWithContext":{"SourceSpan":[],"Comparable":["SourceSpan"]},"SseClient":{"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":{"Restarter":[]},"DdcRestarter":{"Restarter":[]},"RequireRestarter":{"Restarter":[]},"HotReloadFailedException":{"Exception":[]},"Int8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"UnmodifiableListBase":1,"__CastListBase__CastIterableBase_ListMixin":2,"NativeTypedArray":1,"_DelayedEvent":1,"_SplayTreeSet__SplayTree_Iterable":1,"_SplayTreeSet__SplayTree_Iterable_SetMixin":1,"_QueueList_Object_ListMixin":1,"StreamChannelMixin":1}')); var string$ = { x00_____: "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\u03f6\x00\u0404\u03f4 \u03f4\u03f6\u01f6\u01f6\u03f6\u03fc\u01f4\u03ff\u03ff\u0584\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u05d4\u01f4\x00\u01f4\x00\u0504\u05c4\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0400\x00\u0400\u0200\u03f7\u0200\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u03ff\u0200\u0200\u0200\u03f7\x00", @@ -28952,7 +28720,6 @@ Comparable_dynamic: findType("Comparable<@>"), DateTime: findType("DateTime"), DebugEvent: findType("DebugEvent"), - DebugInfo: findType("DebugInfo"), DevToolsRequest: findType("DevToolsRequest"), DevToolsResponse: findType("DevToolsResponse"), Duration: findType("Duration"), @@ -29142,7 +28909,6 @@ nullable_void_Function: findType("~()?"), nullable_void_Function_BatchedDebugEventsBuilder: findType("~(BatchedDebugEventsBuilder)?"), nullable_void_Function_DebugEventBuilder: findType("~(DebugEventBuilder)?"), - nullable_void_Function_DebugInfoBuilder: findType("~(DebugInfoBuilder)?"), nullable_void_Function_DevToolsRequestBuilder: findType("~(DevToolsRequestBuilder)?"), nullable_void_Function_JSObject: findType("~(JSObject)?"), nullable_void_Function_RegisterEventBuilder: findType("~(RegisterEventBuilder)?"), @@ -29366,9 +29132,6 @@ B.Type_ExtensionRequest_9GR = A.typeLiteral("ExtensionRequest"); B.Type__$ExtensionRequest_o1C = A.typeLiteral("_$ExtensionRequest"); B.List_2dD = makeConstList([B.Type_ExtensionRequest_9GR, B.Type__$ExtensionRequest_o1C], type$.JSArray_Type); - B.Type_DebugInfo_ua9 = A.typeLiteral("DebugInfo"); - B.Type__$DebugInfo_ywz = A.typeLiteral("_$DebugInfo"); - B.List_55I = makeConstList([B.Type_DebugInfo_ua9, B.Type__$DebugInfo_ywz], type$.JSArray_Type); B.Type_ErrorResponse_WMn = A.typeLiteral("ErrorResponse"); B.Type__$ErrorResponse_9Ps = A.typeLiteral("_$ErrorResponse"); B.List_5LV = makeConstList([B.Type_ErrorResponse_WMn, B.Type__$ErrorResponse_9Ps], type$.JSArray_Type); @@ -29583,7 +29346,6 @@ _lazy($, "_$buildResultSerializer", "$get$_$buildResultSerializer", () => new A._$BuildResultSerializer()); _lazy($, "_$debugEventSerializer", "$get$_$debugEventSerializer", () => new A._$DebugEventSerializer()); _lazy($, "_$batchedDebugEventsSerializer", "$get$_$batchedDebugEventsSerializer", () => new A._$BatchedDebugEventsSerializer()); - _lazy($, "_$debugInfoSerializer", "$get$_$debugInfoSerializer", () => new A._$DebugInfoSerializer()); _lazy($, "_$devToolsRequestSerializer", "$get$_$devToolsRequestSerializer", () => new A._$DevToolsRequestSerializer()); _lazy($, "_$devToolsResponseSerializer", "$get$_$devToolsResponseSerializer", () => new A._$DevToolsResponseSerializer()); _lazy($, "_$errorResponseSerializer", "$get$_$errorResponseSerializer", () => new A._$ErrorResponseSerializer()); @@ -29603,7 +29365,6 @@ t1.add$1(0, $.$get$_$buildResultSerializer()); t1.add$1(0, $.$get$_$buildStatusSerializer()); t1.add$1(0, $.$get$_$debugEventSerializer()); - t1.add$1(0, $.$get$_$debugInfoSerializer()); t1.add$1(0, $.$get$_$devToolsRequestSerializer()); t1.add$1(0, $.$get$_$devToolsResponseSerializer()); t1.add$1(0, $.$get$_$errorResponseSerializer()); diff --git a/dwds/web/client.dart b/dwds/web/client.dart index ae994322d..246e2c17c 100644 --- a/dwds/web/client.dart +++ b/dwds/web/client.dart @@ -384,20 +384,17 @@ void _launchCommunicationWithDebugExtension() { // Send the dart-app-ready event along with debug info to the Dart Debug // Extension so that it can debug the Dart app: final debugInfoJson = jsonEncode( - serializers.serialize( - DebugInfo( - (b) => b - ..appEntrypointPath = dartEntrypointPath - ..appId = windowContext.$dartAppId - ..appInstanceId = dartAppInstanceId - ..appOrigin = window.location.origin - ..appUrl = window.location.href - ..authUrl = _authUrl - ..extensionUrl = windowContext.$dartExtensionUri - ..isInternalBuild = windowContext.$isInternalBuild - ..isFlutterApp = windowContext.$isFlutterApp - ..workspaceName = dartWorkspaceName, - ), + DebugInfo( + appEntrypointPath: dartEntrypointPath, + appId: windowContext.$dartAppId, + appInstanceId: dartAppInstanceId, + appOrigin: window.location.origin, + appUrl: window.location.href, + authUrl: _authUrl, + extensionUrl: windowContext.$dartExtensionUri, + isInternalBuild: windowContext.$isInternalBuild, + isFlutterApp: windowContext.$isFlutterApp, + workspaceName: dartWorkspaceName, ), ); _dispatchEvent('dart-app-ready', debugInfoJson);