diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index f5a35ec42..614e774e5 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.4.0-edge.ad57ea3960bcdfcb02a9a319384736c9a1b8f7ef. +// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.4.0-190.2.beta. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -25736,7 +25736,7 @@ // join manager = new A.ReloadingManager(client, restarter); t1.readyToRunMainCompleter = null; - self.$dartHotRestartDwds = A.allowInterop(new A.main__closure(t1, manager), type$.Promise_bool_Function_String_bool); + self.$dartHotRestartDwds = A.allowInterop(new A.main__closure(t1, manager), type$.Promise_bool_Function_String_$opt_nullable_bool); t2 = type$.void_Function; self.$dartReadyToRunMain = A.allowInterop(new A.main__closure0(t1), t2); t1 = $.Zone__current; @@ -25782,15 +25782,24 @@ call$2(runId, pauseIsolatesOnStart) { var t1, t2, t3; A._asString(runId); + A._asBoolQ(pauseIsolatesOnStart); t1 = this.manager; t2 = type$.bool; - if (A._asBool(pauseIsolatesOnStart)) { + if (pauseIsolatesOnStart === true) { t3 = new A._Future($.Zone__current, type$._Future_dynamic); this._box_0.readyToRunMainCompleter = new A._AsyncCompleter(t3, type$._AsyncCompleter_dynamic); return A.toPromise(t1.hotRestart$2$readyToRunMain$runId(t3, runId), t2); } else return A.toPromise(t1.hotRestart$1$runId(runId), t2); }, + call$1(runId) { + return this.call$2(runId, null); + }, + "call*": "call$2", + $requiredArgCount: 1, + $defaultValues() { + return [null]; + }, $signature: 82 }; A.main__closure0.prototype = { @@ -26281,7 +26290,7 @@ restart$2$readyToRunMain$runId(readyToRunMain, runId) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.bool), - $async$returnValue, $async$self = this, t1, developer, t2, t3, newDigests, modulesToLoad, t4, t5, t6, t7, line, toZone, t8, result; + $async$returnValue, $async$self = this, newDigests, modulesToLoad, t4, t5, t6, t7, line, toZone, t8, result, developer, t1, t2, t3; var $async$restart$2$readyToRunMain$runId = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -26289,11 +26298,6 @@ switch ($async$goto) { case 0: // Function start - window.toString; - t1 = typeof console != "undefined"; - t1.toString; - if (t1) - window.console.log("[!IMPORTANT] Restart called in the REQUIRE restarter."); developer = self.$loadModuleConfig.call$1("dart_sdk").developer; t1 = developer == null; t2 = t1 ? type$.Object._as(developer) : developer; @@ -26637,12 +26641,7 @@ }; A.RequireRestarter__reload_closure.prototype = { call$0() { - window.toString; - var t1 = typeof console != "undefined"; - t1.toString; - if (t1) - window.console.log("===== CALLING MAIN FROM REQUIRE RESTARTER"); - t1 = this.childModule; + var t1 = this.childModule; t1 = J.get$first$ax(self.Object.values(t1 == null ? type$.Object._as(t1) : t1)); if (t1 == null) t1 = type$.Object._as(t1); @@ -26806,8 +26805,8 @@ _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.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__chainForeignFuture_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A.SplayTreeSet_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A._createTables_setChars, A._createTables_setRange, A.Element_Element$html_closure, A.HttpRequest_request_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure0, A.NodeValidatorBuilder_allowsElement_closure, A.NodeValidatorBuilder_allowsAttribute_closure, A._SimpleNodeValidator_closure, A._SimpleNodeValidator_closure0, A._TemplatingNodeValidator_closure, A._convertToJS_closure, A._convertToJS_closure0, A._wrapToDart_closure, A._wrapToDart_closure0, A._wrapToDart_closure1, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.WebSocketClient_stream_closure, A.Pool__runOnRelease_closure, A.SseClient_closure0, A.SseClient_closure1, A.generateUuidV4_generateBits, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure0, A._EventStreamSubscription_onData_closure, A.HtmlWebSocketChannel_closure, A.HtmlWebSocketChannel_closure0, A.HtmlWebSocketChannel_closure1, A.HtmlWebSocketChannel__listen_closure, A.main__closure1, A.main___closure2, A.main___closure1, A.main__closure3, A.main___closure0, A.main___closure, A.main__closure5, A.main__closure6, A.main__closure7, A.main__closure8, A._launchCommunicationWithDebugExtension_closure, A._listenForDebugExtensionAuthRequest_closure, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.toFuture_closure, A.RequireRestarter__reloadModule_closure]); - _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.Primitives_functionNoSuchMethod_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__chainForeignFuture_closure0, A._Future_timeout_closure1, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A._symbolMapToStringMap_closure, A.NoSuchMethodError_toString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A._createTables_build, A.MidiInputMap_keys_closure, A.MidiOutputMap_keys_closure, A.RtcStatsReport_keys_closure, A.Storage_keys_closure, A._ValidatingTreeSanitizer_sanitizeTree_walk, A._StructuredClone_walk_closure, A._StructuredClone_walk_closure0, A._AcceptStructuredClone_walk_closure, A.AudioParamMap_keys_closure, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.safeUnawaited_closure, A.Pool__runOnRelease_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure, A.main__closure2, A.main_closure0, A.toPromise_closure]); + _inheritMany(A.Closure, [A.Closure2Args, A.Closure0Args, A.TearOffClosure, A.initHooks_closure, A.initHooks_closure1, A._AsyncRun__initializeScheduleImmediate_internalCallback, A._AsyncRun__initializeScheduleImmediate_closure, A._awaitOnObject_closure, A._Future__chainForeignFuture_closure, A._Future__propagateToListeners_handleWhenCompleteCallback_closure, A._Future_timeout_closure0, A.Stream_length_closure, A.Stream_first_closure0, A._CustomZone_bindUnaryCallback_closure, A._CustomZone_bindUnaryCallbackGuarded_closure, A._RootZone_bindUnaryCallback_closure, A._RootZone_bindUnaryCallbackGuarded_closure, A.runZonedGuarded_closure, A._CustomHashMap_closure, A.SplayTreeSet_closure, A._BigIntImpl_hashCode_finish, A._Uri__makePath_closure, A._createTables_setChars, A._createTables_setRange, A.Element_Element$html_closure, A.HttpRequest_request_closure, A._EventStreamSubscription_closure, A._EventStreamSubscription_onData_closure0, A.NodeValidatorBuilder_allowsElement_closure, A.NodeValidatorBuilder_allowsAttribute_closure, A._SimpleNodeValidator_closure, A._SimpleNodeValidator_closure0, A._TemplatingNodeValidator_closure, A._convertToJS_closure, A._convertToJS_closure0, A._wrapToDart_closure, A._wrapToDart_closure0, A._wrapToDart_closure1, A.jsify__convert, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.dartify_convert, A.StreamQueue__ensureListening_closure, A.BuiltListMultimap_BuiltListMultimap_closure, A.BuiltListMultimap_hashCode_closure, A.ListMultimapBuilder_replace_closure, A.BuiltMap_BuiltMap_closure, A.BuiltMap_hashCode_closure, A.BuiltSet_hashCode_closure, A.BuiltSetMultimap_hashCode_closure, A.SetMultimapBuilder_replace_closure, A.newBuiltValueToStringHelper_closure, A.BuiltListMultimapSerializer_serialize_closure, A.BuiltListMultimapSerializer_deserialize_closure, A.BuiltListSerializer_serialize_closure, A.BuiltListSerializer_deserialize_closure, A.BuiltSetMultimapSerializer_serialize_closure, A.BuiltSetMultimapSerializer_deserialize_closure, A.BuiltSetSerializer_serialize_closure, A.BuiltSetSerializer_deserialize_closure, A.WebSocketClient_stream_closure, A.Pool__runOnRelease_closure, A.SseClient_closure0, A.SseClient_closure1, A.generateUuidV4_generateBits, A._GuaranteeSink__addError_closure, A._EventStreamSubscription_closure0, A._EventStreamSubscription_onData_closure, A.HtmlWebSocketChannel_closure, A.HtmlWebSocketChannel_closure0, A.HtmlWebSocketChannel_closure1, A.HtmlWebSocketChannel__listen_closure, A.main__closure, A.main__closure1, A.main___closure2, A.main___closure1, A.main__closure3, A.main___closure0, A.main___closure, A.main__closure5, A.main__closure6, A.main__closure7, A.main__closure8, A._launchCommunicationWithDebugExtension_closure, A._listenForDebugExtensionAuthRequest_closure, A.DdcRestarter_restart_closure0, A.DdcRestarter_restart_closure, A.toFuture_closure, A.RequireRestarter__reloadModule_closure]); + _inheritMany(A.Closure2Args, [A._CastListBase_sort_closure, A.CastMap_forEach_closure, A.ConstantMap_map_closure, A.Primitives_functionNoSuchMethod_closure, A.JsLinkedHashMap_addAll_closure, A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__chainForeignFuture_closure0, A._Future_timeout_closure1, A._BufferingStreamSubscription_asFuture_closure0, A.LinkedHashMap_LinkedHashMap$from_closure, A.MapBase_mapToString_closure, A._JsonStringifier_writeMap_closure, A._BigIntImpl_hashCode_combine, A._symbolMapToStringMap_closure, A.NoSuchMethodError_toString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A._createTables_build, A.MidiInputMap_keys_closure, A.MidiOutputMap_keys_closure, A.RtcStatsReport_keys_closure, A.Storage_keys_closure, A._ValidatingTreeSanitizer_sanitizeTree_walk, A._StructuredClone_walk_closure, A._StructuredClone_walk_closure0, A._AcceptStructuredClone_walk_closure, A.AudioParamMap_keys_closure, A.StreamQueue__ensureListening_closure1, A.hashObjects_closure, A.MapBuilder_replace_closure, A.safeUnawaited_closure, A.Pool__runOnRelease_closure0, A.generateUuidV4_printDigits, A.generateUuidV4_bitsDigits, A.main__closure2, A.main_closure0, A.toPromise_closure]); _inherit(A.CastList, A._CastListBase); _inheritMany(A.MapBase, [A.CastMap, A.JsLinkedHashMap, A._HashMap, A._JsonMap, A._AttributeMap]); _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A._CyclicInitializationError, A.RuntimeError, A.AssertionError, A._Error, A.JsonUnsupportedObjectError, A.ArgumentError, A.NoSuchMethodError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError, A.BuiltValueNullFieldError, A.BuiltValueNestedFieldError, A.DeserializationError]); @@ -27021,7 +27020,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"}, mangledNames: {}, - types: ["~()", "@(@)", "Object?(@)", "~(JavaScriptObject)", "Null()", "~(String,@)", "Null(@)", "~(@)", "Null(Object,StackTrace)", "Object?(Object?)", "~(~())", "~(Object,StackTrace)", "~(Object?)", "~(@,@)", "~(Event)", "bool(Object?,Object?)", "int(Object?)", "Null(JavaScriptObject)", "ScriptElement()", "int(@,@)", "bool(@)", "~(Object?,Object?)", "int(int,int)", "int(int)", "~(Symbol0,@)", "String(String)", "~(Uint8List,String,int)", "~(@,StackTrace)", "Future()", "bool(NodeValidator)", "bool(String)", "~(Object[StackTrace?])", "bool()", "~(String,String)", "String(int,int)", "bool(Element,String,String,_Html5NodeValidator)", "~(String)", "IndentingBuiltValueToStringHelper(String)", "Null(@,@)", "@(@,@)", "JsFunction(@)", "JsArray<@>(@)", "JsObject(@)", "bool(Node)", "int(int,@)", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "ListBuilder()", "ListMultimapBuilder()", "MapBuilder()", "_Future<@>(@)", "SetMultimapBuilder()", "~([Object?])", "@(String)", "@(@,String)", "bool(Object?)", "ListBuilder()", "ListBuilder()", "~(String,int?)", "String(@)", "Logger()", "Null(@,StackTrace)", "~(String?)", "~(int,@)", "Null(~())", "Future<~>()", "Uint8List(@,@)", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "DebugEventBuilder(DebugEventBuilder)", "~(String,int)", "RegisterEventBuilder(RegisterEventBuilder)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "Future<~>(String)", "ConnectRequestBuilder(ConnectRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "Future(Event)", "~(MessageEvent)", "bool(bool)", "List(String)", "int(String,String)", "~(JsError)", "ScriptElement()()", "Promise<1&>(String,bool)", "~(Node,Node?)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "~(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)", "~(ProgressEvent)", "SetBuilder()"], + types: ["~()", "@(@)", "Object?(@)", "~(JavaScriptObject)", "Null()", "~(String,@)", "Null(@)", "~(@)", "Null(Object,StackTrace)", "Object?(Object?)", "~(~())", "~(Object,StackTrace)", "~(Object?)", "~(@,@)", "~(Event)", "bool(Object?,Object?)", "int(Object?)", "Null(JavaScriptObject)", "ScriptElement()", "int(@,@)", "bool(@)", "~(Object?,Object?)", "int(int,int)", "int(int)", "~(Symbol0,@)", "String(String)", "~(Uint8List,String,int)", "~(@,StackTrace)", "Future()", "bool(NodeValidator)", "bool(String)", "~(Object[StackTrace?])", "bool()", "~(String,String)", "String(int,int)", "bool(Element,String,String,_Html5NodeValidator)", "~(String)", "IndentingBuiltValueToStringHelper(String)", "Null(@,@)", "@(@,@)", "JsFunction(@)", "JsArray<@>(@)", "JsObject(@)", "bool(Node)", "int(int,@)", "~(Zone,ZoneDelegate,Zone,Object,StackTrace)", "ListBuilder()", "ListMultimapBuilder()", "MapBuilder()", "_Future<@>(@)", "SetMultimapBuilder()", "~([Object?])", "@(String)", "@(@,String)", "bool(Object?)", "ListBuilder()", "ListBuilder()", "~(String,int?)", "String(@)", "Logger()", "Null(@,StackTrace)", "~(String?)", "~(int,@)", "Null(~())", "Future<~>()", "Uint8List(@,@)", "~(List)", "ListBuilder(BatchedDebugEventsBuilder)", "DebugEventBuilder(DebugEventBuilder)", "~(String,int)", "RegisterEventBuilder(RegisterEventBuilder)", "Zone(Zone?,ZoneDelegate?,Zone,ZoneSpecification?,Map?)", "Future<~>(String)", "ConnectRequestBuilder(ConnectRequestBuilder)", "DebugInfoBuilder(DebugInfoBuilder)", "Future(Event)", "~(MessageEvent)", "bool(bool)", "List(String)", "int(String,String)", "~(JsError)", "ScriptElement()()", "Promise<1&>(String[bool?])", "~(Node,Node?)", "DevToolsRequestBuilder(DevToolsRequestBuilder)", "~(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)", "~(ProgressEvent)", "SetBuilder()"], interceptorsByTag: null, leafTags: null, arrayRti: Symbol("$ti"), @@ -27159,7 +27158,7 @@ PoolResource: findType("PoolResource"), PrimitiveSerializer_dynamic: findType("PrimitiveSerializer<@>"), ProgressEvent: findType("ProgressEvent"), - Promise_bool_Function_String_bool: findType("Promise<1&>(String,bool)"), + Promise_bool_Function_String_$opt_nullable_bool: findType("Promise<1&>(String[bool?])"), Promise_void: findType("Promise<1&>"), QueueList_Result_DebugEvent: findType("QueueList>"), Record: findType("Record"), diff --git a/dwds/web/client.dart b/dwds/web/client.dart index a653e0be0..79bc31512 100644 --- a/dwds/web/client.dart +++ b/dwds/web/client.dart @@ -64,8 +64,8 @@ Future? main() { Completer? readyToRunMainCompleter; - hotRestartJs = allowInterop((String runId, bool pauseIsolatesOnStart) { - if (pauseIsolatesOnStart) { + hotRestartJs = allowInterop((String runId, [bool? pauseIsolatesOnStart]) { + if (pauseIsolatesOnStart ?? false) { readyToRunMainCompleter = Completer(); return toPromise( manager.hotRestart( @@ -344,7 +344,7 @@ external String get dartModuleStrategy; @JS(r'$dartHotRestartDwds') external set hotRestartJs( - Promise Function(String runId, bool pauseIsolatesOnStart) cb, + Promise Function(String runId, [bool? pauseIsolatesOnStart]) cb, ); @JS(r'$dartReadyToRunMain')