diff --git a/dwds/CHANGELOG.md b/dwds/CHANGELOG.md index fa60ebeee..ff9e196cd 100644 --- a/dwds/CHANGELOG.md +++ b/dwds/CHANGELOG.md @@ -1,3 +1,6 @@ +## 14.0.3-dev +- Update `package:vm_service` to 8.3.0. + ## 14.0.2 - Update the min SDK constraint to 2.17.0. diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js index ebaf1c419..7e79d6cb2 100644 --- a/dwds/lib/src/injected/client.js +++ b/dwds/lib/src/injected/client.js @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.unsound, csp), the Dart to JavaScript compiler version: 2.17.0. +// Generated by dart2js (NullSafetyMode.unsound, csp), the Dart to JavaScript compiler version: 2.18.0-106.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -245,7 +245,10 @@ return new A.LateError("Field '" + A.S(fieldName) + "' has been assigned during initialization."); }, LateError$fieldNI(fieldName) { - return new A.LateError("Field '" + fieldName + "' has not been initialized."); + return new A.LateError("Field '" + A.S(fieldName) + "' has not been initialized."); + }, + LateError$fieldAI(fieldName) { + return new A.LateError("Field '" + A.S(fieldName) + "' has already been initialized."); }, ReachabilityError$(_message) { return new A.ReachabilityError(_message); @@ -1870,6 +1873,12 @@ _.__js_helper$_index = t2; _.__js_helper$_current = null; }, + throwLateFieldNI(fieldName) { + return A.throwExpression(A.LateError$fieldNI(fieldName)); + }, + throwLateFieldAI(fieldName) { + return A.throwExpression(A.LateError$fieldAI(fieldName)); + }, throwLateFieldADI(fieldName) { return A.throwExpression(A.LateError$fieldADI(fieldName)); }, @@ -1877,19 +1886,6 @@ var t1 = new A._Cell(_name); return t1.__late_helper$_value = t1; }, - _lateReadCheck(value, $name) { - if (value === $) - throw A.wrapException(A.LateError$fieldNI($name)); - return value; - }, - _lateWriteOnceCheck(value, $name) { - if (value !== $) - throw A.wrapException(new A.LateError("Field '" + $name + "' has already been initialized.")); - }, - _lateInitializeOnceCheck(value, $name) { - if (value !== $) - throw A.wrapException(A.LateError$fieldADI($name)); - }, _Cell: function _Cell(t0) { this.__late_helper$_name = t0; this.__late_helper$_value = null; @@ -8593,7 +8589,7 @@ Uuid: function Uuid() { }, HtmlWebSocketChannel$connect(url, protocols) { - var t2, t3, localToForeignController, foreignToLocalController, t4, t5, t6, _null = null, + var t2, t3, localToForeignController, foreignToLocalController, t4, t5, _null = null, t1 = A.WebSocket_WebSocket(url.toString$0(0), protocols); B.WebSocket_methods.set$binaryType(t1, "arraybuffer"); t2 = new A.StreamChannelController(type$.StreamChannelController_dynamic); @@ -8602,11 +8598,10 @@ foreignToLocalController = A.StreamController_StreamController(_null, _null, true, t3); t4 = A._instanceType(foreignToLocalController); t5 = A._instanceType(localToForeignController); - t6 = A.GuaranteeChannel$(new A._ControllerStream(foreignToLocalController, t4._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(localToForeignController, t5._eval$1("_StreamSinkWrapper<1>")), true, t3); - A._lateWriteOnceCheck($, "_local"); - t2.set$__StreamChannelController__local(t6); + t2.set$__StreamChannelController__local(A.GuaranteeChannel$(new A._ControllerStream(foreignToLocalController, t4._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(localToForeignController, t5._eval$1("_StreamSinkWrapper<1>")), true, t3)); t3 = A.GuaranteeChannel$(new A._ControllerStream(localToForeignController, t5._eval$1("_ControllerStream<1>")), new A._StreamSinkWrapper(foreignToLocalController, t4._eval$1("_StreamSinkWrapper<1>")), false, t3); - A._lateWriteOnceCheck(t2.__StreamChannelController__foreign, "_foreign"); + if (t2.__StreamChannelController__foreign !== $) + A.throwLateFieldAI("_foreign"); t2.set$__StreamChannelController__foreign(t3); t2 = new A.HtmlWebSocketChannel(t1, t2); t2.HtmlWebSocketChannel$1(t1); @@ -9113,9 +9108,6 @@ _removeEventListener$3$x(receiver, a0, a1, a2) { return J.getInterceptor$x(receiver)._removeEventListener$3(receiver, a0, a1, a2); }, - add$1$ax(receiver, a0) { - return J.getInterceptor$ax(receiver).add$1(receiver, a0); - }, addEventListener$3$x(receiver, a0, a1, a2) { return J.getInterceptor$x(receiver).addEventListener$3(receiver, a0, a1, a2); }, @@ -9179,9 +9171,6 @@ remove$0$x(receiver) { return J.getInterceptor$x(receiver).remove$0(receiver); }, - remove$1$x(receiver, a0) { - return J.getInterceptor$x(receiver).remove$1(receiver, a0); - }, skip$1$ax(receiver, a0) { return J.getInterceptor$ax(receiver).skip$1(receiver, a0); }, @@ -9389,6 +9378,11 @@ for (i = 0; i < len; ++i) receiver.push(array[i]); }, + clear$0(receiver) { + if (!!receiver.fixed$length) + A.throwExpression(A.UnsupportedError$("clear")); + receiver.length = 0; + }, forEach$1(receiver, f) { var end, i; A._arrayInstanceType(receiver)._eval$1("~(1)")._as(f); @@ -9542,13 +9536,6 @@ get$length(receiver) { return receiver.length; }, - set$length(receiver, newLength) { - if (!!receiver.fixed$length) - A.throwExpression(A.UnsupportedError$("set length")); - if (newLength < 0) - throw A.wrapException(A.RangeError$range(newLength, 0, null, "newLength", null)); - receiver.length = newLength; - }, $index(receiver, index) { if (!A._isInt(index)) throw A.wrapException(A.diagnoseIndexError(receiver, index)); @@ -14652,7 +14639,7 @@ return false; if (_this._splayCount !== t2._splayCount) { t3 = _this.$ti._eval$1("_SplayTreeIterator.K")._as(B.JSArray_methods.get$last(t1).key); - B.JSArray_methods.set$length(t1, 0); + B.JSArray_methods.clear$0(t1); t2._splay$1(t3); t3 = t2._root; t3.toString; @@ -14859,7 +14846,7 @@ if (t1 === 0) B.JSArray_methods.add$1(keys, ""); else - B.JSArray_methods.set$length(keys, 0); + B.JSArray_methods.clear$0(keys); _this._original = _this._processed = null; return _this._data = result; }, @@ -15803,6 +15790,7 @@ toString$0(_) { var minutes, minutesPadding, seconds, secondsPadding, microseconds = this._duration, + sign = microseconds < 0 ? "-" : "", hours = B.JSInt_methods._tdivFast$1(microseconds, 3600000000); microseconds %= 3600000000; if (microseconds < 0) @@ -15812,7 +15800,7 @@ minutesPadding = minutes < 10 ? "0" : ""; seconds = B.JSInt_methods._tdivFast$1(microseconds, 1000000); secondsPadding = seconds < 10 ? "0" : ""; - return "" + hours + ":" + minutesPadding + minutes + ":" + secondsPadding + seconds + "." + B.JSString_methods.padLeft$2(B.JSInt_methods.toString$0(microseconds % 1000000), 6, "0"); + return sign + Math.abs(hours) + ":" + minutesPadding + minutes + ":" + secondsPadding + seconds + "." + B.JSString_methods.padLeft$2(B.JSInt_methods.toString$0(microseconds % 1000000), 6, "0"); }, $isComparable: 1 }; @@ -16228,7 +16216,8 @@ t2 = _this._fragment; if (t2 != null) t1 = t1 + "#" + t2; - A._lateInitializeOnceCheck(value, "_text"); + if (value !== $) + A.throwLateFieldADI("_text"); value = _this.___Uri__text = t1.charCodeAt(0) == 0 ? t1 : t1; } return value; @@ -16238,7 +16227,8 @@ value = _this.___Uri_hashCode; if (value === $) { result = B.JSString_methods.get$hashCode(_this.get$_text()); - A._lateInitializeOnceCheck(_this.___Uri_hashCode, "hashCode"); + if (_this.___Uri_hashCode !== $) + A.throwLateFieldADI("hashCode"); _this.___Uri_hashCode = result; value = result; } @@ -19339,7 +19329,9 @@ build$0() { var t1, t2, t3, _this = this; if (_this._listOwner == null) { - t1 = A._lateReadCheck(_this.__ListBuilder__list, "_list"); + t1 = _this.__ListBuilder__list; + if (t1 === $) + A.throwLateFieldNI("_list"); t2 = _this.$ti; t3 = t2._eval$1("_BuiltList<1>"); t3 = t3._as(new A._BuiltList(t1, t3)); @@ -19365,15 +19357,20 @@ } }, get$length(_) { - return J.get$length$asx(A._lateReadCheck(this.__ListBuilder__list, "_list")); + var t1 = this.__ListBuilder__list; + if (t1 === $) + A.throwLateFieldNI("_list"); + return t1.length; }, map$1(_, f) { var t2, t3, t4, t5, result, _this = this, t1 = _this.$ti; t1._eval$1("1(1)")._as(f); - t2 = A._lateReadCheck(_this.__ListBuilder__list, "_list"); + t2 = _this.__ListBuilder__list; + if (t2 === $) + A.throwLateFieldNI("_list"); t3 = t1._precomputed1; - t4 = A.instanceType(t2); + t4 = A._arrayInstanceType(t2); t5 = t4._eval$1("@<1>")._bind$1(t3)._eval$1("MappedListIterable<1,2>"); result = A.List_List$of(new A.MappedListIterable(t2, t4._bind$1(t3)._eval$1("1(2)")._as(f), t5), true, t5._eval$1("ListIterable.E")); _this._list$_maybeCheckElements$1(result); @@ -19493,11 +19490,20 @@ _s11_ = "_builderMap", _s9_ = "_builtMap"; if (_this._list_multimap$_builtMapOwner == null) { - for (t1 = A._lateReadCheck(_this.__ListMultimapBuilder__builderMap, _s11_), t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications, A.instanceType(t1)._precomputed1); t1.moveNext$0();) { + t1 = _this.__ListMultimapBuilder__builderMap; + if (t1 === $) + A.throwLateFieldNI(_s11_); + t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications, A._instanceType(t1)._precomputed1); + for (; t1.moveNext$0();) { key = t1.__js_helper$_current; - t2 = J.$index$asx(A._lateReadCheck(_this.__ListMultimapBuilder__builderMap, _s11_), key); + t2 = _this.__ListMultimapBuilder__builderMap; + if (t2 === $) + A.throwLateFieldNI(_s11_); + t2 = t2.$index(0, key); if (t2._listOwner == null) { - t3 = A._lateReadCheck(t2.__ListBuilder__list, "_list"); + t3 = t2.__ListBuilder__list; + if (t3 === $) + A.throwLateFieldNI("_list"); t4 = A._instanceType(t2); t5 = t4._eval$1("_BuiltList<1>"); t5 = t5._as(new A._BuiltList(t3, t5)); @@ -19507,14 +19513,22 @@ builtList = t2._listOwner; t2 = builtList._list.length; t3 = _this.__ListMultimapBuilder__builtMap; - if (t2 === 0) - J.remove$1$x(A._lateReadCheck(t3, _s9_), key); - else - J.$indexSet$ax(A._lateReadCheck(t3, _s9_), key, builtList); + if (t2 === 0) { + if (t3 === $) + A.throwLateFieldNI(_s9_); + t3.remove$1(0, key); + } else { + if (t3 === $) + A.throwLateFieldNI(_s9_); + t3.$indexSet(0, key, builtList); + } } - t1 = _this.$ti; - t2 = t1._rest[1]; - _this.set$_list_multimap$_builtMapOwner(new A._BuiltListMultimap(A._lateReadCheck(_this.__ListMultimapBuilder__builtMap, _s9_), A.BuiltList_BuiltList$from(B.List_empty0, t2), t1._eval$1("@<1>")._bind$1(t2)._eval$1("_BuiltListMultimap<1,2>"))); + t1 = _this.__ListMultimapBuilder__builtMap; + if (t1 === $) + A.throwLateFieldNI(_s9_); + t2 = _this.$ti; + t3 = t2._rest[1]; + _this.set$_list_multimap$_builtMapOwner(new A._BuiltListMultimap(t1, A.BuiltList_BuiltList$from(B.List_empty0, t3), t2._eval$1("@<1>")._bind$1(t3)._eval$1("_BuiltListMultimap<1,2>"))); } t1 = _this._list_multimap$_builtMapOwner; t1.toString; @@ -19524,20 +19538,29 @@ this._list_multimap$_setWithCopyAndCheck$2(multimap.get$keys(multimap), new A.ListMultimapBuilder_replace_closure(multimap)); }, _list_multimap$_getValuesBuilder$1(key) { - var result, builtValues, _this = this, + var t2, result, builtValues, _this = this, _s11_ = "_builderMap", t1 = _this.$ti; t1._precomputed1._as(key); - result = J.$index$asx(A._lateReadCheck(_this.__ListMultimapBuilder__builderMap, _s11_), key); + t2 = _this.__ListMultimapBuilder__builderMap; + if (t2 === $) + A.throwLateFieldNI(_s11_); + result = t2.$index(0, key); if (result == null) { - builtValues = J.$index$asx(A._lateReadCheck(_this.__ListMultimapBuilder__builtMap, "_builtMap"), key); + t2 = _this.__ListMultimapBuilder__builtMap; + if (t2 === $) + A.throwLateFieldNI("_builtMap"); + builtValues = t2.$index(0, key); result = builtValues == null ? A.ListBuilder_ListBuilder(B.List_empty0, t1._rest[1]) : A.ListBuilder_ListBuilder(builtValues, builtValues.$ti._precomputed1); - J.$indexSet$ax(A._lateReadCheck(_this.__ListMultimapBuilder__builderMap, _s11_), key, result); + t1 = _this.__ListMultimapBuilder__builderMap; + if (t1 === $) + A.throwLateFieldNI(_s11_); + t1.$indexSet(0, key, result); } return result; }, _list_multimap$_setWithCopyAndCheck$2(keys, lookup) { - var t1, t2, t3, t4, t5, t6, key, t7, value, t8, t9, t10, _this = this, _null = null; + var t1, t2, t3, t4, t5, t6, key, t7, value, t8, t9, t10, t11, _this = this, _null = null; _this.set$_list_multimap$_builtMapOwner(_null); t1 = _this.$ti; t2 = t1._precomputed1; @@ -19554,7 +19577,10 @@ t2._as(key); t1._as(value); if (_this._list_multimap$_builtMapOwner != null) { - _this.set$__ListMultimapBuilder__builtMap(t4._as(A.LinkedHashMap_LinkedHashMap$from(A._lateReadCheck(_this.__ListMultimapBuilder__builtMap, "_builtMap"), t2, t3))); + t8 = _this.__ListMultimapBuilder__builtMap; + if (t8 === $) + A.throwLateFieldNI("_builtMap"); + _this.set$__ListMultimapBuilder__builtMap(t4._as(A.LinkedHashMap_LinkedHashMap$from(t8, t2, t3))); _this.set$_list_multimap$_builtMapOwner(_null); } _this._list_multimap$_checkKey$1(key); @@ -19567,10 +19593,16 @@ if (value == null) A.throwExpression(A.ArgumentError$("null element", _null)); if (t8._listOwner != null) { - t8.set$__ListBuilder__list(t9._eval$1("List<1>")._as(A.List_List$from(A._lateReadCheck(t8.__ListBuilder__list, "_list"), true, t10))); + t11 = t8.__ListBuilder__list; + if (t11 === $) + A.throwLateFieldNI("_list"); + t8.set$__ListBuilder__list(t9._eval$1("List<1>")._as(A.List_List$from(t11, true, t10))); t8.set$_listOwner(_null); } - J.add$1$ax(A._lateReadCheck(t8.__ListBuilder__list, "_list"), value); + t8 = t8.__ListBuilder__list; + if (t8 === $) + A.throwLateFieldNI("_list"); + B.JSArray_methods.add$1(t8, value); } else throw A.wrapException(A.ArgumentError$("map contained invalid value: " + A.S(value) + ", for key " + A.S(key), _null)); } @@ -19717,10 +19749,13 @@ }; A.MapBuilder.prototype = { build$0() { - var t1, _this = this; + var t1, t2, _this = this; if (_this._mapOwner == null) { - t1 = _this.$ti; - _this.set$_mapOwner(new A._BuiltMap(_this._mapFactory, A._lateReadCheck(_this.__MapBuilder__map, "_map"), t1._eval$1("@<1>")._bind$1(t1._rest[1])._eval$1("_BuiltMap<1,2>"))); + t1 = _this.__MapBuilder__map; + if (t1 === $) + A.throwLateFieldNI("_map"); + t2 = _this.$ti; + _this.set$_mapOwner(new A._BuiltMap(_this._mapFactory, t1, t2._eval$1("@<1>")._bind$1(t2._rest[1])._eval$1("_BuiltMap<1,2>"))); } t1 = _this._mapOwner; t1.toString; @@ -19735,7 +19770,7 @@ _this.set$__MapBuilder__map(replacement); }, $indexSet(_, key, value) { - var t2, _this = this, + var t2, t3, _this = this, t1 = _this.$ti; t1._precomputed1._as(key); t1._rest[1]._as(value); @@ -19743,24 +19778,39 @@ _this._checkValue$1(value); if (_this._mapOwner != null) { t2 = _this._createMap$0(); - t2.addAll$1(0, A._lateReadCheck(_this.__MapBuilder__map, "_map")); + t3 = _this.__MapBuilder__map; + if (t3 === $) + A.throwLateFieldNI("_map"); + t2.addAll$1(0, t3); _this.set$__MapBuilder__map(t1._eval$1("Map<1,2>")._as(t2)); _this.set$_mapOwner(null); } - J.$indexSet$ax(A._lateReadCheck(_this.__MapBuilder__map, "_map"), key, value); + t1 = _this.__MapBuilder__map; + if (t1 === $) + A.throwLateFieldNI("_map"); + t1.$indexSet(0, key, value); }, get$length(_) { - return A._lateReadCheck(this.__MapBuilder__map, "_map")._length; + var t1 = this.__MapBuilder__map; + if (t1 === $) + A.throwLateFieldNI("_map"); + return t1._length; }, get$_safeMap() { - var t1, _this = this; + var t1, t2, _this = this; if (_this._mapOwner != null) { t1 = _this._createMap$0(); - t1.addAll$1(0, A._lateReadCheck(_this.__MapBuilder__map, "_map")); + t2 = _this.__MapBuilder__map; + if (t2 === $) + A.throwLateFieldNI("_map"); + t1.addAll$1(0, t2); _this.set$__MapBuilder__map(_this.$ti._eval$1("Map<1,2>")._as(t1)); _this.set$_mapOwner(null); } - return A._lateReadCheck(_this.__MapBuilder__map, "_map"); + t1 = _this.__MapBuilder__map; + if (t1 === $) + A.throwLateFieldNI("_map"); + return t1; }, _createMap$0() { var t1 = this.$ti; @@ -19900,8 +19950,12 @@ A.SetBuilder.prototype = { build$0() { var t1, _this = this; - if (_this._setOwner == null) - _this.set$_setOwner(new A._BuiltSet(_this._setFactory, A._lateReadCheck(_this.__SetBuilder__set, "_set"), _this.$ti._eval$1("_BuiltSet<1>"))); + if (_this._setOwner == null) { + t1 = _this.__SetBuilder__set; + if (t1 === $) + A.throwLateFieldNI("_set"); + _this.set$_setOwner(new A._BuiltSet(_this._setFactory, t1, _this.$ti._eval$1("_BuiltSet<1>"))); + } t1 = _this._setOwner; t1.toString; return t1; @@ -19921,14 +19975,19 @@ _this.set$__SetBuilder__set(set); }, get$length(_) { - return A._lateReadCheck(this.__SetBuilder__set, "_set")._collection$_length; + var t1 = this.__SetBuilder__set; + if (t1 === $) + A.throwLateFieldNI("_set"); + return t1._collection$_length; }, map$1(_, f) { var result, t2, t3, t4, _this = this, t1 = _this.$ti; t1._eval$1("1(1)")._as(f); result = _this._createSet$0(); - t2 = A._lateReadCheck(_this.__SetBuilder__set, "_set"); + t2 = _this.__SetBuilder__set; + if (t2 === $) + A.throwLateFieldNI("_set"); t3 = t1._precomputed1; t4 = A._instanceType(t2); result.addAll$1(0, new A.EfficientLengthMappedIterable(t2, t4._bind$1(t3)._eval$1("1(2)")._as(f), t4._eval$1("@<1>")._bind$1(t3)._eval$1("EfficientLengthMappedIterable<1,2>"))); @@ -19938,14 +19997,20 @@ _this.set$__SetBuilder__set(result); }, get$_safeSet() { - var t1, _this = this; + var t1, t2, _this = this; if (_this._setOwner != null) { t1 = _this._createSet$0(); - t1.addAll$1(0, A._lateReadCheck(_this.__SetBuilder__set, "_set")); + t2 = _this.__SetBuilder__set; + if (t2 === $) + A.throwLateFieldNI("_set"); + t1.addAll$1(0, t2); _this.set$__SetBuilder__set(_this.$ti._eval$1("Set<1>")._as(t1)); _this.set$_setOwner(null); } - return A._lateReadCheck(_this.__SetBuilder__set, "_set"); + t1 = _this.__SetBuilder__set; + if (t1 === $) + A.throwLateFieldNI("_set"); + return t1; }, _createSet$0() { return A.LinkedHashSet_LinkedHashSet$_empty(this.$ti._precomputed1); @@ -20042,26 +20107,46 @@ A._BuiltSetMultimap.prototype = {}; A.SetMultimapBuilder.prototype = { build$0() { - var t1, key, t2, builtSet, t3, _this = this, + var t1, key, t2, t3, t4, builtSet, _this = this, _s11_ = "_builderMap", _s9_ = "_builtMap"; if (_this._builtMapOwner == null) { - for (t1 = A._lateReadCheck(_this.__SetMultimapBuilder__builderMap, _s11_), t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications, A.instanceType(t1)._precomputed1); t1.moveNext$0();) { + t1 = _this.__SetMultimapBuilder__builderMap; + if (t1 === $) + A.throwLateFieldNI(_s11_); + t1 = A.LinkedHashMapKeyIterator$(t1, t1._modifications, A._instanceType(t1)._precomputed1); + for (; t1.moveNext$0();) { key = t1.__js_helper$_current; - t2 = J.$index$asx(A._lateReadCheck(_this.__SetMultimapBuilder__builderMap, _s11_), key); - if (t2._setOwner == null) - t2.set$_setOwner(new A._BuiltSet(t2._setFactory, A._lateReadCheck(t2.__SetBuilder__set, "_set"), A._instanceType(t2)._eval$1("_BuiltSet<1>"))); + t2 = _this.__SetMultimapBuilder__builderMap; + if (t2 === $) + A.throwLateFieldNI(_s11_); + t2 = t2.$index(0, key); + if (t2._setOwner == null) { + t3 = t2._setFactory; + t4 = t2.__SetBuilder__set; + if (t4 === $) + A.throwLateFieldNI("_set"); + t2.set$_setOwner(new A._BuiltSet(t3, t4, A._instanceType(t2)._eval$1("_BuiltSet<1>"))); + } builtSet = t2._setOwner; t2 = builtSet._set$_set._collection$_length; t3 = _this.__SetMultimapBuilder__builtMap; - if (t2 === 0) - J.remove$1$x(A._lateReadCheck(t3, _s9_), key); - else - J.$indexSet$ax(A._lateReadCheck(t3, _s9_), key, builtSet); + if (t2 === 0) { + if (t3 === $) + A.throwLateFieldNI(_s9_); + t3.remove$1(0, key); + } else { + if (t3 === $) + A.throwLateFieldNI(_s9_); + t3.$indexSet(0, key, builtSet); + } } - t1 = _this.$ti; - t2 = t1._rest[1]; - _this.set$_builtMapOwner(new A._BuiltSetMultimap(A._lateReadCheck(_this.__SetMultimapBuilder__builtMap, _s9_), A.BuiltSet_BuiltSet$from(B.List_empty0, t2), t1._eval$1("@<1>")._bind$1(t2)._eval$1("_BuiltSetMultimap<1,2>"))); + t1 = _this.__SetMultimapBuilder__builtMap; + if (t1 === $) + A.throwLateFieldNI(_s9_); + t2 = _this.$ti; + t3 = t2._rest[1]; + _this.set$_builtMapOwner(new A._BuiltSetMultimap(t1, A.BuiltSet_BuiltSet$from(B.List_empty0, t3), t2._eval$1("@<1>")._bind$1(t3)._eval$1("_BuiltSetMultimap<1,2>"))); } t1 = _this._builtMapOwner; t1.toString; @@ -20071,13 +20156,19 @@ this._setWithCopyAndCheck$2(multimap.get$keys(multimap), new A.SetMultimapBuilder_replace_closure(multimap)); }, _getValuesBuilder$1(key) { - var result, builtValues, _this = this, + var t2, result, builtValues, _this = this, _s11_ = "_builderMap", t1 = _this.$ti; t1._precomputed1._as(key); - result = J.$index$asx(A._lateReadCheck(_this.__SetMultimapBuilder__builderMap, _s11_), key); + t2 = _this.__SetMultimapBuilder__builderMap; + if (t2 === $) + A.throwLateFieldNI(_s11_); + result = t2.$index(0, key); if (result == null) { - builtValues = J.$index$asx(A._lateReadCheck(_this.__SetMultimapBuilder__builtMap, "_builtMap"), key); + t2 = _this.__SetMultimapBuilder__builtMap; + if (t2 === $) + A.throwLateFieldNI("_builtMap"); + builtValues = t2.$index(0, key); if (builtValues == null) result = A.SetBuilder_SetBuilder(t1._rest[1]); else { @@ -20085,7 +20176,10 @@ t1._eval$1("_BuiltSet<1>")._as(builtValues); result = new A.SetBuilder(builtValues._setFactory, builtValues._set$_set, builtValues, t1._eval$1("SetBuilder<1>")); } - J.$indexSet$ax(A._lateReadCheck(_this.__SetMultimapBuilder__builderMap, _s11_), key, result); + t1 = _this.__SetMultimapBuilder__builderMap; + if (t1 === $) + A.throwLateFieldNI(_s11_); + t1.$indexSet(0, key, result); } return result; }, @@ -20107,7 +20201,10 @@ t2._as(key); t1._as(value); if (_this._builtMapOwner != null) { - _this.set$__SetMultimapBuilder__builtMap(t4._as(A.LinkedHashMap_LinkedHashMap$from(A._lateReadCheck(_this.__SetMultimapBuilder__builtMap, "_builtMap"), t2, t3))); + t8 = _this.__SetMultimapBuilder__builtMap; + if (t8 === $) + A.throwLateFieldNI("_builtMap"); + _this.set$__SetMultimapBuilder__builtMap(t4._as(A.LinkedHashMap_LinkedHashMap$from(t8, t2, t3))); _this.set$_builtMapOwner(_null); } _this._set_multimap$_checkKey$1(key); @@ -20672,7 +20769,7 @@ return this.serialize$3$specifiedType(serializers, builtListMultimap, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var isUnderspecified, t2, t3, t4, keyType, valueType, result, i, key, values, value, t5, t6, t7, _null = null, + var isUnderspecified, t2, t3, t4, keyType, valueType, result, i, key, values, value, t5, t6, t7, t8, _null = null, t1 = type$.Iterable_nullable_Object; t1._as(serialized); isUnderspecified = specifiedType.root == null || specifiedType.parameters.length === 0; @@ -20712,7 +20809,10 @@ t6._as(key); t5._rest[1]._as(value); if (result._list_multimap$_builtMapOwner != null) { - result.set$__ListMultimapBuilder__builtMap(t5._eval$1("Map<1,BuiltList<2>>")._as(A.LinkedHashMap_LinkedHashMap$from(A._lateReadCheck(result.__ListMultimapBuilder__builtMap, "_builtMap"), t6, t5._eval$1("BuiltList<2>")))); + t7 = result.__ListMultimapBuilder__builtMap; + if (t7 === $) + A.throwLateFieldNI("_builtMap"); + result.set$__ListMultimapBuilder__builtMap(t5._eval$1("Map<1,BuiltList<2>>")._as(A.LinkedHashMap_LinkedHashMap$from(t7, t6, t5._eval$1("BuiltList<2>")))); result.set$_list_multimap$_builtMapOwner(_null); } result._list_multimap$_checkKey$1(key); @@ -20725,10 +20825,16 @@ if (value == null) A.throwExpression(A.ArgumentError$("null element", _null)); if (t5._listOwner != null) { - t5.set$__ListBuilder__list(t6._eval$1("List<1>")._as(A.List_List$from(A._lateReadCheck(t5.__ListBuilder__list, "_list"), true, t7))); + t8 = t5.__ListBuilder__list; + if (t8 === $) + A.throwLateFieldNI("_list"); + t5.set$__ListBuilder__list(t6._eval$1("List<1>")._as(A.List_List$from(t8, true, t7))); t5.set$_listOwner(_null); } - J.add$1$ax(A._lateReadCheck(t5.__ListBuilder__list, "_list"), value); + t5 = t5.__ListBuilder__list; + if (t5 === $) + A.throwLateFieldNI("_list"); + B.JSArray_methods.add$1(t5, value); } } return result.build$0(); @@ -20949,7 +21055,7 @@ return this.serialize$3$specifiedType(serializers, builtSetMultimap, B.FullType_null_List_empty_false); }, deserialize$3$specifiedType(serializers, serialized, specifiedType) { - var isUnderspecified, t2, t3, t4, keyType, valueType, result, i, key, value, t5, + var isUnderspecified, t2, t3, t4, keyType, valueType, result, i, key, value, t5, t6, t1 = type$.Iterable_dynamic; t1._as(serialized); isUnderspecified = specifiedType.root == null || specifiedType.parameters.length === 0; @@ -20988,7 +21094,10 @@ t5._as(key); t4._rest[1]._as(value); if (result._builtMapOwner != null) { - result.set$__SetMultimapBuilder__builtMap(t4._eval$1("Map<1,BuiltSet<2>>")._as(A.LinkedHashMap_LinkedHashMap$from(A._lateReadCheck(result.__SetMultimapBuilder__builtMap, "_builtMap"), t5, t4._eval$1("BuiltSet<2>")))); + t6 = result.__SetMultimapBuilder__builtMap; + if (t6 === $) + A.throwLateFieldNI("_builtMap"); + result.set$__SetMultimapBuilder__builtMap(t4._eval$1("Map<1,BuiltSet<2>>")._as(A.LinkedHashMap_LinkedHashMap$from(t6, t5, t4._eval$1("BuiltSet<2>")))); result.set$_builtMapOwner(null); } result._set_multimap$_checkKey$1(key); @@ -23173,15 +23282,27 @@ t1 = this._channel, value = t1.__HtmlWebSocketChannel_sink; if (value === $) { - t2 = A._lateReadCheck(A._lateReadCheck(t1._html0$_controller.__StreamChannelController__foreign, "_foreign").__GuaranteeChannel__sink, "_sink"); - A._lateInitializeOnceCheck(t1.__HtmlWebSocketChannel_sink, "sink"); + t2 = t1._html0$_controller.__StreamChannelController__foreign; + if (t2 === $) + A.throwLateFieldNI("_foreign"); + t2 = t2.__GuaranteeChannel__sink; + if (t2 === $) + A.throwLateFieldNI("_sink"); + if (value !== $) + A.throwLateFieldADI("sink"); value = t1.__HtmlWebSocketChannel_sink = new A._HtmlWebSocketSink(t1, t2); } return value; }, get$stream(_) { - var t1 = A._lateReadCheck(A._lateReadCheck(this._channel._html0$_controller.__StreamChannelController__foreign, "_foreign").__GuaranteeChannel__streamController, "_streamController"), - t2 = A._instanceType(t1)._eval$1("_ControllerStream<1>"); + var t2, + t1 = this._channel._html0$_controller.__StreamChannelController__foreign; + if (t1 === $) + A.throwLateFieldNI("_foreign"); + t1 = t1.__GuaranteeChannel__streamController; + if (t1 === $) + A.throwLateFieldNI("_streamController"); + t2 = A._instanceType(t1)._eval$1("_ControllerStream<1>"); return new A._MapStream(t2._eval$1("String*(Stream.T)")._as(new A.WebSocketClient_stream_closure()), new A._ControllerStream(t1, t2), t2._eval$1("_MapStream")); } }; @@ -23564,23 +23685,35 @@ t2 = A.EventSource__factoryEventSource(t1, A.LinkedHashMap_LinkedHashMap$_literal(["withCredentials", true], type$.String, type$.dynamic)); _this.__SseClient__eventSource = t2; _this.__SseClient__serverUrl = t1; - t2 = new A._EventStream(A._lateReadCheck(t2, _s12_), "open", false, type$._EventStream_legacy_Event); + t2 = new A._EventStream(t2, "open", false, type$._EventStream_legacy_Event); t2.get$first(t2).whenComplete$1(new A.SseClient_closure(_this)); - t2 = A._lateReadCheck(_this.__SseClient__eventSource, _s12_); - (t2 && B.EventSource_methods).addEventListener$2(t2, "message", _this.get$_onIncomingMessage()); - t2 = A._lateReadCheck(_this.__SseClient__eventSource, _s12_); - (t2 && B.EventSource_methods).addEventListener$2(t2, "control", _this.get$_onIncomingControlMessage()); - t2 = A._lateReadCheck(_this.__SseClient__eventSource, _s12_); + t2 = _this.__SseClient__eventSource; + if (t2 === $) + A.throwLateFieldNI(_s12_); + B.EventSource_methods.addEventListener$2(t2, "message", _this.get$_onIncomingMessage()); + t2 = _this.__SseClient__eventSource; + if (t2 === $) + A.throwLateFieldNI(_s12_); + B.EventSource_methods.addEventListener$2(t2, "control", _this.get$_onIncomingControlMessage()); + t2 = _this.__SseClient__eventSource; + if (t2 === $) + A.throwLateFieldNI(_s12_); t1 = type$.nullable_void_Function_legacy_Event; t3 = t1._as(new A.SseClient_closure0(_this)); type$.nullable_void_Function._as(null); t4 = type$.legacy_Event; A._EventStreamSubscription$(t2, "open", t3, false, t4); - A._EventStreamSubscription$(A._lateReadCheck(_this.__SseClient__eventSource, _s12_), "error", t1._as(new A.SseClient_closure1(_this)), false, t4); + t3 = _this.__SseClient__eventSource; + if (t3 === $) + A.throwLateFieldNI(_s12_); + A._EventStreamSubscription$(t3, "error", t1._as(new A.SseClient_closure1(_this)), false, t4); }, close$0(_) { - var t1, _this = this; - A._lateReadCheck(_this.__SseClient__eventSource, "_eventSource").close(); + var _this = this, + t1 = _this.__SseClient__eventSource; + if (t1 === $) + A.throwLateFieldNI("_eventSource"); + t1.close(); if ((_this._onConnected.future._state & 30) === 0) { t1 = _this._outgoingController; new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")).listen$2$cancelOnError(null, true).asFuture$1$1(null, type$.dynamic); @@ -23672,7 +23805,7 @@ call$0() { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.Null), - $async$handler = 1, $async$currentError, $async$next = [], $async$self = this, e, e0, e1, exception, t1, $async$exception; + $async$handler = 1, $async$currentError, $async$next = [], $async$self = this, e, e0, e1, exception, t1, t2, $async$exception; var $async$call$0 = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) { $async$currentError = $async$result; @@ -23697,8 +23830,11 @@ } $async$handler = 3; t1 = $async$self.$this; + t2 = t1.__SseClient__serverUrl; + if (t2 === $) + A.throwLateFieldNI("_serverUrl"); $async$goto = 6; - return A._asyncAwait(A.HttpRequest_request(A.S(A._lateReadCheck(t1.__SseClient__serverUrl, "_serverUrl")) + "&messageId=" + ++t1._lastMessageId, "POST", null, $async$self._box_0.encodedMessage, true), $async$call$0); + return A._asyncAwait(A.HttpRequest_request(t2 + "&messageId=" + ++t1._lastMessageId, "POST", null, $async$self._box_0.encodedMessage, true), $async$call$0); case 6: // returning from await. $async$handler = 1; @@ -23757,18 +23893,24 @@ var _this = this, t1 = _this.$ti, t2 = t1._eval$1("_GuaranteeSink<1>")._as(new A._GuaranteeSink(innerSink, _this, new A._AsyncCompleter(new A._Future($.Zone__current, type$._Future_dynamic), type$._AsyncCompleter_dynamic), allowSinkErrors, $T._eval$1("_GuaranteeSink<0>"))); - A._lateWriteOnceCheck(_this.__GuaranteeChannel__sink, "_sink"); + if (_this.__GuaranteeChannel__sink !== $) + A.throwLateFieldAI("_sink"); _this.set$__GuaranteeChannel__sink(t2); t1 = t1._eval$1("StreamController<1>")._as(A.StreamController_StreamController(null, new A.GuaranteeChannel_closure(_box_0, _this, $T), true, $T)); - A._lateWriteOnceCheck(_this.__GuaranteeChannel__streamController, "_streamController"); + if (_this.__GuaranteeChannel__streamController !== $) + A.throwLateFieldAI("_streamController"); _this.set$__GuaranteeChannel__streamController(t1); }, _onSinkDisconnected$0() { + var subscription, t1; this._disconnected = true; - var subscription = this._guarantee_channel$_subscription; + subscription = this._guarantee_channel$_subscription; if (subscription != null) subscription.cancel$0(0); - A._lateReadCheck(this.__GuaranteeChannel__streamController, "_streamController").close$0(0); + t1 = this.__GuaranteeChannel__streamController; + if (t1 === $) + A.throwLateFieldNI("_streamController"); + t1.close$0(0); }, set$__GuaranteeChannel__sink(__GuaranteeChannel__sink) { this.__GuaranteeChannel__sink = this.$ti._eval$1("_GuaranteeSink<1>")._as(__GuaranteeChannel__sink); @@ -23783,21 +23925,28 @@ A.GuaranteeChannel_closure.prototype = { call$0() { var t2, t3, - _s17_ = "_streamController", t1 = this.$this; if (t1._disconnected) return; t2 = this._box_0.innerStream; - t3 = A._lateReadCheck(t1.__GuaranteeChannel__streamController, _s17_); - t1.set$_guarantee_channel$_subscription(t2.listen$3$onDone$onError(this.T._eval$1("~(0)")._as(t3.get$add(t3)), new A.GuaranteeChannel__closure(t1), A._lateReadCheck(t1.__GuaranteeChannel__streamController, _s17_).get$addError())); + t3 = t1.__GuaranteeChannel__streamController; + if (t3 === $) + A.throwLateFieldNI("_streamController"); + t1.set$_guarantee_channel$_subscription(t2.listen$3$onDone$onError(this.T._eval$1("~(0)")._as(t3.get$add(t3)), new A.GuaranteeChannel__closure(t1), t3.get$addError())); }, $signature: 0 }; A.GuaranteeChannel__closure.prototype = { call$0() { - var t1 = this.$this; - A._lateReadCheck(t1.__GuaranteeChannel__sink, "_sink")._onStreamDisconnected$0(); - A._lateReadCheck(t1.__GuaranteeChannel__streamController, "_streamController").close$0(0); + var t1 = this.$this, + t2 = t1.__GuaranteeChannel__sink; + if (t2 === $) + A.throwLateFieldNI("_sink"); + t2._onStreamDisconnected$0(); + t1 = t1.__GuaranteeChannel__streamController; + if (t1 === $) + A.throwLateFieldNI("_streamController"); + t1.close$0(0); }, $signature: 0 }; @@ -24065,7 +24214,12 @@ t1.get$first(t1).then$1$1(0, new A.HtmlWebSocketChannel_closure2(_this), t3); }, _listen$0() { - var t1 = A._lateReadCheck(A._lateReadCheck(this._html0$_controller.__StreamChannelController__local, "_local").__GuaranteeChannel__streamController, "_streamController"); + var t1 = this._html0$_controller.__StreamChannelController__local; + if (t1 === $) + A.throwLateFieldNI("_local"); + t1 = t1.__GuaranteeChannel__streamController; + if (t1 === $) + A.throwLateFieldNI("_streamController"); new A._ControllerStream(t1, A._instanceType(t1)._eval$1("_ControllerStream<1>")).listen$2$onDone(B.WebSocket_methods.get$send(this.innerWebSocket), new A.HtmlWebSocketChannel__listen_closure(this)); }, $isWebSocketChannel: 1 @@ -24079,29 +24233,55 @@ }; A.HtmlWebSocketChannel_closure0.prototype = { call$1(_) { - var t1; + var t1, t2; type$.Event._as(_); t1 = this.$this._html0$_controller; - A._lateReadCheck(A._lateReadCheck(t1.__StreamChannelController__local, "_local").__GuaranteeChannel__sink, "_sink").addError$1(new A.WebSocketChannelException("WebSocket connection failed.")); - A._lateReadCheck(A._lateReadCheck(t1.__StreamChannelController__local, "_local").__GuaranteeChannel__sink, "_sink").close$0(0); + t2 = t1.__StreamChannelController__local; + if (t2 === $) + A.throwLateFieldNI("_local"); + t2 = t2.__GuaranteeChannel__sink; + if (t2 === $) + A.throwLateFieldNI("_sink"); + t2.addError$1(new A.WebSocketChannelException("WebSocket connection failed.")); + t1 = t1.__StreamChannelController__local; + if (t1 === $) + A.throwLateFieldNI("_local"); + t1 = t1.__GuaranteeChannel__sink; + if (t1 === $) + A.throwLateFieldNI("_sink"); + t1.close$0(0); }, $signature: 26 }; A.HtmlWebSocketChannel_closure1.prototype = { call$1($event) { - var data = new A._AcceptStructuredCloneDart2Js([], []).convertNativeToDart_AcceptStructuredClone$2$mustCopy(type$.MessageEvent._as($event).data, true); + var t1, + data = new A._AcceptStructuredCloneDart2Js([], []).convertNativeToDart_AcceptStructuredClone$2$mustCopy(type$.MessageEvent._as($event).data, true); if (type$.ByteBuffer._is(data)) data = A.NativeUint8List_NativeUint8List$view(data, 0, null); - A._lateReadCheck(A._lateReadCheck(this.$this._html0$_controller.__StreamChannelController__local, "_local").__GuaranteeChannel__sink, "_sink").add$1(0, data); + t1 = this.$this._html0$_controller.__StreamChannelController__local; + if (t1 === $) + A.throwLateFieldNI("_local"); + t1 = t1.__GuaranteeChannel__sink; + if (t1 === $) + A.throwLateFieldNI("_sink"); + t1.add$1(0, data); }, $signature: 64 }; A.HtmlWebSocketChannel_closure2.prototype = { call$1($event) { + var t1; type$.CloseEvent._as($event); $event.code; $event.reason; - A._lateReadCheck(A._lateReadCheck(this.$this._html0$_controller.__StreamChannelController__local, "_local").__GuaranteeChannel__sink, "_sink").close$0(0); + t1 = this.$this._html0$_controller.__StreamChannelController__local; + if (t1 === $) + A.throwLateFieldNI("_local"); + t1 = t1.__GuaranteeChannel__sink; + if (t1 === $) + A.throwLateFieldNI("_sink"); + t1.close$0(0); }, $signature: 65 }; @@ -24190,7 +24370,7 @@ t3.lastPendingEvent = t4; } } - B.JSArray_methods.set$length(buffer, 0); + B.JSArray_methods.clear$0(buffer); } lastSendTime = lastSendTime0; } diff --git a/dwds/lib/src/version.dart b/dwds/lib/src/version.dart index 859aa1994..45b0b4513 100644 --- a/dwds/lib/src/version.dart +++ b/dwds/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '14.0.2'; +const packageVersion = '14.0.3-dev'; diff --git a/dwds/pubspec.yaml b/dwds/pubspec.yaml index 688c32adb..298ef4f7b 100644 --- a/dwds/pubspec.yaml +++ b/dwds/pubspec.yaml @@ -1,6 +1,6 @@ name: dwds # Every time this changes you need to run `dart run build_runner build`. -version: 14.0.2 +version: 14.0.3-dev description: >- A service that proxies between the Chrome debug protocol and the Dart VM service protocol. @@ -33,7 +33,7 @@ dependencies: stack_trace: ^1.10.0 sse: ^4.1.0 uuid: '>=2.0.0 <4.0.0' - vm_service: ^8.2.0 + vm_service: ^8.3.0 web_socket_channel: ^2.0.0 webkit_inspection_protocol: ^1.0.0 diff --git a/webdev/CHANGELOG.md b/webdev/CHANGELOG.md index 978cd21aa..03ea6af25 100644 --- a/webdev/CHANGELOG.md +++ b/webdev/CHANGELOG.md @@ -1,3 +1,5 @@ +## 2.7.1-dev + ## 2.7.9 - Add an option to pass user data directory to chrome: `user-data-dir`. Auto detect user data directory based on the current OS if `auto` is diff --git a/webdev/lib/src/version.dart b/webdev/lib/src/version.dart index f07f27aee..755244213 100644 --- a/webdev/lib/src/version.dart +++ b/webdev/lib/src/version.dart @@ -1,2 +1,2 @@ // Generated code. Do not modify. -const packageVersion = '2.7.9'; +const packageVersion = '2.7.10-dev'; diff --git a/webdev/pubspec.yaml b/webdev/pubspec.yaml index a43be7860..98c586897 100644 --- a/webdev/pubspec.yaml +++ b/webdev/pubspec.yaml @@ -1,6 +1,6 @@ name: webdev # Every time this changes you need to run `dart run build_runner build`. -version: 2.7.9 +version: 2.7.10-dev # We should not depend on a dev SDK before publishing. # publish_to: none description: >- @@ -48,9 +48,9 @@ dev_dependencies: webdriver: ^3.0.0 # Comment out before releasing webdev. -# dependency_overrides: -# dwds: -# path: ../dwds +dependency_overrides: + dwds: + path: ../dwds executables: webdev: