diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c57aa2..d14b4d9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,3 +19,4 @@ jobs: - run: dart pub get - run: dart analyze --fatal-infos - run: dart tool/sig.dart --verify + - run: npm run build diff --git a/dist/index.mjs b/dist/index.mjs index a70823b..00dd09b 100644 --- a/dist/index.mjs +++ b/dist/index.mjs @@ -1,7 +1,7 @@ import { createRequire as __WEBPACK_EXTERNAL_createRequire } from "module"; /******/ var __webpack_modules__ = ({ -/***/ 8949: +/***/ 2690: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -27,7 +27,7 @@ var __importStar = (this && this.__importStar) || function (mod) { Object.defineProperty(exports, "__esModule", ({ value: true })); exports.issue = exports.issueCommand = void 0; const os = __importStar(__nccwpck_require__(2037)); -const utils_1 = __nccwpck_require__(3254); +const utils_1 = __nccwpck_require__(353); /** * Commands * @@ -99,7 +99,7 @@ function escapeProperty(s) { /***/ }), -/***/ 7232: +/***/ 9935: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -133,12 +133,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.getIDToken = exports.getState = exports.saveState = exports.group = exports.endGroup = exports.startGroup = exports.info = exports.notice = exports.warning = exports.error = exports.debug = exports.isDebug = exports.setFailed = exports.setCommandEcho = exports.setOutput = exports.getBooleanInput = exports.getMultilineInput = exports.getInput = exports.addPath = exports.setSecret = exports.exportVariable = exports.ExitCode = void 0; -const command_1 = __nccwpck_require__(8949); -const file_command_1 = __nccwpck_require__(2302); -const utils_1 = __nccwpck_require__(3254); +const command_1 = __nccwpck_require__(2690); +const file_command_1 = __nccwpck_require__(5898); +const utils_1 = __nccwpck_require__(353); const os = __importStar(__nccwpck_require__(2037)); const path = __importStar(__nccwpck_require__(1017)); -const oidc_utils_1 = __nccwpck_require__(2538); +const oidc_utils_1 = __nccwpck_require__(7901); /** * The code to exit an action */ @@ -423,17 +423,17 @@ exports.getIDToken = getIDToken; /** * Summary exports */ -var summary_1 = __nccwpck_require__(8295); +var summary_1 = __nccwpck_require__(9050); Object.defineProperty(exports, "summary", ({ enumerable: true, get: function () { return summary_1.summary; } })); /** * @deprecated use core.summary */ -var summary_2 = __nccwpck_require__(8295); +var summary_2 = __nccwpck_require__(9050); Object.defineProperty(exports, "markdownSummary", ({ enumerable: true, get: function () { return summary_2.markdownSummary; } })); /** * Path exports */ -var path_utils_1 = __nccwpck_require__(422); +var path_utils_1 = __nccwpck_require__(1341); Object.defineProperty(exports, "toPosixPath", ({ enumerable: true, get: function () { return path_utils_1.toPosixPath; } })); Object.defineProperty(exports, "toWin32Path", ({ enumerable: true, get: function () { return path_utils_1.toWin32Path; } })); Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: function () { return path_utils_1.toPlatformPath; } })); @@ -441,7 +441,7 @@ Object.defineProperty(exports, "toPlatformPath", ({ enumerable: true, get: funct /***/ }), -/***/ 2302: +/***/ 5898: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -471,8 +471,8 @@ exports.prepareKeyValueMessage = exports.issueFileCommand = void 0; /* eslint-disable @typescript-eslint/no-explicit-any */ const fs = __importStar(__nccwpck_require__(7147)); const os = __importStar(__nccwpck_require__(2037)); -const uuid_1 = __nccwpck_require__(7857); -const utils_1 = __nccwpck_require__(3254); +const uuid_1 = __nccwpck_require__(1368); +const utils_1 = __nccwpck_require__(353); function issueFileCommand(command, message) { const filePath = process.env[`GITHUB_${command}`]; if (!filePath) { @@ -505,7 +505,7 @@ exports.prepareKeyValueMessage = prepareKeyValueMessage; /***/ }), -/***/ 2538: +/***/ 7901: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -520,9 +520,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.OidcClient = void 0; -const http_client_1 = __nccwpck_require__(604); -const auth_1 = __nccwpck_require__(8779); -const core_1 = __nccwpck_require__(7232); +const http_client_1 = __nccwpck_require__(3658); +const auth_1 = __nccwpck_require__(2660); +const core_1 = __nccwpck_require__(9935); class OidcClient { static createHttpClient(allowRetry = true, maxRetry = 10) { const requestOptions = { @@ -588,7 +588,7 @@ exports.OidcClient = OidcClient; /***/ }), -/***/ 422: +/***/ 1341: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -652,7 +652,7 @@ exports.toPlatformPath = toPlatformPath; /***/ }), -/***/ 8295: +/***/ 9050: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -941,7 +941,7 @@ exports.summary = _summary; /***/ }), -/***/ 3254: +/***/ 353: /***/ ((__unused_webpack_module, exports) => { @@ -987,7 +987,7 @@ exports.toCommandProperties = toCommandProperties; /***/ }), -/***/ 7889: +/***/ 3409: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1022,7 +1022,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge Object.defineProperty(exports, "__esModule", ({ value: true })); exports.getExecOutput = exports.exec = void 0; const string_decoder_1 = __nccwpck_require__(1576); -const tr = __importStar(__nccwpck_require__(9565)); +const tr = __importStar(__nccwpck_require__(1139)); /** * Exec a command. * Output will be streamed to the live console. @@ -1096,7 +1096,7 @@ exports.getExecOutput = getExecOutput; /***/ }), -/***/ 9565: +/***/ 1139: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1134,8 +1134,8 @@ const os = __importStar(__nccwpck_require__(2037)); const events = __importStar(__nccwpck_require__(2361)); const child = __importStar(__nccwpck_require__(2081)); const path = __importStar(__nccwpck_require__(1017)); -const io = __importStar(__nccwpck_require__(6724)); -const ioUtil = __importStar(__nccwpck_require__(9302)); +const io = __importStar(__nccwpck_require__(2725)); +const ioUtil = __importStar(__nccwpck_require__(573)); const timers_1 = __nccwpck_require__(9512); /* eslint-disable @typescript-eslint/unbound-method */ const IS_WINDOWS = process.platform === 'win32'; @@ -1720,7 +1720,7 @@ class ExecState extends events.EventEmitter { /***/ }), -/***/ 8779: +/***/ 2660: /***/ (function(__unused_webpack_module, exports) { @@ -1807,7 +1807,7 @@ exports.PersonalAccessTokenCredentialHandler = PersonalAccessTokenCredentialHand /***/ }), -/***/ 604: +/***/ 3658: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1844,8 +1844,8 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.HttpClient = exports.isHttps = exports.HttpClientResponse = exports.HttpClientError = exports.getProxyUrl = exports.MediaTypes = exports.Headers = exports.HttpCodes = void 0; const http = __importStar(__nccwpck_require__(3685)); const https = __importStar(__nccwpck_require__(5687)); -const pm = __importStar(__nccwpck_require__(8933)); -const tunnel = __importStar(__nccwpck_require__(3919)); +const pm = __importStar(__nccwpck_require__(9697)); +const tunnel = __importStar(__nccwpck_require__(7477)); var HttpCodes; (function (HttpCodes) { HttpCodes[HttpCodes["OK"] = 200] = "OK"; @@ -2418,7 +2418,7 @@ const lowercaseKeys = (obj) => Object.keys(obj).reduce((c, k) => ((c[k.toLowerCa /***/ }), -/***/ 8933: +/***/ 9697: /***/ ((__unused_webpack_module, exports) => { @@ -2485,7 +2485,7 @@ exports.checkBypass = checkBypass; /***/ }), -/***/ 9302: +/***/ 573: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2668,7 +2668,7 @@ exports.getCmdPath = getCmdPath; /***/ }), -/***/ 6724: +/***/ 2725: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2706,7 +2706,7 @@ const assert_1 = __nccwpck_require__(9491); const childProcess = __importStar(__nccwpck_require__(2081)); const path = __importStar(__nccwpck_require__(1017)); const util_1 = __nccwpck_require__(3837); -const ioUtil = __importStar(__nccwpck_require__(9302)); +const ioUtil = __importStar(__nccwpck_require__(573)); const exec = util_1.promisify(childProcess.exec); const execFile = util_1.promisify(childProcess.execFile); /** @@ -3015,7 +3015,7 @@ function copyFile(srcFile, destFile, force) { /***/ }), -/***/ 5919: +/***/ 7936: /***/ (function(module, exports, __nccwpck_require__) { @@ -3049,8 +3049,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports._readLinuxVersionFile = exports._getOsVersion = exports._findMatch = void 0; -const semver = __importStar(__nccwpck_require__(490)); -const core_1 = __nccwpck_require__(7232); +const semver = __importStar(__nccwpck_require__(7163)); +const core_1 = __nccwpck_require__(9935); // needs to be require for core node modules to be mocked /* eslint @typescript-eslint/no-require-imports: 0 */ const os = __nccwpck_require__(2037); @@ -3149,7 +3149,7 @@ exports._readLinuxVersionFile = _readLinuxVersionFile; /***/ }), -/***/ 6217: +/***/ 721: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -3183,7 +3183,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.RetryHelper = void 0; -const core = __importStar(__nccwpck_require__(7232)); +const core = __importStar(__nccwpck_require__(9935)); /** * Internal class for retries */ @@ -3238,7 +3238,7 @@ exports.RetryHelper = RetryHelper; /***/ }), -/***/ 6511: +/***/ 2275: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -3275,20 +3275,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) { }; Object.defineProperty(exports, "__esModule", ({ value: true })); exports.evaluateVersions = exports.isExplicitVersion = exports.findFromManifest = exports.getManifestFromRepo = exports.findAllVersions = exports.find = exports.cacheFile = exports.cacheDir = exports.extractZip = exports.extractXar = exports.extractTar = exports.extract7z = exports.downloadTool = exports.HTTPError = void 0; -const core = __importStar(__nccwpck_require__(7232)); -const io = __importStar(__nccwpck_require__(6724)); +const core = __importStar(__nccwpck_require__(9935)); +const io = __importStar(__nccwpck_require__(2725)); const fs = __importStar(__nccwpck_require__(7147)); -const mm = __importStar(__nccwpck_require__(5919)); +const mm = __importStar(__nccwpck_require__(7936)); const os = __importStar(__nccwpck_require__(2037)); const path = __importStar(__nccwpck_require__(1017)); -const httpm = __importStar(__nccwpck_require__(604)); -const semver = __importStar(__nccwpck_require__(490)); +const httpm = __importStar(__nccwpck_require__(3658)); +const semver = __importStar(__nccwpck_require__(7163)); const stream = __importStar(__nccwpck_require__(2781)); const util = __importStar(__nccwpck_require__(3837)); const assert_1 = __nccwpck_require__(9491); -const v4_1 = __importDefault(__nccwpck_require__(819)); -const exec_1 = __nccwpck_require__(7889); -const retry_helper_1 = __nccwpck_require__(6217); +const v4_1 = __importDefault(__nccwpck_require__(4559)); +const exec_1 = __nccwpck_require__(3409); +const retry_helper_1 = __nccwpck_require__(721); class HTTPError extends Error { constructor(httpStatusCode) { super(`Unexpected HTTP response: ${httpStatusCode}`); @@ -3909,7 +3909,7 @@ function _unique(values) { /***/ }), -/***/ 2906: +/***/ 6993: /***/ ((module) => { /** @@ -3942,7 +3942,7 @@ module.exports = bytesToUuid; /***/ }), -/***/ 1731: +/***/ 3480: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { // Unique ID creation requires a high quality random # generator. In node.js @@ -3957,11 +3957,11 @@ module.exports = function nodeRNG() { /***/ }), -/***/ 819: +/***/ 4559: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { -var rng = __nccwpck_require__(1731); -var bytesToUuid = __nccwpck_require__(2906); +var rng = __nccwpck_require__(3480); +var bytesToUuid = __nccwpck_require__(6993); function v4(options, buf, offset) { var i = buf && offset || 0; @@ -3993,7 +3993,7 @@ module.exports = v4; /***/ }), -/***/ 490: +/***/ 7163: /***/ ((module, exports) => { exports = module.exports = SemVer @@ -5596,15 +5596,15 @@ function coerce (version, options) { /***/ }), -/***/ 3919: +/***/ 7477: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { -module.exports = __nccwpck_require__(680); +module.exports = __nccwpck_require__(8162); /***/ }), -/***/ 680: +/***/ 8162: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -5875,7 +5875,7 @@ exports.debug = debug; // for test /***/ }), -/***/ 7857: +/***/ 1368: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -5938,29 +5938,29 @@ Object.defineProperty(exports, "parse", ({ } })); -var _v = _interopRequireDefault(__nccwpck_require__(3068)); +var _v = _interopRequireDefault(__nccwpck_require__(3258)); -var _v2 = _interopRequireDefault(__nccwpck_require__(845)); +var _v2 = _interopRequireDefault(__nccwpck_require__(2559)); -var _v3 = _interopRequireDefault(__nccwpck_require__(784)); +var _v3 = _interopRequireDefault(__nccwpck_require__(2872)); -var _v4 = _interopRequireDefault(__nccwpck_require__(8811)); +var _v4 = _interopRequireDefault(__nccwpck_require__(5034)); -var _nil = _interopRequireDefault(__nccwpck_require__(7297)); +var _nil = _interopRequireDefault(__nccwpck_require__(6051)); -var _version = _interopRequireDefault(__nccwpck_require__(2238)); +var _version = _interopRequireDefault(__nccwpck_require__(6630)); -var _validate = _interopRequireDefault(__nccwpck_require__(6966)); +var _validate = _interopRequireDefault(__nccwpck_require__(6879)); -var _stringify = _interopRequireDefault(__nccwpck_require__(5178)); +var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); -var _parse = _interopRequireDefault(__nccwpck_require__(3641)); +var _parse = _interopRequireDefault(__nccwpck_require__(3783)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } /***/ }), -/***/ 3899: +/***/ 1102: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -5989,7 +5989,7 @@ exports["default"] = _default; /***/ }), -/***/ 7297: +/***/ 6051: /***/ ((__unused_webpack_module, exports) => { @@ -6003,7 +6003,7 @@ exports["default"] = _default; /***/ }), -/***/ 3641: +/***/ 3783: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6013,7 +6013,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(6966)); +var _validate = _interopRequireDefault(__nccwpck_require__(6879)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6054,7 +6054,7 @@ exports["default"] = _default; /***/ }), -/***/ 4171: +/***/ 4557: /***/ ((__unused_webpack_module, exports) => { @@ -6068,7 +6068,7 @@ exports["default"] = _default; /***/ }), -/***/ 3088: +/***/ 160: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6098,7 +6098,7 @@ function rng() { /***/ }), -/***/ 6717: +/***/ 4850: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6127,7 +6127,7 @@ exports["default"] = _default; /***/ }), -/***/ 5178: +/***/ 2992: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6137,7 +6137,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(6966)); +var _validate = _interopRequireDefault(__nccwpck_require__(6879)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6172,7 +6172,7 @@ exports["default"] = _default; /***/ }), -/***/ 3068: +/***/ 3258: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6182,9 +6182,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(3088)); +var _rng = _interopRequireDefault(__nccwpck_require__(160)); -var _stringify = _interopRequireDefault(__nccwpck_require__(5178)); +var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6285,7 +6285,7 @@ exports["default"] = _default; /***/ }), -/***/ 845: +/***/ 2559: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6295,9 +6295,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(3052)); +var _v = _interopRequireDefault(__nccwpck_require__(810)); -var _md = _interopRequireDefault(__nccwpck_require__(3899)); +var _md = _interopRequireDefault(__nccwpck_require__(1102)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6307,7 +6307,7 @@ exports["default"] = _default; /***/ }), -/***/ 3052: +/***/ 810: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6318,9 +6318,9 @@ Object.defineProperty(exports, "__esModule", ({ exports["default"] = _default; exports.URL = exports.DNS = void 0; -var _stringify = _interopRequireDefault(__nccwpck_require__(5178)); +var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); -var _parse = _interopRequireDefault(__nccwpck_require__(3641)); +var _parse = _interopRequireDefault(__nccwpck_require__(3783)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6391,7 +6391,7 @@ function _default(name, version, hashfunc) { /***/ }), -/***/ 784: +/***/ 2872: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6401,9 +6401,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _rng = _interopRequireDefault(__nccwpck_require__(3088)); +var _rng = _interopRequireDefault(__nccwpck_require__(160)); -var _stringify = _interopRequireDefault(__nccwpck_require__(5178)); +var _stringify = _interopRequireDefault(__nccwpck_require__(2992)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6434,7 +6434,7 @@ exports["default"] = _default; /***/ }), -/***/ 8811: +/***/ 5034: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6444,9 +6444,9 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _v = _interopRequireDefault(__nccwpck_require__(3052)); +var _v = _interopRequireDefault(__nccwpck_require__(810)); -var _sha = _interopRequireDefault(__nccwpck_require__(6717)); +var _sha = _interopRequireDefault(__nccwpck_require__(4850)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6456,7 +6456,7 @@ exports["default"] = _default; /***/ }), -/***/ 6966: +/***/ 6879: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6466,7 +6466,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _regex = _interopRequireDefault(__nccwpck_require__(4171)); +var _regex = _interopRequireDefault(__nccwpck_require__(4557)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6479,7 +6479,7 @@ exports["default"] = _default; /***/ }), -/***/ 2238: +/***/ 6630: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -6489,7 +6489,7 @@ Object.defineProperty(exports, "__esModule", ({ })); exports["default"] = void 0; -var _validate = _interopRequireDefault(__nccwpck_require__(6966)); +var _validate = _interopRequireDefault(__nccwpck_require__(6879)); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -6625,7 +6625,7 @@ module.exports = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("util"); /***/ }), -/***/ 4710: +/***/ 8405: /***/ ((__webpack_module__, __unused_webpack___webpack_exports__, __nccwpck_require__) => { var _actions_core__WEBPACK_IMPORTED_MODULE_0___namespace_cache; @@ -6635,10 +6635,10 @@ var fs__WEBPACK_IMPORTED_MODULE_4___namespace_cache; var os__WEBPACK_IMPORTED_MODULE_6___namespace_cache; var process__WEBPACK_IMPORTED_MODULE_7___namespace_cache; __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try { -/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(7232); -/* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(7889); -/* harmony import */ var _actions_http_client__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(604); -/* harmony import */ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(6511); +/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(9935); +/* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(3409); +/* harmony import */ var _actions_http_client__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(3658); +/* harmony import */ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(2275); /* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(7147); /* harmony import */ var module__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(8188); /* harmony import */ var os__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(2037); @@ -6859,6 +6859,6 @@ __webpack_async_result__(); /******/ // startup /******/ // Load entry module and return exports /******/ // This entry module used 'module' so it can't be inlined -/******/ var __webpack_exports__ = __nccwpck_require__(4710); +/******/ var __webpack_exports__ = __nccwpck_require__(8405); /******/ __webpack_exports__ = await __webpack_exports__; /******/ diff --git a/dist/main.cjs b/dist/main.cjs index 911c06d..253f2a8 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-417.0.dev. +// Generated by dart2js (NullSafetyMode.sound, csp, deferred-serialization, intern-composite-values), the Dart to JavaScript compiler version: 3.1.0-296.0.dev. // The code supports the following hooks: // dartPrint(message): // if this function is defined it is called instead of the Dart [print] @@ -238,9 +238,6 @@ } var A = {JS_CONST: function JS_CONST() { }, - LateError$fieldADI(fieldName) { - return new A.LateError("Field '" + fieldName + "' has been assigned during initialization."); - }, hexDigitValue(char) { var letter, digit = char ^ 48; @@ -270,6 +267,11 @@ } return new A.SubListIterable(_iterable, _start, _endOrLength, $E._eval$1("SubListIterable<0>")); }, + MappedIterable_MappedIterable(iterable, $function, $S, $T) { + if (type$.EfficientLengthIterable_dynamic._is(iterable)) + return new A.EfficientLengthMappedIterable(iterable, $function, $S._eval$1("@<0>")._bind$1($T)._eval$1("EfficientLengthMappedIterable<1,2>")); + return new A.MappedIterable(iterable, $function, $S._eval$1("@<0>")._bind$1($T)._eval$1("MappedIterable<1,2>")); + }, IterableElementError_noElement() { return new A.StateError("No element"); }, @@ -298,6 +300,23 @@ _.__internal$_current = null; _.$ti = t2; }, + MappedIterable: function MappedIterable(t0, t1, t2) { + this.__internal$_iterable = t0; + this._f = t1; + this.$ti = t2; + }, + EfficientLengthMappedIterable: function EfficientLengthMappedIterable(t0, t1, t2) { + this.__internal$_iterable = t0; + this._f = t1; + this.$ti = t2; + }, + MappedIterator: function MappedIterator(t0, t1, t2) { + var _ = this; + _.__internal$_current = null; + _._iterator = t0; + _._f = t1; + _.$ti = t2; + }, MappedListIterable: function MappedListIterable(t0, t1, t2) { this._source = t0; this._f = t1; @@ -393,7 +412,7 @@ maxCharCode = radix <= 10 ? 47 + radix : 86 + radix; digitsPart = match[1]; for (t1 = digitsPart.length, i = 0; i < t1; ++i) - if ((B.JSString_methods._codeUnitAt$1(digitsPart, i) | 32) > maxCharCode) + if ((digitsPart.charCodeAt(i) | 32) > maxCharCode) return _null; } return parseInt(source, radix); @@ -477,10 +496,12 @@ return new A.ArgumentError(true, object, null, null); }, wrapException(ex) { - var wrapper, t1; + return A.initializeExceptionWrapper(new Error(), ex); + }, + initializeExceptionWrapper(wrapper, ex) { + var t1; if (ex == null) ex = new A.TypeError(); - wrapper = new Error(); wrapper.dartException = ex; t1 = A.toStringWrapper; if ("defineProperty" in Object) { @@ -496,6 +517,9 @@ throwExpression(ex) { throw A.wrapException(ex); }, + throwExpressionWithWrapper(ex, wrapper) { + throw A.initializeExceptionWrapper(wrapper, ex); + }, throwConcurrentModificationError(collection) { throw A.wrapException(A.ConcurrentModificationError$(collection)); }, @@ -661,10 +685,11 @@ return exception.$cachedTrace = new A._StackTrace(exception); }, objectHashCode(object) { - if (object == null || typeof object != "object") + if (object == null) return J.get$hashCode$(object); - else + if (typeof object == "object") return A.Primitives_objectHashCode(object); + return J.get$hashCode$(object); }, fillLiteralMap(keyValuePairs, result) { var t1, t2, index, index0, key, value, strings, table, cell, nums, rest, hash, bucket, @@ -677,12 +702,12 @@ t2._as(key); t1._as(value); if (typeof key == "string") { - strings = result._strings; + strings = result.__js_helper$_strings; if (strings == null) { table = Object.create(null); table[""] = table; delete table[""]; - result._strings = table; + result.__js_helper$_strings = table; strings = table; } cell = strings[key]; @@ -691,12 +716,12 @@ else cell.hashMapCellValue = value; } else if (typeof key == "number" && (key & 0x3fffffff) === key) { - nums = result._nums; + nums = result.__js_helper$_nums; if (nums == null) { table = Object.create(null); table[""] = table; delete table[""]; - result._nums = table; + result.__js_helper$_nums = table; nums = table; } cell = nums[key]; @@ -713,7 +738,7 @@ result.__js_helper$_rest = table; rest = table; } - hash = J.get$hashCode$(key) & 0x3fffffff; + hash = J.get$hashCode$(key) & 1073741823; bucket = rest[hash]; if (bucket == null) rest[hash] = [result._newLinkedCell$2(key, value)]; @@ -1117,7 +1142,7 @@ transformers = dartNativeDispatchHooksTransformer; if (typeof transformers == "function") transformers = [transformers]; - if (transformers.constructor == Array) + if (Array.isArray(transformers)) for (i = 0; i < transformers.length; ++i) { transformer = transformers[i]; if (typeof transformer == "function") @@ -1237,7 +1262,7 @@ JsLinkedHashMap: function JsLinkedHashMap(t0) { var _ = this; _.__js_helper$_length = 0; - _._last = _._first = _.__js_helper$_rest = _._nums = _._strings = null; + _._last = _._first = _.__js_helper$_rest = _.__js_helper$_nums = _.__js_helper$_strings = null; _._modifications = 0; _.$ti = t0; }, @@ -1246,6 +1271,17 @@ this.hashMapCellValue = t1; this._next = null; }, + LinkedHashMapKeyIterable: function LinkedHashMapKeyIterable(t0, t1) { + this.__js_helper$_map = t0; + this.$ti = t1; + }, + LinkedHashMapKeyIterator: function LinkedHashMapKeyIterator(t0, t1, t2) { + var _ = this; + _.__js_helper$_map = t0; + _._modifications = t1; + _.__js_helper$_current = _._cell = null; + _.$ti = t2; + }, initHooks_closure: function initHooks_closure(t0) { this.getTag = t0; }, @@ -1525,7 +1561,7 @@ return A._instanceTypeFromConstructorMiss(instance, $constructor); }, _instanceTypeFromConstructorMiss(instance, $constructor) { - var effectiveConstructor = instance instanceof A.Closure ? instance.__proto__.__proto__.constructor : $constructor, + var effectiveConstructor = instance instanceof A.Closure ? Object.getPrototypeOf(Object.getPrototypeOf(instance)).constructor : $constructor, rti = A._Universe_findErasedType(init.typeUniverse, effectiveConstructor.name); $constructor.$ccache = rti; return rti; @@ -1728,8 +1764,9 @@ 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); + var testRti = this, + unstarred = testRti._kind === 6 ? testRti._primary : testRti; + return unstarred._primary._is(object) || A.Rti__getFutureFromFutureOr(init.typeUniverse, unstarred)._is(object); }, _isObject(object) { return object != null; @@ -2973,7 +3010,7 @@ object._thenAwait$1$2(thenCallback, errorCallback, type$.dynamic); else { t1 = type$.dynamic; - if (type$.Future_dynamic._is(object)) + if (object instanceof A._Future) object.then$1$2$onError(thenCallback, errorCallback, t1); else { future = new A._Future($.Zone__current, type$._Future_dynamic); @@ -3011,7 +3048,7 @@ } return B.C__StringStackTrace; }, - _Future__chainCoreFuture(source, target) { + _Future__chainCoreFutureSync(source, target) { var t1, t2, listeners; for (t1 = type$._Future_dynamic; t2 = source._state, (t2 & 4) !== 0;) source = t1._as(source._resultOrListeners); @@ -3021,11 +3058,30 @@ A._Future__propagateToListeners(target, listeners); } else { listeners = type$.nullable__FutureListener_dynamic_dynamic._as(target._resultOrListeners); - target._state = target._state & 1 | 4; - target._resultOrListeners = source; + target._setChained$1(source); source._prependListeners$1(listeners); } }, + _Future__chainCoreFutureAsync(source, target) { + var t2, t3, listeners, _box_0 = {}, + t1 = _box_0.source = source; + for (t2 = type$._Future_dynamic; t3 = t1._state, (t3 & 4) !== 0; t1 = source) { + source = t2._as(t1._resultOrListeners); + _box_0.source = source; + } + if ((t3 & 24) === 0) { + listeners = type$.nullable__FutureListener_dynamic_dynamic._as(target._resultOrListeners); + target._setChained$1(t1); + _box_0.source._prependListeners$1(listeners); + return; + } + if ((t3 & 16) === 0 && target._resultOrListeners == null) { + target._cloneResult$1(t1); + return; + } + target._state ^= 2; + A._rootScheduleMicrotask(null, null, target._zone, type$.void_Function._as(new A._Future__chainCoreFutureAsync_closure(_box_0, target))); + }, _Future__propagateToListeners(source, listeners) { var t2, t3, t4, _box_0, t5, t6, hasError, asyncError, nextListener, nextListener0, sourceResult, t7, zone, oldZone, result, current, _box_1 = {}, t1 = _box_1.source = source; @@ -3086,7 +3142,7 @@ if (oldZone != null) $.Zone__current = oldZone; t1 = _box_0.listenerValueOrError; - if (t4._is(t1)) { + if (t1 instanceof A._Future) { t5 = _box_0.listener.$ti; t5 = t5._eval$1("Future<2>")._is(t1) || !t5._rest[1]._is(t1); } else @@ -3103,7 +3159,7 @@ _box_1.source = t1; continue; } else - A._Future__chainCoreFuture(t1, result); + A._Future__chainCoreFutureSync(t1, result); return; } } @@ -3336,11 +3392,11 @@ this.e = t1; this.s = t2; }, - _Future__asyncCompleteWithValue_closure: function _Future__asyncCompleteWithValue_closure(t0, t1) { - this.$this = t0; - this.value = t1; + _Future__chainCoreFutureAsync_closure: function _Future__chainCoreFutureAsync_closure(t0, t1) { + this._box_0 = t0; + this.target = t1; }, - _Future__chainFuture_closure: function _Future__chainFuture_closure(t0, t1) { + _Future__asyncCompleteWithValue_closure: function _Future__asyncCompleteWithValue_closure(t0, t1) { this.$this = t0; this.value = t1; }, @@ -3384,6 +3440,22 @@ this.$this = t0; this.f = t1; }, + _HashMap__getTableEntry(table, key) { + var entry = table[key]; + return entry === table ? null : entry; + }, + _HashMap__setTableEntry(table, key, value) { + if (value == null) + table[key] = table; + else + table[key] = value; + }, + _HashMap__newHashTable() { + var table = Object.create(null); + A._HashMap__setTableEntry(table, "", table); + delete table[""]; + return table; + }, 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>")))); }, @@ -3406,6 +3478,26 @@ t1 = result._contents; return t1.charCodeAt(0) == 0 ? t1 : t1; }, + _HashMap: function _HashMap() { + }, + _IdentityHashMap: function _IdentityHashMap(t0) { + var _ = this; + _._collection$_length = 0; + _._keys = _._collection$_rest = _._nums = _._strings = null; + _.$ti = t0; + }, + _HashMapKeyIterable: function _HashMapKeyIterable(t0, t1) { + this._map = t0; + this.$ti = t1; + }, + _HashMapKeyIterator: function _HashMapKeyIterator(t0, t1, t2) { + var _ = this; + _._map = t0; + _._keys = t1; + _._offset = 0; + _._collection$_current = null; + _.$ti = t2; + }, ListBase: function ListBase() { }, MapBase: function MapBase() { @@ -3577,10 +3669,17 @@ return string; }, Uri_base() { - var uri = A.Primitives_currentUri(); - if (uri != null) - return A.Uri_parse(uri); - throw A.wrapException(A.UnsupportedError$("'Uri.base' is not supported")); + var cachedUri, uri, + current = A.Primitives_currentUri(); + if (current == null) + throw A.wrapException(A.UnsupportedError$("'Uri.base' is not supported")); + cachedUri = $.Uri__cachedBaseUri; + if (cachedUri != null && current === $.Uri__cachedBaseString) + return cachedUri; + uri = A.Uri_parse(current); + $.Uri__cachedBaseUri = uri; + $.Uri__cachedBaseString = current; + return uri; }, Error_safeToString(object) { if (typeof object == "number" || A._isBool(object) || object == null) @@ -3589,6 +3688,11 @@ return JSON.stringify(object); return A.Primitives_safeToString(object); }, + Error_throwWithStackTrace(error, stackTrace) { + A.checkNotNullable(error, "error", type$.Object); + A.checkNotNullable(stackTrace, "stackTrace", type$.StackTrace); + A.Error__throw(error, stackTrace); + }, AssertionError$(message) { return new A.AssertionError(message); }, @@ -3756,7 +3860,9 @@ 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; if (end >= 5) { - delta = ((B.JSString_methods._codeUnitAt$1(uri, 4) ^ 58) * 3 | B.JSString_methods._codeUnitAt$1(uri, 0) ^ 100 | B.JSString_methods._codeUnitAt$1(uri, 1) ^ 97 | B.JSString_methods._codeUnitAt$1(uri, 2) ^ 116 | B.JSString_methods._codeUnitAt$1(uri, 3) ^ 97) >>> 0; + if (4 >= end) + return A.ioore(uri, 4); + delta = ((uri.charCodeAt(4) ^ 58) * 3 | uri.charCodeAt(0) ^ 100 | uri.charCodeAt(1) ^ 97 | uri.charCodeAt(2) ^ 116 | uri.charCodeAt(3) ^ 97) >>> 0; if (delta === 0) return A.UriData__parse(end < end ? B.JSString_methods.substring$2(uri, 0, end) : uri, 5, _null).get$uri(); else if (delta === 32) @@ -3922,13 +4028,15 @@ return A._Uri__uriDecode(encodedComponent, 0, encodedComponent.length, B.C_Utf8Codec, false); }, Uri__parseIPv4Address(host, start, end) { - var i, partStart, partIndex, char, part, partIndex0, + var t1, i, partStart, partIndex, char, part, partIndex0, _s43_ = "IPv4 address should contain exactly 4 parts", _s37_ = "each part must be in the range 0..255", error = new A.Uri__parseIPv4Address_error(host), result = new Uint8Array(4); - for (i = start, partStart = i, partIndex = 0; i < end; ++i) { - char = B.JSString_methods.codeUnitAt$1(host, i); + for (t1 = host.length, i = start, partStart = i, partIndex = 0; i < end; ++i) { + if (!(i >= 0 && i < t1)) + return A.ioore(host, i); + char = host.charCodeAt(i); if (char !== 46) { if ((char ^ 48) > 9) error.call$2("invalid character", i); @@ -3957,18 +4065,23 @@ return result; }, Uri_parseIPv6Address(host, start, end) { - var parts, i, partStart, wildcardSeen, seenDot, char, atEnd, t1, last, bytes, wildCardLength, index, value, j, t2, _null = null, + var parts, i, partStart, wildcardSeen, seenDot, char, atEnd, last, bytes, wildCardLength, index, value, j, t2, _null = null, error = new A.Uri_parseIPv6Address_error(host), - parseHex = new A.Uri_parseIPv6Address_parseHex(error, host); - if (host.length < 2) + parseHex = new A.Uri_parseIPv6Address_parseHex(error, host), + t1 = host.length; + if (t1 < 2) error.call$2("address is too short", _null); parts = A._setArrayType([], type$.JSArray_int); for (i = start, partStart = i, wildcardSeen = false, seenDot = false; i < end; ++i) { - char = B.JSString_methods.codeUnitAt$1(host, i); + if (!(i >= 0 && i < t1)) + return A.ioore(host, i); + char = host.charCodeAt(i); if (char === 58) { if (i === start) { ++i; - if (B.JSString_methods.codeUnitAt$1(host, i) !== 58) + if (!(i < t1)) + return A.ioore(host, i); + if (host.charCodeAt(i) !== 58) error.call$2("invalid start colon.", i); partStart = i; } @@ -4087,22 +4200,29 @@ return null; if (start === end) return ""; - if (B.JSString_methods.codeUnitAt$1(host, start) === 91) { - t1 = end - 1; - if (B.JSString_methods.codeUnitAt$1(host, t1) !== 93) + t1 = host.length; + if (!(start >= 0 && start < t1)) + return A.ioore(host, start); + if (host.charCodeAt(start) === 91) { + t2 = end - 1; + if (!(t2 >= 0 && t2 < t1)) + return A.ioore(host, t2); + if (host.charCodeAt(t2) !== 93) A._Uri__fail(host, start, "Missing end `]` to match `[` in host"); - t2 = start + 1; - index = A._Uri__checkZoneID(host, t2, t1); - if (index < t1) { + t1 = start + 1; + index = A._Uri__checkZoneID(host, t1, t2); + if (index < t2) { zoneIDstart = index + 1; - zoneID = A._Uri__normalizeZoneID(host, B.JSString_methods.startsWith$2(host, "25", zoneIDstart) ? index + 3 : zoneIDstart, t1, "%25"); + zoneID = A._Uri__normalizeZoneID(host, B.JSString_methods.startsWith$2(host, "25", zoneIDstart) ? index + 3 : zoneIDstart, t2, "%25"); } else zoneID = ""; - A.Uri_parseIPv6Address(host, t2, index); + A.Uri_parseIPv6Address(host, t1, index); return B.JSString_methods.substring$2(host, start, index).toLowerCase() + zoneID + "]"; } - for (i = start; i < end; ++i) - if (B.JSString_methods.codeUnitAt$1(host, i) === 58) { + for (i = start; i < end; ++i) { + if (!(i < t1)) + return A.ioore(host, i); + if (host.charCodeAt(i) === 58) { index = B.JSString_methods.indexOf$2(host, "%", start); index = index >= start && index < end ? index : end; if (index < end) { @@ -4113,6 +4233,7 @@ A.Uri_parseIPv6Address(host, start, index); return "[" + B.JSString_methods.substring$2(host, start, index) + zoneID + "]"; } + } return A._Uri__normalizeRegName(host, start, end); }, _Uri__checkZoneID(host, start, end) { @@ -4120,37 +4241,39 @@ return index >= start && index < end ? index : end; }, _Uri__normalizeZoneID(host, start, end, prefix) { - var index, sectionStart, isNormalized, char, replacement, t1, t2, tail, sourceLength, slice, + var t1, index, sectionStart, isNormalized, char, replacement, t2, t3, tail, sourceLength, slice, buffer = prefix !== "" ? new A.StringBuffer(prefix) : null; - for (index = start, sectionStart = index, isNormalized = true; index < end;) { - char = B.JSString_methods.codeUnitAt$1(host, index); + for (t1 = host.length, index = start, sectionStart = index, isNormalized = true; index < end;) { + if (!(index >= 0 && index < t1)) + return A.ioore(host, index); + char = host.charCodeAt(index); if (char === 37) { replacement = A._Uri__normalizeEscape(host, index, true); - t1 = replacement == null; - if (t1 && isNormalized) { + t2 = replacement == null; + if (t2 && isNormalized) { index += 3; continue; } if (buffer == null) buffer = new A.StringBuffer(""); - t2 = buffer._contents += B.JSString_methods.substring$2(host, sectionStart, index); - if (t1) + t3 = buffer._contents += B.JSString_methods.substring$2(host, sectionStart, index); + if (t2) replacement = B.JSString_methods.substring$2(host, index, index + 3); else if (replacement === "%") A._Uri__fail(host, index, "ZoneID should not contain % anymore"); - buffer._contents = t2 + replacement; + buffer._contents = t3 + replacement; index += 3; sectionStart = index; isNormalized = true; } else { if (char < 127) { - t1 = char >>> 4; - if (!(t1 < 8)) - return A.ioore(B.List_M1A, t1); - t1 = (B.List_M1A[t1] & 1 << (char & 15)) !== 0; + t2 = char >>> 4; + if (!(t2 < 8)) + return A.ioore(B.List_M1A, t2); + t2 = (B.List_M1A[t2] & 1 << (char & 15)) !== 0; } else - t1 = false; - if (t1) { + t2 = false; + if (t2) { if (isNormalized && 65 <= char && 90 >= char) { if (buffer == null) buffer = new A.StringBuffer(""); @@ -4163,7 +4286,10 @@ ++index; } else { if ((char & 64512) === 55296 && index + 1 < end) { - tail = B.JSString_methods.codeUnitAt$1(host, index + 1); + t2 = index + 1; + if (!(t2 < t1)) + return A.ioore(host, t2); + tail = host.charCodeAt(t2); if ((tail & 64512) === 56320) { char = (char & 1023) << 10 | tail & 1023 | 65536; sourceLength = 2; @@ -4174,11 +4300,11 @@ slice = B.JSString_methods.substring$2(host, sectionStart, index); if (buffer == null) { buffer = new A.StringBuffer(""); - t1 = buffer; + t2 = buffer; } else - t1 = buffer; - t1._contents += slice; - t1._contents += A._Uri__escapeChar(char); + t2 = buffer; + t2._contents += slice; + t2._contents += A._Uri__escapeChar(char); index += sourceLength; sectionStart = index; } @@ -4192,21 +4318,23 @@ return t1.charCodeAt(0) == 0 ? t1 : t1; }, _Uri__normalizeRegName(host, start, end) { - var index, sectionStart, buffer, isNormalized, char, replacement, t1, slice, t2, sourceLength, tail; - for (index = start, sectionStart = index, buffer = null, isNormalized = true; index < end;) { - char = B.JSString_methods.codeUnitAt$1(host, index); + var t1, index, sectionStart, buffer, isNormalized, char, replacement, t2, slice, t3, sourceLength, tail; + for (t1 = host.length, index = start, sectionStart = index, buffer = null, isNormalized = true; index < end;) { + if (!(index >= 0 && index < t1)) + return A.ioore(host, index); + char = host.charCodeAt(index); if (char === 37) { replacement = A._Uri__normalizeEscape(host, index, true); - t1 = replacement == null; - if (t1 && isNormalized) { + t2 = replacement == null; + if (t2 && isNormalized) { index += 3; continue; } if (buffer == null) buffer = new A.StringBuffer(""); slice = B.JSString_methods.substring$2(host, sectionStart, index); - t2 = buffer._contents += !isNormalized ? slice.toLowerCase() : slice; - if (t1) { + t3 = buffer._contents += !isNormalized ? slice.toLowerCase() : slice; + if (t2) { replacement = B.JSString_methods.substring$2(host, index, index + 3); sourceLength = 3; } else if (replacement === "%") { @@ -4214,19 +4342,19 @@ sourceLength = 1; } else sourceLength = 3; - buffer._contents = t2 + replacement; + buffer._contents = t3 + replacement; index += sourceLength; sectionStart = index; isNormalized = true; } else { if (char < 127) { - t1 = char >>> 4; - if (!(t1 < 8)) - return A.ioore(B.List_ejq, t1); - t1 = (B.List_ejq[t1] & 1 << (char & 15)) !== 0; + t2 = char >>> 4; + if (!(t2 < 8)) + return A.ioore(B.List_ejq, t2); + t2 = (B.List_ejq[t2] & 1 << (char & 15)) !== 0; } else - t1 = false; - if (t1) { + t2 = false; + if (t2) { if (isNormalized && 65 <= char && 90 >= char) { if (buffer == null) buffer = new A.StringBuffer(""); @@ -4239,17 +4367,20 @@ ++index; } else { if (char <= 93) { - t1 = char >>> 4; - if (!(t1 < 8)) - return A.ioore(B.List_YmH, t1); - t1 = (B.List_YmH[t1] & 1 << (char & 15)) !== 0; + t2 = char >>> 4; + if (!(t2 < 8)) + return A.ioore(B.List_YmH, t2); + t2 = (B.List_YmH[t2] & 1 << (char & 15)) !== 0; } else - t1 = false; - if (t1) + t2 = false; + if (t2) A._Uri__fail(host, index, "Invalid character"); else { if ((char & 64512) === 55296 && index + 1 < end) { - tail = B.JSString_methods.codeUnitAt$1(host, index + 1); + t2 = index + 1; + if (!(t2 < t1)) + return A.ioore(host, t2); + tail = host.charCodeAt(t2); if ((tail & 64512) === 56320) { char = (char & 1023) << 10 | tail & 1023 | 65536; sourceLength = 2; @@ -4262,11 +4393,11 @@ slice = slice.toLowerCase(); if (buffer == null) { buffer = new A.StringBuffer(""); - t1 = buffer; + t2 = buffer; } else - t1 = buffer; - t1._contents += slice; - t1._contents += A._Uri__escapeChar(char); + t2 = buffer; + t2._contents += slice; + t2._contents += A._Uri__escapeChar(char); index += sourceLength; sectionStart = index; } @@ -4283,21 +4414,26 @@ return t1.charCodeAt(0) == 0 ? t1 : t1; }, _Uri__makeScheme(scheme, start, end) { - var i, containsUpperCase, codeUnit, t1; + var t1, i, containsUpperCase, codeUnit, t2; if (start === end) return ""; - if (!A._Uri__isAlphabeticCharacter(B.JSString_methods._codeUnitAt$1(scheme, start))) + t1 = scheme.length; + if (!(start < t1)) + return A.ioore(scheme, start); + if (!A._Uri__isAlphabeticCharacter(scheme.charCodeAt(start))) A._Uri__fail(scheme, start, "Scheme not starting with alphabetic character"); for (i = start, containsUpperCase = false; i < end; ++i) { - codeUnit = B.JSString_methods._codeUnitAt$1(scheme, i); + if (!(i < t1)) + return A.ioore(scheme, i); + codeUnit = scheme.charCodeAt(i); if (codeUnit < 128) { - t1 = codeUnit >>> 4; - if (!(t1 < 8)) - return A.ioore(B.List_MMm, t1); - t1 = (B.List_MMm[t1] & 1 << (codeUnit & 15)) !== 0; + t2 = codeUnit >>> 4; + if (!(t2 < 8)) + return A.ioore(B.List_MMm, t2); + t2 = (B.List_MMm[t2] & 1 << (codeUnit & 15)) !== 0; } else - t1 = false; - if (!t1) + t2 = false; + if (!t2) A._Uri__fail(scheme, i, "Illegal scheme character"); if (65 <= codeUnit && codeUnit <= 90) containsUpperCase = true; @@ -4349,12 +4485,18 @@ return A._Uri__normalizeOrSubstring(fragment, start, end, B.List_oFp, true, false); }, _Uri__normalizeEscape(source, index, lowerCase) { - var firstDigit, secondDigit, firstDigitValue, secondDigitValue, value, - t1 = index + 2; - if (t1 >= source.length) + var t3, firstDigit, secondDigit, firstDigitValue, secondDigitValue, value, + t1 = index + 2, + t2 = source.length; + if (t1 >= t2) return "%"; - firstDigit = B.JSString_methods.codeUnitAt$1(source, index + 1); - secondDigit = B.JSString_methods.codeUnitAt$1(source, t1); + t3 = index + 1; + if (!(t3 >= 0 && t3 < t2)) + return A.ioore(source, t3); + firstDigit = source.charCodeAt(t3); + if (!(t1 >= 0)) + return A.ioore(source, t1); + secondDigit = source.charCodeAt(t1); firstDigitValue = A.hexDigitValue(firstDigit); secondDigitValue = A.hexDigitValue(secondDigit); if (firstDigitValue < 0 || secondDigitValue < 0) @@ -4374,13 +4516,16 @@ return null; }, _Uri__escapeChar(char) { - var codeUnits, flag, encodedBytes, t1, index, byte, t2, t3, + var codeUnits, t1, flag, encodedBytes, index, byte, t2, t3, _s16_ = "0123456789ABCDEF"; if (char < 128) { codeUnits = new Uint8Array(3); codeUnits[0] = 37; - codeUnits[1] = B.JSString_methods._codeUnitAt$1(_s16_, char >>> 4); - codeUnits[2] = B.JSString_methods._codeUnitAt$1(_s16_, char & 15); + t1 = char >>> 4; + if (!(t1 < 16)) + return A.ioore(_s16_, t1); + codeUnits[1] = _s16_.charCodeAt(t1); + codeUnits[2] = _s16_.charCodeAt(char & 15); } else { if (char > 2047) if (char > 65535) { @@ -4402,15 +4547,16 @@ return A.ioore(codeUnits, index); codeUnits[index] = 37; t2 = index + 1; - t3 = B.JSString_methods._codeUnitAt$1(_s16_, byte >>> 4); + t3 = byte >>> 4; + if (!(t3 < 16)) + return A.ioore(_s16_, t3); if (!(t2 < t1)) return A.ioore(codeUnits, t2); - codeUnits[t2] = t3; + codeUnits[t2] = _s16_.charCodeAt(t3); t3 = index + 2; - t2 = B.JSString_methods._codeUnitAt$1(_s16_, byte & 15); if (!(t3 < t1)) return A.ioore(codeUnits, t3); - codeUnits[t3] = t2; + codeUnits[t3] = _s16_.charCodeAt(byte & 15); index += 3; } } @@ -4421,17 +4567,19 @@ return t1 == null ? B.JSString_methods.substring$2(component, start, end) : t1; }, _Uri__normalize(component, start, end, charTable, escapeDelimiters, replaceBackslash) { - var t1, index, sectionStart, buffer, char, t2, replacement, sourceLength, tail, t3, _null = null; - for (t1 = !escapeDelimiters, index = start, sectionStart = index, buffer = _null; index < end;) { - char = B.JSString_methods.codeUnitAt$1(component, index); + var t1, t2, index, sectionStart, buffer, char, t3, replacement, sourceLength, tail, t4, _null = null; + for (t1 = !escapeDelimiters, t2 = component.length, index = start, sectionStart = index, buffer = _null; index < end;) { + if (!(index >= 0 && index < t2)) + return A.ioore(component, index); + char = component.charCodeAt(index); if (char < 127) { - t2 = char >>> 4; - if (!(t2 < 8)) - return A.ioore(charTable, t2); - t2 = (charTable[t2] & 1 << (char & 15)) !== 0; + t3 = char >>> 4; + if (!(t3 < 8)) + return A.ioore(charTable, t3); + t3 = (charTable[t3] & 1 << (char & 15)) !== 0; } else - t2 = false; - if (t2) + t3 = false; + if (t3) ++index; else { if (char === 37) { @@ -4451,23 +4599,25 @@ } else { if (t1) 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; + t3 = char >>> 4; + if (!(t3 < 8)) + return A.ioore(B.List_YmH, t3); + t3 = (B.List_YmH[t3] & 1 << (char & 15)) !== 0; } else - t2 = false; + t3 = false; else - t2 = false; - if (t2) { + t3 = false; + if (t3) { A._Uri__fail(component, index, "Invalid character"); sourceLength = _null; replacement = sourceLength; } else { if ((char & 64512) === 55296) { - t2 = index + 1; - if (t2 < end) { - tail = B.JSString_methods.codeUnitAt$1(component, t2); + t3 = index + 1; + if (t3 < end) { + if (!(t3 < t2)) + return A.ioore(component, t3); + tail = component.charCodeAt(t3); if ((tail & 64512) === 56320) { char = (char & 1023) << 10 | tail & 1023 | 65536; sourceLength = 2; @@ -4482,11 +4632,11 @@ } if (buffer == null) { buffer = new A.StringBuffer(""); - t2 = buffer; + t3 = buffer; } else - t2 = buffer; - t3 = t2._contents += B.JSString_methods.substring$2(component, sectionStart, index); - t2._contents = t3 + A.S(replacement); + t3 = buffer; + t4 = t3._contents += B.JSString_methods.substring$2(component, sectionStart, index); + t3._contents = t4 + A.S(replacement); if (typeof sourceLength !== "number") return A.iae(sourceLength); index += sourceLength; @@ -4581,9 +4731,9 @@ _Uri__escapeScheme(path) { var i, char, t2, t1 = path.length; - if (t1 >= 2 && A._Uri__isAlphabeticCharacter(B.JSString_methods._codeUnitAt$1(path, 0))) + if (t1 >= 2 && A._Uri__isAlphabeticCharacter(path.charCodeAt(0))) for (i = 1; i < t1; ++i) { - char = B.JSString_methods._codeUnitAt$1(path, i); + char = path.charCodeAt(i); if (char === 58) return B.JSString_methods.substring$2(path, 0, i) + "%3A" + B.JSString_methods.substring$1(path, i + 1); if (char <= 127) { @@ -4599,9 +4749,12 @@ return path; }, _Uri__hexCharPairToByte(s, pos) { - var byte, i, charCode; - for (byte = 0, i = 0; i < 2; ++i) { - charCode = B.JSString_methods._codeUnitAt$1(s, pos + i); + var t1, byte, i, t2, charCode; + for (t1 = s.length, byte = 0, i = 0; i < 2; ++i) { + t2 = pos + i; + if (!(t2 < t1)) + return A.ioore(s, t2); + charCode = s.charCodeAt(t2); if (48 <= charCode && charCode <= 57) byte = byte * 16 + charCode - 48; else { @@ -4615,22 +4768,25 @@ return byte; }, _Uri__uriDecode(text, start, end, encoding, plusToSpace) { - var simple, codeUnit, t1, bytes, + var simple, codeUnit, t2, bytes, + t1 = text.length, i = start; while (true) { if (!(i < end)) { simple = true; break; } - codeUnit = B.JSString_methods._codeUnitAt$1(text, i); + if (!(i < t1)) + return A.ioore(text, i); + codeUnit = text.charCodeAt(i); if (codeUnit <= 127) if (codeUnit !== 37) - t1 = false; + t2 = false; else - t1 = true; + t2 = true; else - t1 = true; - if (t1) { + t2 = true; + if (t2) { simple = false; break; } @@ -4647,8 +4803,10 @@ bytes = new A.CodeUnits(B.JSString_methods.substring$2(text, start, end)); } else { bytes = A._setArrayType([], type$.JSArray_int); - for (t1 = text.length, i = start; i < end; ++i) { - codeUnit = B.JSString_methods._codeUnitAt$1(text, i); + for (i = start; i < end; ++i) { + if (!(i < t1)) + return A.ioore(text, i); + codeUnit = text.charCodeAt(i); if (codeUnit > 127) throw A.wrapException(A.ArgumentError$("Illegal percent encoding in URI", null)); if (codeUnit === 37) { @@ -4672,7 +4830,7 @@ _s17_ = "Invalid MIME type", indices = A._setArrayType([start - 1], type$.JSArray_int); for (t1 = text.length, i = start, slashIndex = -1, char = null; i < t1; ++i) { - char = B.JSString_methods._codeUnitAt$1(text, i); + char = text.charCodeAt(i); if (char === 44 || char === 59) break; if (char === 47) { @@ -4689,7 +4847,9 @@ B.JSArray_methods.add$1(indices, i); ++i; for (equalsIndex = -1; i < t1; ++i) { - char = B.JSString_methods._codeUnitAt$1(text, i); + if (!(i >= 0)) + return A.ioore(text, i); + char = text.charCodeAt(i); if (char === 61) { if (equalsIndex < 0) equalsIndex = i; @@ -4862,13 +5022,15 @@ return tables; }, _scan(uri, start, end, state, indices) { - var i, table, char, transition, + var t1, i, table, char, transition, tables = $.$get$_scannerTables(); - for (i = start; i < end; ++i) { + for (t1 = uri.length, i = start; i < end; ++i) { if (!(state >= 0 && state < tables.length)) return A.ioore(tables, state); table = tables[state]; - char = B.JSString_methods._codeUnitAt$1(uri, i) ^ 96; + if (!(i < t1)) + return A.ioore(uri, i); + char = uri.charCodeAt(i) ^ 96; transition = table[char > 95 ? 31 : char]; state = transition & 31; B.JSArray_methods.$indexSet(indices, transition >>> 5, i); @@ -4997,12 +5159,23 @@ _._fragment = t6; _.___Uri_hashCode_FI = _.___Uri_pathSegments_FI = _.___Uri__text_FI = $; }, + _noJsifyRequired(o) { + return o == null || A._isBool(o) || typeof o == "number" || typeof o == "string" || type$.Int8List._is(o) || type$.Uint8List._is(o) || type$.Uint8ClampedList._is(o) || type$.Int16List._is(o) || type$.Uint16List._is(o) || type$.Int32List._is(o) || type$.Uint32List._is(o) || type$.Float32List._is(o) || type$.Float64List._is(o) || type$.ByteBuffer._is(o) || type$.ByteData._is(o); + }, + jsify(object) { + if (A._noJsifyRequired(object)) + return object; + return new A.jsify__convert(new A._IdentityHashMap(type$._IdentityHashMap_of_nullable_Object_and_nullable_Object)).call$1(object); + }, 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>")); jsPromise.then(A.convertDartClosureToJS(new A.promiseToFuture_closure(completer, $T), 1), A.convertDartClosureToJS(new A.promiseToFuture_closure0(completer), 1)); return t1; }, + jsify__convert: function jsify__convert(t0) { + this._convertedObjects = t0; + }, promiseToFuture_closure: function promiseToFuture_closure(t0, t1) { this.completer = t0; this.T = t1; @@ -5046,7 +5219,7 @@ InternalStyle: function InternalStyle() { }, ParsedPath_ParsedPath$parse(path, style) { - var t1, parts, separators, start, i, + var t1, parts, separators, t2, start, i, root = style.getRoot$1(path); style.isRootRelative$1(path); if (root != null) @@ -5055,7 +5228,13 @@ parts = A._setArrayType([], t1); separators = A._setArrayType([], t1); t1 = path.length; - if (t1 !== 0 && style.isSeparator$1(B.JSString_methods._codeUnitAt$1(path, 0))) { + if (t1 !== 0) { + if (0 >= t1) + return A.ioore(path, 0); + t2 = style.isSeparator$1(path.charCodeAt(0)); + } else + t2 = false; + if (t2) { if (0 >= t1) return A.ioore(path, 0); B.JSArray_methods.add$1(separators, path[0]); @@ -5065,7 +5244,7 @@ start = 0; } for (i = start; i < t1; ++i) - if (style.isSeparator$1(B.JSString_methods._codeUnitAt$1(path, i))) { + if (style.isSeparator$1(path.charCodeAt(i))) { B.JSArray_methods.add$1(parts, B.JSString_methods.substring$2(path, start, i)); B.JSArray_methods.add$1(separators, path[i]); start = i + 1; @@ -5116,7 +5295,7 @@ if ((t1 == null ? "" : t1) !== "") A.throwExpression(A.UnsupportedError$("Cannot extract a file path from a URI with a fragment component")); t1 = $.$get$_Uri__isWindowsCached(); - if (A.boolConversionCheck(t1)) { + if (t1) { segments = t2.get$pathSegments(); t1 = segments.length; if (t1 > 0 && J.get$length$asx(segments[0]) === 2 && J.codeUnitAt$1$s(segments[0], 1) === 58) { @@ -5172,7 +5351,7 @@ _.relativeRootPattern = t3; }, throwLateFieldADI(fieldName) { - return A.throwExpression(A.LateError$fieldADI(fieldName)); + A.throwExpressionWithWrapper(new A.LateError("Field '" + fieldName + "' has been assigned during initialization."), new Error()); }, join(part1, part2) { var t1 = $.$get$context(), @@ -5189,17 +5368,25 @@ return t1; }, isDriveLetter(path, index) { - var t1 = path.length, + var t3, + t1 = path.length, t2 = index + 2; if (t1 < t2) return false; - if (!A.isAlphabetic(B.JSString_methods.codeUnitAt$1(path, index))) + if (!(index >= 0 && index < t1)) + return A.ioore(path, index); + if (!A.isAlphabetic(path.charCodeAt(index))) return false; - if (B.JSString_methods.codeUnitAt$1(path, index + 1) !== 58) + t3 = index + 1; + if (!(t3 < t1)) + return A.ioore(path, t3); + if (path.charCodeAt(t3) !== 58) return false; if (t1 === t2) return true; - return B.JSString_methods.codeUnitAt$1(path, t2) === 47; + if (!(t2 >= 0 && t2 < t1)) + return A.ioore(path, t2); + return path.charCodeAt(t2) === 47; }, main(args) { return A.main$body(args); @@ -5218,25 +5405,24 @@ case 0: // Function start $async$handler = 4; - sdk = A._asString(globalThis.core.getInput("sdk")); + t1 = type$.JSObject; + sdk = A._asString(t1._as(globalThis.core).getInput("sdk")); if (J.get$length$asx(sdk) === 0) sdk = "stable"; - flavor = A._asString(globalThis.core.getInput("flavor")); + flavor = A._asString(t1._as(globalThis.core).getInput("flavor")); if (J.get$length$asx(flavor) === 0) flavor = J.$eq$(sdk, "main") ? "raw" : "release"; else if (!J.$eq$(flavor, "raw") && !J.$eq$(flavor, "release")) { - globalThis.core.setFailed("Unrecognized build flavor '" + A.S(flavor) + "'."); + t1._as(globalThis.core).setFailed("Unrecognized build flavor '" + A.S(flavor) + "'."); // goto return $async$goto = 1; break; } raw = J.$eq$(flavor, "raw"); os = A.getPlatform(); - architecture = A._asString(globalThis.core.getInput("architecture")); - if (J.get$length$asx(architecture) === 0) { - t1 = type$.JSObject; + architecture = A._asString(t1._as(globalThis.core).getInput("architecture")); + if (J.get$length$asx(architecture) === 0) architecture = B.JSArray_methods.contains$1(B.List_x64_ia32_arm_arm64, A._asString(t1._as(globalThis.os).arch())) ? A._asString(t1._as(globalThis.os).arch()) : "x64"; - } version = null; channel = null; $async$goto = J.$eq$(sdk, "stable") || J.$eq$(sdk, "beta") || J.$eq$(sdk, "dev") ? 7 : 9; @@ -5299,7 +5485,7 @@ else if (J.contains$1$asx(sdk, "beta")) channel = "beta"; else if (J.contains$1$asx(sdk, "main")) { - globalThis.core.setFailed("Versions cannot be specified for main channel builds."); + t1._as(globalThis.core).setFailed("Versions cannot be specified for main channel builds."); // goto return $async$goto = 1; break; @@ -5309,63 +5495,61 @@ // join case 8: // join - globalThis.core.info("Installing the " + A.S(os) + "-" + A.S(architecture) + " Dart SDK version " + A.S(version) + " from the " + A.S(channel) + " (" + A.S(flavor) + ") channel."); + t1._as(globalThis.core).info("Installing the " + A.S(os) + "-" + A.S(architecture) + " Dart SDK version " + A.S(version) + " from the " + A.S(channel) + " (" + A.S(flavor) + ") channel."); url = string$.https_ + A.S(channel) + "/" + A.S(flavor) + "/" + A.S(version) + "/sdk/dartsdk-" + A.S(os) + "-" + A.S(architecture) + "-release.zip"; toolName = A.boolConversionCheck(raw) ? "dart_raw" : "dart"; - sdkPath = !A.boolConversionCheck(raw) ? A._asString(globalThis.toolCache.find(toolName, version, architecture)) : ""; + sdkPath = !A.boolConversionCheck(raw) ? A._asString(t1._as(globalThis.toolCache).find(toolName, version, architecture)) : ""; $async$goto = J.get$length$asx(sdkPath) !== 0 ? 21 : 23; break; case 21: // then - globalThis.core.info("Using cached sdk from " + A.S(sdkPath) + "."); + t1._as(globalThis.core).info("Using cached sdk from " + A.S(sdkPath) + "."); // goto join $async$goto = 22; break; case 23: // else - globalThis.core.info(A.S(url) + " ..."); - t1 = type$.JavaScriptObject; + t1._as(globalThis.core).info(A.S(url) + " ..."); t2 = type$.String; $async$goto = 24; - return A._asyncAwait(A.promiseToFuture(t1._as(globalThis.toolCache.downloadTool(url)), t2), $async$main); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(globalThis.toolCache).downloadTool(url)), t2), $async$main); case 24: // returning from await. archivePath = $async$result; $async$goto = 25; - return A._asyncAwait(A.promiseToFuture(t1._as(globalThis.toolCache.extractZip(archivePath)), t2), $async$main); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(globalThis.toolCache).extractZip(archivePath)), t2), $async$main); case 25: // returning from await. extractedFolder = $async$result; extractedFolder = A.join(extractedFolder, "dart-sdk"); $async$goto = 26; - return A._asyncAwait(A.promiseToFuture(t1._as(globalThis.toolCache.cacheDir(extractedFolder, toolName, version, architecture)), t2), $async$main); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(globalThis.toolCache).cacheDir(extractedFolder, toolName, version, architecture)), t2), $async$main); case 26: // returning from await. sdkPath = $async$result; case 22: // join - t1 = type$.JSObject; t2 = t1._as(globalThis.process); t3 = J.$eq$(os, "windows") ? "USERPROFILE" : "HOME"; t3 = A._asStringQ(t1._as(t2.env)[t3]); t3.toString; pubCache = A.join(t3, ".pub-cache"); - globalThis.core.exportVariable("DART_HOME", sdkPath); - globalThis.core.addPath(A.join(sdkPath, "bin")); - globalThis.core.exportVariable("PUB_CACHE", pubCache); - globalThis.core.addPath(A.join(pubCache, "bin")); + t1._as(globalThis.core).exportVariable("DART_HOME", sdkPath); + t1._as(globalThis.core).addPath(A.join(sdkPath, "bin")); + t1._as(globalThis.core).exportVariable("PUB_CACHE", pubCache); + t1._as(globalThis.core).addPath(A.join(pubCache, "bin")); $async$goto = 27; return A._asyncAwait(A.createPubOIDCToken(), $async$main); case 27: // returning from await. if (A.boolConversionCheck(raw)) { - t2 = globalThis.core; + t2 = t1._as(globalThis.core); versionFilePath = A.join(sdkPath, "version"); t2.setOutput("dart-version", B.JSString_methods.trim$0(A._asString(t1._as(globalThis.fs).readFileSync(versionFilePath, "utf8")))); } else - globalThis.core.setOutput("dart-version", version); + t1._as(globalThis.core).setOutput("dart-version", version); $async$goto = 28; - return A._asyncAwait(A.promiseToFuture(type$.JavaScriptObject._as(globalThis.exec.exec("dart", A._setArrayType(["--version"], type$.JSArray_String))), type$.dynamic), $async$main); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(globalThis.exec).exec("dart", A._setArrayType(["--version"], type$.JSArray_String))), type$.dynamic), $async$main); case 28: // returning from await. $async$handler = 2; @@ -5378,7 +5562,7 @@ $async$exception = $async$currentError; error = A.unwrapException($async$exception); t1 = globalThis; - t1.core.setFailed(A.S(error)); + type$.JSObject._as(t1.core).setFailed(A.S(error)); // goto after finally $async$goto = 6; break; @@ -5435,15 +5619,14 @@ $async$goto = 1; break; } - t1 = type$.JavaScriptObject; $async$goto = 3; - return A._asyncAwait(A.promiseToFuture(t1._as(globalThis.core.getIDToken("https://pub.dev")), type$.String), $async$createPubOIDCToken); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(globalThis.core).getIDToken("https://pub.dev")), type$.String), $async$createPubOIDCToken); case 3: // returning from await. token = $async$result; - globalThis.core.exportVariable("PUB_TOKEN", token); + t1._as(globalThis.core).exportVariable("PUB_TOKEN", token); $async$goto = 4; - return A._asyncAwait(A.promiseToFuture(t1._as(globalThis.exec.exec("dart", A._setArrayType(["pub", "token", "add", "https://pub.dev", "--env-var", "PUB_TOKEN"], type$.JSArray_String))), type$.dynamic), $async$createPubOIDCToken); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(globalThis.exec).exec("dart", A._setArrayType(["pub", "token", "add", "https://pub.dev", "--env-var", "PUB_TOKEN"], type$.JSArray_String))), type$.dynamic), $async$createPubOIDCToken); case 4: // returning from await. case 1: @@ -5456,7 +5639,7 @@ latestPublishedVersion(channel, flavor) { var $async$goto = 0, $async$completer = A._makeAsyncAwaitCompleter(type$.String), - $async$returnValue, t2, t1, $async$temp1, $async$temp2; + $async$returnValue, t1, $async$temp1, $async$temp2; var $async$latestPublishedVersion = A._wrapJsFunctionForAsync(function($async$errorCode, $async$result) { if ($async$errorCode === 1) return A._asyncRethrow($async$result, $async$completer); @@ -5464,13 +5647,11 @@ switch ($async$goto) { case 0: // Function start - t1 = type$.dynamic; - t1 = A.LinkedHashMap_LinkedHashMap$_literal(["allowRedirects", true, "maxRedirects", 3, "allowRetries", true, "maxRetries", 3], t1, t1); - t2 = type$.JSObject; + t1 = type$.JSObject; $async$temp1 = type$.FutureOr_String; - $async$temp2 = t2; + $async$temp2 = t1; $async$goto = 3; - return A._asyncAwait(A.promiseToFuture(type$.JavaScriptObject._as(new globalThis.HttpClient("setup-dart", [], t1).getJson(string$.https_ + channel + "/" + flavor + "/latest/VERSION")), t2), $async$latestPublishedVersion); + return A._asyncAwait(A.promiseToFuture(t1._as(t1._as(new globalThis.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); @@ -5585,7 +5766,7 @@ JSString__skipLeadingWhitespace(string, index) { var t1, codeUnit; for (t1 = string.length; index < t1;) { - codeUnit = B.JSString_methods._codeUnitAt$1(string, index); + codeUnit = string.charCodeAt(index); if (codeUnit !== 32 && codeUnit !== 13 && !J.JSString__isWhitespace(codeUnit)) break; ++index; @@ -5593,10 +5774,12 @@ return index; }, JSString__skipTrailingWhitespace(string, index) { - var index0, codeUnit; - for (; index > 0; index = index0) { + var t1, index0, codeUnit; + for (t1 = string.length; index > 0; index = index0) { index0 = index - 1; - codeUnit = B.JSString_methods.codeUnitAt$1(string, index0); + if (!(index0 < t1)) + return A.ioore(string, index0); + codeUnit = string.charCodeAt(index0); if (codeUnit !== 32 && codeUnit !== 13 && !J.JSString__isWhitespace(codeUnit)) break; } @@ -5614,7 +5797,7 @@ return J.JSNull.prototype; if (typeof receiver == "boolean") return J.JSBool.prototype; - if (receiver.constructor == Array) + if (Array.isArray(receiver)) return J.JSArray.prototype; if (typeof receiver != "object") { if (typeof receiver == "function") @@ -5630,7 +5813,7 @@ return J.JSString.prototype; if (receiver == null) return receiver; - if (receiver.constructor == Array) + if (Array.isArray(receiver)) return J.JSArray.prototype; if (typeof receiver != "object") { if (typeof receiver == "function") @@ -5644,7 +5827,7 @@ getInterceptor$ax(receiver) { if (receiver == null) return receiver; - if (receiver.constructor == Array) + if (Array.isArray(receiver)) return J.JSArray.prototype; if (typeof receiver != "object") { if (typeof receiver == "function") @@ -5695,6 +5878,9 @@ elementAt$1$ax(receiver, a0) { return J.getInterceptor$ax(receiver).elementAt$1(receiver, a0); }, + map$1$1$ax(receiver, a0, $T1) { + return J.getInterceptor$ax(receiver).map$1$1(receiver, a0, $T1); + }, toString$0$(receiver) { return J.getInterceptor$(receiver).toString$0(receiver); }, @@ -5808,6 +5994,18 @@ A.throwExpression(A.UnsupportedError$("add")); receiver.push(value); }, + addAll$1(receiver, collection) { + var t1; + A._arrayInstanceType(receiver)._eval$1("Iterable<1>")._as(collection); + if (!!receiver.fixed$length) + A.throwExpression(A.UnsupportedError$("addAll")); + for (t1 = collection.get$iterator(collection); t1.moveNext$0();) + receiver.push(t1.get$current()); + }, + 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>")); + }, join$1(receiver, separator) { var i, list = A.List_List$filled(receiver.length, "", false, type$.String); @@ -5860,6 +6058,7 @@ throw A.wrapException(A.diagnoseIndexError(receiver, index)); receiver[index] = value; }, + $isEfficientLengthIterable: 1, $isIterable: 1, $isList: 1 }; @@ -5976,11 +6175,6 @@ A.throwExpression(A.diagnoseIndexError(receiver, index)); return receiver.charCodeAt(index); }, - _codeUnitAt$1(receiver, index) { - if (index >= receiver.length) - throw A.wrapException(A.diagnoseIndexError(receiver, index)); - return receiver.charCodeAt(index); - }, allMatches$1(receiver, string) { return new A._StringAllMatchesIterable(string, receiver, 0); }, @@ -6022,14 +6216,18 @@ endIndex = result.length; if (endIndex === 0) return result; - if (this._codeUnitAt$1(result, 0) === 133) { + if (0 >= endIndex) + return A.ioore(result, 0); + if (result.charCodeAt(0) === 133) { startIndex = J.JSString__skipLeadingWhitespace(result, 1); if (startIndex === endIndex) return ""; } else startIndex = 0; t1 = endIndex - 1; - endIndex0 = this.codeUnitAt$1(result, t1) === 133 ? J.JSString__skipTrailingWhitespace(result, t1) : endIndex; + if (!(t1 >= 0)) + return A.ioore(result, t1); + endIndex0 = result.charCodeAt(t1) === 133 ? J.JSString__skipTrailingWhitespace(result, t1) : endIndex; if (startIndex === 0 && endIndex0 === endIndex) return result; return result.substring(startIndex, endIndex0); @@ -6099,7 +6297,10 @@ return this.__internal$_string.length; }, $index(_, i) { - return B.JSString_methods.codeUnitAt$1(this.__internal$_string, i); + var t1 = this.__internal$_string; + if (!(i >= 0 && i < t1.length)) + return A.ioore(t1, i); + return t1.charCodeAt(i); } }; A.EfficientLengthIterable.prototype = {}; @@ -6131,6 +6332,10 @@ } return t1.charCodeAt(0) == 0 ? t1 : t1; } + }, + map$1$1(_, toElement, $T) { + var t1 = A._instanceType(this); + return new A.MappedListIterable(this, t1._bind$1($T)._eval$1("1(ListIterable.E)")._as(toElement), t1._eval$1("@")._bind$1($T)._eval$1("MappedListIterable<1,2>")); } }; A.SubListIterable.prototype = { @@ -6207,6 +6412,38 @@ }, $isIterator: 1 }; + A.MappedIterable.prototype = { + get$iterator(_) { + var t1 = this.__internal$_iterable, + t2 = A._instanceType(this); + return new A.MappedIterator(t1.get$iterator(t1), this._f, t2._eval$1("@<1>")._bind$1(t2._rest[1])._eval$1("MappedIterator<1,2>")); + }, + get$length(_) { + var t1 = this.__internal$_iterable; + return t1.get$length(t1); + } + }; + A.EfficientLengthMappedIterable.prototype = {$isEfficientLengthIterable: 1}; + A.MappedIterator.prototype = { + moveNext$0() { + var _this = this, + t1 = _this._iterator; + if (t1.moveNext$0()) { + _this.set$__internal$_current(_this._f.call$1(t1.get$current())); + return true; + } + _this.set$__internal$_current(null); + return false; + }, + get$current() { + var t1 = this.__internal$_current; + return t1 == null ? this.$ti._rest[1]._as(t1) : t1; + }, + set$__internal$_current(_current) { + this.__internal$_current = this.$ti._eval$1("2?")._as(_current); + }, + $isIterator: 1 + }; A.MappedListIterable.prototype = { get$length(_) { return J.get$length$asx(this._source); @@ -6218,6 +6455,10 @@ A.WhereIterable.prototype = { get$iterator(_) { return new A.WhereIterator(J.get$iterator$ax(this.__internal$_iterable), this._f, this.$ti._eval$1("WhereIterator<1>")); + }, + map$1$1(_, toElement, $T) { + var t1 = this.$ti; + return new A.MappedIterable(this, t1._bind$1($T)._eval$1("1(2)")._as(toElement), t1._eval$1("@<1>")._bind$1($T)._eval$1("MappedIterable<1,2>")); } }; A.WhereIterator.prototype = { @@ -6390,6 +6631,39 @@ get$length(_) { return this.__js_helper$_length; }, + get$keys() { + return new A.LinkedHashMapKeyIterable(this, this.$ti._eval$1("LinkedHashMapKeyIterable<1>")); + }, + $index(_, key) { + var strings, cell, t1, nums, _null = null; + if (typeof key == "string") { + strings = this.__js_helper$_strings; + if (strings == null) + return _null; + cell = strings[key]; + t1 = cell == null ? _null : cell.hashMapCellValue; + return t1; + } else if (typeof key == "number" && (key & 0x3fffffff) === key) { + nums = this.__js_helper$_nums; + if (nums == null) + return _null; + cell = nums[key]; + t1 = cell == null ? _null : cell.hashMapCellValue; + return t1; + } else + return this.internalGet$1(key); + }, + internalGet$1(key) { + var bucket, index, + rest = this.__js_helper$_rest; + if (rest == null) + return null; + bucket = rest[J.get$hashCode$(key) & 1073741823]; + index = this.internalFindBucketIndex$2(bucket, key); + if (index < 0) + return null; + return bucket[index].hashMapCellValue; + }, forEach$1(_, action) { var cell, modifications, _this = this; _this.$ti._eval$1("~(1,2)")._as(action); @@ -6430,6 +6704,41 @@ $isLinkedHashMap: 1 }; A.LinkedHashMapCell.prototype = {}; + A.LinkedHashMapKeyIterable.prototype = { + get$length(_) { + return this.__js_helper$_map.__js_helper$_length; + }, + get$iterator(_) { + var t1 = this.__js_helper$_map, + t2 = new A.LinkedHashMapKeyIterator(t1, t1._modifications, this.$ti._eval$1("LinkedHashMapKeyIterator<1>")); + t2._cell = t1._first; + return t2; + } + }; + A.LinkedHashMapKeyIterator.prototype = { + get$current() { + return this.__js_helper$_current; + }, + moveNext$0() { + var cell, _this = this, + t1 = _this.__js_helper$_map; + if (_this._modifications !== t1._modifications) + throw A.wrapException(A.ConcurrentModificationError$(t1)); + cell = _this._cell; + if (cell == null) { + _this.set$__js_helper$_current(null); + return false; + } else { + _this.set$__js_helper$_current(cell.hashMapCellKey); + _this._cell = cell._next; + return true; + } + }, + set$__js_helper$_current(_current) { + this.__js_helper$_current = this.$ti._eval$1("1?")._as(_current); + }, + $isIterator: 1 + }; A.initHooks_closure.prototype = { call$1(o) { return this.getTag(o); @@ -6508,9 +6817,13 @@ t1 = _this._nextIndex; t3 = t1 + 1; if (t3 < t2) { - t1 = B.JSString_methods.codeUnitAt$1(string, t1); + if (!(t1 >= 0 && t1 < t2)) + return A.ioore(string, t1); + t1 = string.charCodeAt(t1); if (t1 >= 55296 && t1 <= 56319) { - t1 = B.JSString_methods.codeUnitAt$1(string, t3); + if (!(t3 >= 0)) + return A.ioore(string, t3); + t1 = string.charCodeAt(t3); t1 = t1 >= 56320 && t1 <= 57343; } else t1 = false; @@ -6569,14 +6882,16 @@ get$runtimeType(receiver) { return B.Type_ByteBuffer_RkP; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isByteBuffer: 1 }; A.NativeTypedData.prototype = {}; A.NativeByteData.prototype = { get$runtimeType(receiver) { return B.Type_ByteData_zNC; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isByteData: 1 }; A.NativeTypedArray.prototype = { get$length(receiver) { @@ -6593,6 +6908,7 @@ A._checkValidIndex(index, receiver, receiver.length); receiver[index] = value; }, + $isEfficientLengthIterable: 1, $isIterable: 1, $isList: 1 }; @@ -6601,6 +6917,7 @@ A._checkValidIndex(index, receiver, receiver.length); receiver[index] = value; }, + $isEfficientLengthIterable: 1, $isIterable: 1, $isList: 1 }; @@ -6608,13 +6925,15 @@ get$runtimeType(receiver) { return B.Type_Float32List_LB7; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isFloat32List: 1 }; A.NativeFloat64List.prototype = { get$runtimeType(receiver) { return B.Type_Float64List_LB7; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isFloat64List: 1 }; A.NativeInt16List.prototype = { get$runtimeType(receiver) { @@ -6624,7 +6943,8 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isInt16List: 1 }; A.NativeInt32List.prototype = { get$runtimeType(receiver) { @@ -6634,7 +6954,8 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isInt32List: 1 }; A.NativeInt8List.prototype = { get$runtimeType(receiver) { @@ -6644,7 +6965,8 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isInt8List: 1 }; A.NativeUint16List.prototype = { get$runtimeType(receiver) { @@ -6654,7 +6976,8 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isUint16List: 1 }; A.NativeUint32List.prototype = { get$runtimeType(receiver) { @@ -6664,7 +6987,8 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isUint32List: 1 }; A.NativeUint8ClampedList.prototype = { get$runtimeType(receiver) { @@ -6677,7 +7001,8 @@ A._checkValidIndex(index, receiver, receiver.length); return receiver[index]; }, - $isTrustedGetRuntimeType: 1 + $isTrustedGetRuntimeType: 1, + $isUint8ClampedList: 1 }; A.NativeUint8List.prototype = { get$runtimeType(receiver) { @@ -6872,6 +7197,10 @@ } }; A._Future.prototype = { + _setChained$1(source) { + this._state = this._state & 1 | 4; + this._resultOrListeners = source; + }, then$1$2$onError(f, onError, $R) { var currentZone, result, t2, t1 = this.$ti; @@ -7010,18 +7339,13 @@ A._rootScheduleMicrotask(null, null, _this._zone, type$.void_Function._as(new A._Future__asyncCompleteWithValue_closure(_this, value))); }, _chainFuture$1(value) { - var _this = this, - t1 = _this.$ti; + var t1 = this.$ti; t1._eval$1("Future<1>")._as(value); if (t1._is(value)) { - if ((value._state & 16) !== 0) { - _this._state ^= 2; - A._rootScheduleMicrotask(null, null, _this._zone, type$.void_Function._as(new A._Future__chainFuture_closure(_this, value))); - } else - A._Future__chainCoreFuture(value, _this); + A._Future__chainCoreFutureAsync(value, this); return; } - _this._chainForeignFuture$1(value); + this._chainForeignFuture$1(value); }, _asyncCompleteError$2(error, stackTrace) { this._state ^= 2; @@ -7068,15 +7392,15 @@ }, $signature: 0 }; - A._Future__asyncCompleteWithValue_closure.prototype = { + A._Future__chainCoreFutureAsync_closure.prototype = { call$0() { - this.$this._completeWithValue$1(this.value); + A._Future__chainCoreFutureSync(this._box_0.source, this.target); }, $signature: 0 }; - A._Future__chainFuture_closure.prototype = { + A._Future__asyncCompleteWithValue_closure.prototype = { call$0() { - A._Future__chainCoreFuture(this.value, this.$this); + this.$this._completeWithValue$1(this.value); }, $signature: 0 }; @@ -7112,7 +7436,7 @@ } return; } - if (type$.Future_dynamic._is(completeResult)) { + if (completeResult instanceof A._Future) { originalSource = _this._box_1.source; t1 = _this._box_0; t1.listenerValueOrError = completeResult.then$1$1(new A._Future__propagateToListeners_handleWhenCompleteCallback_closure(originalSource), type$.dynamic); @@ -7176,11 +7500,7 @@ A._Zone.prototype = {$isZone: 1}; A._rootHandleError_closure.prototype = { call$0() { - var t1 = this.error, - t2 = this.stackTrace; - A.checkNotNullable(t1, "error", type$.Object); - A.checkNotNullable(t2, "stackTrace", type$.StackTrace); - A.Error__throw(t1, t2); + A.Error_throwWithStackTrace(this.error, this.stackTrace); }, $signature: 0 }; @@ -7234,6 +7554,184 @@ }, $signature: 0 }; + A._HashMap.prototype = { + get$length(_) { + return this._collection$_length; + }, + get$keys() { + return new A._HashMapKeyIterable(this, this.$ti._eval$1("_HashMapKeyIterable<1>")); + }, + containsKey$1(key) { + var strings, nums; + if (typeof key == "string" && key !== "__proto__") { + strings = this._strings; + return strings == null ? false : strings[key] != null; + } else if (typeof key == "number" && (key & 1073741823) === key) { + nums = this._nums; + return nums == null ? false : nums[key] != null; + } else + return this._containsKey$1(key); + }, + _containsKey$1(key) { + var rest = this._collection$_rest; + if (rest == null) + return false; + return this._findBucketIndex$2(this._getBucket$2(rest, key), key) >= 0; + }, + $index(_, key) { + var strings, t1, nums; + if (typeof key == "string" && key !== "__proto__") { + strings = this._strings; + t1 = strings == null ? null : A._HashMap__getTableEntry(strings, key); + return t1; + } else if (typeof key == "number" && (key & 1073741823) === key) { + nums = this._nums; + t1 = nums == null ? null : A._HashMap__getTableEntry(nums, key); + return t1; + } else + return this._get$1(key); + }, + _get$1(key) { + var bucket, index, + rest = this._collection$_rest; + if (rest == null) + return null; + bucket = this._getBucket$2(rest, key); + index = this._findBucketIndex$2(bucket, key); + return index < 0 ? null : bucket[index + 1]; + }, + $indexSet(_, key, value) { + var rest, hash, bucket, index, _this = this, + t1 = _this.$ti; + t1._precomputed1._as(key); + t1._rest[1]._as(value); + rest = _this._collection$_rest; + if (rest == null) + rest = _this._collection$_rest = A._HashMap__newHashTable(); + hash = A.objectHashCode(key) & 1073741823; + bucket = rest[hash]; + if (bucket == null) { + A._HashMap__setTableEntry(rest, hash, [key, value]); + ++_this._collection$_length; + _this._keys = null; + } else { + index = _this._findBucketIndex$2(bucket, key); + if (index >= 0) + bucket[index + 1] = value; + else { + bucket.push(key, value); + ++_this._collection$_length; + _this._keys = null; + } + } + }, + forEach$1(_, action) { + var keys, $length, t2, i, key, t3, _this = this, + t1 = _this.$ti; + t1._eval$1("~(1,2)")._as(action); + keys = _this._computeKeys$0(); + for ($length = keys.length, t2 = t1._precomputed1, t1 = t1._rest[1], i = 0; i < $length; ++i) { + key = keys[i]; + t2._as(key); + t3 = _this.$index(0, key); + action.call$2(key, t3 == null ? t1._as(t3) : t3); + if (keys !== _this._keys) + throw A.wrapException(A.ConcurrentModificationError$(_this)); + } + }, + _computeKeys$0() { + var strings, names, entries, index, i, nums, rest, bucket, $length, i0, _this = this, + result = _this._keys; + if (result != null) + return result; + result = A.List_List$filled(_this._collection$_length, null, false, type$.dynamic); + strings = _this._strings; + if (strings != null) { + names = Object.getOwnPropertyNames(strings); + entries = names.length; + for (index = 0, i = 0; i < entries; ++i) { + result[index] = names[i]; + ++index; + } + } else + index = 0; + nums = _this._nums; + if (nums != null) { + names = Object.getOwnPropertyNames(nums); + entries = names.length; + for (i = 0; i < entries; ++i) { + result[index] = +names[i]; + ++index; + } + } + rest = _this._collection$_rest; + if (rest != null) { + names = Object.getOwnPropertyNames(rest); + entries = names.length; + for (i = 0; i < entries; ++i) { + bucket = rest[names[i]]; + $length = bucket.length; + for (i0 = 0; i0 < $length; i0 += 2) { + result[index] = bucket[i0]; + ++index; + } + } + } + return _this._keys = result; + }, + _getBucket$2(table, key) { + return table[A.objectHashCode(key) & 1073741823]; + } + }; + A._IdentityHashMap.prototype = { + _findBucketIndex$2(bucket, key) { + var $length, i, t1; + if (bucket == null) + return -1; + $length = bucket.length; + for (i = 0; i < $length; i += 2) { + t1 = bucket[i]; + if (t1 == null ? key == null : t1 === key) + return i; + } + return -1; + } + }; + A._HashMapKeyIterable.prototype = { + get$length(_) { + return this._map._collection$_length; + }, + get$iterator(_) { + var t1 = this._map; + return new A._HashMapKeyIterator(t1, t1._computeKeys$0(), this.$ti._eval$1("_HashMapKeyIterator<1>")); + } + }; + A._HashMapKeyIterator.prototype = { + get$current() { + var t1 = this._collection$_current; + return t1 == null ? this.$ti._precomputed1._as(t1) : t1; + }, + moveNext$0() { + var _this = this, + keys = _this._keys, + offset = _this._offset, + t1 = _this._map; + if (keys !== t1._keys) + throw A.wrapException(A.ConcurrentModificationError$(t1)); + else if (offset >= keys.length) { + _this.set$_collection$_current(null); + return false; + } else { + _this.set$_collection$_current(keys[offset]); + _this._offset = offset + 1; + return true; + } + }, + set$_collection$_current(_current) { + this._collection$_current = this.$ti._eval$1("1?")._as(_current); + }, + $isIterator: 1 + }; A.ListBase.prototype = { get$iterator(receiver) { return new A.ListIterator(receiver, this.get$length(receiver), A.instanceType(receiver)._eval$1("ListIterator")); @@ -7241,6 +7739,10 @@ elementAt$1(receiver, index) { return this.$index(receiver, index); }, + map$1$1(receiver, f, $T) { + var t1 = A.instanceType(receiver); + return new A.MappedListIterable(receiver, t1._bind$1($T)._eval$1("1(ListBase.E)")._as(f), t1._eval$1("@")._bind$1($T)._eval$1("MappedListIterable<1,2>")); + }, fillRange$3(receiver, start, end, fill) { var i; A.instanceType(receiver)._eval$1("ListBase.E?")._as(fill); @@ -7251,12 +7753,24 @@ toString$0(receiver) { return A.Iterable_iterableToFullString(receiver, "[", "]"); }, + $isEfficientLengthIterable: 1, $isIterable: 1, $isList: 1 }; A.MapBase.prototype = { + forEach$1(_, action) { + var t2, key, t3, + t1 = A._instanceType(this); + t1._eval$1("~(1,2)")._as(action); + for (t2 = this.get$keys(), t2 = t2.get$iterator(t2), t1 = t1._rest[1]; t2.moveNext$0();) { + key = t2.get$current(); + t3 = this.$index(0, key); + action.call$2(key, t3 == null ? t1._as(t3) : t3); + } + }, get$length(_) { - return this.__js_helper$_length; + var t1 = this.get$keys(); + return t1.get$length(t1); }, toString$0(_) { return A.MapBase_mapToString(this); @@ -7303,18 +7817,27 @@ }; A.Base64Codec.prototype = { normalize$3(source, start, end) { - var inverseAlphabet, t1, i, sliceStart, buffer, firstPadding, firstPaddingSourceIndex, paddingCount, i0, char, i1, digit1, digit2, char0, value, t2, endLength, $length, - _s31_ = "Invalid base64 encoding length "; - end = A.RangeError_checkValidRange(start, end, source.length); + var inverseAlphabet, t2, i, sliceStart, buffer, firstPadding, firstPaddingSourceIndex, paddingCount, i0, char, i1, digit1, t3, digit2, char0, value, endLength, $length, + _s64_ = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", + _s31_ = "Invalid base64 encoding length ", + t1 = source.length; + end = A.RangeError_checkValidRange(start, end, t1); inverseAlphabet = $.$get$_Base64Decoder__inverseAlphabet(); - for (t1 = inverseAlphabet.length, i = start, sliceStart = i, buffer = null, firstPadding = -1, firstPaddingSourceIndex = -1, paddingCount = 0; i < end; i = i0) { + for (t2 = inverseAlphabet.length, i = start, sliceStart = i, buffer = null, firstPadding = -1, firstPaddingSourceIndex = -1, paddingCount = 0; i < end; i = i0) { i0 = i + 1; - char = B.JSString_methods._codeUnitAt$1(source, i); + if (!(i < t1)) + return A.ioore(source, i); + char = source.charCodeAt(i); if (char === 37) { i1 = i0 + 2; if (i1 <= end) { - digit1 = A.hexDigitValue(B.JSString_methods._codeUnitAt$1(source, i0)); - digit2 = A.hexDigitValue(B.JSString_methods._codeUnitAt$1(source, i0 + 1)); + if (!(i0 < t1)) + return A.ioore(source, i0); + digit1 = A.hexDigitValue(source.charCodeAt(i0)); + t3 = i0 + 1; + if (!(t3 < t1)) + return A.ioore(source, t3); + digit2 = A.hexDigitValue(source.charCodeAt(t3)); char0 = digit1 * 16 + digit2 - (digit2 & 256); if (char0 === 37) char0 = -1; @@ -7324,21 +7847,23 @@ } else char0 = char; if (0 <= char0 && char0 <= 127) { - if (!(char0 >= 0 && char0 < t1)) + if (!(char0 >= 0 && char0 < t2)) return A.ioore(inverseAlphabet, char0); value = inverseAlphabet[char0]; if (value >= 0) { - char0 = B.JSString_methods.codeUnitAt$1("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", value); + if (!(value < 64)) + return A.ioore(_s64_, value); + char0 = _s64_.charCodeAt(value); if (char0 === char) continue; char = char0; } else { if (value === -1) { if (firstPadding < 0) { - t2 = buffer == null ? null : buffer._contents.length; - if (t2 == null) - t2 = 0; - firstPadding = t2 + (i - sliceStart); + t3 = buffer == null ? null : buffer._contents.length; + if (t3 == null) + t3 = 0; + firstPadding = t3 + (i - sliceStart); firstPaddingSourceIndex = i; } ++paddingCount; @@ -7350,11 +7875,11 @@ if (value !== -2) { if (buffer == null) { buffer = new A.StringBuffer(""); - t2 = buffer; + t3 = buffer; } else - t2 = buffer; - t2._contents += B.JSString_methods.substring$2(source, sliceStart, i); - t2._contents += A.Primitives_stringFromCharCode(char); + t3 = buffer; + t3._contents += B.JSString_methods.substring$2(source, sliceStart, i); + t3._contents += A.Primitives_stringFromCharCode(char); sliceStart = i0; continue; } @@ -7437,7 +7962,10 @@ return _this.decodeGeneral$4(bytes, start, end, single); }, decodeGeneral$4(bytes, start, end, single) { - var byte, t2, type, t3, i0, markEnd, i1, m, _this = this, _65533 = 65533, + var byte, t2, type, t3, i0, markEnd, i1, m, _this = this, + _s256_ = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFFFFFFFFFFFFFFFGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHHHHHHHHIHHHJEEBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBKCCCCCCCCCCCCDCLONNNMEEEEEEEEEEE", + _s144_ = " \x000:XECCCCCN:lDb \x000:XECCCCCNvlDb \x000:XECCCCCN:lDb AAAAA\x00\x00\x00\x00\x00AAAAA00000AAAAA:::::AAAAAGG000AAAAA00KKKAAAAAG::::AAAAA:IIIIAAAAA000\x800AAAAA\x00\x00\x00\x00 AAAAA", + _65533 = 65533, state = _this._convert$_state, char = _this._charOrIndex, buffer = new A.StringBuffer(""), @@ -7449,9 +7977,14 @@ $label0$0: for (t2 = _this.allowMalformed; true;) { for (; true; i = i0) { - type = B.JSString_methods._codeUnitAt$1("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFFFFFFFFFFFFFFFGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHHHHHHHHIHHHJEEBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBKCCCCCCCCCCCCDCLONNNMEEEEEEEEEEE", byte) & 31; + if (!(byte >= 0 && byte < 256)) + return A.ioore(_s256_, byte); + type = _s256_.charCodeAt(byte) & 31; char = state <= 32 ? byte & 61694 >>> type : (byte & 63 | char << 6) >>> 0; - state = B.JSString_methods._codeUnitAt$1(" \x000:XECCCCCN:lDb \x000:XECCCCCNvlDb \x000:XECCCCCN:lDb AAAAA\x00\x00\x00\x00\x00AAAAA00000AAAAA:::::AAAAAGG000AAAAA00KKKAAAAAG::::AAAAA:IIIIAAAAA000\x800AAAAA\x00\x00\x00\x00 AAAAA", state + type); + t3 = state + type; + if (!(t3 >= 0 && t3 < 144)) + return A.ioore(_s144_, t3); + state = _s144_.charCodeAt(t3); if (state === 0) { buffer._contents += A.Primitives_stringFromCharCode(char); if (i === end) @@ -7661,7 +8194,7 @@ }; A.FormatException.prototype = { toString$0(_) { - var t1, lineNum, lineStart, previousCharWasCR, i, char, lineEnd, end, start, prefix, postfix, + var t1, lineEnd, lineNum, lineStart, previousCharWasCR, i, char, end, start, prefix, postfix, message = this.message, report = "" !== message ? "FormatException: " + message : "FormatException", offset = this.offset, @@ -7678,8 +8211,10 @@ source = B.JSString_methods.substring$2(source, 0, 75) + "..."; return report + "\n" + source; } - for (lineNum = 1, lineStart = 0, previousCharWasCR = false, i = 0; i < offset; ++i) { - char = B.JSString_methods._codeUnitAt$1(source, i); + for (lineEnd = source.length, lineNum = 1, lineStart = 0, previousCharWasCR = false, i = 0; i < offset; ++i) { + if (!(i < lineEnd)) + return A.ioore(source, i); + char = source.charCodeAt(i); if (char === 10) { if (lineStart !== i || !previousCharWasCR) ++lineNum; @@ -7692,9 +8227,10 @@ } } report = lineNum > 1 ? report + (" (at line " + lineNum + ", character " + (offset - lineStart + 1) + ")\n") : report + (" (at character " + (offset + 1) + ")\n"); - lineEnd = source.length; for (i = offset; i < lineEnd; ++i) { - char = B.JSString_methods.codeUnitAt$1(source, i); + if (!(i >= 0)) + return A.ioore(source, i); + char = source.charCodeAt(i); if (char === 10 || char === 13) { lineEnd = i; break; @@ -7730,6 +8266,10 @@ } }; A.Iterable.prototype = { + map$1$1(_, toElement, $T) { + var t1 = A._instanceType(this); + return A.MappedIterable_MappedIterable(this, t1._bind$1($T)._eval$1("1(Iterable.E)")._as(toElement), t1._eval$1("Iterable.E"), $T); + }, get$length(_) { var count, it = this.get$iterator(this); @@ -7854,11 +8394,18 @@ return value; }, get$pathSegments() { - var pathToSplit, result, _this = this, + var pathToSplit, t1, result, _this = this, value = _this.___Uri_pathSegments_FI; if (value === $) { pathToSplit = _this.path; - if (pathToSplit.length !== 0 && B.JSString_methods._codeUnitAt$1(pathToSplit, 0) === 47) + t1 = pathToSplit.length; + if (t1 !== 0) { + if (0 >= t1) + return A.ioore(pathToSplit, 0); + t1 = pathToSplit.charCodeAt(0) === 47; + } else + t1 = false; + if (t1) pathToSplit = B.JSString_methods.substring$1(pathToSplit, 1); result = pathToSplit.length === 0 ? B.List_empty : A.List_List$unmodifiable(new A.MappedListIterable(A._setArrayType(pathToSplit.split("/"), type$.JSArray_String), type$.dynamic_Function_String._as(A.core_Uri_decodeComponent$closure()), type$.MappedListIterable_String_dynamic), type$.String); _this.___Uri_pathSegments_FI !== $ && A.throwLateFieldADI("pathSegments"); @@ -8016,7 +8563,7 @@ call$3(target, chars, transition) { var t1, i, t2; for (t1 = chars.length, i = 0; i < t1; ++i) { - t2 = B.JSString_methods._codeUnitAt$1(chars, i) ^ 96; + t2 = chars.charCodeAt(i) ^ 96; if (!(t2 < 96)) return A.ioore(target, t2); target[t2] = transition; @@ -8026,8 +8573,15 @@ }; A._createTables_setRange.prototype = { call$3(target, range, transition) { - var i, n, t1; - for (i = B.JSString_methods._codeUnitAt$1(range, 0), n = B.JSString_methods._codeUnitAt$1(range, 1); i <= n; ++i) { + var i, n, + t1 = range.length; + if (0 >= t1) + return A.ioore(range, 0); + i = range.charCodeAt(0); + if (1 >= t1) + return A.ioore(range, 1); + n = range.charCodeAt(1); + for (; i <= n; ++i) { t1 = (i ^ 96) >>> 0; if (!(t1 < 96)) return A.ioore(target, t1); @@ -8116,6 +8670,32 @@ $isUri: 1 }; A._DataUri.prototype = {}; + A.jsify__convert.prototype = { + call$1(o) { + var t1, convertedMap, key, convertedList; + if (A._noJsifyRequired(o)) + return o; + t1 = this._convertedObjects; + if (t1.containsKey$1(o)) + return t1.$index(0, o); + if (o instanceof A.MapBase) { + convertedMap = {}; + t1.$indexSet(0, o, convertedMap); + for (t1 = o.get$keys(), t1 = t1.get$iterator(t1); t1.moveNext$0();) { + key = t1.get$current(); + convertedMap[key] = this.call$1(o.$index(0, key)); + } + return convertedMap; + } else if (type$.Iterable_nullable_Object._is(o)) { + convertedList = []; + t1.$indexSet(0, o, convertedList); + B.JSArray_methods.addAll$1(convertedList, J.map$1$1$ax(o, this, type$.dynamic)); + return convertedList; + } else + return o; + }, + $signature: 20 + }; A.promiseToFuture_closure.prototype = { call$1(r) { return this.completer.complete$1(this.T._eval$1("0/?")._as(r)); @@ -8174,14 +8754,14 @@ call$1(part) { return A._asString(part) !== ""; }, - $signature: 20 + $signature: 21 }; A._validateArgList_closure.prototype = { call$1(arg) { A._asStringQ(arg); return arg == null ? "null" : '"' + arg + '"'; }, - $signature: 21 + $signature: 22 }; A.InternalStyle.prototype = { getRoot$1(path) { @@ -8225,11 +8805,27 @@ return codeUnit === 47; }, needsSeparator$1(path) { - var t1 = path.length; - return t1 !== 0 && B.JSString_methods.codeUnitAt$1(path, t1 - 1) !== 47; + var t2, + t1 = path.length; + if (t1 !== 0) { + t2 = t1 - 1; + if (!(t2 >= 0)) + return A.ioore(path, t2); + t2 = path.charCodeAt(t2) !== 47; + t1 = t2; + } else + t1 = false; + return t1; }, rootLength$2$withDrive(path, withDrive) { - if (path.length !== 0 && B.JSString_methods._codeUnitAt$1(path, 0) === 47) + var t1 = path.length; + if (t1 !== 0) { + if (0 >= t1) + return A.ioore(path, 0); + t1 = path.charCodeAt(0) === 47; + } else + t1 = false; + if (t1) return 1; return 0; }, @@ -8254,10 +8850,14 @@ return codeUnit === 47; }, needsSeparator$1(path) { - var t1 = path.length; + var t2, + t1 = path.length; if (t1 === 0) return false; - if (B.JSString_methods.codeUnitAt$1(path, t1 - 1) !== 47) + t2 = t1 - 1; + if (!(t2 >= 0)) + return A.ioore(path, t2); + if (path.charCodeAt(t2) !== 47) return true; return B.JSString_methods.endsWith$1(path, "://") && this.rootLength$1(path) === t1; }, @@ -8266,10 +8866,12 @@ t1 = path.length; if (t1 === 0) return 0; - if (B.JSString_methods._codeUnitAt$1(path, 0) === 47) + if (0 >= t1) + return A.ioore(path, 0); + if (path.charCodeAt(0) === 47) return 1; for (i = 0; i < t1; ++i) { - codeUnit = B.JSString_methods._codeUnitAt$1(path, i); + codeUnit = path.charCodeAt(i); if (codeUnit === 47) return 0; if (codeUnit === 58) { @@ -8294,7 +8896,14 @@ return this.rootLength$2$withDrive(path, false); }, isRootRelative$1(path) { - return path.length !== 0 && B.JSString_methods._codeUnitAt$1(path, 0) === 47; + var t1 = path.length; + if (t1 !== 0) { + if (0 >= t1) + return A.ioore(path, 0); + t1 = path.charCodeAt(0) === 47; + } else + t1 = false; + return t1; }, get$name() { return "url"; @@ -8311,22 +8920,33 @@ return codeUnit === 47 || codeUnit === 92; }, needsSeparator$1(path) { - var t1 = path.length; + var t2, + t1 = path.length; if (t1 === 0) return false; - t1 = B.JSString_methods.codeUnitAt$1(path, t1 - 1); - return !(t1 === 47 || t1 === 92); + t2 = t1 - 1; + if (!(t2 >= 0)) + return A.ioore(path, t2); + t2 = path.charCodeAt(t2); + return !(t2 === 47 || t2 === 92); }, rootLength$2$withDrive(path, withDrive) { var t2, index, t1 = path.length; if (t1 === 0) return 0; - t2 = B.JSString_methods._codeUnitAt$1(path, 0); - if (t2 === 47) + if (0 >= t1) + return A.ioore(path, 0); + if (path.charCodeAt(0) === 47) return 1; - if (t2 === 92) { - if (t1 < 2 || B.JSString_methods._codeUnitAt$1(path, 1) !== 92) + if (path.charCodeAt(0) === 92) { + if (t1 >= 2) { + if (1 >= t1) + return A.ioore(path, 1); + t2 = path.charCodeAt(1) !== 92; + } else + t2 = true; + if (t2) return 1; index = B.JSString_methods.indexOf$2(path, "\\", 2); if (index > 0) { @@ -8338,11 +8958,11 @@ } if (t1 < 3) return 0; - if (!A.isAlphabetic(t2)) + if (!A.isAlphabetic(path.charCodeAt(0))) return 0; - if (B.JSString_methods._codeUnitAt$1(path, 1) !== 58) + if (path.charCodeAt(1) !== 58) return 0; - t1 = B.JSString_methods._codeUnitAt$1(path, 2); + t1 = path.charCodeAt(2); if (!(t1 === 47 || t1 === 92)) return 0; return 3; @@ -8371,14 +8991,14 @@ _static_1(A, "async__AsyncRun__scheduleImmediateWithSetImmediate$closure", "_AsyncRun__scheduleImmediateWithSetImmediate", 2); _static_1(A, "async__AsyncRun__scheduleImmediateWithTimer$closure", "_AsyncRun__scheduleImmediateWithTimer", 2); _static_0(A, "async___startMicrotaskLoop$closure", "_startMicrotaskLoop", 0); - _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 22); + _static_1(A, "core_Uri_decodeComponent$closure", "Uri_decodeComponent", 23); })(); (function inheritance() { var _mixin = hunkHelpers.mixin, _inherit = hunkHelpers.inherit, _inheritMany = hunkHelpers.inheritMany; _inherit(A.Object, null); - _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(A.Object, [A.JS_CONST, J.Interceptor, J.ArrayIterator, A.Error, A.ListBase, A.Iterable, A.ListIterator, A.MappedIterator, A.WhereIterator, A.WhereTypeIterator, A.FixedLengthListMixin, A.UnmodifiableListMixin, A.TypeErrorDecoder, A.NullThrownFromJavaScriptException, A.ExceptionAndStackTrace, A._StackTrace, A.Closure, A.MapBase, A.LinkedHashMapCell, A.LinkedHashMapKeyIterator, 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._HashMapKeyIterator, 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.NativeByteBuffer, A.NativeTypedData]); _inheritMany(J.LegacyJavaScriptObject, [J.PlainJavaScriptObject, J.UnknownJavaScriptObject, J.JavaScriptFunction]); @@ -8387,14 +9007,15 @@ _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.UnmodifiableListBase, A.ListBase); _inherit(A.CodeUnits, A.UnmodifiableListBase); - _inheritMany(A.Iterable, [A.EfficientLengthIterable, A.WhereIterable, A.WhereTypeIterable, A._AllMatchesIterable, A._StringAllMatchesIterable]); - _inherit(A.ListIterable, A.EfficientLengthIterable); + _inheritMany(A.Iterable, [A.EfficientLengthIterable, A.MappedIterable, A.WhereIterable, A.WhereTypeIterable, A._AllMatchesIterable, A._StringAllMatchesIterable]); + _inheritMany(A.EfficientLengthIterable, [A.ListIterable, A.LinkedHashMapKeyIterable, A._HashMapKeyIterable]); _inheritMany(A.ListIterable, [A.SubListIterable, A.MappedListIterable]); + _inherit(A.EfficientLengthMappedIterable, A.MappedIterable); _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.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.jsify__convert, 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.JsLinkedHashMap, A.MapBase); + _inheritMany(A.MapBase, [A.JsLinkedHashMap, A._HashMap]); _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]); _inheritMany(A.NativeTypedData, [A.NativeByteData, A.NativeTypedArray]); _inheritMany(A.NativeTypedArray, [A._NativeTypedArrayOfDouble_NativeTypedArray_ListMixin, A._NativeTypedArrayOfInt_NativeTypedArray_ListMixin]); @@ -8405,9 +9026,10 @@ _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]); + _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__chainCoreFutureAsync_closure, A._Future__asyncCompleteWithValue_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); + _inherit(A._IdentityHashMap, A._HashMap); _inheritMany(A.Codec, [A.Base64Codec, A.Encoding]); _inheritMany(A.Converter, [A.Base64Encoder, A.Utf8Decoder]); _inherit(A.Utf8Codec, A.Encoding); @@ -8425,12 +9047,12 @@ typeUniverse: {eC: new Map(), tR: {}, eT: {}, tPV: {}, sEA: []}, mangledGlobalNames: {int: "int", double: "double", num: "num", String: "String", bool: "bool", Null: "Null", List: "List"}, mangledNames: {}, - types: ["~()", "~(@)", "~(~())", "Null(@)", "Null()", "@()", "~(Uint8List,String,int)", "@(@)", "@(@,String)", "@(String)", "Null(~())", "Null(@,StackTrace)", "~(int,@)", "Null(Object,StackTrace)", "_Future<@>(@)", "~(Object?,Object?)", "~(String,int)", "~(String,int?)", "int(int,int)", "Uint8List(@,@)", "bool(String)", "String(String?)", "String(String)"], + types: ["~()", "~(@)", "~(~())", "Null(@)", "Null()", "@()", "~(Uint8List,String,int)", "@(@)", "@(@,String)", "@(String)", "Null(~())", "Null(@,StackTrace)", "~(int,@)", "Null(Object,StackTrace)", "_Future<@>(@)", "~(Object?,Object?)", "~(String,int)", "~(String,int?)", "int(int,int)", "Uint8List(@,@)", "Object?(Object?)", "bool(String)", "String(String?)", "String(String)"], interceptorsByTag: null, leafTags: null, arrayRti: Symbol("$ti") }; - 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_addRules(init.typeUniverse, JSON.parse('{"PlainJavaScriptObject":"LegacyJavaScriptObject","UnknownJavaScriptObject":"LegacyJavaScriptObject","JavaScriptFunction":"LegacyJavaScriptObject","JSBool":{"bool":[],"TrustedGetRuntimeType":[]},"JSNull":{"Null":[],"TrustedGetRuntimeType":[]},"JavaScriptObject":{"JSObject":[]},"LegacyJavaScriptObject":{"JSObject":[]},"JSArray":{"List":["1"],"EfficientLengthIterable":["1"],"JSObject":[],"Iterable":["1"]},"JSUnmodifiableArray":{"JSArray":["1"],"List":["1"],"EfficientLengthIterable":["1"],"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"],"EfficientLengthIterable":["int"],"Iterable":["int"],"ListBase.E":"int","UnmodifiableListMixin.E":"int"},"EfficientLengthIterable":{"Iterable":["1"]},"ListIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"]},"SubListIterable":{"ListIterable":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1","ListIterable.E":"1"},"ListIterator":{"Iterator":["1"]},"MappedIterable":{"Iterable":["2"],"Iterable.E":"2"},"EfficientLengthMappedIterable":{"MappedIterable":["1","2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"Iterable.E":"2"},"MappedIterator":{"Iterator":["2"]},"MappedListIterable":{"ListIterable":["2"],"EfficientLengthIterable":["2"],"Iterable":["2"],"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"],"EfficientLengthIterable":["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"]},"LinkedHashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"LinkedHashMapKeyIterator":{"Iterator":["1"]},"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":{"JSObject":[],"ByteBuffer":[],"TrustedGetRuntimeType":[]},"NativeTypedData":{"JSObject":[]},"NativeByteData":{"ByteData":[],"JSObject":[],"TrustedGetRuntimeType":[]},"NativeTypedArray":{"JavaScriptIndexingBehavior":["1"],"JSObject":[]},"NativeTypedArrayOfDouble":{"ListBase":["double"],"JavaScriptIndexingBehavior":["double"],"List":["double"],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"]},"NativeTypedArrayOfInt":{"ListBase":["int"],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"]},"NativeFloat32List":{"ListBase":["double"],"Float32List":[],"JavaScriptIndexingBehavior":["double"],"List":["double"],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeFloat64List":{"ListBase":["double"],"Float64List":[],"JavaScriptIndexingBehavior":["double"],"List":["double"],"EfficientLengthIterable":["double"],"JSObject":[],"Iterable":["double"],"FixedLengthListMixin":["double"],"TrustedGetRuntimeType":[],"ListBase.E":"double"},"NativeInt16List":{"ListBase":["int"],"Int16List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt32List":{"ListBase":["int"],"Int32List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeInt8List":{"ListBase":["int"],"Int8List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint16List":{"ListBase":["int"],"Uint16List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint32List":{"ListBase":["int"],"Uint32List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8ClampedList":{"ListBase":["int"],"Uint8ClampedList":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"JSObject":[],"Iterable":["int"],"FixedLengthListMixin":["int"],"TrustedGetRuntimeType":[],"ListBase.E":"int"},"NativeUint8List":{"ListBase":["int"],"Uint8List":[],"JavaScriptIndexingBehavior":["int"],"List":["int"],"EfficientLengthIterable":["int"],"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":[]},"_HashMap":{"MapBase":["1","2"],"Map":["1","2"]},"_IdentityHashMap":{"_HashMap":["1","2"],"MapBase":["1","2"],"Map":["1","2"]},"_HashMapKeyIterable":{"EfficientLengthIterable":["1"],"Iterable":["1"],"Iterable.E":"1"},"_HashMapKeyIterator":{"Iterator":["1"]},"ListBase":{"List":["1"],"EfficientLengthIterable":["1"],"Iterable":["1"]},"MapBase":{"Map":["1","2"]},"Base64Codec":{"Codec":["List","String"]},"Encoding":{"Codec":["String","List"]},"Utf8Codec":{"Codec":["String","List"]},"double":{"num":[]},"int":{"num":[]},"List":{"EfficientLengthIterable":["1"],"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"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint8ClampedList":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint16List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Int32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Uint32List":{"List":["int"],"EfficientLengthIterable":["int"],"Iterable":["int"]},"Float32List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]},"Float64List":{"List":["double"],"EfficientLengthIterable":["double"],"Iterable":["double"]}}')); A._Universe_addErasedTypes(init.typeUniverse, JSON.parse('{"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", @@ -8440,12 +9062,22 @@ var findType = A.findType; return { AsyncError: findType("AsyncError"), + ByteBuffer: findType("ByteBuffer"), + ByteData: findType("ByteData"), + EfficientLengthIterable_dynamic: findType("EfficientLengthIterable<@>"), Error: findType("Error"), + Float32List: findType("Float32List"), + Float64List: findType("Float64List"), Function: findType("Function"), FutureOr_String: findType("String/"), Future_dynamic: findType("Future<@>"), + Int16List: findType("Int16List"), + Int32List: findType("Int32List"), + Int8List: findType("Int8List"), Iterable_String: findType("Iterable"), Iterable_dynamic: findType("Iterable<@>"), + Iterable_nullable_Object: findType("Iterable"), + JSArray_Object: findType("JSArray"), JSArray_String: findType("JSArray"), JSArray_Uint8List: findType("JSArray"), JSArray_dynamic: findType("JSArray<@>"), @@ -8455,7 +9087,6 @@ JSObject: findType("JSObject"), JavaScriptFunction: findType("JavaScriptFunction"), JavaScriptIndexingBehavior_dynamic: findType("JavaScriptIndexingBehavior<@>"), - JavaScriptObject: findType("JavaScriptObject"), List_String: findType("List"), List_int: findType("List"), MappedListIterable_String_dynamic: findType("MappedListIterable"), @@ -8467,11 +9098,15 @@ String: findType("String"), TrustedGetRuntimeType: findType("TrustedGetRuntimeType"), TypeError: findType("TypeError"), + Uint16List: findType("Uint16List"), + Uint32List: findType("Uint32List"), + Uint8ClampedList: findType("Uint8ClampedList"), Uint8List: findType("Uint8List"), UnknownJavaScriptObject: findType("UnknownJavaScriptObject"), Uri: findType("Uri"), WhereTypeIterable_String: findType("WhereTypeIterable"), _Future_dynamic: findType("_Future<@>"), + _IdentityHashMap_of_nullable_Object_and_nullable_Object: findType("_IdentityHashMap"), bool: findType("bool"), bool_Function_Object: findType("bool(Object)"), double: findType("double"), @@ -8484,6 +9119,7 @@ legacy_Never: findType("0&*"), legacy_Object: findType("Object*"), nullable_Future_Null: findType("Future?"), + nullable_JSObject: findType("JSObject?"), nullable_Object: findType("Object?"), nullable__FutureListener_dynamic_dynamic: findType("_FutureListener<@,@>?"), num: findType("num"), @@ -8652,7 +9288,7 @@ })(); (function staticFields() { $._JS_INTEROP_INTERCEPTOR_TAG = null; - $.toStringVisiting = A._setArrayType([], A.findType("JSArray")); + $.toStringVisiting = A._setArrayType([], type$.JSArray_Object); $.Primitives__identityHashCodeProperty = null; $.BoundClosure__receiverFieldNameCache = null; $.BoundClosure__interceptorFieldNameCache = null; @@ -8667,6 +9303,8 @@ $._lastPriorityCallback = null; $._isInCallbackLoop = false; $.Zone__current = B.C__RootZone; + $.Uri__cachedBaseString = ""; + $.Uri__cachedBaseUri = null; })(); (function lazyInitializers() { var _lazyFinal = hunkHelpers.lazyFinal; @@ -8721,7 +9359,7 @@ _lazyFinal($, "_Base64Decoder__inverseAlphabet", "$get$_Base64Decoder__inverseAlphabet", () => new Int8Array(A._ensureNativeList(A._setArrayType([-2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -1, -2, -2, -2, -2, -2, 62, -2, 62, -2, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -2, -2, -2, -1, -2, -2, -2, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -2, -2, -2, -2, 63, -2, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -2, -2, -2, -2, -2], type$.JSArray_int)))); _lazyFinal($, "_Uri__isWindowsCached", "$get$_Uri__isWindowsCached", () => typeof process != "undefined" && Object.prototype.toString.call(process) == "[object process]" && process.platform == "win32"); _lazyFinal($, "_scannerTables", "$get$_scannerTables", () => A._createTables()); - _lazyFinal($, "context", "$get$context", () => new A.Context(A.findType("InternalStyle")._as($.$get$Style_platform()))); + _lazyFinal($, "context", "$get$context", () => new A.Context($.$get$Style_platform())); _lazyFinal($, "Style_posix", "$get$Style_posix", () => new A.PosixStyle(A.RegExp_RegExp("/"), A.RegExp_RegExp("[^/]$"), A.RegExp_RegExp("^/"))); _lazyFinal($, "Style_windows", "$get$Style_windows", () => new A.WindowsStyle(A.RegExp_RegExp("[/\\\\]"), A.RegExp_RegExp("[^/\\\\]$"), A.RegExp_RegExp("^(\\\\\\\\[^\\\\]+\\\\[^\\\\/]+|[a-zA-Z]:[/\\\\])"), A.RegExp_RegExp("^[/\\\\](?![/\\\\])"))); _lazyFinal($, "Style_url", "$get$Style_url", () => new A.UrlStyle(A.RegExp_RegExp("/"), A.RegExp_RegExp("(^[a-zA-Z][-+.a-zA-Z\\d]*://|[^/])$"), A.RegExp_RegExp("[a-zA-Z][-+.a-zA-Z\\d]*://[^/]*"), A.RegExp_RegExp("^/"))); diff --git a/dist/sig.txt b/dist/sig.txt index b419ef9..8fd3970 100644 --- a/dist/sig.txt +++ b/dist/sig.txt @@ -1 +1 @@ -7F2C5F3CF99AE2F47DBFA36238B06AEA +5824C997FA8A298F08447E92FF5FEF52 diff --git a/lib/main.dart b/lib/main.dart index c423201..d39946e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -116,7 +116,10 @@ void main(List args) async { } // Report success; print version. - await promiseToFuture(exec.exec('dart', ['--version'])); + await promiseToFuture(exec.exec( + 'dart', + ['--version'.toJS].toJS, + )); } catch (error) { core.setFailed('$error'); } @@ -157,8 +160,17 @@ Future createPubOIDCToken() async { core.exportVariable('PUB_TOKEN', token); - await promiseToFuture(exec.exec('dart', - ['pub', 'token', 'add', 'https://pub.dev', '--env-var', 'PUB_TOKEN'])); + await promiseToFuture(exec.exec( + 'dart', + [ + 'pub'.toJS, + 'token'.toJS, + 'add'.toJS, + 'https://pub.dev'.toJS, + '--env-var'.toJS, + 'PUB_TOKEN'.toJS, + ].toJS, + )); } // https://storage.googleapis.com/dart-archive/channels/stable/release/latest/VERSION @@ -174,12 +186,16 @@ Future latestPublishedVersion(String channel, String flavor) async { final url = 'https://storage.googleapis.com/dart-archive/channels/' '$channel/$flavor/latest/VERSION'; - final http = HttpClient('setup-dart', [], { - 'allowRedirects': true, - 'maxRedirects': 3, - 'allowRetries': true, - 'maxRetries': 3, - }); + final http = HttpClient( + 'setup-dart', + [].toJS, + jsify({ + 'allowRedirects': true, + 'maxRedirects': 3, + 'allowRetries': true, + 'maxRetries': 3, + }) as JSObject?, + ); var response = await promiseToFuture(http.getJson(url)); var result = getProperty(response, 'result'); diff --git a/lib/node/actions/core.dart b/lib/node/actions/core.dart index 9c7bdbc..3c8a044 100644 --- a/lib/node/actions/core.dart +++ b/lib/node/actions/core.dart @@ -9,20 +9,24 @@ external Core get core; @JS() inline class Core { - external JSString getInput(JSString name); + final JSObject obj; - external void setOutput(JSString name, JSString value); + Core(this.obj); - external void info(JSString name); - external void warning(JSString name); - external void error(JSString name); + external String getInput(String name); - external void addPath(JSString element); + external void setOutput(String name, String value); - external void exportVariable(JSString name, JSString value); + external void info(String name); + external void warning(String name); + external void error(String name); - external void setFailed(JSString name); + external void addPath(String element); + + external void exportVariable(String name, String value); + + external void setFailed(String name); // JSPromise - external JSPromise getIDToken(JSString audience); + external JSPromise getIDToken(String audience); } diff --git a/lib/node/actions/exec.dart b/lib/node/actions/exec.dart index 2cebac2..16a51de 100644 --- a/lib/node/actions/exec.dart +++ b/lib/node/actions/exec.dart @@ -9,9 +9,13 @@ external Exec get exec; @JS() inline class Exec { + final JSObject obj; + + Exec(this.obj); + /// Exec a command. /// /// Output will be streamed to the live console. Returns promise with return /// code. - external JSPromise exec(JSString commandLine, [List args]); + external JSPromise exec(String commandLine, [JSArray? args]); } diff --git a/lib/node/actions/http_client.dart b/lib/node/actions/http_client.dart index 6906989..579fa99 100644 --- a/lib/node/actions/http_client.dart +++ b/lib/node/actions/http_client.dart @@ -6,12 +6,14 @@ import 'dart:js_interop'; @JS() inline class HttpClient { + final JSObject obj; + external HttpClient( - JSString userAgent, - JSArray handlers, - Map requestOptions, - ); + String userAgent, [ + JSArray? handlers, + JSObject? requestOptions, + ]); // JSPromise - external JSPromise getJson(JSString requestUrl); + external JSPromise getJson(String requestUrl); } diff --git a/lib/node/actions/tool_cache.dart b/lib/node/actions/tool_cache.dart index ebf46f1..dd6c906 100644 --- a/lib/node/actions/tool_cache.dart +++ b/lib/node/actions/tool_cache.dart @@ -9,15 +9,19 @@ external ToolCache get toolCache; @JS() inline class ToolCache { + final JSObject obj; + + ToolCache(this.obj); + /// Finds the path to a tool version in the local installed tool cache. /// /// @param toolName name of the tool /// @param versionSpec version of the tool /// @param arch optional arch. defaults to arch of computer - external JSString find( - JSString toolName, - JSString versionSpec, [ - JSString arch, + external String find( + String toolName, + String versionSpec, [ + String? arch, ]); /// Download a tool from an url and stream it into a file. @@ -25,13 +29,13 @@ inline class ToolCache { /// @param url url of tool to download /// @returns path to downloaded tool // JSPromise - external JSPromise downloadTool(JSString url); + external JSPromise downloadTool(String url); /// Extract a zip. /// /// @param file path to the zip /// @returns path to the destination directory - external JSPromise extractZip(JSString file); + external JSPromise extractZip(String file); /// Caches a directory and installs it into the tool cacheDir /// @@ -41,9 +45,9 @@ inline class ToolCache { /// @param arch architecture of the tool. Optional. /// Defaults to machine architecture external JSPromise cacheDir( - JSString sourceDir, - JSString tool, - JSString version, [ - JSString arch, + String sourceDir, + String tool, + String version, [ + String? arch, ]); } diff --git a/lib/node/fs.dart b/lib/node/fs.dart index 1f88579..a0196fe 100644 --- a/lib/node/fs.dart +++ b/lib/node/fs.dart @@ -12,11 +12,12 @@ external FileSystem get fs; @JS() inline class FileSystem { final JSObject fileSystem; + FileSystem(this.fileSystem); /// Whether the [path] exists, false otherwise. - external JSBoolean existsSync(JSString path); + external bool existsSync(String path); /// Read the contents of the [path]. - external JSString readFileSync(JSString path, [JSString encoding]); + external String readFileSync(String path, [String encoding]); } diff --git a/lib/node/os.dart b/lib/node/os.dart index 65767db..a2e670b 100644 --- a/lib/node/os.dart +++ b/lib/node/os.dart @@ -12,17 +12,18 @@ external OS get os; @JS() inline class OS { final JSObject os; + OS(this.os); @JS('arch') - external JSString _arch(); + external String _arch(); /// The operating system CPU architecture. - JSString get arch => _arch(); + String get arch => _arch(); @JS('platform') - external JSString _platform(); + external String _platform(); /// The operating system platform. - JSString get platform => _platform(); + String get platform => _platform(); } diff --git a/lib/node/process.dart b/lib/node/process.dart index d98b883..57f1985 100644 --- a/lib/node/process.dart +++ b/lib/node/process.dart @@ -13,6 +13,7 @@ external Process get process; @JS() inline class Process { final JSObject process; + Process(this.process); @JS('env') diff --git a/package-lock.json b/package-lock.json index bc9a094..4f41f35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,9 +41,9 @@ } }, "node_modules/@actions/io": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.2.tgz", - "integrity": "sha512-d+RwPlMp+2qmBfeLYPLXuSRykDIFEwdTA0MMxzS9kh4kvP1ftrc/9fzy6pX6qAjthdXruHQ6/6kjT/DNo5ALuw==" + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@actions/io/-/io-1.1.3.tgz", + "integrity": "sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==" }, "node_modules/@actions/tool-cache": { "version": "2.0.1", diff --git a/pubspec.yaml b/pubspec.yaml index 65f86b1..2dc5844 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-417 + sdk: ^3.1.0-0 dependencies: path: ^1.8.0