From b8c0b77d1f6fb52c5ddff2fc3da6cfa3f9585860 Mon Sep 17 00:00:00 2001 From: Devon Carew Date: Mon, 11 Mar 2024 10:55:02 -0700 Subject: [PATCH] no longer specify the inline-class experiment flag (#125) * no longer specify the inline-class experiment flag * rebuild the action --- analysis_options.yaml | 4 - dist/main.cjs | 442 ++++++++++++++++++------------------------ dist/sig.txt | 2 +- package.json | 2 +- pubspec.yaml | 2 +- 5 files changed, 189 insertions(+), 263 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 44831eb..81aa71c 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -3,7 +3,3 @@ include: package:dart_flutter_team_lints/analysis_options.yaml linter: rules: - prefer_relative_imports - -analyzer: - enable-experiment: - - inline-class diff --git a/dist/main.cjs b/dist/main.cjs index 5aeba39..0a0cfb7 100644 --- a/dist/main.cjs +++ b/dist/main.cjs @@ -1,4 +1,4 @@ -// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.4.0-9.0.dev. +// Generated by dart2js (NullSafetyMode.sound, csp, intern-composite-values), the Dart to JavaScript compiler version: 3.4.0-220.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -95,33 +95,6 @@ mixinPropertiesHard(mixin.prototype, cls.prototype); cls.prototype.constructor = cls; } - function lazyOld(holder, name, getterName, initializer) { - var uninitializedSentinel = holder; - holder[name] = uninitializedSentinel; - holder[getterName] = function() { - holder[getterName] = function() { - A.throwCyclicInit(name); - }; - var result; - var sentinelInProgress = initializer; - try { - if (holder[name] === uninitializedSentinel) { - result = holder[name] = sentinelInProgress; - result = holder[name] = initializer(); - } else { - result = holder[name]; - } - } finally { - if (result === sentinelInProgress) { - holder[name] = null; - } - holder[getterName] = function() { - return this[name]; - }; - } - return result; - }; - } function lazy(holder, name, getterName, initializer) { var uninitializedSentinel = holder; holder[name] = uninitializedSentinel; @@ -246,7 +219,7 @@ return installStaticTearOff(container, getterName, requiredParameterCount, optionalParameterDefaultValues, callNames, [name], funType, applyIndex); }; }; - return {inherit: inherit, inheritMany: inheritMany, mixin: mixinEasy, mixinHard: mixinHard, installStaticTearOff: installStaticTearOff, installInstanceTearOff: installInstanceTearOff, _instance_0u: mkInstance(0, 0, null, ["call$0"], 0), _instance_1u: mkInstance(0, 1, null, ["call$1"], 0), _instance_2u: mkInstance(0, 2, null, ["call$2"], 0), _instance_0i: mkInstance(1, 0, null, ["call$0"], 0), _instance_1i: mkInstance(1, 1, null, ["call$1"], 0), _instance_2i: mkInstance(1, 2, null, ["call$2"], 0), _static_0: mkStatic(0, null, ["call$0"], 0), _static_1: mkStatic(1, null, ["call$1"], 0), _static_2: mkStatic(2, null, ["call$2"], 0), makeConstList: makeConstList, lazy: lazy, lazyFinal: lazyFinal, lazyOld: lazyOld, updateHolder: updateHolder, convertToFastObject: convertToFastObject, updateTypes: updateTypes, setOrUpdateInterceptorsByTag: setOrUpdateInterceptorsByTag, setOrUpdateLeafTags: setOrUpdateLeafTags}; + return {inherit: inherit, inheritMany: inheritMany, mixin: mixinEasy, mixinHard: mixinHard, installStaticTearOff: installStaticTearOff, installInstanceTearOff: installInstanceTearOff, _instance_0u: mkInstance(0, 0, null, ["call$0"], 0), _instance_1u: mkInstance(0, 1, null, ["call$1"], 0), _instance_2u: mkInstance(0, 2, null, ["call$2"], 0), _instance_0i: mkInstance(1, 0, null, ["call$0"], 0), _instance_1i: mkInstance(1, 1, null, ["call$1"], 0), _instance_2i: mkInstance(1, 2, null, ["call$2"], 0), _static_0: mkStatic(0, null, ["call$0"], 0), _static_1: mkStatic(1, null, ["call$1"], 0), _static_2: mkStatic(2, null, ["call$2"], 0), makeConstList: makeConstList, lazy: lazy, lazyFinal: lazyFinal, updateHolder: updateHolder, convertToFastObject: convertToFastObject, updateTypes: updateTypes, setOrUpdateInterceptorsByTag: setOrUpdateInterceptorsByTag, setOrUpdateLeafTags: setOrUpdateLeafTags}; }(); function initializeDeferredHunk(hunk) { typesOffset = init.types.length; @@ -823,6 +796,12 @@ } throw A.wrapException(A.RangeError$range(charCode, 0, 1114111, null, null)); }, + Primitives_extractStackTrace(error) { + var jsError = error.$thrownJsError; + if (jsError == null) + return null; + return A.getTraceFromException(jsError); + }, iae(argument) { throw A.wrapException(A.argumentErrorValue(argument)); }, @@ -1954,10 +1933,7 @@ if (testRti === type$.Object) return A._finishIsFn(testRti, object, A._isObject); if (!A.isSoundTopType(testRti)) - if (!(testRti === type$.legacy_Object)) - t1 = false; - else - t1 = true; + t1 = testRti === type$.legacy_Object; else t1 = true; if (t1) @@ -2003,10 +1979,7 @@ var t1, testRti = this, asFn = A._generalAsCheckImplementation; if (!A.isSoundTopType(testRti)) - if (!(testRti === type$.legacy_Object)) - t1 = false; - else - t1 = true; + t1 = testRti === type$.legacy_Object; else t1 = true; if (t1) @@ -2286,10 +2259,7 @@ boundRti = bounds[i]; kind = boundRti._kind; if (!(kind === 2 || kind === 3 || kind === 4 || kind === 5 || boundRti === t1)) - if (!(boundRti === t2)) - t3 = false; - else - t3 = true; + t3 = boundRti === t2; else t3 = true; if (!t3) @@ -3016,10 +2986,7 @@ if (s === t) return true; if (!A.isSoundTopType(t)) - if (!(t === type$.legacy_Object)) - t1 = false; - else - t1 = true; + t1 = t === type$.legacy_Object; else t1 = true; if (t1) @@ -3029,11 +2996,8 @@ return true; if (A.isSoundTopType(s)) return false; - if (s._kind !== 1) - t1 = false; - else - t1 = true; - if (t1) + t1 = s._kind; + if (t1 === 1) return true; leftTypeVariable = sKind === 14; if (leftTypeVariable) @@ -3256,10 +3220,7 @@ isDefinitelyTopType(t) { var t1; if (!A.isSoundTopType(t)) - if (!(t === type$.legacy_Object)) - t1 = false; - else - t1 = true; + t1 = t === type$.legacy_Object; else t1 = true; return t1; @@ -3396,7 +3357,9 @@ var t1, t2, listeners; for (t1 = type$._Future_dynamic; t2 = source._state, (t2 & 4) !== 0;) source = t1._as(source._resultOrListeners); - if ((t2 & 24) !== 0) { + t1 = t2 | target._state & 1; + source._state = t1; + if ((t1 & 24) !== 0) { listeners = target._removeListeners$0(); target._cloneResult$1(source); A._Future__propagateToListeners(target, listeners); @@ -3589,17 +3552,12 @@ } }, scheduleMicrotask(callback) { - var t1, _null = null, + var _null = null, currentZone = $.Zone__current; if (B.C__RootZone === currentZone) { A._rootScheduleMicrotask(_null, _null, B.C__RootZone, callback); return; } - t1 = false; - if (t1) { - A._rootScheduleMicrotask(_null, _null, currentZone, type$.void_Function._as(callback)); - return; - } A._rootScheduleMicrotask(_null, _null, currentZone, type$.void_Function._as(currentZone.bindCallbackGuarded$1(callback))); }, StreamIterator_StreamIterator(stream, $T) { @@ -4275,63 +4233,60 @@ t2 = queryStart > pathStart + 2 && B.JSString_methods.startsWith$2(uri, "/..", queryStart - 3); else t2 = true; - if (t2) { + if (t2) scheme = _null; - isSimple = false; - } else { - if (schemeEnd === 4) - if (B.JSString_methods.startsWith$2(uri, "file", 0)) { - if (hostStart <= 0) { - if (!B.JSString_methods.startsWith$2(uri, "/", pathStart)) { - schemeAuth = "file:///"; - delta = 3; - } else { - schemeAuth = "file://"; - delta = 2; - } - uri = schemeAuth + B.JSString_methods.substring$2(uri, pathStart, end); - schemeEnd -= 0; - t1 = delta - 0; - queryStart += t1; - fragmentStart += t1; - end = uri.length; - hostStart = 7; - portStart = 7; - pathStart = 7; - } else if (pathStart === queryStart) { - ++fragmentStart; - queryStart0 = queryStart + 1; - uri = B.JSString_methods.replaceRange$3(uri, pathStart, queryStart, "/"); - ++end; - queryStart = queryStart0; - } - scheme = "file"; - } else if (B.JSString_methods.startsWith$2(uri, "http", 0)) { - if (t1 && portStart + 3 === pathStart && B.JSString_methods.startsWith$2(uri, "80", portStart + 1)) { - fragmentStart -= 3; - pathStart0 = pathStart - 3; - queryStart -= 3; - uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, ""); - end -= 3; - pathStart = pathStart0; + else if (schemeEnd === 4) + if (B.JSString_methods.startsWith$2(uri, "file", 0)) { + if (hostStart <= 0) { + if (!B.JSString_methods.startsWith$2(uri, "/", pathStart)) { + schemeAuth = "file:///"; + delta = 3; + } else { + schemeAuth = "file://"; + delta = 2; } - scheme = "http"; - } else - scheme = _null; - else if (schemeEnd === 5 && B.JSString_methods.startsWith$2(uri, "https", 0)) { - if (t1 && portStart + 4 === pathStart && B.JSString_methods.startsWith$2(uri, "443", portStart + 1)) { - fragmentStart -= 4; - pathStart0 = pathStart - 4; - queryStart -= 4; + uri = schemeAuth + B.JSString_methods.substring$2(uri, pathStart, end); + schemeEnd -= 0; + t1 = delta - 0; + queryStart += t1; + fragmentStart += t1; + end = uri.length; + hostStart = 7; + portStart = 7; + pathStart = 7; + } else if (pathStart === queryStart) { + ++fragmentStart; + queryStart0 = queryStart + 1; + uri = B.JSString_methods.replaceRange$3(uri, pathStart, queryStart, "/"); + ++end; + queryStart = queryStart0; + } + scheme = "file"; + } else if (B.JSString_methods.startsWith$2(uri, "http", 0)) { + if (t1 && portStart + 3 === pathStart && B.JSString_methods.startsWith$2(uri, "80", portStart + 1)) { + fragmentStart -= 3; + pathStart0 = pathStart - 3; + queryStart -= 3; uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, ""); end -= 3; pathStart = pathStart0; } - scheme = "https"; + scheme = "http"; } else scheme = _null; - isSimple = true; - } + else if (schemeEnd === 5 && B.JSString_methods.startsWith$2(uri, "https", 0)) { + if (t1 && portStart + 4 === pathStart && B.JSString_methods.startsWith$2(uri, "443", portStart + 1)) { + fragmentStart -= 4; + pathStart0 = pathStart - 4; + queryStart -= 4; + uri = B.JSString_methods.replaceRange$3(uri, portStart, pathStart, ""); + end -= 3; + pathStart = pathStart0; + } + scheme = "https"; + } else + scheme = _null; + isSimple = !t2; } } } @@ -4599,8 +4554,8 @@ if (char < 127) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_M1A, t2); - t2 = (B.List_M1A[t2] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_piR, t2); + t2 = (B.List_piR[t2] & 1 << (char & 15)) !== 0; } else t2 = false; if (t2) { @@ -4634,7 +4589,8 @@ } else t2 = buffer; t2._contents += slice; - t2._contents += A._Uri__escapeChar(char); + t3 = A._Uri__escapeChar(char); + t2._contents += t3; index += sourceLength; sectionStart = index; } @@ -4642,8 +4598,10 @@ } if (buffer == null) return B.JSString_methods.substring$2(host, start, end); - if (sectionStart < end) - buffer._contents += B.JSString_methods.substring$2(host, sectionStart, end); + if (sectionStart < end) { + slice = B.JSString_methods.substring$2(host, sectionStart, end); + buffer._contents += slice; + } t1 = buffer._contents; return t1.charCodeAt(0) == 0 ? t1 : t1; }, @@ -4663,7 +4621,9 @@ if (buffer == null) buffer = new A.StringBuffer(""); slice = B.JSString_methods.substring$2(host, sectionStart, index); - t3 = buffer._contents += !isNormalized ? slice.toLowerCase() : slice; + if (!isNormalized) + slice = slice.toLowerCase(); + t3 = buffer._contents += slice; if (t2) { replacement = B.JSString_methods.substring$2(host, index, index + 3); sourceLength = 3; @@ -4680,8 +4640,8 @@ if (char < 127) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_ejq, t2); - t2 = (B.List_ejq[t2] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_4AN, t2); + t2 = (B.List_4AN[t2] & 1 << (char & 15)) !== 0; } else t2 = false; if (t2) { @@ -4699,8 +4659,8 @@ if (char <= 93) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_YmH, t2); - t2 = (B.List_YmH[t2] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_VOY, t2); + t2 = (B.List_VOY[t2] & 1 << (char & 15)) !== 0; } else t2 = false; if (t2) @@ -4727,7 +4687,8 @@ } else t2 = buffer; t2._contents += slice; - t2._contents += A._Uri__escapeChar(char); + t3 = A._Uri__escapeChar(char); + t2._contents += t3; index += sourceLength; sectionStart = index; } @@ -4738,7 +4699,9 @@ return B.JSString_methods.substring$2(host, start, end); if (sectionStart < end) { slice = B.JSString_methods.substring$2(host, sectionStart, end); - buffer._contents += !isNormalized ? slice.toLowerCase() : slice; + if (!isNormalized) + slice = slice.toLowerCase(); + buffer._contents += slice; } t1 = buffer._contents; return t1.charCodeAt(0) == 0 ? t1 : t1; @@ -4759,8 +4722,8 @@ if (codeUnit < 128) { t2 = codeUnit >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_MMm, t2); - t2 = (B.List_MMm[t2] & 1 << (codeUnit & 15)) !== 0; + return A.ioore(B.List_GVy, t2); + t2 = (B.List_GVy[t2] & 1 << (codeUnit & 15)) !== 0; } else t2 = false; if (!t2) @@ -4785,12 +4748,12 @@ _Uri__makeUserInfo(userInfo, start, end) { if (userInfo == null) return ""; - return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_OL3, false, false); + return A._Uri__normalizeOrSubstring(userInfo, start, end, B.List_2jN, false, false); }, _Uri__makePath(path, start, end, pathSegments, scheme, hasAuthority) { var isFile = scheme === "file", ensureLeadingSlash = isFile || hasAuthority, - result = A._Uri__normalizeOrSubstring(path, start, end, B.List_XRg, true, true); + result = A._Uri__normalizeOrSubstring(path, start, end, B.List_M2I, true, true); if (result.length === 0) { if (isFile) return "/"; @@ -4806,13 +4769,13 @@ }, _Uri__makeQuery(query, start, end, queryParameters) { if (query != null) - return A._Uri__normalizeOrSubstring(query, start, end, B.List_oFp, true, false); + return A._Uri__normalizeOrSubstring(query, start, end, B.List_42A, true, false); return null; }, _Uri__makeFragment(fragment, start, end) { if (fragment == null) return null; - return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_oFp, true, false); + return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_42A, true, false); }, _Uri__normalizeEscape(source, index, lowerCase) { var t3, firstDigit, secondDigit, firstDigitValue, secondDigitValue, value, @@ -4835,8 +4798,8 @@ if (value < 127) { t1 = B.JSInt_methods._shrOtherPositive$1(value, 4); if (!(t1 < 8)) - return A.ioore(B.List_M1A, t1); - t1 = (B.List_M1A[t1] & 1 << (value & 15)) !== 0; + return A.ioore(B.List_piR, t1); + t1 = (B.List_piR[t1] & 1 << (value & 15)) !== 0; } else t1 = false; if (t1) @@ -4931,8 +4894,8 @@ if (char <= 93) { t3 = char >>> 4; if (!(t3 < 8)) - return A.ioore(B.List_YmH, t3); - t3 = (B.List_YmH[t3] & 1 << (char & 15)) !== 0; + return A.ioore(B.List_VOY, t3); + t3 = (B.List_VOY[t3] & 1 << (char & 15)) !== 0; } else t3 = false; else @@ -4975,8 +4938,10 @@ } if (buffer == null) return _null; - if (sectionStart < end) - buffer._contents += B.JSString_methods.substring$2(component, sectionStart, end); + if (sectionStart < end) { + t1 = B.JSString_methods.substring$2(component, sectionStart, end); + buffer._contents += t1; + } t1 = buffer._contents; return t1.charCodeAt(0) == 0 ? t1 : t1; }, @@ -5002,11 +4967,10 @@ B.JSArray_methods.add$1(output, ""); } appendSlash = true; - } else if ("." === segment) - appendSlash = true; - else { - B.JSArray_methods.add$1(output, segment); - appendSlash = false; + } else { + appendSlash = "." === segment; + if (!appendSlash) + B.JSArray_methods.add$1(output, segment); } } if (appendSlash) @@ -5020,21 +4984,18 @@ output = A._setArrayType([], type$.JSArray_String); for (t1 = path.split("/"), t2 = t1.length, appendSlash = false, _i = 0; _i < t2; ++_i) { segment = t1[_i]; - if (".." === segment) - if (output.length !== 0 && B.JSArray_methods.get$last(output) !== "..") { + if (".." === segment) { + appendSlash = output.length !== 0 && B.JSArray_methods.get$last(output) !== ".."; + if (appendSlash) { if (0 >= output.length) return A.ioore(output, -1); output.pop(); - appendSlash = true; - } else { + } else B.JSArray_methods.add$1(output, ".."); - appendSlash = false; - } - else if ("." === segment) - appendSlash = true; - else { - B.JSArray_methods.add$1(output, segment); - appendSlash = false; + } else { + appendSlash = "." === segment; + if (!appendSlash) + B.JSArray_methods.add$1(output, segment); } } t1 = output.length; @@ -5069,8 +5030,8 @@ if (char <= 127) { t2 = char >>> 4; if (!(t2 < 8)) - return A.ioore(B.List_MMm, t2); - t2 = (B.List_MMm[t2] & 1 << (char & 15)) === 0; + return A.ioore(B.List_GVy, t2); + t2 = (B.List_GVy[t2] & 1 << (char & 15)) === 0; } else t2 = true; if (t2) @@ -5110,10 +5071,7 @@ return A.ioore(text, i); codeUnit = text.charCodeAt(i); if (codeUnit <= 127) - if (codeUnit !== 37) - t2 = false; - else - t2 = true; + t2 = codeUnit === 37; else t2 = true; if (t2) { @@ -5122,16 +5080,12 @@ } ++i; } - if (simple) { - if (B.C_Utf8Codec !== encoding) - t1 = false; - else - t1 = true; - if (t1) + if (simple) + if (B.C_Utf8Codec === encoding) return B.JSString_methods.substring$2(text, start, end); else bytes = new A.CodeUnits(B.JSString_methods.substring$2(text, start, end)); - } else { + else { bytes = A._setArrayType([], type$.JSArray_int); for (i = start; i < end; ++i) { if (!(i < t1)) @@ -5200,7 +5154,7 @@ if ((indices.length & 1) === 1) text = B.C_Base64Codec.normalize$3(text, t2, t1); else { - data = A._Uri__normalize(text, t2, t1, B.List_oFp, true, false); + data = A._Uri__normalize(text, t2, t1, B.List_42A, true, false); if (data != null) text = B.JSString_methods.replaceRange$3(text, t2, t1, data); } @@ -5496,30 +5450,6 @@ return object; return new A.jsify__convert(new A._IdentityHashMap(type$._IdentityHashMap_of_nullable_Object_and_nullable_Object)).call$1(object); }, - callMethod(o, method, args, $T) { - return $T._as(o[method].apply(o, args)); - }, - callConstructor(constr, $arguments, $T) { - var args, factoryFunction; - if ($arguments instanceof Array) - switch ($arguments.length) { - case 0: - return $T._as(new constr()); - case 1: - return $T._as(new constr($arguments[0])); - case 2: - return $T._as(new constr($arguments[0], $arguments[1])); - case 3: - return $T._as(new constr($arguments[0], $arguments[1], $arguments[2])); - case 4: - return $T._as(new constr($arguments[0], $arguments[1], $arguments[2], $arguments[3])); - } - args = [null]; - B.JSArray_methods.addAll$1(args, $arguments); - factoryFunction = constr.bind.apply(constr, args); - String(factoryFunction); - return $T._as(new factoryFunction()); - }, promiseToFuture(jsPromise, $T) { var t1 = new A._Future($.Zone__current, $T._eval$1("_Future<0>")), completer = new A._AsyncCompleter(t1, $T._eval$1("_AsyncCompleter<0>")); @@ -5631,7 +5561,10 @@ fragment = A._Uri__makeFragment(_null, 0, 0); port = A._Uri__makePort(_null, ""); if (host == null) - t1 = userInfo.length !== 0 || port != null || false; + if (userInfo.length === 0) + t1 = port != null; + else + t1 = true; else t1 = false; if (t1) @@ -5954,7 +5887,7 @@ versionFilePath = A.join(sdkPath, "version"); t4.setOutput("dart-version", B.JSString_methods.trim$0(A._asString(t2._as(t1.fs).readFileSync(versionFilePath, "utf8")))); $async$goto = 21; - return A._asyncAwait(A.promiseToFuture(A.callMethod(t2._as(t1.exec), "exec", ["dart", A._setArrayType(["--version"], type$.JSArray_String)], t2), type$.void), $async$_impl); + return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.exec).exec("dart", A._setArrayType(["--version"], type$.JSArray_String))), type$.void), $async$_impl); case 21: // returning from await. case 1: @@ -6008,7 +5941,7 @@ token = $async$result; t2._as(t1.core).exportVariable("PUB_TOKEN", token); $async$goto = 4; - return A._asyncAwait(A.promiseToFuture(A.callMethod(t2._as(t1.exec), "exec", ["dart", A._setArrayType(["pub", "token", "add", "https://pub.dev", "--env-var", "PUB_TOKEN"], type$.JSArray_String)], t2), type$.void), $async$createPubOIDCToken); + return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(t1.exec).exec("dart", A._setArrayType(["pub", "token", "add", "https://pub.dev", "--env-var", "PUB_TOKEN"], type$.JSArray_String))), type$.void), $async$createPubOIDCToken); case 4: // returning from await. case 1: @@ -6033,7 +5966,7 @@ $async$temp1 = type$.FutureOr_String; $async$temp2 = t1; $async$goto = 3; - return A._asyncAwait(A.promiseToFuture(t1._as(A.callConstructor(self.HttpClient, ["setup-dart", A._setArrayType([], type$.JSArray_Object), type$.nullable_JSObject._as(A.jsify(A.LinkedHashMap_LinkedHashMap$_literal(["allowRedirects", true, "maxRedirects", 3, "allowRetries", true, "maxRetries", 3], type$.String, type$.Object)))], t1).getJson(string$.https_ + channel + "/" + flavor + "/latest/VERSION")), t1), $async$latestPublishedVersion); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(new self.HttpClient("setup-dart", A._setArrayType([], type$.JSArray_Object), type$.nullable_JSObject._as(A.jsify(A.LinkedHashMap_LinkedHashMap$_literal(["allowRedirects", true, "maxRedirects", 3, "allowRetries", true, "maxRetries", 3], type$.String, type$.Object))))).getJson(string$.https_ + channel + "/" + flavor + "/latest/VERSION")), t1), $async$latestPublishedVersion); case 3: // returning from await. $async$returnValue = $async$temp1._as($async$temp2._as($async$result.result).version); @@ -6064,7 +5997,7 @@ $async$temp2 = type$.List_dynamic; $async$temp3 = t2; $async$goto = 3; - return A._asyncAwait(A.promiseToFuture(t2._as(A.callConstructor(self.HttpClient, ["setup-dart", A._setArrayType([], type$.JSArray_Object), type$.nullable_JSObject._as(A.jsify(A.LinkedHashMap_LinkedHashMap$_literal(["allowRedirects", true, "maxRedirects", 3, "allowRetries", true, "maxRetries", 3], t1, type$.Object)))], t2).getJson("https://storage.googleapis.com/storage/v1/b/dart-archive/o?prefix=" + ("channels/stable/release/" + sdkRelease + ".") + "&delimiter=/")), t2), $async$findLatestSdkForRelease); + return A._asyncAwait(A.promiseToFuture(t2._as(t2._as(new self.HttpClient("setup-dart", A._setArrayType([], type$.JSArray_Object), type$.nullable_JSObject._as(A.jsify(A.LinkedHashMap_LinkedHashMap$_literal(["allowRedirects", true, "maxRedirects", 3, "allowRetries", true, "maxRetries", 3], t1, type$.Object))))).getJson("https://storage.googleapis.com/storage/v1/b/dart-archive/o?prefix=" + ("channels/stable/release/" + sdkRelease + ".") + "&delimiter=/")), t2), $async$findLatestSdkForRelease); case 3: // returning from await. paths = $async$temp1.cast$1$0$ax($async$temp2._as($async$temp3._as($async$result.result).prefixes), t1); @@ -6237,24 +6170,9 @@ A._arrayInstanceType(receiver)._eval$1("Iterable<1>")._as(collection); if (!!receiver.fixed$length) A.throwExpression(A.UnsupportedError$("addAll")); - if (Array.isArray(collection)) { - this._addAllFromArray$1(receiver, collection); - return; - } - for (t1 = J.get$iterator$ax(collection); t1.moveNext$0();) + for (t1 = collection.get$iterator(collection); t1.moveNext$0();) receiver.push(t1.get$current()); }, - _addAllFromArray$1(receiver, array) { - var len, i; - type$.JSArray_dynamic._as(array); - len = array.length; - if (len === 0) - return; - if (receiver === array) - throw A.wrapException(A.ConcurrentModificationError$(receiver)); - for (i = 0; i < len; ++i) - receiver.push(array[i]); - }, map$1$1(receiver, f, $T) { var t1 = A._arrayInstanceType(receiver); return new A.MappedListIterable(receiver, t1._bind$1($T)._eval$1("1(2)")._as(f), t1._eval$1("@<1>")._bind$1($T)._eval$1("MappedListIterable<1,2>")); @@ -7267,7 +7185,7 @@ }; A.NativeByteBuffer.prototype = { get$runtimeType(receiver) { - return B.Type_ByteBuffer_RkP; + return B.Type_ByteBuffer_EOZ; }, $isTrustedGetRuntimeType: 1, $isByteBuffer: 1 @@ -7275,7 +7193,7 @@ A.NativeTypedData.prototype = {}; A.NativeByteData.prototype = { get$runtimeType(receiver) { - return B.Type_ByteData_zNC; + return B.Type_ByteData_mF8; }, $isTrustedGetRuntimeType: 1, $isByteData: 1 @@ -7312,21 +7230,21 @@ }; A.NativeFloat32List.prototype = { get$runtimeType(receiver) { - return B.Type_Float32List_LB7; + return B.Type_Float32List_Ymk; }, $isTrustedGetRuntimeType: 1, $isFloat32List: 1 }; A.NativeFloat64List.prototype = { get$runtimeType(receiver) { - return B.Type_Float64List_LB7; + return B.Type_Float64List_Ymk; }, $isTrustedGetRuntimeType: 1, $isFloat64List: 1 }; A.NativeInt16List.prototype = { get$runtimeType(receiver) { - return B.Type_Int16List_uXf; + return B.Type_Int16List_cot; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -7337,7 +7255,7 @@ }; A.NativeInt32List.prototype = { get$runtimeType(receiver) { - return B.Type_Int32List_O50; + return B.Type_Int32List_m1p; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -7348,7 +7266,7 @@ }; A.NativeInt8List.prototype = { get$runtimeType(receiver) { - return B.Type_Int8List_ekJ; + return B.Type_Int8List_woc; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -7359,7 +7277,7 @@ }; A.NativeUint16List.prototype = { get$runtimeType(receiver) { - return B.Type_Uint16List_2bx; + return B.Type_Uint16List_2mh; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -7370,7 +7288,7 @@ }; A.NativeUint32List.prototype = { get$runtimeType(receiver) { - return B.Type_Uint32List_2bx; + return B.Type_Uint32List_2mh; }, $index(receiver, index) { A._checkValidIndex(index, receiver, receiver.length); @@ -7381,7 +7299,7 @@ }; A.NativeUint8ClampedList.prototype = { get$runtimeType(receiver) { - return B.Type_Uint8ClampedList_Jik; + return B.Type_Uint8ClampedList_9Bb; }, get$length(receiver) { return receiver.length; @@ -7395,7 +7313,7 @@ }; A.NativeUint8List.prototype = { get$runtimeType(receiver) { - return B.Type_Uint8List_WLA; + return B.Type_Uint8List_CSc; }, get$length(receiver) { return receiver.length; @@ -8177,9 +8095,11 @@ this.result._contents += ", "; t1.first = false; t1 = this.result; - t2 = t1._contents += A.S(k); + t2 = A.S(k); + t2 = t1._contents += t2; t1._contents = t2 + ": "; - t1._contents += A.S(v); + t2 = A.S(v); + t1._contents += t2; }, $signature: 16 }; @@ -8209,7 +8129,7 @@ }; A.Base64Codec.prototype = { normalize$3(source, start, end) { - var inverseAlphabet, t2, i, sliceStart, buffer, firstPadding, firstPaddingSourceIndex, paddingCount, i0, char, i1, digit1, t3, digit2, char0, value, endLength, $length, + var inverseAlphabet, t2, i, sliceStart, buffer, firstPadding, firstPaddingSourceIndex, paddingCount, i0, char, i1, digit1, t3, digit2, char0, value, t4, endLength, $length, _s64_ = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", _s31_ = "Invalid base64 encoding length ", t1 = source.length; @@ -8271,7 +8191,8 @@ } else t3 = buffer; t3._contents += B.JSString_methods.substring$2(source, sliceStart, i); - t3._contents += A.Primitives_stringFromCharCode(char); + t4 = A.Primitives_stringFromCharCode(char); + t3._contents += t4; sliceStart = i0; continue; } @@ -8279,7 +8200,8 @@ throw A.wrapException(A.FormatException$("Invalid base64 data", source, i)); } if (buffer != null) { - t1 = buffer._contents += B.JSString_methods.substring$2(source, sliceStart, end); + t1 = B.JSString_methods.substring$2(source, sliceStart, end); + t1 = buffer._contents += t1; t2 = t1.length; if (firstPadding >= 0) A.Base64Codec__checkPadding(source, firstPaddingSourceIndex, end, firstPadding, paddingCount, t2); @@ -8391,7 +8313,8 @@ return A.ioore(_s144_, t3); state = _s144_.charCodeAt(t3); if (state === 0) { - buffer._contents += A.Primitives_stringFromCharCode(char); + t3 = A.Primitives_stringFromCharCode(char); + buffer._contents += t3; if (i === end) break $label0$0; break; @@ -8400,14 +8323,17 @@ switch (state) { case 69: case 67: - buffer._contents += A.Primitives_stringFromCharCode(_65533); + t3 = A.Primitives_stringFromCharCode(_65533); + buffer._contents += t3; break; case 65: - buffer._contents += A.Primitives_stringFromCharCode(_65533); + t3 = A.Primitives_stringFromCharCode(_65533); + buffer._contents += t3; --i; break; default: - t3 = buffer._contents += A.Primitives_stringFromCharCode(_65533); + t3 = A.Primitives_stringFromCharCode(_65533); + t3 = buffer._contents += t3; buffer._contents = t3 + A.Primitives_stringFromCharCode(_65533); break; } @@ -8450,10 +8376,13 @@ for (m = i; m < markEnd; ++m) { if (!(m < t1)) return A.ioore(bytes, m); - buffer._contents += A.Primitives_stringFromCharCode(bytes[m]); + t3 = A.Primitives_stringFromCharCode(bytes[m]); + buffer._contents += t3; } - else - buffer._contents += A.String_String$fromCharCodes(bytes, i, markEnd); + else { + t3 = A.String_String$fromCharCodes(bytes, i, markEnd); + buffer._contents += t3; + } if (markEnd === end) break $label0$0; i = i0; @@ -8461,9 +8390,10 @@ i = i0; } if (single && state > 32) - if (t2) - buffer._contents += A.Primitives_stringFromCharCode(_65533); - else { + if (t2) { + t1 = A.Primitives_stringFromCharCode(_65533); + buffer._contents += t1; + } else { _this._convert$_state = 77; _this._charOrIndex = end; return ""; @@ -8476,7 +8406,7 @@ }; A.Error.prototype = { get$stackTrace() { - return A.getTraceFromException(this.$thrownJsError); + return A.Primitives_extractStackTrace(this); } }; A.AssertionError.prototype = { @@ -8939,11 +8869,11 @@ queryIndex = B.JSString_methods.indexOf$2(t2, "?", t1); end = t2.length; if (queryIndex >= 0) { - query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_oFp, false, false); + query = A._Uri__normalizeOrSubstring(t2, queryIndex + 1, end, B.List_42A, false, false); end = queryIndex; } else query = _null; - t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_XRg, false, false), query, _null); + t1 = _this._uriCache = new A._DataUri("data", "", _null, _null, A._Uri__normalizeOrSubstring(t2, t1, end, B.List_M2I, false, false), query, _null); } return t1; }, @@ -9835,26 +9765,26 @@ B.C_Utf8Codec = new A.Utf8Codec(); B.C__RootZone = new A._RootZone(); B.C__StringStackTrace = new A._StringStackTrace(); - B.List_M1A = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 34815, 65534, 18431]), type$.JSArray_int); - B.List_MMm = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int); - B.List_OL3 = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int); - B.List_XRg = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int); - B.List_YmH = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int); - B.List_ejq = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int); + B.List_2jN = A._setArrayType(makeConstList([0, 0, 32722, 12287, 65534, 34815, 65534, 18431]), type$.JSArray_int); + B.List_42A = A._setArrayType(makeConstList([0, 0, 65490, 45055, 65535, 34815, 65534, 18431]), type$.JSArray_int); + B.List_4AN = A._setArrayType(makeConstList([0, 0, 32754, 11263, 65534, 34815, 65534, 18431]), type$.JSArray_int); + B.List_GVy = A._setArrayType(makeConstList([0, 0, 26624, 1023, 65534, 2047, 65534, 2047]), type$.JSArray_int); + B.List_M2I = A._setArrayType(makeConstList([0, 0, 65490, 12287, 65535, 34815, 65534, 18431]), type$.JSArray_int); + B.List_VOY = A._setArrayType(makeConstList([0, 0, 32776, 33792, 1, 10240, 0, 0]), type$.JSArray_int); 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_piR = A._setArrayType(makeConstList([0, 0, 24576, 1023, 65534, 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.Type_ByteBuffer_EOZ = A.typeLiteral("ByteBuffer"); + B.Type_ByteData_mF8 = A.typeLiteral("ByteData"); + B.Type_Float32List_Ymk = A.typeLiteral("Float32List"); + B.Type_Float64List_Ymk = A.typeLiteral("Float64List"); + B.Type_Int16List_cot = A.typeLiteral("Int16List"); + B.Type_Int32List_m1p = A.typeLiteral("Int32List"); + B.Type_Int8List_woc = A.typeLiteral("Int8List"); + B.Type_Uint16List_2mh = A.typeLiteral("Uint16List"); + B.Type_Uint32List_2mh = A.typeLiteral("Uint32List"); + B.Type_Uint8ClampedList_9Bb = A.typeLiteral("Uint8ClampedList"); + B.Type_Uint8List_CSc = A.typeLiteral("Uint8List"); B.Utf8Decoder_false = new A.Utf8Decoder(false); })(); (function staticFields() { diff --git a/dist/sig.txt b/dist/sig.txt index e8a34ea..b424e67 100644 --- a/dist/sig.txt +++ b/dist/sig.txt @@ -1 +1 @@ -46eaeff23d36eff012b8b95892a67285 +e76f61ce34065bf3985e7b7084f42a34 diff --git a/package.json b/package.json index ad862f1..ac02b3d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "description": "The setup-dart GitHub Action - download and setup the Dart SDK.", "main": "lib/main.mjs", "scripts": { - "build": "dart compile js --enable-experiment=inline-class -olib/main.js lib/main.dart && dart tool/sig.dart --generate", + "build": "dart compile js -olib/main.js lib/main.dart && dart tool/sig.dart --generate", "dist": "ncc build lib/main.mjs && cp lib/main.js dist/main.cjs && cp lib/sig.txt dist/sig.txt", "all": "npm run build && npm run dist" }, diff --git a/pubspec.yaml b/pubspec.yaml index 9a9437a..36beac6 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.3.0-0 + sdk: ^3.3.0 dependencies: path: ^1.8.0