From 08de7e0c9a57cb3229b052af11c7f8eae4a845bd Mon Sep 17 00:00:00 2001 From: Michael Thomsen Date: Tue, 11 Apr 2023 13:38:40 +0200 Subject: [PATCH] Remove annotations no longer needed (#91) --- dist/main.cjs | 556 ++++++++++++++++++------------ dist/sig.txt | 2 +- lib/node/actions/core.dart | 9 - lib/node/actions/exec.dart | 1 - lib/node/actions/http_client.dart | 2 - lib/node/actions/tool_cache.dart | 4 - lib/node/fs.dart | 2 - pubspec.yaml | 2 +- 8 files changed, 341 insertions(+), 237 deletions(-) diff --git a/dist/main.cjs b/dist/main.cjs index 672f34b..911c06d 100644 --- a/dist/main.cjs +++ b/dist/main.cjs @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.sound, csp, deferred-serialization, intern-composite-values), the Dart to JavaScript compiler version: 3.0.0-375.0.dev. +// Generated by dart2js (NullSafetyMode.sound, csp, deferred-serialization, intern-composite-values), the Dart to JavaScript compiler version: 3.0.0-417.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -254,6 +254,13 @@ checkNotNullable(value, $name, $T) { return value; }, + isToStringVisiting(object) { + var t1, i; + for (t1 = $.toStringVisiting.length, i = 0; i < t1; ++i) + if (object === $.toStringVisiting[i]) + return true; + return false; + }, SubListIterable$(_iterable, _start, _endOrLength, $E) { A.RangeError_checkNotNegative(_start, "start"); if (_endOrLength != null) { @@ -1292,14 +1299,22 @@ if (index >>> 0 !== index || index >= $length) throw A.wrapException(A.diagnoseIndexError(list, index)); }, + NativeByteBuffer: function NativeByteBuffer() { + }, NativeTypedData: function NativeTypedData() { }, + NativeByteData: function NativeByteData() { + }, NativeTypedArray: function NativeTypedArray() { }, NativeTypedArrayOfDouble: function NativeTypedArrayOfDouble() { }, NativeTypedArrayOfInt: function NativeTypedArrayOfInt() { }, + NativeFloat32List: function NativeFloat32List() { + }, + NativeFloat64List: function NativeFloat64List() { + }, NativeInt16List: function NativeInt16List() { }, NativeInt32List: function NativeInt32List() { @@ -1483,11 +1498,8 @@ return A.instanceType(object); }, instanceType(object) { - var rti; - if (object instanceof A.Object) { - rti = object.$ti; - return rti != null ? rti : A._instanceTypeFromConstructor(object); - } + if (object instanceof A.Object) + return A._instanceType(object); if (Array.isArray(object)) return A._arrayInstanceType(object); return A._instanceTypeFromConstructor(J.getInterceptor$(object)); @@ -1529,12 +1541,38 @@ } return type; }, + getRuntimeTypeOfDartObject(object) { + return A.createRuntimeType(A._instanceType(object)); + }, _structuralTypeOf(object) { - var t1 = object instanceof A.Closure ? A.closureFunctionType(object) : null; - return t1 == null ? A.instanceType(object) : t1; + var functionRti = object instanceof A.Closure ? A.closureFunctionType(object) : null; + if (functionRti != null) + return functionRti; + if (type$.TrustedGetRuntimeType._is(object)) + return J.get$runtimeType$(object)._rti; + if (Array.isArray(object)) + return A._arrayInstanceType(object); + return A.instanceType(object); + }, + createRuntimeType(rti) { + var t1 = rti._cachedRuntimeType; + return t1 == null ? rti._cachedRuntimeType = A._createRuntimeType(rti) : t1; + }, + _createRuntimeType(rti) { + var starErasedRti, t1, + s = rti._canonicalRecipe, + starErasedRecipe = s.replace(/\*/g, ""); + if (starErasedRecipe === s) + return rti._cachedRuntimeType = new A._Type(rti); + starErasedRti = A._Universe_eval(init.typeUniverse, starErasedRecipe, true); + t1 = starErasedRti._cachedRuntimeType; + return t1 == null ? starErasedRti._cachedRuntimeType = A._createRuntimeType(starErasedRti) : t1; + }, + typeLiteral(recipe) { + return A.createRuntimeType(A._Universe_eval(init.typeUniverse, recipe, false)); }, _installSpecializedIsTest(object) { - var t1, unstarred, isFn, t2, $name, predicate, testRti = this; + var t1, unstarred, isFn, $name, predicate, testRti = this; if (testRti === type$.Object) return A._finishIsFn(testRti, object, A._isObject); if (!A.isStrongTopType(testRti)) @@ -1547,9 +1585,14 @@ if (t1) return A._finishIsFn(testRti, object, A._isTop); t1 = testRti._kind; + if (t1 === 7) + return A._finishIsFn(testRti, object, A._generalNullableIsTestImplementation); if (t1 === 1) return A._finishIsFn(testRti, object, A._isNever); unstarred = t1 === 6 ? testRti._primary : testRti; + t1 = unstarred._kind; + if (t1 === 8) + return A._finishIsFn(testRti, object, A._isFutureOr); if (unstarred === type$.int) isFn = A._isInt; else if (unstarred === type$.double || unstarred === type$.num) @@ -1560,8 +1603,7 @@ isFn = unstarred === type$.bool ? A._isBool : null; if (isFn != null) return A._finishIsFn(testRti, object, isFn); - t2 = unstarred._kind; - if (t2 === 9) { + if (t1 === 9) { $name = unstarred._primary; if (unstarred._rest.every(A.isTopType)) { testRti._specializedTestResource = "$is" + $name; @@ -1569,9 +1611,7 @@ return A._finishIsFn(testRti, object, A._isListTestViaProperty); return A._finishIsFn(testRti, object, A._isTestViaProperty); } - } else if (t1 === 7) - return A._finishIsFn(testRti, object, A._generalNullableIsTestImplementation); - else if (t2 === 11) { + } else if (t1 === 11) { predicate = A.createRecordTypePredicate(unstarred._primary, unstarred._rest); return A._finishIsFn(testRti, object, predicate == null ? A._isNever : predicate); } @@ -1687,6 +1727,10 @@ _TypeError__TypeError$forType(object, type) { return new A._TypeError("TypeError: " + A._Error_compose(object, type)); }, + _isFutureOr(object) { + var testRti = this; + return testRti._primary._is(object) || A.Rti__getFutureFromFutureOr(init.typeUniverse, testRti)._is(object); + }, _isObject(object) { return object != null; }, @@ -2583,7 +2627,7 @@ throw A.wrapException(A.AssertionError$("Bad index " + index + " for " + environment.toString$0(0))); }, _isSubtype(universe, s, sEnv, t, tEnv) { - var t1, sKind, leftTypeVariable, tKind, sBounds, tBounds, sLength, i, sBound, tBound; + var t1, sKind, leftTypeVariable, tKind, t2, sBounds, tBounds, sLength, i, sBound, tBound; if (s === t) return true; if (!A.isStrongTopType(t)) @@ -2653,6 +2697,9 @@ t1 = sKind !== 12; if ((!t1 || sKind === 13) && t === type$.Function) return true; + t2 = sKind === 11; + if (t2 && t === type$.Record) + return true; if (tKind === 13) { if (s === type$.JavaScriptFunction) return true; @@ -2685,10 +2732,7 @@ return false; return A._isInterfaceSubtype(universe, s, sEnv, t, tEnv); } - t1 = sKind === 11; - if (t1 && t === type$.Record) - return true; - if (t1 && tKind === 11) + if (t2 && tKind === 11) return A._isRecordSubtype(universe, s, sEnv, t, tEnv); return false; }, @@ -2867,6 +2911,9 @@ _FunctionParameters: function _FunctionParameters() { this._named = this._optionalPositional = this._requiredPositional = null; }, + _Type: function _Type(t0) { + this._rti = t0; + }, _Error: function _Error() { }, _TypeError: function _TypeError(t0) { @@ -3322,8 +3369,6 @@ this.callback = t0; this.next = null; }, - StreamTransformerBase: function StreamTransformerBase() { - }, _StreamIterator: function _StreamIterator(t0) { this.$ti = t0; }, @@ -3342,166 +3387,33 @@ LinkedHashMap_LinkedHashMap$_literal(keyValuePairs, $K, $V) { return $K._eval$1("@<0>")._bind$1($V)._eval$1("LinkedHashMap<1,2>")._as(A.fillLiteralMap(keyValuePairs, new A.JsLinkedHashMap($K._eval$1("@<0>")._bind$1($V)._eval$1("JsLinkedHashMap<1,2>")))); }, - IterableBase_iterableToShortString(iterable, leftDelimiter, rightDelimiter) { - var parts, t1; - if (A._isToStringVisiting(iterable)) { - if (leftDelimiter === "(" && rightDelimiter === ")") - return "(...)"; - return leftDelimiter + "..." + rightDelimiter; - } - parts = A._setArrayType([], type$.JSArray_String); - B.JSArray_methods.add$1($._toStringVisiting, iterable); - try { - A._iterablePartsToStrings(iterable, parts); - } finally { - if (0 >= $._toStringVisiting.length) - return A.ioore($._toStringVisiting, -1); - $._toStringVisiting.pop(); - } - t1 = A.StringBuffer__writeAll(leftDelimiter, type$.Iterable_dynamic._as(parts), ", ") + rightDelimiter; - return t1.charCodeAt(0) == 0 ? t1 : t1; - }, - IterableBase_iterableToFullString(iterable, leftDelimiter, rightDelimiter) { - var buffer, t1; - if (A._isToStringVisiting(iterable)) - return leftDelimiter + "..." + rightDelimiter; - buffer = new A.StringBuffer(leftDelimiter); - B.JSArray_methods.add$1($._toStringVisiting, iterable); - try { - t1 = buffer; - t1._contents = A.StringBuffer__writeAll(t1._contents, iterable, ", "); - } finally { - if (0 >= $._toStringVisiting.length) - return A.ioore($._toStringVisiting, -1); - $._toStringVisiting.pop(); - } - buffer._contents += rightDelimiter; - t1 = buffer._contents; - return t1.charCodeAt(0) == 0 ? t1 : t1; - }, - _isToStringVisiting(o) { - var t1, i; - for (t1 = $._toStringVisiting.length, i = 0; i < t1; ++i) - if (o === $._toStringVisiting[i]) - return true; - return false; - }, - _iterablePartsToStrings(iterable, parts) { - var next, ultimateString, penultimateString, penultimate, ultimate, ultimate0, elision, - it = iterable.get$iterator(iterable), - $length = 0, count = 0; - while (true) { - if (!($length < 80 || count < 3)) - break; - if (!it.moveNext$0()) - return; - next = A.S(it.get$current()); - B.JSArray_methods.add$1(parts, next); - $length += next.length + 2; - ++count; - } - if (!it.moveNext$0()) { - if (count <= 5) - return; - if (0 >= parts.length) - return A.ioore(parts, -1); - ultimateString = parts.pop(); - if (0 >= parts.length) - return A.ioore(parts, -1); - penultimateString = parts.pop(); - } else { - penultimate = it.get$current(); - ++count; - if (!it.moveNext$0()) { - if (count <= 4) { - B.JSArray_methods.add$1(parts, A.S(penultimate)); - return; - } - ultimateString = A.S(penultimate); - if (0 >= parts.length) - return A.ioore(parts, -1); - penultimateString = parts.pop(); - $length += ultimateString.length + 2; - } else { - ultimate = it.get$current(); - ++count; - for (; it.moveNext$0(); penultimate = ultimate, ultimate = ultimate0) { - ultimate0 = it.get$current(); - ++count; - if (count > 100) { - while (true) { - if (!($length > 75 && count > 3)) - break; - if (0 >= parts.length) - return A.ioore(parts, -1); - $length -= parts.pop().length + 2; - --count; - } - B.JSArray_methods.add$1(parts, "..."); - return; - } - } - penultimateString = A.S(penultimate); - ultimateString = A.S(ultimate); - $length += ultimateString.length + penultimateString.length + 4; - } - } - if (count > parts.length + 2) { - $length += 5; - elision = "..."; - } else - elision = null; - while (true) { - if (!($length > 80 && parts.length > 3)) - break; - if (0 >= parts.length) - return A.ioore(parts, -1); - $length -= parts.pop().length + 2; - if (elision == null) { - $length += 5; - elision = "..."; - } - } - if (elision != null) - B.JSArray_methods.add$1(parts, elision); - B.JSArray_methods.add$1(parts, penultimateString); - B.JSArray_methods.add$1(parts, ultimateString); - }, MapBase_mapToString(m) { var result, t1 = {}; - if (A._isToStringVisiting(m)) + if (A.isToStringVisiting(m)) return "{...}"; result = new A.StringBuffer(""); try { - B.JSArray_methods.add$1($._toStringVisiting, m); + B.JSArray_methods.add$1($.toStringVisiting, m); result._contents += "{"; t1.first = true; m.forEach$1(0, new A.MapBase_mapToString_closure(t1, result)); result._contents += "}"; } finally { - if (0 >= $._toStringVisiting.length) - return A.ioore($._toStringVisiting, -1); - $._toStringVisiting.pop(); + if (0 >= $.toStringVisiting.length) + return A.ioore($.toStringVisiting, -1); + $.toStringVisiting.pop(); } t1 = result._contents; return t1.charCodeAt(0) == 0 ? t1 : t1; }, - IterableBase: function IterableBase() { - }, ListBase: function ListBase() { }, - ListMixin: function ListMixin() { - }, MapBase: function MapBase() { }, MapBase_mapToString_closure: function MapBase_mapToString_closure(t0, t1) { this._box_0 = t0; this.result = t1; }, - MapMixin: function MapMixin() { - }, - _ListBase_Object_ListMixin: function _ListBase_Object_ListMixin() { - }, Utf8Decoder__convertIntercepted(allowMalformed, codeUnits, start, end) { var casted, result; if (codeUnits instanceof Uint8Array) { @@ -3722,6 +3634,124 @@ FormatException$(message, source, offset) { return new A.FormatException(message, source, offset); }, + Iterable_iterableToShortString(iterable, leftDelimiter, rightDelimiter) { + var parts, t1; + if (A.isToStringVisiting(iterable)) { + if (leftDelimiter === "(" && rightDelimiter === ")") + return "(...)"; + return leftDelimiter + "..." + rightDelimiter; + } + parts = A._setArrayType([], type$.JSArray_String); + B.JSArray_methods.add$1($.toStringVisiting, iterable); + try { + A._iterablePartsToStrings(iterable, parts); + } finally { + if (0 >= $.toStringVisiting.length) + return A.ioore($.toStringVisiting, -1); + $.toStringVisiting.pop(); + } + t1 = A.StringBuffer__writeAll(leftDelimiter, type$.Iterable_dynamic._as(parts), ", ") + rightDelimiter; + return t1.charCodeAt(0) == 0 ? t1 : t1; + }, + Iterable_iterableToFullString(iterable, leftDelimiter, rightDelimiter) { + var buffer, t1; + if (A.isToStringVisiting(iterable)) + return leftDelimiter + "..." + rightDelimiter; + buffer = new A.StringBuffer(leftDelimiter); + B.JSArray_methods.add$1($.toStringVisiting, iterable); + try { + t1 = buffer; + t1._contents = A.StringBuffer__writeAll(t1._contents, iterable, ", "); + } finally { + if (0 >= $.toStringVisiting.length) + return A.ioore($.toStringVisiting, -1); + $.toStringVisiting.pop(); + } + buffer._contents += rightDelimiter; + t1 = buffer._contents; + return t1.charCodeAt(0) == 0 ? t1 : t1; + }, + _iterablePartsToStrings(iterable, parts) { + var next, ultimateString, penultimateString, penultimate, ultimate, ultimate0, elision, + it = iterable.get$iterator(iterable), + $length = 0, count = 0; + while (true) { + if (!($length < 80 || count < 3)) + break; + if (!it.moveNext$0()) + return; + next = A.S(it.get$current()); + B.JSArray_methods.add$1(parts, next); + $length += next.length + 2; + ++count; + } + if (!it.moveNext$0()) { + if (count <= 5) + return; + if (0 >= parts.length) + return A.ioore(parts, -1); + ultimateString = parts.pop(); + if (0 >= parts.length) + return A.ioore(parts, -1); + penultimateString = parts.pop(); + } else { + penultimate = it.get$current(); + ++count; + if (!it.moveNext$0()) { + if (count <= 4) { + B.JSArray_methods.add$1(parts, A.S(penultimate)); + return; + } + ultimateString = A.S(penultimate); + if (0 >= parts.length) + return A.ioore(parts, -1); + penultimateString = parts.pop(); + $length += ultimateString.length + 2; + } else { + ultimate = it.get$current(); + ++count; + for (; it.moveNext$0(); penultimate = ultimate, ultimate = ultimate0) { + ultimate0 = it.get$current(); + ++count; + if (count > 100) { + while (true) { + if (!($length > 75 && count > 3)) + break; + if (0 >= parts.length) + return A.ioore(parts, -1); + $length -= parts.pop().length + 2; + --count; + } + B.JSArray_methods.add$1(parts, "..."); + return; + } + } + penultimateString = A.S(penultimate); + ultimateString = A.S(ultimate); + $length += ultimateString.length + penultimateString.length + 4; + } + } + if (count > parts.length + 2) { + $length += 5; + elision = "..."; + } else + elision = null; + while (true) { + if (!($length > 80 && parts.length > 3)) + break; + if (0 >= parts.length) + return A.ioore(parts, -1); + $length -= parts.pop().length + 2; + if (elision == null) { + $length += 5; + elision = "..."; + } + } + if (elision != null) + B.JSArray_methods.add$1(parts, elision); + B.JSArray_methods.add$1(parts, penultimateString); + B.JSArray_methods.add$1(parts, ultimateString); + }, Uri_parse(uri) { var delta, indices, schemeEnd, hostStart, portStart, pathStart, queryStart, fragmentStart, isSimple, scheme, t1, t2, schemeAuth, queryStart0, pathStart0, userInfoStart, userInfo, host, portNumber, port, path, query, _null = null, end = uri.length; @@ -4902,8 +4932,6 @@ }, Iterable: function Iterable() { }, - Iterator: function Iterator() { - }, Null: function Null() { }, Object: function Object() { @@ -5645,6 +5673,9 @@ get$length$asx(receiver) { return J.getInterceptor$asx(receiver).get$length(receiver); }, + get$runtimeType$(receiver) { + return J.getInterceptor$(receiver).get$runtimeType(receiver); + }, $eq$(receiver, a0) { if (receiver == null) return a0 == null; @@ -5719,6 +5750,9 @@ }, toString$0(receiver) { return "Instance of '" + A.Primitives_objectTypeName(receiver) + "'"; + }, + get$runtimeType(receiver) { + return A.createRuntimeType(A._instanceTypeFromConstructor(this)); } }; J.JSBool.prototype = { @@ -5728,6 +5762,10 @@ get$hashCode(receiver) { return receiver ? 519018 : 218159; }, + get$runtimeType(receiver) { + return A.createRuntimeType(type$.bool); + }, + $isTrustedGetRuntimeType: 1, $isbool: 1 }; J.JSNull.prototype = { @@ -5740,6 +5778,7 @@ get$hashCode(receiver) { return 0; }, + $isTrustedGetRuntimeType: 1, $isNull: 1 }; J.JavaScriptObject.prototype = {$isJSObject: 1}; @@ -5795,7 +5834,7 @@ return false; }, toString$0(receiver) { - return A.IterableBase_iterableToFullString(receiver, "[", "]"); + return A.Iterable_iterableToFullString(receiver, "[", "]"); }, get$iterator(receiver) { return new J.ArrayIterator(receiver, receiver.length, A._arrayInstanceType(receiver)._eval$1("ArrayIterator<1>")); @@ -5910,11 +5949,25 @@ _shrBothPositive$1(receiver, other) { return other > 31 ? 0 : receiver >>> other; }, + get$runtimeType(receiver) { + return A.createRuntimeType(type$.num); + }, $isdouble: 1, $isnum: 1 }; - J.JSInt.prototype = {$isint: 1}; - J.JSNumNotInt.prototype = {}; + J.JSInt.prototype = { + get$runtimeType(receiver) { + return A.createRuntimeType(type$.int); + }, + $isTrustedGetRuntimeType: 1, + $isint: 1 + }; + J.JSNumNotInt.prototype = { + get$runtimeType(receiver) { + return A.createRuntimeType(type$.double); + }, + $isTrustedGetRuntimeType: 1 + }; J.JSString.prototype = { codeUnitAt$1(receiver, index) { if (index < 0) @@ -6026,9 +6079,13 @@ hash ^= hash >> 11; return hash + ((hash & 16383) << 15) & 536870911; }, + get$runtimeType(receiver) { + return A.createRuntimeType(type$.String); + }, get$length(receiver) { return receiver.length; }, + $isTrustedGetRuntimeType: 1, $isPattern: 1, $isString: 1 }; @@ -6173,7 +6230,8 @@ }, get$current() { return this._iterator.get$current(); - } + }, + $isIterator: 1 }; A.WhereTypeIterable.prototype = { get$iterator(_) { @@ -6416,7 +6474,8 @@ return null; return new A._MatchImplementation(match); }, - $isPattern: 1 + $isPattern: 1, + $isRegExp: 1 }; A._MatchImplementation.prototype = {$isMatch: 1, $isRegExpMatch: 1}; A._AllMatchesIterable.prototype = { @@ -6506,7 +6565,19 @@ }, $isIterator: 1 }; + A.NativeByteBuffer.prototype = { + get$runtimeType(receiver) { + return B.Type_ByteBuffer_RkP; + }, + $isTrustedGetRuntimeType: 1 + }; A.NativeTypedData.prototype = {}; + A.NativeByteData.prototype = { + get$runtimeType(receiver) { + return B.Type_ByteData_zNC; + }, + $isTrustedGetRuntimeType: 1 + }; A.NativeTypedArray.prototype = { get$length(receiver) { return receiver.length; @@ -6533,46 +6604,85 @@ $isIterable: 1, $isList: 1 }; + A.NativeFloat32List.prototype = { + get$runtimeType(receiver) { + return B.Type_Float32List_LB7; + }, + $isTrustedGetRuntimeType: 1 + }; + A.NativeFloat64List.prototype = { + get$runtimeType(receiver) { + return B.Type_Float64List_LB7; + }, + $isTrustedGetRuntimeType: 1 + }; A.NativeInt16List.prototype = { + get$runtimeType(receiver) { + return B.Type_Int16List_uXf; + }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; - } + }, + $isTrustedGetRuntimeType: 1 }; A.NativeInt32List.prototype = { + get$runtimeType(receiver) { + return B.Type_Int32List_O50; + }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; - } + }, + $isTrustedGetRuntimeType: 1 }; A.NativeInt8List.prototype = { + get$runtimeType(receiver) { + return B.Type_Int8List_ekJ; + }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; - } + }, + $isTrustedGetRuntimeType: 1 }; A.NativeUint16List.prototype = { + get$runtimeType(receiver) { + return B.Type_Uint16List_2bx; + }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; - } + }, + $isTrustedGetRuntimeType: 1 }; A.NativeUint32List.prototype = { + get$runtimeType(receiver) { + return B.Type_Uint32List_2bx; + }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; - } + }, + $isTrustedGetRuntimeType: 1 }; A.NativeUint8ClampedList.prototype = { + get$runtimeType(receiver) { + return B.Type_Uint8ClampedList_Jik; + }, get$length(receiver) { return receiver.length; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; - } + }, + $isTrustedGetRuntimeType: 1 }; A.NativeUint8List.prototype = { + get$runtimeType(receiver) { + return B.Type_Uint8List_WLA; + }, get$length(receiver) { return receiver.length; }, @@ -6580,6 +6690,7 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, + $isTrustedGetRuntimeType: 1, $isUint8List: 1 }; A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin.prototype = {}; @@ -6595,6 +6706,11 @@ } }; A._FunctionParameters.prototype = {}; + A._Type.prototype = { + toString$0(_) { + return A._rtiToString(this._rti, null); + } + }; A._Error.prototype = { toString$0(_) { return this._message; @@ -7056,7 +7172,6 @@ $signature: 0 }; A._AsyncCallbackEntry.prototype = {}; - A.StreamTransformerBase.prototype = {}; A._StreamIterator.prototype = {}; A._Zone.prototype = {$isZone: 1}; A._rootHandleError_closure.prototype = { @@ -7119,27 +7234,35 @@ }, $signature: 0 }; - A.IterableBase.prototype = {}; - A.ListBase.prototype = {$isIterable: 1, $isList: 1}; - A.ListMixin.prototype = { + A.ListBase.prototype = { get$iterator(receiver) { - return new A.ListIterator(receiver, this.get$length(receiver), A.instanceType(receiver)._eval$1("ListIterator")); + return new A.ListIterator(receiver, this.get$length(receiver), A.instanceType(receiver)._eval$1("ListIterator")); }, elementAt$1(receiver, index) { return this.$index(receiver, index); }, fillRange$3(receiver, start, end, fill) { var i; - A.instanceType(receiver)._eval$1("ListMixin.E?")._as(fill); + A.instanceType(receiver)._eval$1("ListBase.E?")._as(fill); A.RangeError_checkValidRange(start, end, this.get$length(receiver)); for (i = start; i < end; ++i) this.$indexSet(receiver, i, fill); }, toString$0(receiver) { - return A.IterableBase_iterableToFullString(receiver, "[", "]"); - } + return A.Iterable_iterableToFullString(receiver, "[", "]"); + }, + $isIterable: 1, + $isList: 1 + }; + A.MapBase.prototype = { + get$length(_) { + return this.__js_helper$_length; + }, + toString$0(_) { + return A.MapBase_mapToString(this); + }, + $isMap: 1 }; - A.MapBase.prototype = {}; A.MapBase_mapToString_closure.prototype = { call$2(k, v) { var t2, @@ -7154,16 +7277,6 @@ }, $signature: 15 }; - A.MapMixin.prototype = { - get$length(_) { - return this.__js_helper$_length; - }, - toString$0(_) { - return A.MapBase_mapToString(this); - }, - $isMap: 1 - }; - A._ListBase_Object_ListMixin.prototype = {}; A.Utf8Decoder__decoder_closure.prototype = { call$0() { var t1, exception; @@ -7628,21 +7741,20 @@ return !this.get$iterator(this).moveNext$0(); }, elementAt$1(_, index) { - var t1, elementIndex, element; + var iterator, skipCount; A.RangeError_checkNotNegative(index, "index"); - for (t1 = this.get$iterator(this), elementIndex = 0; t1.moveNext$0();) { - element = t1.get$current(); - if (index === elementIndex) - return element; - ++elementIndex; + iterator = this.get$iterator(this); + for (skipCount = index; iterator.moveNext$0();) { + if (skipCount === 0) + return iterator.get$current(); + --skipCount; } - throw A.wrapException(A.IndexError$withLength(index, elementIndex, this, "index")); + throw A.wrapException(A.IndexError$withLength(index, index - skipCount, this, "index")); }, toString$0(_) { - return A.IterableBase_iterableToShortString(this, "(", ")"); + return A.Iterable_iterableToShortString(this, "(", ")"); } }; - A.Iterator.prototype = {}; A.Null.prototype = { get$hashCode(_) { return A.Object.prototype.get$hashCode.call(this, this); @@ -7661,6 +7773,9 @@ toString$0(_) { return "Instance of '" + A.Primitives_objectTypeName(this) + "'"; }, + get$runtimeType(_) { + return A.getRuntimeTypeOfDartObject(this); + }, toString() { return this.toString$0(this); } @@ -8263,41 +8378,37 @@ _inherit = hunkHelpers.inherit, _inheritMany = hunkHelpers.inheritMany; _inherit(A.Object, null); - _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Error, A._ListBase_Object_ListMixin, A.Iterable, A.ListIterator, A.Iterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.Closure, A.MapMixin, A.LinkedHashMapCell, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A.Rti, A._FunctionParameters, A._TimerImpl, A._AsyncAwaitCompleter, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A.StreamTransformerBase, A._StreamIterator, A._Zone, A.ListMixin, A.Codec, A._Utf8Decoder, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A.Context, A.Style, A.ParsedPath]); + _inheritMany(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Error, A.ListBase, A.Iterable, A.ListIterator, A.WhereIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.Closure, A.MapBase, A.LinkedHashMapCell, A.JSSyntaxRegExp, A._MatchImplementation, A._AllMatchesIterator, A.StringMatch, A._StringAllMatchesIterator, A.Rti, A._FunctionParameters, A._Type, A._TimerImpl, A._AsyncAwaitCompleter, A.AsyncError, A._Completer, A._FutureListener, A._Future, A._AsyncCallbackEntry, A._StreamIterator, A._Zone, A.Codec, A.Converter, A._Utf8Decoder, A.OutOfMemoryError, A.StackOverflowError, A._Exception, A.FormatException, A.Null, A._StringStackTrace, A.StringBuffer, A._Uri, A.UriData, A._SimpleUri, A.NullRejectionException, A.Context, A.Style, A.ParsedPath]); _inheritMany(J.Interceptor, [J.JSBool, J.JSNull, J.JavaScriptObject, J.JSNumber, J.JSString]); - _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeTypedData]); + _inheritMany(J.JavaScriptObject, [J.LegacyJavaScriptObject, J.JSArray, A.NativeByteBuffer, A.NativeTypedData]); _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]); _inherit(J.JSUnmodifiableArray, J.JSArray); _inheritMany(J.JSNumber, [J.JSInt, J.JSNumNotInt]); _inheritMany(A.Error, [A.LateError, A.TypeError, A.JsNoSuchMethodError, A.UnknownJsTypeError, A._CyclicInitializationError, A.RuntimeError, A.AssertionError, A._Error, A.ArgumentError, A.UnsupportedError, A.UnimplementedError, A.StateError, A.ConcurrentModificationError]); - _inherit(A.ListBase, A._ListBase_Object_ListMixin); _inherit(A.UnmodifiableListBase, A.ListBase); _inherit(A.CodeUnits, A.UnmodifiableListBase); - _inheritMany(A.Iterable, [A.EfficientLengthIterable, A.WhereIterable, A.WhereTypeIterable, A.IterableBase, A._StringAllMatchesIterable]); + _inheritMany(A.Iterable, [A.EfficientLengthIterable, A.WhereIterable, A.WhereTypeIterable, A._AllMatchesIterable, A._StringAllMatchesIterable]); _inherit(A.ListIterable, A.EfficientLengthIterable); _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable]); - _inherit(A.WhereIterator, A.Iterator); _inherit(A.NullError, A.TypeError); _inheritMany(A.Closure, [A.Closure0Args, A.Closure2Args, 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._createTables_setChars, A._createTables_setRange, A.promiseToFuture_closure, A.promiseToFuture_closure0, A.Context_joinAll_closure, A._validateArgList_closure]); _inheritMany(A.TearOffClosure, [A.StaticClosure, A.BoundClosure]); _inherit(A._AssertionError, A.AssertionError); - _inherit(A.MapBase, A.MapMixin); _inherit(A.JsLinkedHashMap, A.MapBase); _inheritMany(A.Closure2Args, [A.initHooks_closure0, A._awaitOnObject_closure0, A._wrapJsFunctionForAsync_closure, A._Future__chainForeignFuture_closure0, A.MapBase_mapToString_closure, A.Uri__parseIPv4Address_error, A.Uri_parseIPv6Address_error, A.Uri_parseIPv6Address_parseHex, A._createTables_build]); - _inherit(A._AllMatchesIterable, A.IterableBase); - _inherit(A.NativeTypedArray, A.NativeTypedData); + _inheritMany(A.NativeTypedData, [A.NativeByteData, A.NativeTypedArray]); _inheritMany(A.NativeTypedArray, [A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin]); _inherit(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin, A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin); _inherit(A.NativeTypedArrayOfDouble, A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin); _inherit(A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin_FixedLengthListMixin, A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin); _inherit(A.NativeTypedArrayOfInt, A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin_FixedLengthListMixin); + _inheritMany(A.NativeTypedArrayOfDouble, [A.NativeFloat32List, A.NativeFloat64List]); _inheritMany(A.NativeTypedArrayOfInt, [A.NativeInt16List, A.NativeInt32List, A.NativeInt8List, A.NativeUint16List, A.NativeUint32List, A.NativeUint8ClampedList, A.NativeUint8List]); _inherit(A._TypeError, A._Error); _inheritMany(A.Closure0Args, [A._AsyncRun__scheduleImmediateJsOverride_internalCallback, A._AsyncRun__scheduleImmediateWithSetImmediate_internalCallback, A._TimerImpl_internalCallback, A._Future__addListener_closure, A._Future__prependListeners_closure, A._Future__chainForeignFuture_closure1, A._Future__asyncCompleteWithValue_closure, A._Future__chainFuture_closure, A._Future__asyncCompleteError_closure, A._Future__propagateToListeners_handleWhenCompleteCallback, A._Future__propagateToListeners_handleValueCallback, A._Future__propagateToListeners_handleError, A._rootHandleError_closure, A._RootZone_bindCallbackGuarded_closure, A.Utf8Decoder__decoder_closure, A.Utf8Decoder__decoderNonfatal_closure]); _inherit(A._AsyncCompleter, A._Completer); _inherit(A._RootZone, A._Zone); _inheritMany(A.Codec, [A.Base64Codec, A.Encoding]); - _inherit(A.Converter, A.StreamTransformerBase); _inheritMany(A.Converter, [A.Base64Encoder, A.Utf8Decoder]); _inherit(A.Utf8Codec, A.Encoding); _inheritMany(A.ArgumentError, [A.RangeError, A.IndexError]); @@ -8305,11 +8416,10 @@ _inherit(A.InternalStyle, A.Style); _inheritMany(A.InternalStyle, [A.PosixStyle, A.UrlStyle, A.WindowsStyle]); _mixin(A.UnmodifiableListBase, A.UnmodifiableListMixin); - _mixin(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A.ListMixin); + _mixin(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A.ListBase); _mixin(A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin, A.FixedLengthListMixin); - _mixin(A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin, A.ListMixin); + _mixin(A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin, A.ListBase); _mixin(A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin_FixedLengthListMixin, A.FixedLengthListMixin); - _mixin(A._ListBase_Object_ListMixin, A.ListMixin); })(); var init = { typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []}, @@ -8320,8 +8430,8 @@ leafTags: null, arrayRti: Symbol("$ti") }; - A._Universe_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","NativeFloat32List":"NativeTypedArrayOfDouble","NativeByteData":"NativeTypedData","NativeByteBuffer":"JavaScriptObject","JavaScriptObject":{"JSObject":[]},"JSBool":{"bool":[]},"JSNull":{"Null":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"JSObject":[],"Iterable":["1"]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"JSObject":[],"Iterable":["1"]},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[]},"JSInt":{"double":[],"int":[],"num":[]},"JSNumNotInt":{"double":[],"num":[]},"JSString":{"String":[],"Pattern":[]},"LateError":{"Error":[]},"CodeUnits":{"ListMixin":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"Iterable":["int"],"ListMixin.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"Iterable":["1"],"Iterable.E":"1","ListIterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedListIterable":{"ListIterable":["2"],"Iterable":["2"],"Iterable.E":"2","ListIterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListMixin":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"Iterable":["1"]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Function":[]},"Closure2Args":{"Function":[]},"TearOffClosure":{"Function":[]},"StaticClosure":{"Function":[]},"BoundClosure":{"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapMixin":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"]},"JSSyntaxRegExp":{"Pattern":[]},"_MatchImplementation":{"RegExpMatch":[],"Match":[]},"_AllMatchesIterable":{"Iterable":["RegExpMatch"],"Iterable.E":"RegExpMatch"},"_AllMatchesIterator":{"Iterator":["RegExpMatch"]},"StringMatch":{"Match":[]},"_StringAllMatchesIterable":{"Iterable":["Match"],"Iterable.E":"Match"},"_StringAllMatchesIterator":{"Iterator":["Match"]},"NativeTypedData":{"JavaScriptObject":[],"JSObject":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[],"JSObject":[]},"NativeTypedArrayOfDouble":{"ListMixin":["double"],"JavaScriptIndexingBehavior":["double"],"List":["double"],"JavaScriptObject":[],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"ListMixin.E":"double"},"NativeTypedArrayOfInt":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeInt16List":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"NativeInt32List":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"NativeInt8List":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"NativeUint16List":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"NativeUint32List":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"NativeUint8ClampedList":{"ListMixin":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"NativeUint8List":{"ListMixin":["int"],"Uint8List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"ListMixin.E":"int"},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"_Future":{"Future":["1"]},"AsyncError":{"Error":[]},"_AsyncCompleter":{"_Completer":["1"]},"_Zone":{"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"IterableBase":{"Iterable":["1"]},"ListBase":{"ListMixin":["1"],"List":["1"],"Iterable":["1"]},"MapBase":{"MapMixin":["1","2"],"Map":["1","2"]},"MapMixin":{"Map":["1","2"]},"Base64Codec":{"Codec":["List","String"]},"Encoding":{"Codec":["String","List"]},"Utf8Codec":{"Codec":["String","List"]},"double":{"num":[]},"int":{"num":[]},"List":{"Iterable":["1"]},"RegExpMatch":{"Match":[]},"String":{"Pattern":[]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"Uint8List":{"List":["int"],"Iterable":["int"]}}')); - A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"EfficientLengthIterable":1,"UnmodifiableListBase":1,"NativeTypedArray":1,"StreamTransformerBase":2,"IterableBase":1,"ListBase":1,"MapBase":2,"_ListBase_Object_ListMixin":1,"Converter":2}')); + A._Universe_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","JavaScriptObject":{"JSObject":[]},"JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"LegacyJavaScriptObject":{"JavaScriptObject":[],"JSObject":[]},"JSArray":{"List":["1"],"JavaScriptObject":[],"JSObject":[],"Iterable":["1"]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"JavaScriptObject":[],"JSObject":[],"Iterable":["1"]},"ArrayIterator":{"Iterator":["1"]},"JSNumber":{"double":[],"num":[]},"JSInt":{"double":[],"int":[],"num":[],"TrustedGetRuntimeType":[]},"JSNumNotInt":{"double":[],"num":[],"TrustedGetRuntimeType":[]},"JSString":{"String":[],"Pattern":[],"TrustedGetRuntimeType":[]},"LateError":{"Error":[]},"CodeUnits":{"ListBase":["int"],"UnmodifiableListMixin":["int"],"List":["int"],"Iterable":["int"],"ListBase.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"Iterable":["1"],"Iterable.E":"1","ListIterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedListIterable":{"ListIterable":["2"],"Iterable":["2"],"Iterable.E":"2","ListIterable.E":"2"},"WhereIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereIterator":{"Iterator":["1"]},"WhereTypeIterable":{"Iterable":["1"],"Iterable.E":"1"},"WhereTypeIterator":{"Iterator":["1"]},"UnmodifiableListBase":{"ListBase":["1"],"UnmodifiableListMixin":["1"],"List":["1"],"Iterable":["1"]},"NullError":{"TypeError":[],"Error":[]},"JsNoSuchMethodError":{"Error":[]},"UnknownJsTypeError":{"Error":[]},"_StackTrace":{"StackTrace":[]},"Closure":{"Function":[]},"Closure0Args":{"Function":[]},"Closure2Args":{"Function":[]},"TearOffClosure":{"Function":[]},"StaticClosure":{"Function":[]},"BoundClosure":{"Function":[]},"_CyclicInitializationError":{"Error":[]},"RuntimeError":{"Error":[]},"_AssertionError":{"Error":[]},"JsLinkedHashMap":{"MapBase":["1","2"],"LinkedHashMap":["1","2"],"Map":["1","2"]},"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":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JavaScriptObject":[],"JSObject":[]},"NativeByteData":{"JavaScriptObject":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JavaScriptObject":[],"JSObject":[]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"JavaScriptIndexingBehavior":["double"],"List":["double"],"JavaScriptObject":[],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"ListBase":["double"],"JavaScriptIndexingBehavior":["double"],"List":["double"],"JavaScriptObject":[],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeFloat64List":{"ListBase":["double"],"JavaScriptIndexingBehavior":["double"],"List":["double"],"JavaScriptObject":[],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeInt16List":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt32List":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt8List":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint16List":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint32List":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8ClampedList":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8List":{"ListBase":["int"],"Uint8List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"JavaScriptObject":[],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"_Error":{"Error":[]},"_TypeError":{"TypeError":[],"Error":[]},"_Future":{"Future":["1"]},"AsyncError":{"Error":[]},"_AsyncCompleter":{"_Completer":["1"]},"_Zone":{"Zone":[]},"_RootZone":{"_Zone":[],"Zone":[]},"ListBase":{"List":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"Base64Codec":{"Codec":["List","String"]},"Encoding":{"Codec":["String","List"]},"Utf8Codec":{"Codec":["String","List"]},"double":{"num":[]},"int":{"num":[]},"List":{"Iterable":["1"]},"RegExpMatch":{"Match":[]},"String":{"Pattern":[]},"AssertionError":{"Error":[]},"TypeError":{"Error":[]},"ArgumentError":{"Error":[]},"RangeError":{"Error":[]},"IndexError":{"Error":[]},"UnsupportedError":{"Error":[]},"UnimplementedError":{"Error":[]},"StateError":{"Error":[]},"ConcurrentModificationError":{"Error":[]},"OutOfMemoryError":{"Error":[]},"StackOverflowError":{"Error":[]},"_StringStackTrace":{"StackTrace":[]},"StringBuffer":{"StringSink":[]},"_Uri":{"Uri":[]},"_SimpleUri":{"Uri":[]},"_DataUri":{"Uri":[]},"PosixStyle":{"InternalStyle":[]},"UrlStyle":{"InternalStyle":[]},"WindowsStyle":{"InternalStyle":[]},"Int8List":{"List":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"Iterable":["double"]}}')); + A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"EfficientLengthIterable":1,"UnmodifiableListBase":1,"NativeTypedArray":1,"Converter":2}')); var string$ = { Error_: "Error handler must accept one Object or one Object and a StackTrace as arguments, and return a value of the returned future's type", https_: "https://storage.googleapis.com/dart-archive/channels/" @@ -8355,6 +8465,7 @@ RegExpMatch: findType("RegExpMatch"), StackTrace: findType("StackTrace"), String: findType("String"), + TrustedGetRuntimeType: findType("TrustedGetRuntimeType"), TypeError: findType("TypeError"), Uint8List: findType("Uint8List"), UnknownJavaScriptObject: findType("UnknownJavaScriptObject"), @@ -8526,10 +8637,22 @@ B.List_empty = A._setArrayType(makeConstList([]), type$.JSArray_String); B.List_oFp = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int); B.List_x64_ia32_arm_arm64 = A._setArrayType(makeConstList(["x64", "ia32", "arm", "arm64"]), type$.JSArray_String); + B.Type_ByteBuffer_RkP = A.typeLiteral("ByteBuffer"); + B.Type_ByteData_zNC = A.typeLiteral("ByteData"); + B.Type_Float32List_LB7 = A.typeLiteral("Float32List"); + B.Type_Float64List_LB7 = A.typeLiteral("Float64List"); + B.Type_Int16List_uXf = A.typeLiteral("Int16List"); + B.Type_Int32List_O50 = A.typeLiteral("Int32List"); + B.Type_Int8List_ekJ = A.typeLiteral("Int8List"); + B.Type_Uint16List_2bx = A.typeLiteral("Uint16List"); + B.Type_Uint32List_2bx = A.typeLiteral("Uint32List"); + B.Type_Uint8ClampedList_Jik = A.typeLiteral("Uint8ClampedList"); + B.Type_Uint8List_WLA = A.typeLiteral("Uint8List"); B.Utf8Decoder_false = new A.Utf8Decoder(false); })(); (function staticFields() { $._JS_INTEROP_INTERCEPTOR_TAG = null; + $.toStringVisiting = A._setArrayType([], A.findType("JSArray")); $.Primitives__identityHashCodeProperty = null; $.BoundClosure__receiverFieldNameCache = null; $.BoundClosure__interceptorFieldNameCache = null; @@ -8544,7 +8667,6 @@ $._lastPriorityCallback = null; $._isInCallbackLoop = false; $.Zone__current = B.C__RootZone; - $._toStringVisiting = A._setArrayType([], A.findType("JSArray")); })(); (function lazyInitializers() { var _lazyFinal = hunkHelpers.lazyFinal; @@ -8628,8 +8750,8 @@ } init.dispatchPropertyName = init.getIsolateTag("dispatch_record"); }(); - hunkHelpers.setOrUpdateInterceptorsByTag({ArrayBuffer: J.JavaScriptObject, DataView: A.NativeTypedData, ArrayBufferView: A.NativeTypedData, Float32Array: A.NativeTypedArrayOfDouble, Float64Array: A.NativeTypedArrayOfDouble, Int16Array: A.NativeInt16List, Int32Array: A.NativeInt32List, Int8Array: A.NativeInt8List, Uint16Array: A.NativeUint16List, Uint32Array: A.NativeUint32List, Uint8ClampedArray: A.NativeUint8ClampedList, CanvasPixelArray: A.NativeUint8ClampedList, Uint8Array: A.NativeUint8List}); - hunkHelpers.setOrUpdateLeafTags({ArrayBuffer: true, DataView: true, ArrayBufferView: false, Float32Array: true, Float64Array: true, Int16Array: true, Int32Array: true, Int8Array: true, Uint16Array: true, Uint32Array: true, Uint8ClampedArray: true, CanvasPixelArray: true, Uint8Array: false}); + hunkHelpers.setOrUpdateInterceptorsByTag({ArrayBuffer: A.NativeByteBuffer, ArrayBufferView: A.NativeTypedData, DataView: A.NativeByteData, Float32Array: A.NativeFloat32List, Float64Array: A.NativeFloat64List, Int16Array: A.NativeInt16List, Int32Array: A.NativeInt32List, Int8Array: A.NativeInt8List, Uint16Array: A.NativeUint16List, Uint32Array: A.NativeUint32List, Uint8ClampedArray: A.NativeUint8ClampedList, CanvasPixelArray: A.NativeUint8ClampedList, Uint8Array: A.NativeUint8List}); + hunkHelpers.setOrUpdateLeafTags({ArrayBuffer: true, ArrayBufferView: false, DataView: true, Float32Array: true, Float64Array: true, Int16Array: true, Int32Array: true, Int8Array: true, Uint16Array: true, Uint32Array: true, Uint8ClampedArray: true, CanvasPixelArray: true, Uint8Array: false}); A.NativeTypedArray.$nativeSuperclassTag = "ArrayBufferView"; A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin.$nativeSuperclassTag = "ArrayBufferView"; A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin_FixedLengthListMixin.$nativeSuperclassTag = "ArrayBufferView"; diff --git a/dist/sig.txt b/dist/sig.txt index c9b72f7..b419ef9 100644 --- a/dist/sig.txt +++ b/dist/sig.txt @@ -1 +1 @@ -29FEF7E65930C36E5A41DC46E821CFB3 +7F2C5F3CF99AE2F47DBFA36238B06AEA diff --git a/lib/node/actions/core.dart b/lib/node/actions/core.dart index 7ab7df9..9c7bdbc 100644 --- a/lib/node/actions/core.dart +++ b/lib/node/actions/core.dart @@ -9,29 +9,20 @@ external Core get core; @JS() inline class Core { - @JS() external JSString getInput(JSString name); - @JS() external void setOutput(JSString name, JSString value); - @JS() external void info(JSString name); - @JS() external void warning(JSString name); - @JS() external void error(JSString name); - @JS() external void addPath(JSString element); - @JS() external void exportVariable(JSString name, JSString value); - @JS() external void setFailed(JSString name); - @JS() // JSPromise external JSPromise getIDToken(JSString audience); } diff --git a/lib/node/actions/exec.dart b/lib/node/actions/exec.dart index f88275a..2cebac2 100644 --- a/lib/node/actions/exec.dart +++ b/lib/node/actions/exec.dart @@ -13,6 +13,5 @@ inline class Exec { /// /// Output will be streamed to the live console. Returns promise with return /// code. - @JS() external JSPromise exec(JSString commandLine, [List args]); } diff --git a/lib/node/actions/http_client.dart b/lib/node/actions/http_client.dart index fe5ca28..6906989 100644 --- a/lib/node/actions/http_client.dart +++ b/lib/node/actions/http_client.dart @@ -6,7 +6,6 @@ import 'dart:js_interop'; @JS() inline class HttpClient { - @JS() external HttpClient( JSString userAgent, JSArray handlers, @@ -14,6 +13,5 @@ inline class HttpClient { ); // JSPromise - @JS() external JSPromise getJson(JSString requestUrl); } diff --git a/lib/node/actions/tool_cache.dart b/lib/node/actions/tool_cache.dart index bcb3225..ebf46f1 100644 --- a/lib/node/actions/tool_cache.dart +++ b/lib/node/actions/tool_cache.dart @@ -14,7 +14,6 @@ inline class ToolCache { /// @param toolName name of the tool /// @param versionSpec version of the tool /// @param arch optional arch. defaults to arch of computer - @JS() external JSString find( JSString toolName, JSString versionSpec, [ @@ -26,14 +25,12 @@ inline class ToolCache { /// @param url url of tool to download /// @returns path to downloaded tool // JSPromise - @JS() external JSPromise downloadTool(JSString url); /// Extract a zip. /// /// @param file path to the zip /// @returns path to the destination directory - @JS() external JSPromise extractZip(JSString file); /// Caches a directory and installs it into the tool cacheDir @@ -43,7 +40,6 @@ inline class ToolCache { /// @param version version of the tool. semver format /// @param arch architecture of the tool. Optional. /// Defaults to machine architecture - @JS() external JSPromise cacheDir( JSString sourceDir, JSString tool, diff --git a/lib/node/fs.dart b/lib/node/fs.dart index 1b4ee7e..1f88579 100644 --- a/lib/node/fs.dart +++ b/lib/node/fs.dart @@ -15,10 +15,8 @@ inline class FileSystem { FileSystem(this.fileSystem); /// Whether the [path] exists, false otherwise. - @JS() external JSBoolean existsSync(JSString path); /// Read the contents of the [path]. - @JS() external JSString readFileSync(JSString path, [JSString encoding]); } diff --git a/pubspec.yaml b/pubspec.yaml index 8378bae..65f86b1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ description: The setup-dart GitHub Action - download and setup the Dart SDK. publish_to: none environment: - sdk: ^3.0.0-356 + sdk: ^3.0.0-417 dependencies: path: ^1.8.0