From cc7e3a255ecde5e2e33b53795534d1754c9525e5 Mon Sep 17 00:00:00 2001 From: "thomashii@dukefirehawk.com" Date: Fri, 21 Apr 2023 14:25:54 +0800 Subject: [PATCH] Updated serialize generator --- .github/workflows/dart.yml | 4 +- .../example2/bin/example3_controller.dart | 4 +- .../bin/example3_controller.reflectable.dart | 3388 ++++++++--------- experiment/container/example2/pubspec.yaml | 20 +- .../angel_serialize_generator/CHANGELOG.md | 7 +- .../example/main.g.dart | 20 +- .../lib/serialize.dart | 2 +- .../angel_serialize_generator/pubspec.yaml | 6 +- .../test/models/book.g.dart | 178 +- .../test/models/game_pad_button.g.dart | 44 +- .../test/models/goat.g.dart | 20 +- .../test/models/subclass.g.dart | 44 +- .../test/models/with_enum.g.dart | 26 +- 13 files changed, 1862 insertions(+), 1901 deletions(-) diff --git a/.github/workflows/dart.yml b/.github/workflows/dart.yml index 5d16959e..d510f77c 100644 --- a/.github/workflows/dart.yml +++ b/.github/workflows/dart.yml @@ -21,7 +21,7 @@ jobs: - uses: dart-lang/setup-dart@v1 with: - sdk: "2.18.0" + sdk: "2.19.0" - id: angel3_container_upgrade name: angel3_container; Upgrade depedencies @@ -87,7 +87,7 @@ jobs: - uses: dart-lang/setup-dart@v1 with: - sdk: "2.18.0" + sdk: "2.19.0" # Angel3 ORM - id: angel3_orm_upgrade diff --git a/experiment/container/example2/bin/example3_controller.dart b/experiment/container/example2/bin/example3_controller.dart index 9fdde382..c01d640d 100644 --- a/experiment/container/example2/bin/example3_controller.dart +++ b/experiment/container/example2/bin/example3_controller.dart @@ -30,8 +30,9 @@ class Todo extends Model { class FoodItem { final String name; final num price; + final num qty; - FoodItem(this.name, this.price); + FoodItem(this.name, this.price, this.qty); } class Order { @@ -65,6 +66,7 @@ void main() async { //await app.mountController(); var http = AngelHttp(app); + var server = await http.startServer('localhost', 3000); print("Angel server listening at ${http.uri}"); } diff --git a/experiment/container/example2/bin/example3_controller.reflectable.dart b/experiment/container/example2/bin/example3_controller.reflectable.dart index 3c11d0b5..751e0f40 100644 --- a/experiment/container/example2/bin/example3_controller.reflectable.dart +++ b/experiment/container/example2/bin/example3_controller.reflectable.dart @@ -55,8 +55,12 @@ final _data = { 134217735, 0, const prefix0.ContainedReflectable(), - const [116, 117], + const [112, 113], const [ + 114, + 115, + 116, + 117, 118, 119, 120, @@ -69,11 +73,7 @@ final _data = { 127, 128, 129, - 130, - 131, - 132, - 133, - 116 + 112 ], const [], 2, @@ -94,21 +94,21 @@ final _data = { 134217735, 1, const prefix0.ContainedReflectable(), - const [134], + const [130], const [ + 114, + 115, + 116, + 117, 118, - 119, - 120, - 121, - 122, + 131, + 132, + 133, + 134, 135, 136, 137, - 138, - 139, - 140, - 141, - 142 + 138 ], const [], 3, @@ -126,8 +126,12 @@ final _data = { 134217735, 2, const prefix0.ContainedReflectable(), - const [30, 31, 32, 123, 124, 125, 126, 132, 133, 143], + const [30, 31, 32, 119, 120, 121, 122, 128, 129, 139], const [ + 114, + 115, + 116, + 117, 118, 119, 120, @@ -139,11 +143,7 @@ final _data = { 126, 127, 128, - 129, - 130, - 131, - 132, - 133 + 129 ], const [], 4, @@ -165,23 +165,23 @@ final _data = { 134218247, 3, const prefix0.ContainedReflectable(), - const [33, 34, 144, 147, 148], + const [33, 34, 140, 143, 144], const [ + 114, + 115, + 116, + 117, 118, - 119, - 120, - 121, - 122, + 131, + 132, + 133, + 134, 135, 136, 137, - 138, - 139, - 140, - 141, - 142 + 138 ], - const [144, 145, 146], + const [140, 141, 142], 5, { r'getInstance': () => prefix3.Reflectable.getInstance, @@ -201,9 +201,9 @@ final _data = { 134217735, 4, const prefix0.ContainedReflectable(), - const [118, 119, 120, 149, 150, 151, 121, 122, 152], - const [118, 119, 120, 121, 122], - const [149, 150, 151], + const [114, 115, 116, 145, 146, 147, 117, 118, 148], + const [114, 115, 116, 117, 118], + const [145, 146, 147], null, { r'hash': () => Object.hash, @@ -223,21 +223,21 @@ final _data = { 134218247, 5, const prefix0.ContainedReflectable(), - const [136, 137, 138, 139, 140, 141, 142, 153, 154], + const [132, 133, 134, 135, 136, 137, 138, 149, 150], const [ + 114, + 115, + 116, + 117, 118, - 119, - 120, - 121, - 122, + 131, + 132, + 133, + 134, 135, 136, 137, - 138, - 139, - 140, - 141, - 142 + 138 ], const [], 6, @@ -255,8 +255,8 @@ final _data = { 134217735, 6, const prefix0.ContainedReflectable(), - const [135, 155, 156], - const [118, 119, 120, 121, 122, 135], + const [131, 151, 152], + const [114, 115, 116, 117, 118, 131], const [], 4, {}, @@ -286,39 +286,18 @@ final _data = { const [], null), r.NonGenericClassMirrorImpl( - r'Todo', - r'.Todo', + r'Order', + r'.Order', 134217735, 7, const prefix0.ContainedReflectable(), - const [35, 36, 157, 162], - const [ - 118, - 119, - 120, - 121, - 122, - 163, - 164, - 165, - 166, - 167, - 168, - 169, - 157, - 158, - 159, - 160, - 161 - ], + const [35, 155, 156], + const [114, 115, 116, 117, 118, 153, 154, 155], const [], - -1, + 4, {}, {}, - { - r'': (bool b) => ({text, over}) => - b ? prefix1.Todo(over: over, text: text) : null - }, + {r'': (bool b) => (item) => b ? prefix1.Order(item) : null}, 0, 7, const [], @@ -331,21 +310,21 @@ final _data = { 8, const prefix0.ContainedReflectable(), const [ - 170, - 171, - 172, - 173, - 174, - 175, - 176, - 177, - 178, - 179, - 180, - 181, - 182 + 157, + 158, + 159, + 160, + 161, + 162, + 163, + 164, + 165, + 166, + 167, + 168, + 169 ], - const [118, 119, 120, 121, 122, 171, 177], + const [114, 115, 116, 117, 118, 158, 164], const [], 4, {}, @@ -379,6 +358,10 @@ final _data = { 9, const prefix0.ContainedReflectable(), const [ + 36, + 37, + 38, + 39, 40, 41, 42, @@ -386,73 +369,81 @@ final _data = { 44, 45, 46, - 47, - 48, - 49, - 50, + 170, + 171, + 172, + 173, + 174, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, 183, 184, - 185, - 186, - 187, - 188, - 189, - 190, - 191, - 192, - 193, - 194, - 195, - 196, - 197, + 200, + 201, + 202, + 203, + 204, + 205, + 206, + 207 + ], + const [ + 114, + 115, + 116, + 117, + 118, + 208, + 170, + 209, + 210, + 174, + 211, + 212, 213, 214, 215, 216, + 171, 217, 218, 219, - 220 - ], - const [ - 118, - 119, - 120, - 121, - 122, + 220, 221, - 183, 222, 223, - 187, 224, 225, 226, 227, + 173, 228, 229, - 184, 230, + 184, 231, 232, 233, 234, - 235, - 236, - 237, - 238, - 239, - 240, - 186, - 241, - 242, - 243, - 197, - 244, - 245, - 246, - 247, + 172, + 175, + 176, + 177, + 178, + 179, + 180, + 181, + 182, + 183, 185, + 186, + 187, 188, 189, 190, @@ -462,6 +453,7 @@ final _data = { 194, 195, 196, + 197, 198, 199, 200, @@ -470,20 +462,7 @@ final _data = { 203, 204, 205, - 206, - 207, - 208, - 209, - 210, - 211, - 212, - 213, - 214, - 215, - 216, - 217, - 218, - 219 + 206 ], const [], 12, @@ -493,7 +472,7 @@ final _data = { r'': (bool b) => ( {reflector = const prefix14.ThrowingReflector( errorMessage: - '${ContainerConst.defaultErrorMessage} $_reflectionInfo'), + '${ThrowingReflector.defaultErrorMessage} $_reflectionInfo'), environment = prefix15.angelEnv, logger, allowMethodOverrides = true, @@ -521,60 +500,60 @@ final _data = { 10, const prefix0.ContainedReflectable(), const [ + 208, + 235, + 209, + 210, + 236, + 211, + 212, + 213, + 214, + 215, + 216, + 237, + 217, + 218, + 219, + 220, 221, - 248, 222, 223, - 249, 224, 225, 226, 227, - 228, - 229, - 250, - 230, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 239, - 240, - 251 + 238 ], const [ + 114, + 115, + 116, + 117, 118, - 119, - 120, - 121, - 122, + 208, + 235, + 209, + 210, + 236, + 211, + 212, + 213, + 214, + 215, + 216, + 237, + 217, + 218, + 219, + 220, 221, - 248, 222, 223, - 249, 224, 225, 226, - 227, - 228, - 229, - 250, - 230, - 231, - 232, - 233, - 234, - 235, - 236, - 237, - 238, - 239, - 240 + 227 ], const [], 4, @@ -596,8 +575,8 @@ final _data = { 134218247, 11, const prefix0.ContainedReflectable(), - const [252, 253, 254, 255, 256, 257, 258], - const [118, 119, 120, 121, 122, 257], + const [239, 240, 241, 242, 243, 244, 245], + const [114, 115, 116, 117, 118, 244], const [], 4, {}, @@ -614,45 +593,45 @@ final _data = { 134217735, 12, const prefix0.ContainedReflectable(), - const [51, 259, 241, 242, 243, 260, 261, 245, 246, 247, 262], + const [47, 246, 228, 229, 230, 247, 248, 232, 233, 234, 249], const [ + 114, + 115, + 116, + 117, 118, - 119, - 120, - 121, - 122, + 208, + 247, + 209, + 210, + 236, + 211, + 212, + 213, + 214, + 215, + 216, + 237, + 217, + 218, + 219, + 220, 221, - 260, 222, 223, - 249, 224, 225, 226, 227, + 246, 228, 229, - 250, 230, + 248, 231, 232, 233, - 234, - 235, - 236, - 237, - 238, - 239, - 240, - 259, - 241, - 242, - 243, - 261, - 244, - 245, - 246, - 247 + 234 ], const [], 10, @@ -673,8 +652,8 @@ final _data = { 134217735, 13, const prefix0.ContainedReflectable(), - const [263, 264, 265, 266, 267, 268, 269], - const [118, 266, 120, 267, 122, 263, 264, 265], + const [250, 251, 252, 253, 254, 255, 256], + const [114, 253, 116, 254, 118, 250, 251, 252], const [], 4, {}, @@ -698,6 +677,19 @@ final _data = { 14, const prefix0.ContainedReflectable(), const [ + 257, + 258, + 259, + 260, + 261, + 262, + 263, + 264, + 265, + 266, + 267, + 268, + 269, 270, 271, 272, @@ -728,23 +720,10 @@ final _data = { 297, 298, 299, - 300, - 301, - 302, - 303, - 304, - 305, - 306, - 307, - 308, - 309, - 310, - 311, - 312, - 313 + 300 ], - const [118, 119, 120, 121, 122], - const [270, 271, 272], + const [114, 115, 116, 117, 118], + const [257, 258, 259], 4, { r'castFrom': () => List.castFrom, @@ -784,6 +763,19 @@ final _data = { 15, const prefix0.ContainedReflectable(), const [ + 301, + 302, + 303, + 304, + 305, + 306, + 307, + 308, + 309, + 310, + 311, + 312, + 313, 314, 315, 316, @@ -800,23 +792,10 @@ final _data = { 327, 328, 329, - 330, - 331, - 332, - 333, - 334, - 335, - 336, - 337, - 338, - 339, - 340, - 341, - 342, - 343 + 330 ], - const [118, 119, 120, 121, 122], - const [314], + const [114, 115, 116, 117, 118], + const [301], 4, {r'castFrom': () => Map.castFrom}, {}, @@ -849,6 +828,19 @@ final _data = { 16, const prefix0.ContainedReflectable(), const [ + 331, + 332, + 333, + 334, + 335, + 336, + 337, + 338, + 339, + 340, + 341, + 342, + 343, 344, 345, 346, @@ -870,22 +862,9 @@ final _data = { 362, 363, 364, - 365, - 366, - 367, - 368, - 369, - 370, - 371, - 372, - 373, - 374, - 375, - 376, - 377, - 378 + 365 ], - const [118, 119, 120, 121, 122], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -911,6 +890,19 @@ final _data = { 17, const prefix0.ContainedReflectable(), const [ + 366, + 367, + 368, + 369, + 370, + 371, + 372, + 373, + 374, + 375, + 376, + 377, + 378, 379, 380, 381, @@ -928,23 +920,10 @@ final _data = { 393, 394, 395, - 396, - 397, - 398, - 399, - 400, - 401, - 402, - 403, - 404, - 405, - 406, - 407, - 408, - 409 + 396 ], - const [118, 119, 120, 121, 122], - const [403, 404], + const [114, 115, 116, 117, 118], + const [390, 391], -1, {r'parse': () => int.parse, r'tryParse': () => int.tryParse}, {}, @@ -964,8 +943,8 @@ final _data = { 134218247, 18, const prefix0.ContainedReflectable(), - const [410, 411, 412, 413], - const [118, 119, 120, 121, 122], + const [397, 398, 399, 400], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -983,24 +962,24 @@ final _data = { 19, const prefix0.ContainedReflectable(), const [ + 401, + 402, + 403, + 404, + 405, + 406, + 407, + 408, + 409, + 410, + 411, + 412, + 413, 414, - 415, - 416, - 417, - 418, - 419, - 420, - 421, - 422, - 423, - 424, - 425, - 426, - 427, - 428 + 415 ], - const [118, 119, 120, 121, 122], - const [414, 415, 416, 417], + const [114, 115, 116, 117, 118], + const [401, 402, 403, 404], 4, { r'wait': () => prefix10.Future.wait, @@ -1038,7 +1017,7 @@ final _data = { 20, const prefix0.ContainedReflectable(), const [], - const [118, 119, 120, 121, 122], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -1058,9 +1037,9 @@ final _data = { 134217735, 21, const prefix0.ContainedReflectable(), - const [52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 440, 441], - const [118, 119, 120, 121, 122, 429, 430, 431, 432, 433], - const [434, 435, 436, 437, 438, 439], + const [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 427, 428], + const [114, 115, 116, 117, 118, 416, 417, 418, 419, 420], + const [421, 422, 423, 424, 425, 426], 4, { r'get': () => prefix11.Expose.get, @@ -1084,9 +1063,8 @@ final _data = { method: method, middleware: middleware) : null, - r'method': (bool b) => (method, - {middleware = const [], as, allowNull = const []}) => - b + r'method': (bool b) => + (method, {middleware, as, allowNull = const []}) => b ? prefix11.Expose.method(method, allowNull: allowNull, as: as, middleware: middleware) : null @@ -1102,22 +1080,22 @@ final _data = { 134217735, 22, const prefix0.ContainedReflectable(), - const [63, 443], + const [59, 430], const [ + 114, + 431, + 116, + 117, 118, - 444, - 120, - 121, - 122, - 445, - 446, - 447, - 448, - 449, - 450, - 451, - 452, - 442 + 432, + 433, + 434, + 435, + 436, + 437, + 438, + 439, + 429 ], const [], -1, @@ -1140,8 +1118,8 @@ final _data = { 134218247, 23, const prefix0.ContainedReflectable(), - const [453, 454, 455, 456, 457, 458, 459], - const [118, 119, 120, 121, 122], + const [440, 441, 442, 443, 444, 445, 446], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -1159,22 +1137,22 @@ final _data = { 24, const prefix0.ContainedReflectable(), const [ - 460, - 461, - 462, - 463, - 464, - 465, - 466, - 467, - 468, - 469, - 470, - 471, - 472, - 473 + 447, + 448, + 449, + 450, + 451, + 452, + 453, + 454, + 455, + 456, + 457, + 458, + 459, + 460 ], - const [118, 119, 120, 121, 122], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -1191,8 +1169,8 @@ final _data = { 134218247, 25, const prefix0.ContainedReflectable(), - const [474, 475, 476, 477, 478, 479, 480], - const [118, 119, 120, 121, 122], + const [461, 462, 463, 464, 465, 466, 467], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -1210,6 +1188,19 @@ final _data = { 26, const prefix0.ContainedReflectable(), const [ + 468, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, 481, 482, 483, @@ -1231,27 +1222,27 @@ final _data = { 499, 500, 501, - 502, - 503, - 504, - 505, - 506, - 507, - 508, - 509, - 510, - 511, - 512, - 513, - 514, - 515 + 502 ], const [ + 114, + 492, + 116, + 117, 118, - 505, - 120, - 121, - 122, + 469, + 470, + 471, + 472, + 473, + 474, + 475, + 476, + 477, + 478, + 479, + 480, + 481, 482, 483, 484, @@ -1262,27 +1253,14 @@ final _data = { 489, 490, 491, - 492, - 493, 494, 495, 496, 497, 498, - 499, - 500, - 501, - 502, - 503, - 504, - 507, - 508, - 509, - 510, - 511, - 512 + 499 ], - const [481], + const [468], 4, {r'castFrom': () => Iterable.castFrom}, {}, @@ -1305,8 +1283,8 @@ final _data = { 134218247, 27, const prefix0.ContainedReflectable(), - const [516], - const [118, 119, 120, 121, 122], + const [503], + const [114, 115, 116, 117, 118], const [], 4, {}, @@ -1612,42 +1590,10 @@ final _data = { 16, 16, const [], const []), r.VariableMirrorImpl( - r'text', - 67239941, + r'item', + 134348805, 7, const prefix0.ContainedReflectable(), - 16, - 16, - 16, const [], const []), - r.VariableMirrorImpl( - r'over', - 67239941, - 7, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, const [], const []), - r.VariableMirrorImpl( - r'id', - 67239941, - -1, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, const [], const []), - r.VariableMirrorImpl( - r'createdAt', - 67239941, - -1, - const prefix0.ContainedReflectable(), - -1, - 57, - 57, const [], const []), - r.VariableMirrorImpl( - r'updatedAt', - 67239941, - -1, - const prefix0.ContainedReflectable(), -1, 57, 57, const [], const []), @@ -1729,13 +1675,13 @@ final _data = { 16, const [], const []), r.VariableMirrorImpl( r'path', - 134349829, + 67240965, 21, const prefix0.ContainedReflectable(), 16, 16, 16, const [], const []), - r.VariableMirrorImpl(r'middleware', 151127045, 21, + r.VariableMirrorImpl(r'middleware', 84018181, 21, const prefix0.ContainedReflectable(), 26, 68, 26, null, const []), r.VariableMirrorImpl( r'as', @@ -1833,7 +1779,7 @@ final _data = { 16, const [], const []), r.MethodMirrorImpl(r'main', 9699352, 0, -1, -1, -1, const [], const [], const prefix0.ContainedReflectable(), const []), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 39), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 35), r.MethodMirrorImpl( r'identical', 10485784, @@ -1858,15 +1804,15 @@ final _data = { const []), r.MethodMirrorImpl(r'print', 9699352, -1, -1, -1, -1, const [], const [3], const prefix0.ContainedReflectable(), const []), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 43), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 44), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 3, 45), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 46), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 47), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 48), - r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 49), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 50), - r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 51), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 39), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 40), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 3, 41), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 4, 42), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 5, 43), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 44), + r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 6, 45), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 46), + r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 7, 47), r.MethodMirrorImpl( r'reflectors', 44040211, @@ -1917,7 +1863,7 @@ final _data = { const [14, 15, 16, 17], const prefix0.ContainedReflectable(), const []), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 8, 59), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 8, 55), r.MethodMirrorImpl( r'reflectableNoSuchInvokableError', 8912920, @@ -1973,49 +1919,49 @@ final _data = { const [35, 36, 37, 38], const prefix0.ContainedReflectable(), const []), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 9, 65), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 9, 61), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 10, 66), + const prefix0.ContainedReflectable(), 10, 62), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 11, 67), + const prefix0.ContainedReflectable(), 11, 63), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 12, 68), + const prefix0.ContainedReflectable(), 12, 64), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 13, 69), + const prefix0.ContainedReflectable(), 13, 65), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 14, 70), + const prefix0.ContainedReflectable(), 14, 66), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 15, 71), + const prefix0.ContainedReflectable(), 15, 67), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 16, 72), + const prefix0.ContainedReflectable(), 16, 68), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 17, 73), + const prefix0.ContainedReflectable(), 17, 69), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 18, 74), + const prefix0.ContainedReflectable(), 18, 70), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 19, 75), + const prefix0.ContainedReflectable(), 19, 71), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 20, 76), + const prefix0.ContainedReflectable(), 20, 72), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 21, 77), + const prefix0.ContainedReflectable(), 21, 73), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 22, 78), + const prefix0.ContainedReflectable(), 22, 74), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 23, 79), + const prefix0.ContainedReflectable(), 23, 75), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 24, 80), + const prefix0.ContainedReflectable(), 24, 76), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 25, 81), + const prefix0.ContainedReflectable(), 25, 77), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 26, 82), + const prefix0.ContainedReflectable(), 26, 78), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 27, 83), + const prefix0.ContainedReflectable(), 27, 79), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 28, 84), + const prefix0.ContainedReflectable(), 28, 80), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 29, 85), + const prefix0.ContainedReflectable(), 29, 81), r.MethodMirrorImpl( - r'todo', + r'order', 2097154, 0, 7, @@ -2099,13 +2045,11 @@ final _data = { const [46, 47], const prefix0.ContainedReflectable(), const []), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 97), - r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 98), - r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 99), - r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 2, 100), - r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 2, 101), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 0, 93), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 94), + r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 1, 95), + r.ImplicitGetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 96), + r.ImplicitSetterMirrorImpl(const prefix0.ContainedReflectable(), 2, 97), r.MethodMirrorImpl(r'app', 2097155, 2, 9, 9, 9, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'mountPoint', 35651587, 2, 22, 79, 22, null, @@ -2205,9 +2149,9 @@ final _data = { r.MethodMirrorImpl(r'getInstance', 2097170, 3, 3, 3, 3, const [], const [56], const prefix0.ContainedReflectable(), const []), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 3, 115), + const prefix0.ContainedReflectable(), 3, 111), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 4, 116), + const prefix0.ContainedReflectable(), 4, 112), r.MethodMirrorImpl( r'', 128, @@ -2294,41 +2238,14 @@ final _data = { const []), r.MethodMirrorImpl(r'fromList', 128, 6, -1, 6, 6, const [], const [111], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'toJson', 35651586, 7, 15, 85, 15, null, - const [], const prefix0.ContainedReflectable(), const []), - r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 5, 128), - r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 5, 129), - r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 6, 130), - r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 6, 131), - r.MethodMirrorImpl( - r'', - 0, - 7, - -1, - 7, - 7, - const [], - const [112, 113], - const prefix0.ContainedReflectable(), - const []), - r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 7, 133), - r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 7, 134), - r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 8, 135), - r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 8, 136), - r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 9, 137), - r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 9, 138), - r.MethodMirrorImpl(r'idAsInt', 2097155, -1, 17, 17, 17, const [], + r.ImplicitGetterMirrorImpl( + const prefix0.ContainedReflectable(), 5, 123), + r.ImplicitSetterMirrorImpl( + const prefix0.ContainedReflectable(), 5, 124), + r.MethodMirrorImpl(r'name', 2097155, 7, 16, 16, 16, const [], const [], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'', 0, 7, -1, 7, 7, const [], const [112], + const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'memberName', 2097667, 8, -1, 33, 33, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2336,7 +2253,7 @@ final _data = { 35651587, 8, 14, - 86, + 85, 14, const [18], const [], @@ -2347,13 +2264,13 @@ final _data = { 35652099, 8, 14, - 87, + 86, 14, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'namedArguments', 35652099, 8, 15, 88, 15, null, + r.MethodMirrorImpl(r'namedArguments', 35652099, 8, 15, 87, 15, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'isMethod', 2097667, 8, 13, 13, 13, const [], const [], const prefix0.ContainedReflectable(), const []), @@ -2373,7 +2290,7 @@ final _data = { 8, 8, const [], - const [119, 120, 121], + const [114, 115, 116], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2384,11 +2301,11 @@ final _data = { 8, 8, const [], - const [122, 123, 124, 125], + const [117, 118, 119, 120], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'getter', 257, 8, -1, 8, 8, const [], - const [126], const prefix0.ContainedReflectable(), const []), + const [121], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'setter', 257, @@ -2397,7 +2314,7 @@ final _data = { 8, 8, const [], - const [127, 128], + const [122, 123], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2405,10 +2322,10 @@ final _data = { 35651586, 9, -1, + 88, 89, - 90, null, - const [129, 130, 131, 132], + const [124, 125, 126, 127], const prefix0.ContainedReflectable(), const [override]), r.MethodMirrorImpl( @@ -2416,10 +2333,10 @@ final _data = { 35651586, 9, 22, - 91, + 90, 22, null, - const [133, 134], + const [128, 129], const prefix0.ContainedReflectable(), const [override]), r.MethodMirrorImpl( @@ -2452,7 +2369,7 @@ final _data = { -1, -1, const [], - const [135, 136, 137, 138], + const [130, 131, 132, 133], const prefix0.ContainedReflectable(), const [override]), r.MethodMirrorImpl( @@ -2460,10 +2377,10 @@ final _data = { 35651586, 9, 19, - 92, + 91, 19, null, - const [139, 140, 141], + const [134, 135, 136], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2471,10 +2388,10 @@ final _data = { 35651586, 9, 19, - 93, + 92, 19, const [13], - const [142, 143, 144], + const [137, 138, 139], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2485,7 +2402,7 @@ final _data = { -1, -1, const [], - const [145], + const [140], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2496,7 +2413,7 @@ final _data = { -1, -1, const [], - const [146], + const [141], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2504,10 +2421,10 @@ final _data = { 35651586, 9, 19, - 92, + 91, 19, null, - const [147, 148, 149, 150], + const [142, 143, 144, 145], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2515,69 +2432,69 @@ final _data = { 35651586, 9, 19, - 92, + 91, 19, null, - const [151, 152, 153, 154], + const [146, 147, 148, 149], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'configure', 35651586, 9, 19, 92, 19, null, - const [155], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'mountController', 35651586, 9, 19, 94, 19, null, - const [156], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'fallback', 35651586, 9, -1, 95, 96, null, - const [157], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'configure', 35651586, 9, 19, 91, 19, null, + const [150], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'mountController', 35651586, 9, 19, 93, 19, null, + const [151], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'fallback', 35651586, 9, -1, 94, 95, null, + const [152], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'use', 35651586, 9, -1, + 96, 97, - 98, null, - const [158, 159], + const [153, 154], const prefix0.ContainedReflectable(), const [override]), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 10, 168), + const prefix0.ContainedReflectable(), 6, 155), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 11, 169), + const prefix0.ContainedReflectable(), 7, 156), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 12, 170), + const prefix0.ContainedReflectable(), 8, 157), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 13, 171), + const prefix0.ContainedReflectable(), 9, 158), r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 13, 172), + const prefix0.ContainedReflectable(), 9, 159), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 14, 173), + const prefix0.ContainedReflectable(), 10, 160), r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 14, 174), + const prefix0.ContainedReflectable(), 10, 161), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 15, 175), + const prefix0.ContainedReflectable(), 11, 162), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 16, 176), + const prefix0.ContainedReflectable(), 12, 163), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 17, 177), + const prefix0.ContainedReflectable(), 13, 164), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 18, 178), + const prefix0.ContainedReflectable(), 14, 165), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 19, 179), + const prefix0.ContainedReflectable(), 15, 166), r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 19, 180), + const prefix0.ContainedReflectable(), 15, 167), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 20, 181), + const prefix0.ContainedReflectable(), 16, 168), r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 20, 182), - r.MethodMirrorImpl(r'preContained', 35651587, 9, 15, 99, 15, null, + const prefix0.ContainedReflectable(), 16, 169), + r.MethodMirrorImpl(r'preContained', 35651587, 9, 15, 98, 15, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'optimizedRouter', 35651587, 9, 10, 100, 10, null, + r.MethodMirrorImpl(r'optimizedRouter', 35651587, 9, 10, 99, 10, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'children', 35651587, 9, 14, - 101, + 100, 14, const [9], const [], @@ -2588,18 +2505,18 @@ final _data = { 35651587, 9, 15, - 103, + 102, 15, - const [102, 2], + const [101, 2], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'parent', 2097155, 9, 9, 9, 9, const [], const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'logger', 2097155, 9, -1, 104, 104, const [], + r.MethodMirrorImpl(r'logger', 2097155, 9, -1, 103, 103, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'logger=', 1310724, 9, -1, -1, -1, const [], - const [170], const prefix0.ContainedReflectable(), const []), + const [165], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'', 0, @@ -2608,7 +2525,7 @@ final _data = { 9, 9, const [], - const [160, 161, 162, 163, 164, 165], + const [155, 156, 157, 158, 159, 160], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2622,19 +2539,19 @@ final _data = { const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'chain', 35651586, 10, -1, 105, 106, null, - const [171], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'clone', 35651586, 10, 10, 107, 10, null, + r.MethodMirrorImpl(r'chain', 35651586, 10, -1, 104, 105, null, + const [166], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'clone', 35651586, 10, 10, 106, 10, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'group', 35651586, 10, 22, - 108, + 107, 22, null, - const [172, 173, 174, 175], + const [167, 168, 169, 170], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2642,10 +2559,10 @@ final _data = { 35651586, 10, 19, - 109, + 108, 19, null, - const [176, 177, 178, 179], + const [171, 172, 173, 174], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2656,7 +2573,7 @@ final _data = { 16, 16, const [], - const [180, 181], + const [175, 176], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2667,7 +2584,7 @@ final _data = { 13, 13, const [], - const [182, 183, 184, 185, 186], + const [177, 178, 179, 180, 181], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2675,10 +2592,10 @@ final _data = { 35651586, 10, 26, - 110, + 109, 26, null, - const [187, 188, 189], + const [182, 183, 184], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2686,10 +2603,10 @@ final _data = { 35651586, 10, 26, - 110, + 109, 26, null, - const [190, 191, 192, 193], + const [185, 186, 187, 188], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2697,10 +2614,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [194, 195, 196], + const [189, 190, 191], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2708,10 +2625,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [197, 198, 199], + const [192, 193, 194], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2719,10 +2636,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [200, 201, 202], + const [195, 196, 197], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2730,10 +2647,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [203, 204, 205], + const [198, 199, 200], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2741,10 +2658,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [206, 207, 208], + const [201, 202, 203], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2752,10 +2669,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [209, 210, 211], + const [204, 205, 206], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2763,10 +2680,10 @@ final _data = { 35651586, 10, -1, + 110, 111, - 112, null, - const [212, 213, 214], + const [207, 208, 209], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2774,59 +2691,59 @@ final _data = { 35651586, 10, -1, + 112, 113, - 114, null, - const [215, 216, 217], + const [210, 211, 212], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'middleware', 35651587, 10, 14, 115, 14, null, + r.MethodMirrorImpl(r'middleware', 35651587, 10, 14, 114, 14, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'mounted', 35651587, 10, 15, 116, 15, null, + r.MethodMirrorImpl(r'mounted', 35651587, 10, 15, 115, 15, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'routes', 35651587, 10, 14, 117, 14, null, + r.MethodMirrorImpl(r'routes', 35651587, 10, 14, 116, 14, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'findService', 2, 12, -1, -1, -1, const [], - const [218], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'findServiceOf', 35651586, 12, -1, 118, 119, null, - const [219], const prefix0.ContainedReflectable(), const []), + const [213], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'findServiceOf', 35651586, 12, -1, 117, 118, null, + const [214], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'findHookedService', 35651586, 12, -1, + 119, 120, - 121, null, - const [220], + const [215], const prefix0.ContainedReflectable(), const []), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 21, 214), + const prefix0.ContainedReflectable(), 17, 201), r.MethodMirrorImpl( r'container', 2097155, 12, -1, - 122, - 122, + 121, + 121, const [], const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'services', 35651587, 12, 15, 123, 15, null, + r.MethodMirrorImpl(r'services', 35651587, 12, 15, 122, 15, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'onService', 35651587, 12, -1, 124, 125, null, + r.MethodMirrorImpl(r'onService', 35651587, 12, -1, 123, 124, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'addRoute', 35651586, 10, -1, + 110, 111, - 112, null, - const [221, 222, 223, 224], + const [216, 217, 218, 219], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2837,7 +2754,7 @@ final _data = { -1, -1, const [], - const [225, 226, 227], + const [220, 221, 222], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2845,25 +2762,25 @@ final _data = { 35651586, 10, 22, - 108, + 107, 22, null, - const [228, 229], + const [223, 224], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'', 0, 10, -1, 107, 10, null, const [], + r.MethodMirrorImpl(r'', 0, 10, -1, 106, 10, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'getName', 2097666, 11, 16, 16, 16, const [], - const [230], const prefix0.ContainedReflectable(), const []), + const [225], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'reflectClass', 2097666, 11, -1, - 126, - 126, + 125, + 125, const [], - const [231], + const [226], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2871,10 +2788,10 @@ final _data = { 2097666, 11, -1, - 127, - 127, + 126, + 126, const [], - const [232], + const [227], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2882,10 +2799,10 @@ final _data = { 2097666, 11, -1, - 128, - 128, + 127, + 127, const [], - const [233], + const [228], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2893,10 +2810,10 @@ final _data = { 2097666, 11, -1, - 129, - 129, + 128, + 128, const [], - const [234], + const [229], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2904,10 +2821,10 @@ final _data = { 2097154, 11, -1, - 130, - 130, + 129, + 129, const [], - const [235], + const [230], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'', 128, 11, -1, 11, 11, const [], @@ -2919,10 +2836,10 @@ final _data = { 35651586, 12, -1, + 88, 89, - 90, null, - const [236, 237, 238, 239], + const [231, 232, 233, 234], const prefix0.ContainedReflectable(), const [override]), r.MethodMirrorImpl( @@ -2930,20 +2847,20 @@ final _data = { 35651586, 12, -1, + 130, 131, - 132, null, - const [240, 241], + const [235, 236], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'', 0, 12, -1, 12, 12, const [], - const [242], const prefix0.ContainedReflectable(), const []), + const [237], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'&', 2097154, 13, 13, 13, 13, const [], - const [243], const prefix0.ContainedReflectable(), const []), + const [238], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'|', 2097154, 13, 13, 13, 13, const [], - const [244], const prefix0.ContainedReflectable(), const []), + const [239], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'^', 2097154, 13, 13, 13, 13, const [], - const [245], const prefix0.ContainedReflectable(), const []), + const [240], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'toString', 2097154, 13, 16, 16, 16, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'hashCode', 2097155, 13, 17, 17, 17, const [], @@ -2956,7 +2873,7 @@ final _data = { 13, 13, const [], - const [246, 247], + const [241, 242], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2967,11 +2884,11 @@ final _data = { 13, 13, const [], - const [248], + const [243], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'castFrom', 35651602, 14, 14, 133, 14, null, - const [249], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'castFrom', 35651602, 14, 14, 132, 14, null, + const [244], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'copyRange', 1310738, @@ -2980,7 +2897,7 @@ final _data = { -1, -1, const [], - const [250, 251, 252, 253, 254], + const [245, 246, 247, 248, 249], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -2991,13 +2908,13 @@ final _data = { -1, -1, const [], - const [255, 256, 257], + const [250, 251, 252], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'cast', 35652098, 14, 14, 134, 14, null, + r.MethodMirrorImpl(r'cast', 35652098, 14, 14, 133, 14, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'[]', 514, 14, -1, -1, -1, const [], - const [258], const prefix0.ContainedReflectable(), const []), + const [253], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'[]=', 1311234, @@ -3006,17 +2923,17 @@ final _data = { -1, -1, const [], - const [259, 260], + const [254, 255], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'add', 1311234, 14, -1, -1, -1, const [], - const [261], const prefix0.ContainedReflectable(), const []), + const [256], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'addAll', 1311234, 14, -1, -1, -1, const [], - const [262], const prefix0.ContainedReflectable(), const []), + const [257], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'sort', 1311234, 14, -1, -1, -1, const [], - const [263], const prefix0.ContainedReflectable(), const []), + const [258], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'shuffle', 1311234, 14, -1, -1, -1, const [], - const [264], const prefix0.ContainedReflectable(), const []), + const [259], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'indexOf', 2097666, @@ -3025,7 +2942,7 @@ final _data = { 17, 17, const [], - const [265, 266], + const [260, 261], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3036,7 +2953,7 @@ final _data = { 17, 17, const [], - const [267, 268], + const [262, 263], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3047,7 +2964,7 @@ final _data = { 17, 17, const [], - const [269, 270], + const [264, 265], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3058,7 +2975,7 @@ final _data = { 17, 17, const [], - const [271, 272], + const [266, 267], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'clear', 1311234, 14, -1, -1, -1, const [], @@ -3071,7 +2988,7 @@ final _data = { -1, -1, const [], - const [273, 274], + const [268, 269], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3082,7 +2999,7 @@ final _data = { -1, -1, const [], - const [275, 276], + const [270, 271], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3093,13 +3010,13 @@ final _data = { -1, -1, const [], - const [277, 278], + const [272, 273], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'remove', 2097666, 14, 13, 13, 13, const [], - const [279], const prefix0.ContainedReflectable(), const []), + const [274], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'removeAt', 514, 14, -1, -1, -1, const [], - const [280], const prefix0.ContainedReflectable(), const []), + const [275], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'removeLast', 514, 14, -1, -1, -1, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3110,7 +3027,7 @@ final _data = { -1, -1, const [], - const [281], + const [276], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3121,20 +3038,20 @@ final _data = { -1, -1, const [], - const [282], + const [277], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'+', 35652098, 14, 14, 135, 14, null, - const [283], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'+', 35652098, 14, 14, 134, 14, null, + const [278], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'sublist', 35652098, 14, 14, - 135, + 134, 14, null, - const [284, 285], + const [279, 280], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3142,10 +3059,10 @@ final _data = { 35652098, 14, 26, - 136, + 135, 26, null, - const [286, 287], + const [281, 282], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3156,7 +3073,7 @@ final _data = { -1, -1, const [], - const [288, 289, 290, 291], + const [283, 284, 285, 286], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3167,7 +3084,7 @@ final _data = { -1, -1, const [], - const [292, 293], + const [287, 288], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3178,7 +3095,7 @@ final _data = { -1, -1, const [], - const [294, 295, 296], + const [289, 290, 291], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3189,47 +3106,47 @@ final _data = { -1, -1, const [], - const [297, 298, 299], + const [292, 293, 294], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'asMap', 35652098, 14, 15, 137, 15, null, + r.MethodMirrorImpl(r'asMap', 35652098, 14, 15, 136, 15, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'==', 2097666, 14, 13, 13, 13, const [], - const [300], const prefix0.ContainedReflectable(), const []), + const [295], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'first=', 1311236, 14, -1, -1, -1, const [], - const [314], const prefix0.ContainedReflectable(), const []), + const [309], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'last=', 1311236, 14, -1, -1, -1, const [], - const [315], const prefix0.ContainedReflectable(), const []), + const [310], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'length', 2097667, 14, 17, 17, 17, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'length=', 1311236, 14, -1, -1, -1, const [], - const [316], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'reversed', 35652099, 14, 26, 136, 26, null, + const [311], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'reversed', 35652099, 14, 26, 135, 26, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'', 1, 14, -1, 135, 14, null, const [301], + r.MethodMirrorImpl(r'', 1, 14, -1, 134, 14, null, const [296], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'filled', 1, 14, -1, - 135, + 134, 14, null, - const [302, 303, 304], + const [297, 298, 299], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'empty', 1, 14, -1, 135, 14, null, const [305], + r.MethodMirrorImpl(r'empty', 1, 14, -1, 134, 14, null, const [300], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'from', 1, 14, -1, - 135, + 134, 14, null, - const [306, 307], + const [301, 302], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3237,10 +3154,10 @@ final _data = { 1, 14, -1, - 135, + 134, 14, null, - const [308, 309], + const [303, 304], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3248,17 +3165,17 @@ final _data = { 1, 14, -1, - 135, + 134, 14, null, - const [310, 311, 312], + const [305, 306, 307], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'unmodifiable', 1, 14, -1, 135, 14, null, - const [313], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'castFrom', 35651602, 15, 15, 138, 15, null, - const [317], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'cast', 35652098, 15, 15, 139, 15, null, + r.MethodMirrorImpl(r'unmodifiable', 1, 14, -1, 134, 14, null, + const [308], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'castFrom', 35651602, 15, 15, 137, 15, null, + const [312], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'cast', 35652098, 15, 15, 138, 15, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'containsValue', @@ -3268,7 +3185,7 @@ final _data = { 13, 13, const [], - const [318], + const [313], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3279,11 +3196,11 @@ final _data = { 13, 13, const [], - const [319], + const [314], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'[]', 514, 15, -1, -1, -1, const [], - const [320], const prefix0.ContainedReflectable(), const []), + const [315], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'[]=', 1311234, @@ -3292,11 +3209,11 @@ final _data = { -1, -1, const [], - const [321, 322], + const [316, 317], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'map', 35652098, 15, 15, 140, 15, null, - const [323], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'map', 35652098, 15, 15, 139, 15, null, + const [318], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'addEntries', 1311234, @@ -3305,7 +3222,7 @@ final _data = { -1, -1, const [], - const [324], + const [319], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3316,11 +3233,11 @@ final _data = { -1, -1, const [], - const [325, 326, 327], + const [320, 321, 322], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'updateAll', 1311234, 15, -1, -1, -1, const [], - const [328], const prefix0.ContainedReflectable(), const []), + const [323], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'removeWhere', 1311234, @@ -3329,7 +3246,7 @@ final _data = { -1, -1, const [], - const [329], + const [324], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3340,22 +3257,22 @@ final _data = { -1, -1, const [], - const [330, 331], + const [325, 326], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'addAll', 1311234, 15, -1, -1, -1, const [], - const [332], const prefix0.ContainedReflectable(), const []), + const [327], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'remove', 514, 15, -1, -1, -1, const [], - const [333], const prefix0.ContainedReflectable(), const []), + const [328], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'clear', 1311234, 15, -1, -1, -1, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'forEach', 1311234, 15, -1, -1, -1, const [], - const [334], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'entries', 35652099, 15, 26, 141, 26, null, + const [329], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'entries', 35652099, 15, 26, 140, 26, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'keys', 35652099, 15, 26, 142, 26, null, + r.MethodMirrorImpl(r'keys', 35652099, 15, 26, 141, 26, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'values', 35652099, 15, 26, 143, 26, null, + r.MethodMirrorImpl(r'values', 35652099, 15, 26, 142, 26, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'length', 2097667, 15, 17, 17, 17, const [], const [], const prefix0.ContainedReflectable(), const []), @@ -3372,25 +3289,25 @@ final _data = { const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'', 1, 15, -1, 144, 15, null, const [], + r.MethodMirrorImpl(r'', 1, 15, -1, 143, 15, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'from', 257, 15, -1, 144, 15, null, - const [335], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'of', 257, 15, -1, 144, 15, null, const [336], + r.MethodMirrorImpl(r'from', 257, 15, -1, 143, 15, null, + const [330], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'of', 257, 15, -1, 143, 15, null, const [331], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'unmodifiable', 1, 15, -1, 144, 15, null, - const [337], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'identity', 257, 15, -1, 144, 15, null, + r.MethodMirrorImpl(r'unmodifiable', 1, 15, -1, 143, 15, null, + const [332], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'identity', 257, 15, -1, 143, 15, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'fromIterable', 257, 15, -1, - 144, + 143, 15, null, - const [338, 339, 340], + const [333, 334, 335], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3398,16 +3315,16 @@ final _data = { 257, 15, -1, - 144, + 143, 15, null, - const [341, 342], + const [336, 337], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'fromEntries', 1, 15, -1, 144, 15, null, - const [343], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'fromEntries', 1, 15, -1, 143, 15, null, + const [338], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'[]', 2097666, 16, 16, 16, 16, const [], - const [344], const prefix0.ContainedReflectable(), const []), + const [339], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'codeUnitAt', 2097666, @@ -3416,15 +3333,15 @@ final _data = { 17, 17, const [], - const [345], + const [340], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'==', 2097666, 16, 13, 13, 13, const [], - const [346], const prefix0.ContainedReflectable(), const []), + const [341], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'compareTo', 2097666, 16, 17, 17, 17, const [], - const [347], const prefix0.ContainedReflectable(), const []), + const [342], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'endsWith', 2097666, 16, 13, 13, 13, const [], - const [348], const prefix0.ContainedReflectable(), const []), + const [343], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'startsWith', 2097666, @@ -3433,7 +3350,7 @@ final _data = { 13, 13, const [], - const [349, 350], + const [344, 345], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3444,7 +3361,7 @@ final _data = { 17, 17, const [], - const [351, 352], + const [346, 347], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3455,11 +3372,11 @@ final _data = { 17, 17, const [], - const [353, 354], + const [348, 349], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'+', 2097666, 16, 16, 16, 16, const [], - const [355], const prefix0.ContainedReflectable(), const []), + const [350], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'substring', 2097666, @@ -3468,7 +3385,7 @@ final _data = { 16, 16, const [], - const [356, 357], + const [351, 352], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'trim', 2097666, 16, 16, 16, 16, const [], @@ -3478,7 +3395,7 @@ final _data = { r.MethodMirrorImpl(r'trimRight', 2097666, 16, 16, 16, 16, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'*', 2097666, 16, 16, 16, 16, const [], - const [358], const prefix0.ContainedReflectable(), const []), + const [353], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'padLeft', 2097666, @@ -3487,7 +3404,7 @@ final _data = { 16, 16, const [], - const [359, 360], + const [354, 355], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3498,7 +3415,7 @@ final _data = { 16, 16, const [], - const [361, 362], + const [356, 357], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3509,7 +3426,7 @@ final _data = { 13, 13, const [], - const [363, 364], + const [358, 359], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3520,7 +3437,7 @@ final _data = { 16, 16, const [], - const [365, 366, 367], + const [360, 361, 362], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3531,7 +3448,7 @@ final _data = { 16, 16, const [], - const [368, 369, 370], + const [363, 364, 365], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3542,7 +3459,7 @@ final _data = { 16, 16, const [], - const [371, 372], + const [366, 367], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3553,7 +3470,7 @@ final _data = { 16, 16, const [], - const [373, 374], + const [368, 369], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3564,11 +3481,11 @@ final _data = { 16, 16, const [], - const [375, 376, 377], + const [370, 371, 372], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'split', 35652098, 16, 14, 69, 14, const [16], - const [378], const prefix0.ContainedReflectable(), const []), + const [373], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'splitMapJoin', 2097666, @@ -3577,7 +3494,7 @@ final _data = { 16, 16, const [], - const [379, 380, 381], + const [374, 375, 376], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3624,13 +3541,13 @@ final _data = { 35652099, 16, 14, - 145, + 144, 14, const [17], const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'runes', 2097667, 16, -1, 146, 146, const [], + r.MethodMirrorImpl(r'runes', 2097667, 16, -1, 145, 145, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'fromCharCodes', @@ -3640,11 +3557,11 @@ final _data = { 16, 16, const [], - const [382, 383, 384], + const [377, 378, 379], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'fromCharCode', 1, 16, -1, 16, 16, const [], - const [385], const prefix0.ContainedReflectable(), const []), + const [380], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'fromEnvironment', 129, @@ -3653,23 +3570,23 @@ final _data = { 16, 16, const [], - const [386, 387], + const [381, 382], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'&', 2097666, 17, 17, 17, 17, const [], - const [388], const prefix0.ContainedReflectable(), const []), + const [383], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'|', 2097666, 17, 17, 17, 17, const [], - const [389], const prefix0.ContainedReflectable(), const []), + const [384], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'^', 2097666, 17, 17, 17, 17, const [], - const [390], const prefix0.ContainedReflectable(), const []), + const [385], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'~', 2097666, 17, 17, 17, 17, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'<<', 2097666, 17, 17, 17, 17, const [], - const [391], const prefix0.ContainedReflectable(), const []), + const [386], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'>>', 2097666, 17, 17, 17, 17, const [], - const [392], const prefix0.ContainedReflectable(), const []), + const [387], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'>>>', 2097666, 17, 17, 17, 17, const [], - const [393], const prefix0.ContainedReflectable(), const []), + const [388], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'modPow', 2097666, @@ -3678,7 +3595,7 @@ final _data = { 17, 17, const [], - const [394, 395], + const [389, 390], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3689,11 +3606,11 @@ final _data = { 17, 17, const [], - const [396], + const [391], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'gcd', 2097666, 17, 17, 17, 17, const [], - const [397], const prefix0.ContainedReflectable(), const []), + const [392], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'toUnsigned', 2097666, @@ -3702,11 +3619,11 @@ final _data = { 17, 17, const [], - const [398], + const [393], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'toSigned', 2097666, 17, 17, 17, 17, const [], - const [399], const prefix0.ContainedReflectable(), const []), + const [394], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'unary-', 2097666, 17, 17, 17, 17, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'abs', 2097666, 17, 17, 17, 17, const [], @@ -3724,8 +3641,8 @@ final _data = { 2097666, 17, -1, - 147, - 147, + 146, + 146, const [], const [], const prefix0.ContainedReflectable(), @@ -3735,8 +3652,8 @@ final _data = { 2097666, 17, -1, - 147, - 147, + 146, + 146, const [], const [], const prefix0.ContainedReflectable(), @@ -3746,8 +3663,8 @@ final _data = { 2097666, 17, -1, - 147, - 147, + 146, + 146, const [], const [], const prefix0.ContainedReflectable(), @@ -3757,8 +3674,8 @@ final _data = { 2097666, 17, -1, - 147, - 147, + 146, + 146, const [], const [], const prefix0.ContainedReflectable(), @@ -3773,7 +3690,7 @@ final _data = { 16, 16, const [], - const [400], + const [395], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3784,7 +3701,7 @@ final _data = { 17, 17, const [], - const [401, 402, 403], + const [396, 397, 398], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3795,7 +3712,7 @@ final _data = { 17, 17, const [], - const [404, 405], + const [399, 400], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'isEven', 2097667, 17, 13, 13, 13, const [], @@ -3814,11 +3731,11 @@ final _data = { 17, 17, const [], - const [406, 407], + const [401, 402], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'==', 2097666, 18, 13, 13, 13, const [], - const [408], const prefix0.ContainedReflectable(), const []), + const [403], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'toString', 2097666, 18, 16, 16, 16, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'hashCode', 2097667, 18, 17, 17, 17, const [], @@ -3830,29 +3747,55 @@ final _data = { 35651602, 19, 19, - 148, + 147, 19, null, - const [409, 410, 411], + const [404, 405, 406], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'any', 35651602, 19, 19, 149, 19, null, - const [412], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'any', 35651602, 19, 19, 148, 19, null, + const [407], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'forEach', 35651602, 19, 19, - 92, + 91, + 19, + null, + const [408, 409], + const prefix0.ContainedReflectable(), + const []), + r.MethodMirrorImpl(r'doWhile', 35651602, 19, 19, 91, 19, null, + const [410], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl( + r'then', + 35652098, + 19, + 19, + 149, + 19, + null, + const [411, 412], + const prefix0.ContainedReflectable(), + const []), + r.MethodMirrorImpl( + r'catchError', + 35652098, + 19, + 19, + 150, 19, null, const [413, 414], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'doWhile', 35651602, 19, 19, 92, 19, null, + r.MethodMirrorImpl(r'whenComplete', 35652098, 19, 19, 150, 19, null, const [415], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'asStream', 35652098, 19, -1, 151, 152, null, + const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( - r'then', + r'timeout', 35652098, 19, 19, @@ -3862,49 +3805,23 @@ final _data = { const [416, 417], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl( - r'catchError', - 35652098, - 19, - 19, - 151, - 19, - null, - const [418, 419], - const prefix0.ContainedReflectable(), - const []), - r.MethodMirrorImpl(r'whenComplete', 35652098, 19, 19, 151, 19, null, - const [420], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'asStream', 35652098, 19, -1, 152, 153, null, - const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl( - r'timeout', - 35652098, - 19, - 19, - 151, - 19, - null, - const [421, 422], - const prefix0.ContainedReflectable(), - const []), - r.MethodMirrorImpl(r'', 1, 19, -1, 151, 19, null, const [423], + r.MethodMirrorImpl(r'', 1, 19, -1, 150, 19, null, const [418], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'microtask', 1, 19, -1, 151, 19, null, - const [424], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'sync', 1, 19, -1, 151, 19, null, const [425], + r.MethodMirrorImpl(r'microtask', 1, 19, -1, 150, 19, null, + const [419], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'sync', 1, 19, -1, 150, 19, null, const [420], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'value', 1, 19, -1, 151, 19, null, const [426], + r.MethodMirrorImpl(r'value', 1, 19, -1, 150, 19, null, const [421], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'error', 1, 19, -1, - 151, + 150, 19, null, - const [427, 428], + const [422, 423], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3912,34 +3829,34 @@ final _data = { 1, 19, -1, - 151, + 150, 19, null, - const [429, 430], + const [424, 425], const prefix0.ContainedReflectable(), const []), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 22, 399), + const prefix0.ContainedReflectable(), 18, 386), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 23, 400), + const prefix0.ContainedReflectable(), 19, 387), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 24, 401), + const prefix0.ContainedReflectable(), 20, 388), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 25, 402), + const prefix0.ContainedReflectable(), 21, 389), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 26, 403), + const prefix0.ContainedReflectable(), 22, 390), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 27, 404), + const prefix0.ContainedReflectable(), 23, 391), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 28, 405), + const prefix0.ContainedReflectable(), 24, 392), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 29, 406), + const prefix0.ContainedReflectable(), 25, 393), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 30, 407), + const prefix0.ContainedReflectable(), 26, 394), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 31, 408), + const prefix0.ContainedReflectable(), 27, 395), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 32, 409), + const prefix0.ContainedReflectable(), 28, 396), r.MethodMirrorImpl( r'', 128, @@ -3948,7 +3865,7 @@ final _data = { 21, 21, const [], - const [431, 432, 433, 434, 435], + const [426, 427, 428, 429, 430], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -3959,12 +3876,12 @@ final _data = { 21, 21, const [], - const [436, 437, 438, 439], + const [431, 432, 433, 434], const prefix0.ContainedReflectable(), const []), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 33, 412), - r.MethodMirrorImpl(r'', 0, 22, -1, 154, 22, null, const [440, 441], + const prefix0.ContainedReflectable(), 29, 399), + r.MethodMirrorImpl(r'', 0, 22, -1, 153, 22, null, const [435, 436], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'toString', @@ -3977,28 +3894,28 @@ final _data = { const [], const prefix0.ContainedReflectable(), const [override]), - r.MethodMirrorImpl(r'clone', 35651586, -1, -1, 155, 156, null, + r.MethodMirrorImpl(r'clone', 35651586, -1, -1, 154, 155, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'makeUri', 2097154, -1, 16, 16, 16, const [], - const [442], const prefix0.ContainedReflectable(), const []), + const [437], const prefix0.ContainedReflectable(), const []), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 34, 417), + const prefix0.ContainedReflectable(), 30, 404), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 35, 418), + const prefix0.ContainedReflectable(), 31, 405), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 36, 419), + const prefix0.ContainedReflectable(), 32, 406), r.ImplicitGetterMirrorImpl( - const prefix0.ContainedReflectable(), 37, 420), + const prefix0.ContainedReflectable(), 33, 407), r.ImplicitSetterMirrorImpl( - const prefix0.ContainedReflectable(), 37, 421), + const prefix0.ContainedReflectable(), 33, 408), r.MethodMirrorImpl( r'parser', 35651587, -1, -1, + 157, 158, - 159, - const [157], + const [156], const [], const prefix0.ContainedReflectable(), const []), @@ -4010,11 +3927,11 @@ final _data = { 13, 13, const [], - const [444], + const [439], const prefix0.ContainedReflectable(), const [override]), r.MethodMirrorImpl(r'delegate', 2097666, 23, 4, 4, 4, const [], - const [445], const prefix0.ContainedReflectable(), const []), + const [440], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'type', 2097667, 23, -1, 83, 83, const [], const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -4051,7 +3968,7 @@ final _data = { 13, 13, const [], - const [446], + const [441], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -4062,7 +3979,7 @@ final _data = { 13, 13, const [], - const [447], + const [442], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -4092,9 +4009,9 @@ final _data = { 35652099, 24, 14, - 161, + 160, 14, - const [160], + const [159], const [], const prefix0.ContainedReflectable(), const []), @@ -4103,7 +4020,7 @@ final _data = { 35652099, 24, 14, - 162, + 161, 14, const [24], const [], @@ -4114,7 +4031,7 @@ final _data = { 35652099, 24, 14, - 86, + 85, 14, const [18], const [], @@ -4196,7 +4113,7 @@ final _data = { 13, 13, const [], - const [448], + const [443], const prefix0.ContainedReflectable(), const [override]), r.MethodMirrorImpl(r'uri', 2097667, 25, -1, 81, 81, const [], @@ -4206,9 +4123,9 @@ final _data = { 35652099, 25, 15, - 164, + 163, 15, - const [16, 163], + const [16, 162], const [], const prefix0.ContainedReflectable(), const []), @@ -4228,9 +4145,9 @@ final _data = { 35652099, 25, 14, - 166, + 165, 14, - const [165], + const [164], const [], const prefix0.ContainedReflectable(), const []), @@ -4247,26 +4164,26 @@ final _data = { const [override]), r.MethodMirrorImpl(r'', 64, 25, -1, 25, 25, const [], const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'castFrom', 35651602, 26, 26, 167, 26, null, - const [449], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'cast', 35651586, 26, 26, 168, 26, null, + r.MethodMirrorImpl(r'castFrom', 35651602, 26, 26, 166, 26, null, + const [444], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'cast', 35651586, 26, 26, 167, 26, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'followedBy', 35651586, 26, 26, 169, 26, null, - const [450], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'map', 35651586, 26, 26, 170, 26, null, - const [451], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'where', 35651586, 26, 26, 169, 26, null, - const [452], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'whereType', 35651586, 26, 26, 171, 26, null, + r.MethodMirrorImpl(r'followedBy', 35651586, 26, 26, 168, 26, null, + const [445], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'map', 35651586, 26, 26, 169, 26, null, + const [446], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'where', 35651586, 26, 26, 168, 26, null, + const [447], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'whereType', 35651586, 26, 26, 170, 26, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'expand', 35651586, 26, 26, 172, 26, null, - const [453], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'expand', 35651586, 26, 26, 171, 26, null, + const [448], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'contains', 2097154, 26, 13, 13, 13, const [], - const [454], const prefix0.ContainedReflectable(), const []), + const [449], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'forEach', 1310722, 26, -1, -1, -1, const [], - const [455], const prefix0.ContainedReflectable(), const []), + const [450], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'reduce', 2, 26, -1, -1, -1, const [], - const [456], const prefix0.ContainedReflectable(), const []), + const [451], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'fold', 2, @@ -4275,27 +4192,27 @@ final _data = { -1, -1, const [], - const [457, 458], + const [452, 453], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'every', 2097154, 26, 13, 13, 13, const [], - const [459], const prefix0.ContainedReflectable(), const []), + const [454], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'join', 2097154, 26, 16, 16, 16, const [], - const [460], const prefix0.ContainedReflectable(), const []), + const [455], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'any', 2097154, 26, 13, 13, 13, const [], - const [461], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'toList', 35651586, 26, 14, 173, 14, null, - const [462], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'toSet', 35651586, 26, -1, 174, 175, null, + const [456], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'toList', 35651586, 26, 14, 172, 14, null, + const [457], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'toSet', 35651586, 26, -1, 173, 174, null, const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'take', 35651586, 26, 26, 169, 26, null, - const [463], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'takeWhile', 35651586, 26, 26, 169, 26, null, - const [464], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'skip', 35651586, 26, 26, 169, 26, null, - const [465], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'skipWhile', 35651586, 26, 26, 169, 26, null, - const [466], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'take', 35651586, 26, 26, 168, 26, null, + const [458], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'takeWhile', 35651586, 26, 26, 168, 26, null, + const [459], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'skip', 35651586, 26, 26, 168, 26, null, + const [460], const prefix0.ContainedReflectable(), const []), + r.MethodMirrorImpl(r'skipWhile', 35651586, 26, 26, 168, 26, null, + const [461], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'firstWhere', 2, @@ -4304,7 +4221,7 @@ final _data = { -1, -1, const [], - const [467, 468], + const [462, 463], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -4315,7 +4232,7 @@ final _data = { -1, -1, const [], - const [469, 470], + const [464, 465], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( @@ -4326,14 +4243,14 @@ final _data = { -1, -1, const [], - const [471, 472], + const [466, 467], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'elementAt', 2, 26, -1, -1, -1, const [], - const [473], const prefix0.ContainedReflectable(), const []), + const [468], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'toString', 2097154, 26, 16, 16, 16, const [], const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'iterator', 35652099, 26, -1, 176, 177, null, + r.MethodMirrorImpl(r'iterator', 35652099, 26, -1, 175, 176, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'length', 2097155, 26, 17, 17, 17, const [], const [], const prefix0.ContainedReflectable(), const []), @@ -4356,20 +4273,20 @@ final _data = { const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'single', 3, 26, -1, -1, -1, const [], const [], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'', 128, 26, -1, 169, 26, null, const [], + r.MethodMirrorImpl(r'', 128, 26, -1, 168, 26, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl( r'generate', 1, 26, -1, - 169, + 168, 26, null, - const [474, 475], + const [469, 470], const prefix0.ContainedReflectable(), const []), - r.MethodMirrorImpl(r'empty', 385, 26, -1, 169, 26, null, const [], + r.MethodMirrorImpl(r'empty', 385, 26, -1, 168, 26, null, const [], const prefix0.ContainedReflectable(), const []), r.MethodMirrorImpl(r'', 128, 27, -1, 27, 27, const [], const [], const prefix0.ContainedReflectable(), const []) @@ -4378,7 +4295,7 @@ final _data = { r.ParameterMirrorImpl( r'a', 67239942, - 40, + 36, const prefix0.ContainedReflectable(), 4, 4, @@ -4390,7 +4307,7 @@ final _data = { r.ParameterMirrorImpl( r'b', 67239942, - 40, + 36, const prefix0.ContainedReflectable(), 4, 4, @@ -4402,7 +4319,7 @@ final _data = { r.ParameterMirrorImpl( r'object', 67239942, - 41, + 37, const prefix0.ContainedReflectable(), 4, 4, @@ -4414,7 +4331,7 @@ final _data = { r.ParameterMirrorImpl( r'object', 67239942, - 42, + 38, const prefix0.ContainedReflectable(), 4, 4, @@ -4426,7 +4343,7 @@ final _data = { r.ParameterMirrorImpl( r'_data', 151126118, - 49, + 45, const prefix0.ContainedReflectable(), 15, 30, @@ -4438,7 +4355,7 @@ final _data = { r.ParameterMirrorImpl( r'_memberSymbolMap', 84017254, - 51, + 47, const prefix0.ContainedReflectable(), 15, 32, @@ -4450,7 +4367,7 @@ final _data = { r.ParameterMirrorImpl( r'router', 151126022, - 53, + 49, const prefix0.ContainedReflectable(), 10, 74, @@ -4462,10 +4379,10 @@ final _data = { r.ParameterMirrorImpl( r'handlers', 151126022, - 54, + 50, const prefix0.ContainedReflectable(), 26, - 68, + 177, 26, null, const [], @@ -4474,7 +4391,7 @@ final _data = { r.ParameterMirrorImpl( r'future', 84017158, - 55, + 51, const prefix0.ContainedReflectable(), 19, 178, @@ -4486,7 +4403,7 @@ final _data = { r.ParameterMirrorImpl( r'callback', 134217734, - 56, + 52, const prefix0.ContainedReflectable(), -1, 179, @@ -4498,7 +4415,7 @@ final _data = { r.ParameterMirrorImpl( r'body', 134217734, - 57, + 53, const prefix0.ContainedReflectable(), -1, 180, @@ -4510,7 +4427,7 @@ final _data = { r.ParameterMirrorImpl( r'zoneValues', 84029446, - 57, + 53, const prefix0.ContainedReflectable(), 15, 181, @@ -4522,7 +4439,7 @@ final _data = { r.ParameterMirrorImpl( r'zoneSpecification', 67252230, - 57, + 53, const prefix0.ContainedReflectable(), -1, 182, @@ -4534,7 +4451,7 @@ final _data = { r.ParameterMirrorImpl( r'onError', 67252230, - 57, + 53, const prefix0.ContainedReflectable(), -1, 183, @@ -4546,7 +4463,7 @@ final _data = { r.ParameterMirrorImpl( r'body', 134217734, - 58, + 54, const prefix0.ContainedReflectable(), -1, 184, @@ -4558,7 +4475,7 @@ final _data = { r.ParameterMirrorImpl( r'onError', 134217734, - 58, + 54, const prefix0.ContainedReflectable(), -1, 185, @@ -4570,7 +4487,7 @@ final _data = { r.ParameterMirrorImpl( r'zoneValues', 84029446, - 58, + 54, const prefix0.ContainedReflectable(), 15, 181, @@ -4582,7 +4499,7 @@ final _data = { r.ParameterMirrorImpl( r'zoneSpecification', 67252230, - 58, + 54, const prefix0.ContainedReflectable(), -1, 182, @@ -4594,7 +4511,7 @@ final _data = { r.ParameterMirrorImpl( r'receiver', 67239942, - 60, + 56, const prefix0.ContainedReflectable(), 4, 4, @@ -4606,7 +4523,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 60, + 56, const prefix0.ContainedReflectable(), 16, 16, @@ -4618,10 +4535,10 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 151126022, - 60, + 56, const prefix0.ContainedReflectable(), 14, - 87, + 86, 14, null, const [], @@ -4630,7 +4547,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84017158, - 60, + 56, const prefix0.ContainedReflectable(), 15, 186, @@ -4642,7 +4559,7 @@ final _data = { r.ParameterMirrorImpl( r'kind', 134348806, - 60, + 56, const prefix0.ContainedReflectable(), -1, 187, @@ -4654,7 +4571,7 @@ final _data = { r.ParameterMirrorImpl( r'receiver', 67239942, - 61, + 57, const prefix0.ContainedReflectable(), 4, 4, @@ -4666,7 +4583,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 61, + 57, const prefix0.ContainedReflectable(), 16, 16, @@ -4678,10 +4595,10 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 151126022, - 61, + 57, const prefix0.ContainedReflectable(), 14, - 87, + 86, 14, null, const [], @@ -4690,7 +4607,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84017158, - 61, + 57, const prefix0.ContainedReflectable(), 15, 186, @@ -4702,7 +4619,7 @@ final _data = { r.ParameterMirrorImpl( r'receiver', 67239942, - 62, + 58, const prefix0.ContainedReflectable(), 4, 4, @@ -4714,7 +4631,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 62, + 58, const prefix0.ContainedReflectable(), 16, 16, @@ -4726,10 +4643,10 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 151126022, - 62, + 58, const prefix0.ContainedReflectable(), 14, - 87, + 86, 14, null, const [], @@ -4738,7 +4655,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84017158, - 62, + 58, const prefix0.ContainedReflectable(), 15, 186, @@ -4750,7 +4667,7 @@ final _data = { r.ParameterMirrorImpl( r'receiver', 67239942, - 63, + 59, const prefix0.ContainedReflectable(), 4, 4, @@ -4762,7 +4679,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 63, + 59, const prefix0.ContainedReflectable(), 16, 16, @@ -4774,10 +4691,10 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 151126022, - 63, + 59, const prefix0.ContainedReflectable(), 14, - 87, + 86, 14, null, const [], @@ -4786,7 +4703,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84017158, - 63, + 59, const prefix0.ContainedReflectable(), 15, 186, @@ -4798,7 +4715,7 @@ final _data = { r.ParameterMirrorImpl( r'receiver', 67239942, - 64, + 60, const prefix0.ContainedReflectable(), 4, 4, @@ -4810,7 +4727,7 @@ final _data = { r.ParameterMirrorImpl( r'constructorName', 134348806, - 64, + 60, const prefix0.ContainedReflectable(), 16, 16, @@ -4822,10 +4739,10 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 151126022, - 64, + 60, const prefix0.ContainedReflectable(), 14, - 87, + 86, 14, null, const [], @@ -4834,7 +4751,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84017158, - 64, + 60, const prefix0.ContainedReflectable(), 15, 186, @@ -4846,7 +4763,7 @@ final _data = { r.ParameterMirrorImpl( r'singleton', 134348806, - 86, + 82, const prefix0.ContainedReflectable(), 7, 7, @@ -4858,7 +4775,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 88, + 84, const prefix0.ContainedReflectable(), 4, 4, @@ -4870,7 +4787,7 @@ final _data = { r.ParameterMirrorImpl( r'invocation', 134348806, - 90, + 86, const prefix0.ContainedReflectable(), 8, 8, @@ -4882,7 +4799,7 @@ final _data = { r.ParameterMirrorImpl( r'app', 134348806, - 93, + 89, const prefix0.ContainedReflectable(), 9, 9, @@ -4894,10 +4811,10 @@ final _data = { r.ParameterMirrorImpl( r'router', 151126022, - 94, + 90, const prefix0.ContainedReflectable(), 10, - 100, + 99, 10, null, const [], @@ -4906,7 +4823,7 @@ final _data = { r.ParameterMirrorImpl( r'reflector', 134348806, - 94, + 90, const prefix0.ContainedReflectable(), 11, 11, @@ -4918,7 +4835,7 @@ final _data = { r.ParameterMirrorImpl( r'routable', 134348806, - 95, + 91, const prefix0.ContainedReflectable(), 12, 12, @@ -4930,7 +4847,7 @@ final _data = { r.ParameterMirrorImpl( r'reflector', 134348806, - 96, + 92, const prefix0.ContainedReflectable(), 11, 11, @@ -4942,7 +4859,7 @@ final _data = { r.ParameterMirrorImpl( r'concreteOnly', 134363142, - 96, + 92, const prefix0.ContainedReflectable(), 13, 13, @@ -4954,7 +4871,7 @@ final _data = { r.ParameterMirrorImpl( r'_middleware', 151126118, - 99, + 95, const prefix0.ContainedReflectable(), 14, 55, @@ -4966,7 +4883,7 @@ final _data = { r.ParameterMirrorImpl( r'_routeMappings', 151126118, - 101, + 97, const prefix0.ContainedReflectable(), 15, 56, @@ -4978,7 +4895,7 @@ final _data = { r.ParameterMirrorImpl( r'reflectee', 134348806, - 106, + 102, const prefix0.ContainedReflectable(), 4, 4, @@ -4990,7 +4907,7 @@ final _data = { r.ParameterMirrorImpl( r'reflectee', 134348806, - 107, + 103, const prefix0.ContainedReflectable(), 4, 4, @@ -5002,7 +4919,7 @@ final _data = { r.ParameterMirrorImpl( r'type', 134348806, - 108, + 104, const prefix0.ContainedReflectable(), 18, 18, @@ -5014,7 +4931,7 @@ final _data = { r.ParameterMirrorImpl( r'type', 134348806, - 109, + 105, const prefix0.ContainedReflectable(), 18, 18, @@ -5026,7 +4943,7 @@ final _data = { r.ParameterMirrorImpl( r'libraryName', 134348806, - 110, + 106, const prefix0.ContainedReflectable(), 16, 16, @@ -5038,7 +4955,7 @@ final _data = { r.ParameterMirrorImpl( r'injectSingleton', 134364166, - 113, + 109, const prefix0.ContainedReflectable(), 13, 13, @@ -5050,7 +4967,7 @@ final _data = { r.ParameterMirrorImpl( r'type', 134348806, - 114, + 110, const prefix0.ContainedReflectable(), 18, 18, @@ -5062,7 +4979,7 @@ final _data = { r.ParameterMirrorImpl( r'cap0', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5074,7 +4991,7 @@ final _data = { r.ParameterMirrorImpl( r'cap1', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5086,7 +5003,7 @@ final _data = { r.ParameterMirrorImpl( r'cap2', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5098,7 +5015,7 @@ final _data = { r.ParameterMirrorImpl( r'cap3', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5110,7 +5027,7 @@ final _data = { r.ParameterMirrorImpl( r'cap4', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5122,7 +5039,7 @@ final _data = { r.ParameterMirrorImpl( r'cap5', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5134,7 +5051,7 @@ final _data = { r.ParameterMirrorImpl( r'cap6', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5146,7 +5063,7 @@ final _data = { r.ParameterMirrorImpl( r'cap7', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5158,7 +5075,7 @@ final _data = { r.ParameterMirrorImpl( r'cap8', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5170,7 +5087,7 @@ final _data = { r.ParameterMirrorImpl( r'cap9', 67244038, - 117, + 113, const prefix0.ContainedReflectable(), 27, 27, @@ -5182,7 +5099,7 @@ final _data = { r.ParameterMirrorImpl( r'capabilities', 151126022, - 118, + 114, const prefix0.ContainedReflectable(), 14, 80, @@ -5194,7 +5111,7 @@ final _data = { r.ParameterMirrorImpl( r'object1', 67239942, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5206,7 +5123,7 @@ final _data = { r.ParameterMirrorImpl( r'object2', 67239942, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5218,7 +5135,7 @@ final _data = { r.ParameterMirrorImpl( r'object3', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5230,7 +5147,7 @@ final _data = { r.ParameterMirrorImpl( r'object4', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5242,7 +5159,7 @@ final _data = { r.ParameterMirrorImpl( r'object5', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5254,7 +5171,7 @@ final _data = { r.ParameterMirrorImpl( r'object6', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5266,7 +5183,7 @@ final _data = { r.ParameterMirrorImpl( r'object7', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5278,7 +5195,7 @@ final _data = { r.ParameterMirrorImpl( r'object8', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5290,7 +5207,7 @@ final _data = { r.ParameterMirrorImpl( r'object9', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5302,7 +5219,7 @@ final _data = { r.ParameterMirrorImpl( r'object10', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5314,7 +5231,7 @@ final _data = { r.ParameterMirrorImpl( r'object11', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5326,7 +5243,7 @@ final _data = { r.ParameterMirrorImpl( r'object12', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5338,7 +5255,7 @@ final _data = { r.ParameterMirrorImpl( r'object13', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5350,7 +5267,7 @@ final _data = { r.ParameterMirrorImpl( r'object14', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5362,7 +5279,7 @@ final _data = { r.ParameterMirrorImpl( r'object15', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5374,7 +5291,7 @@ final _data = { r.ParameterMirrorImpl( r'object16', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5386,7 +5303,7 @@ final _data = { r.ParameterMirrorImpl( r'object17', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5398,7 +5315,7 @@ final _data = { r.ParameterMirrorImpl( r'object18', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5410,7 +5327,7 @@ final _data = { r.ParameterMirrorImpl( r'object19', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5422,7 +5339,7 @@ final _data = { r.ParameterMirrorImpl( r'object20', 67246086, - 119, + 115, const prefix0.ContainedReflectable(), 4, 4, @@ -5434,7 +5351,7 @@ final _data = { r.ParameterMirrorImpl( r'objects', 151126022, - 120, + 116, const prefix0.ContainedReflectable(), 26, 188, @@ -5446,7 +5363,7 @@ final _data = { r.ParameterMirrorImpl( r'objects', 151126022, - 121, + 117, const prefix0.ContainedReflectable(), 26, 188, @@ -5458,7 +5375,7 @@ final _data = { r.ParameterMirrorImpl( r'cap0', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5470,7 +5387,7 @@ final _data = { r.ParameterMirrorImpl( r'cap1', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5482,7 +5399,7 @@ final _data = { r.ParameterMirrorImpl( r'cap2', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5494,7 +5411,7 @@ final _data = { r.ParameterMirrorImpl( r'cap3', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5506,7 +5423,7 @@ final _data = { r.ParameterMirrorImpl( r'cap4', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5518,7 +5435,7 @@ final _data = { r.ParameterMirrorImpl( r'cap5', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5530,7 +5447,7 @@ final _data = { r.ParameterMirrorImpl( r'cap6', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5542,7 +5459,7 @@ final _data = { r.ParameterMirrorImpl( r'cap7', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5554,7 +5471,7 @@ final _data = { r.ParameterMirrorImpl( r'cap8', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5566,7 +5483,7 @@ final _data = { r.ParameterMirrorImpl( r'cap9', 67244038, - 123, + 119, const prefix0.ContainedReflectable(), 27, 27, @@ -5578,7 +5495,7 @@ final _data = { r.ParameterMirrorImpl( r'capabilities', 151126022, - 124, + 120, const prefix0.ContainedReflectable(), 14, 80, @@ -5590,7 +5507,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap0', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5602,7 +5519,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap1', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5614,7 +5531,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap2', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5626,7 +5543,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap3', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5638,7 +5555,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap4', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5650,7 +5567,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap5', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5662,7 +5579,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap6', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5674,7 +5591,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap7', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5686,7 +5603,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap8', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5698,7 +5615,7 @@ final _data = { r.ParameterMirrorImpl( r'_cap9', 67245094, - 125, + 121, const prefix0.ContainedReflectable(), 27, 27, @@ -5710,7 +5627,7 @@ final _data = { r.ParameterMirrorImpl( r'_capabilities', 84018214, - 126, + 122, const prefix0.ContainedReflectable(), 14, 189, @@ -5720,69 +5637,9 @@ final _data = { null, null), r.ParameterMirrorImpl( - r'text', - 67253254, - 132, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, - const [], - const [], - null, - #text), - r.ParameterMirrorImpl( - r'over', - 67253254, - 132, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, - const [], - const [], - null, - #over), - r.ParameterMirrorImpl( - r'_text', - 67240038, - 129, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'_over', - 67240038, - 131, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'_id', - 67240038, - 134, - const prefix0.ContainedReflectable(), - 16, - 16, - 16, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'_createdAt', - 67240038, - 136, + r'item', + 134349830, + 126, const prefix0.ContainedReflectable(), -1, 57, @@ -5792,9 +5649,9 @@ final _data = { null, null), r.ParameterMirrorImpl( - r'_updatedAt', - 67240038, - 138, + r'_item', + 134348902, + 124, const prefix0.ContainedReflectable(), -1, 57, @@ -5806,7 +5663,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 149, + 136, const prefix0.ContainedReflectable(), -1, 33, @@ -5818,7 +5675,7 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 84017158, - 149, + 136, const prefix0.ContainedReflectable(), 26, 190, @@ -5830,7 +5687,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84021254, - 149, + 136, const prefix0.ContainedReflectable(), 15, 191, @@ -5842,7 +5699,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 150, + 137, const prefix0.ContainedReflectable(), -1, 33, @@ -5854,7 +5711,7 @@ final _data = { r.ParameterMirrorImpl( r'typeArguments', 84017158, - 150, + 137, const prefix0.ContainedReflectable(), 26, 192, @@ -5866,7 +5723,7 @@ final _data = { r.ParameterMirrorImpl( r'positionalArguments', 84017158, - 150, + 137, const prefix0.ContainedReflectable(), 26, 190, @@ -5878,7 +5735,7 @@ final _data = { r.ParameterMirrorImpl( r'namedArguments', 84021254, - 150, + 137, const prefix0.ContainedReflectable(), 15, 191, @@ -5890,7 +5747,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134348806, - 151, + 138, const prefix0.ContainedReflectable(), -1, 33, @@ -5902,7 +5759,7 @@ final _data = { r.ParameterMirrorImpl( r'memberName', 134348806, - 152, + 139, const prefix0.ContainedReflectable(), -1, 33, @@ -5914,7 +5771,7 @@ final _data = { r.ParameterMirrorImpl( r'argument', 67239942, - 152, + 139, const prefix0.ContainedReflectable(), 4, 4, @@ -5926,7 +5783,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134348806, - 153, + 140, const prefix0.ContainedReflectable(), 16, 16, @@ -5938,7 +5795,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 153, + 140, const prefix0.ContainedReflectable(), 16, 16, @@ -5950,7 +5807,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 134217734, - 153, + 140, const prefix0.ContainedReflectable(), -1, 75, @@ -5962,10 +5819,10 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 153, + 140, const prefix0.ContainedReflectable(), 26, - 68, + 177, 26, null, const [], @@ -5974,7 +5831,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 154, + 141, const prefix0.ContainedReflectable(), 16, 16, @@ -5986,10 +5843,10 @@ final _data = { r.ParameterMirrorImpl( r'router', 151126022, - 154, + 141, const prefix0.ContainedReflectable(), 10, - 100, + 99, 10, null, const [], @@ -5998,7 +5855,7 @@ final _data = { r.ParameterMirrorImpl( r'callback', 67121158, - 157, + 144, const prefix0.ContainedReflectable(), -1, 193, @@ -6010,7 +5867,7 @@ final _data = { r.ParameterMirrorImpl( r'header', 134363142, - 157, + 144, const prefix0.ContainedReflectable(), 16, 16, @@ -6022,7 +5879,7 @@ final _data = { r.ParameterMirrorImpl( r'tab', 134363142, - 157, + 144, const prefix0.ContainedReflectable(), 16, 16, @@ -6034,7 +5891,7 @@ final _data = { r.ParameterMirrorImpl( r'showMatchers', 134363142, - 157, + 144, const prefix0.ContainedReflectable(), 13, 13, @@ -6046,7 +5903,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 67141638, - 158, + 145, const prefix0.ContainedReflectable(), -1, -1, @@ -6058,7 +5915,7 @@ final _data = { r.ParameterMirrorImpl( r'req', 151126022, - 158, + 145, const prefix0.ContainedReflectable(), -1, 194, @@ -6070,7 +5927,7 @@ final _data = { r.ParameterMirrorImpl( r'res', 151126022, - 158, + 145, const prefix0.ContainedReflectable(), -1, 196, @@ -6082,7 +5939,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 67141638, - 159, + 146, const prefix0.ContainedReflectable(), -1, -1, @@ -6094,7 +5951,7 @@ final _data = { r.ParameterMirrorImpl( r'req', 151126022, - 159, + 146, const prefix0.ContainedReflectable(), -1, 194, @@ -6106,7 +5963,7 @@ final _data = { r.ParameterMirrorImpl( r'res', 151126022, - 159, + 146, const prefix0.ContainedReflectable(), -1, 196, @@ -6118,7 +5975,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 67141638, - 160, + 147, const prefix0.ContainedReflectable(), -1, -1, @@ -6130,7 +5987,7 @@ final _data = { r.ParameterMirrorImpl( r'force', 134363142, - 161, + 148, const prefix0.ContainedReflectable(), 13, 13, @@ -6142,7 +5999,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 134348806, - 162, + 149, const prefix0.ContainedReflectable(), -1, 198, @@ -6154,7 +6011,7 @@ final _data = { r.ParameterMirrorImpl( r'req', 151126022, - 162, + 149, const prefix0.ContainedReflectable(), -1, 194, @@ -6166,7 +6023,7 @@ final _data = { r.ParameterMirrorImpl( r'res', 151126022, - 162, + 149, const prefix0.ContainedReflectable(), -1, 196, @@ -6178,7 +6035,7 @@ final _data = { r.ParameterMirrorImpl( r'container', 67244038, - 162, + 149, const prefix0.ContainedReflectable(), -1, 199, @@ -6190,7 +6047,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 134348806, - 163, + 150, const prefix0.ContainedReflectable(), -1, 198, @@ -6202,7 +6059,7 @@ final _data = { r.ParameterMirrorImpl( r'req', 151126022, - 163, + 150, const prefix0.ContainedReflectable(), -1, 194, @@ -6214,7 +6071,7 @@ final _data = { r.ParameterMirrorImpl( r'res', 151126022, - 163, + 150, const prefix0.ContainedReflectable(), -1, 196, @@ -6226,7 +6083,7 @@ final _data = { r.ParameterMirrorImpl( r'container', 67244038, - 163, + 150, const prefix0.ContainedReflectable(), -1, 199, @@ -6238,7 +6095,7 @@ final _data = { r.ParameterMirrorImpl( r'configurer', 134217734, - 164, + 151, const prefix0.ContainedReflectable(), -1, 200, @@ -6250,7 +6107,7 @@ final _data = { r.ParameterMirrorImpl( r'type', 67244038, - 165, + 152, const prefix0.ContainedReflectable(), 18, 18, @@ -6262,7 +6119,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 134217734, - 166, + 153, const prefix0.ContainedReflectable(), -1, 75, @@ -6274,7 +6131,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 167, + 154, const prefix0.ContainedReflectable(), 16, 16, @@ -6286,7 +6143,7 @@ final _data = { r.ParameterMirrorImpl( r'service', 134217734, - 167, + 154, const prefix0.ContainedReflectable(), -1, -1, @@ -6298,7 +6155,7 @@ final _data = { r.ParameterMirrorImpl( r'reflector', 134363142, - 190, + 177, const prefix0.ContainedReflectable(), 11, 11, @@ -6307,12 +6164,12 @@ final _data = { const [], const prefix14.ThrowingReflector( errorMessage: - '${ContainerConst.defaultErrorMessage} $_reflectionInfo'), + '${ThrowingReflector.defaultErrorMessage} $_reflectionInfo'), #reflector), r.ParameterMirrorImpl( r'environment', 134364166, - 190, + 177, const prefix0.ContainedReflectable(), -1, 63, @@ -6324,7 +6181,7 @@ final _data = { r.ParameterMirrorImpl( r'logger', 67252230, - 190, + 177, const prefix0.ContainedReflectable(), -1, 201, @@ -6336,7 +6193,7 @@ final _data = { r.ParameterMirrorImpl( r'allowMethodOverrides', 134364166, - 190, + 177, const prefix0.ContainedReflectable(), 13, 13, @@ -6348,7 +6205,7 @@ final _data = { r.ParameterMirrorImpl( r'serializer', 67122182, - 190, + 177, const prefix0.ContainedReflectable(), -1, 62, @@ -6360,7 +6217,7 @@ final _data = { r.ParameterMirrorImpl( r'viewGenerator', 67122182, - 190, + 177, const prefix0.ContainedReflectable(), -1, 65, @@ -6372,7 +6229,7 @@ final _data = { r.ParameterMirrorImpl( r'_serializer', 67108966, - 172, + 159, const prefix0.ContainedReflectable(), -1, 62, @@ -6384,7 +6241,7 @@ final _data = { r.ParameterMirrorImpl( r'_allowMethodOverrides', 134348902, - 174, + 161, const prefix0.ContainedReflectable(), 13, 13, @@ -6396,7 +6253,7 @@ final _data = { r.ParameterMirrorImpl( r'_viewGenerator', 67108966, - 180, + 167, const prefix0.ContainedReflectable(), -1, 65, @@ -6408,7 +6265,7 @@ final _data = { r.ParameterMirrorImpl( r'_errorHandler', 134217830, - 182, + 169, const prefix0.ContainedReflectable(), -1, 66, @@ -6420,7 +6277,7 @@ final _data = { r.ParameterMirrorImpl( r'log', 67239942, - 189, + 176, const prefix0.ContainedReflectable(), -1, 201, @@ -6432,7 +6289,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151126022, - 192, + 179, const prefix0.ContainedReflectable(), 26, 202, @@ -6444,7 +6301,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 194, + 181, const prefix0.ContainedReflectable(), 16, 16, @@ -6456,7 +6313,7 @@ final _data = { r.ParameterMirrorImpl( r'callback', 134217734, - 194, + 181, const prefix0.ContainedReflectable(), -1, 203, @@ -6468,7 +6325,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 194, + 181, const prefix0.ContainedReflectable(), 26, 202, @@ -6480,7 +6337,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134363142, - 194, + 181, const prefix0.ContainedReflectable(), 16, 16, @@ -6492,7 +6349,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 195, + 182, const prefix0.ContainedReflectable(), 16, 16, @@ -6504,7 +6361,7 @@ final _data = { r.ParameterMirrorImpl( r'callback', 134217734, - 195, + 182, const prefix0.ContainedReflectable(), -1, 204, @@ -6516,7 +6373,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 195, + 182, const prefix0.ContainedReflectable(), 26, 202, @@ -6528,7 +6385,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134363142, - 195, + 182, const prefix0.ContainedReflectable(), 16, 16, @@ -6540,7 +6397,7 @@ final _data = { r.ParameterMirrorImpl( r'linkParams', 151126022, - 196, + 183, const prefix0.ContainedReflectable(), 26, 205, @@ -6552,7 +6409,7 @@ final _data = { r.ParameterMirrorImpl( r'absolute', 134363142, - 196, + 183, const prefix0.ContainedReflectable(), 13, 13, @@ -6564,7 +6421,7 @@ final _data = { r.ParameterMirrorImpl( r'absolute', 134348806, - 197, + 184, const prefix0.ContainedReflectable(), 16, 16, @@ -6576,7 +6433,7 @@ final _data = { r.ParameterMirrorImpl( r'relative', 134348806, - 197, + 184, const prefix0.ContainedReflectable(), 16, 16, @@ -6588,7 +6445,7 @@ final _data = { r.ParameterMirrorImpl( r'out', 151126022, - 197, + 184, const prefix0.ContainedReflectable(), 14, 206, @@ -6600,7 +6457,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134363142, - 197, + 184, const prefix0.ContainedReflectable(), 16, 16, @@ -6612,7 +6469,7 @@ final _data = { r.ParameterMirrorImpl( r'strip', 134363142, - 197, + 184, const prefix0.ContainedReflectable(), 13, 13, @@ -6624,7 +6481,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 198, + 185, const prefix0.ContainedReflectable(), 16, 16, @@ -6636,7 +6493,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134363142, - 198, + 185, const prefix0.ContainedReflectable(), 16, 16, @@ -6648,7 +6505,7 @@ final _data = { r.ParameterMirrorImpl( r'strip', 134363142, - 198, + 185, const prefix0.ContainedReflectable(), 13, 13, @@ -6660,7 +6517,7 @@ final _data = { r.ParameterMirrorImpl( r'absolute', 134348806, - 199, + 186, const prefix0.ContainedReflectable(), 16, 16, @@ -6672,7 +6529,7 @@ final _data = { r.ParameterMirrorImpl( r'relative', 134348806, - 199, + 186, const prefix0.ContainedReflectable(), 16, 16, @@ -6684,7 +6541,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134363142, - 199, + 186, const prefix0.ContainedReflectable(), 16, 16, @@ -6696,7 +6553,7 @@ final _data = { r.ParameterMirrorImpl( r'strip', 134363142, - 199, + 186, const prefix0.ContainedReflectable(), 13, 13, @@ -6708,7 +6565,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 200, + 187, const prefix0.ContainedReflectable(), 16, 16, @@ -6720,7 +6577,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 200, + 187, const prefix0.ContainedReflectable(), -1, -1, @@ -6732,7 +6589,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 200, + 187, const prefix0.ContainedReflectable(), 26, 202, @@ -6744,7 +6601,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 201, + 188, const prefix0.ContainedReflectable(), 16, 16, @@ -6756,7 +6613,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 201, + 188, const prefix0.ContainedReflectable(), -1, -1, @@ -6768,7 +6625,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 201, + 188, const prefix0.ContainedReflectable(), 26, 202, @@ -6780,7 +6637,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 202, + 189, const prefix0.ContainedReflectable(), 16, 16, @@ -6792,7 +6649,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 202, + 189, const prefix0.ContainedReflectable(), -1, -1, @@ -6804,7 +6661,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 202, + 189, const prefix0.ContainedReflectable(), 26, 202, @@ -6816,7 +6673,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 203, + 190, const prefix0.ContainedReflectable(), 16, 16, @@ -6828,7 +6685,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 203, + 190, const prefix0.ContainedReflectable(), -1, -1, @@ -6840,7 +6697,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 203, + 190, const prefix0.ContainedReflectable(), 26, 202, @@ -6852,7 +6709,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 204, + 191, const prefix0.ContainedReflectable(), 16, 16, @@ -6864,7 +6721,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 204, + 191, const prefix0.ContainedReflectable(), -1, -1, @@ -6876,7 +6733,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 204, + 191, const prefix0.ContainedReflectable(), 26, 202, @@ -6888,7 +6745,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 205, + 192, const prefix0.ContainedReflectable(), 16, 16, @@ -6900,7 +6757,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 205, + 192, const prefix0.ContainedReflectable(), -1, -1, @@ -6912,7 +6769,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 205, + 192, const prefix0.ContainedReflectable(), 26, 202, @@ -6924,7 +6781,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 206, + 193, const prefix0.ContainedReflectable(), 16, 16, @@ -6936,7 +6793,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 206, + 193, const prefix0.ContainedReflectable(), -1, -1, @@ -6948,7 +6805,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 206, + 193, const prefix0.ContainedReflectable(), 26, 202, @@ -6960,7 +6817,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 207, + 194, const prefix0.ContainedReflectable(), 16, 16, @@ -6972,7 +6829,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 207, + 194, const prefix0.ContainedReflectable(), -1, -1, @@ -6984,7 +6841,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 207, + 194, const prefix0.ContainedReflectable(), 26, 202, @@ -6996,11 +6853,11 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 211, + 198, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -7008,11 +6865,11 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 212, + 199, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -7020,11 +6877,11 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 213, + 200, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -7032,7 +6889,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134348806, - 218, + 205, const prefix0.ContainedReflectable(), 16, 16, @@ -7044,7 +6901,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 218, + 205, const prefix0.ContainedReflectable(), 16, 16, @@ -7056,7 +6913,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 6, - 218, + 205, const prefix0.ContainedReflectable(), -1, -1, @@ -7068,7 +6925,7 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 218, + 205, const prefix0.ContainedReflectable(), 26, 202, @@ -7080,7 +6937,7 @@ final _data = { r.ParameterMirrorImpl( r'callback', 67121158, - 219, + 206, const prefix0.ContainedReflectable(), -1, 193, @@ -7092,7 +6949,7 @@ final _data = { r.ParameterMirrorImpl( r'header', 134363142, - 219, + 206, const prefix0.ContainedReflectable(), 16, 16, @@ -7104,7 +6961,7 @@ final _data = { r.ParameterMirrorImpl( r'tab', 134363142, - 219, + 206, const prefix0.ContainedReflectable(), 16, 16, @@ -7116,7 +6973,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 220, + 207, const prefix0.ContainedReflectable(), 16, 16, @@ -7128,10 +6985,10 @@ final _data = { r.ParameterMirrorImpl( r'router', 151126022, - 220, + 207, const prefix0.ContainedReflectable(), 10, - 107, + 106, 10, null, const [], @@ -7140,7 +6997,7 @@ final _data = { r.ParameterMirrorImpl( r'symbol', 134348806, - 222, + 209, const prefix0.ContainedReflectable(), -1, 33, @@ -7152,7 +7009,7 @@ final _data = { r.ParameterMirrorImpl( r'clazz', 134348806, - 223, + 210, const prefix0.ContainedReflectable(), 18, 18, @@ -7164,7 +7021,7 @@ final _data = { r.ParameterMirrorImpl( r'function', 134348806, - 224, + 211, const prefix0.ContainedReflectable(), -1, 198, @@ -7176,7 +7033,7 @@ final _data = { r.ParameterMirrorImpl( r'type', 134348806, - 225, + 212, const prefix0.ContainedReflectable(), 18, 18, @@ -7188,7 +7045,7 @@ final _data = { r.ParameterMirrorImpl( r'object', 134348806, - 226, + 213, const prefix0.ContainedReflectable(), 4, 4, @@ -7200,7 +7057,7 @@ final _data = { r.ParameterMirrorImpl( r'type', 134348806, - 227, + 214, const prefix0.ContainedReflectable(), 18, 18, @@ -7212,7 +7069,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134348806, - 230, + 217, const prefix0.ContainedReflectable(), 16, 16, @@ -7224,7 +7081,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 230, + 217, const prefix0.ContainedReflectable(), 16, 16, @@ -7236,7 +7093,7 @@ final _data = { r.ParameterMirrorImpl( r'handler', 134217734, - 230, + 217, const prefix0.ContainedReflectable(), -1, 75, @@ -7248,10 +7105,10 @@ final _data = { r.ParameterMirrorImpl( r'middleware', 151140358, - 230, + 217, const prefix0.ContainedReflectable(), 26, - 68, + 177, 26, null, const [], @@ -7260,7 +7117,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 231, + 218, const prefix0.ContainedReflectable(), 16, 16, @@ -7272,7 +7129,7 @@ final _data = { r.ParameterMirrorImpl( r'service', 134217734, - 231, + 218, const prefix0.ContainedReflectable(), -1, -1, @@ -7284,7 +7141,7 @@ final _data = { r.ParameterMirrorImpl( r'reflector', 67244038, - 232, + 219, const prefix0.ContainedReflectable(), 11, 11, @@ -7296,7 +7153,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 233, + 220, const prefix0.ContainedReflectable(), 13, 13, @@ -7308,7 +7165,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 234, + 221, const prefix0.ContainedReflectable(), 13, 13, @@ -7320,7 +7177,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 235, + 222, const prefix0.ContainedReflectable(), 13, 13, @@ -7332,7 +7189,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134348806, - 238, + 225, const prefix0.ContainedReflectable(), 16, 16, @@ -7344,7 +7201,7 @@ final _data = { r.ParameterMirrorImpl( r'defaultValue', 134363142, - 238, + 225, const prefix0.ContainedReflectable(), 13, 13, @@ -7356,7 +7213,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134348806, - 239, + 226, const prefix0.ContainedReflectable(), 16, 16, @@ -7368,7 +7225,7 @@ final _data = { r.ParameterMirrorImpl( r'source', 151126022, - 240, + 227, const prefix0.ContainedReflectable(), 14, 207, @@ -7380,7 +7237,7 @@ final _data = { r.ParameterMirrorImpl( r'target', 151126022, - 241, + 228, const prefix0.ContainedReflectable(), 14, 208, @@ -7392,7 +7249,7 @@ final _data = { r.ParameterMirrorImpl( r'at', 134348806, - 241, + 228, const prefix0.ContainedReflectable(), 17, 17, @@ -7404,7 +7261,7 @@ final _data = { r.ParameterMirrorImpl( r'source', 151126022, - 241, + 228, const prefix0.ContainedReflectable(), 14, 208, @@ -7416,7 +7273,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 67244038, - 241, + 228, const prefix0.ContainedReflectable(), 17, 17, @@ -7428,7 +7285,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 67244038, - 241, + 228, const prefix0.ContainedReflectable(), 17, 17, @@ -7440,7 +7297,7 @@ final _data = { r.ParameterMirrorImpl( r'target', 151126022, - 242, + 229, const prefix0.ContainedReflectable(), 14, 209, @@ -7452,7 +7309,7 @@ final _data = { r.ParameterMirrorImpl( r'at', 134348806, - 242, + 229, const prefix0.ContainedReflectable(), 17, 17, @@ -7464,7 +7321,7 @@ final _data = { r.ParameterMirrorImpl( r'source', 151126022, - 242, + 229, const prefix0.ContainedReflectable(), 26, 210, @@ -7473,6 +7330,234 @@ final _data = { const [], null, null), + r.ParameterMirrorImpl( + r'index', + 134348806, + 231, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'index', + 134348806, + 232, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'value', + 6, + 232, + const prefix0.ContainedReflectable(), + -1, + -1, + -1, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'value', + 6, + 233, + const prefix0.ContainedReflectable(), + -1, + -1, + -1, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'iterable', + 151126022, + 234, + const prefix0.ContainedReflectable(), + 26, + 135, + 26, + null, + const [], + null, + null), + r.ParameterMirrorImpl( + r'compare', + 67112966, + 235, + const prefix0.ContainedReflectable(), + -1, + 211, + 211, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'random', + 67244038, + 236, + const prefix0.ContainedReflectable(), + -1, + 212, + 212, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'element', + 6, + 237, + const prefix0.ContainedReflectable(), + -1, + -1, + -1, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'start', + 134354950, + 237, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'test', + 134217734, + 238, + const prefix0.ContainedReflectable(), + -1, + 213, + 213, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'start', + 134354950, + 238, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'test', + 134217734, + 239, + const prefix0.ContainedReflectable(), + -1, + 213, + 213, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'start', + 67244038, + 239, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'element', + 6, + 240, + const prefix0.ContainedReflectable(), + -1, + -1, + -1, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'start', + 67244038, + 240, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'index', + 134348806, + 242, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'element', + 6, + 242, + const prefix0.ContainedReflectable(), + -1, + -1, + -1, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'index', + 134348806, + 243, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'iterable', + 151126022, + 243, + const prefix0.ContainedReflectable(), + 26, + 135, + 26, + null, + const [], + null, + null), r.ParameterMirrorImpl( r'index', 134348806, @@ -7485,241 +7570,13 @@ final _data = { const [], null, null), - r.ParameterMirrorImpl( - r'index', - 134348806, - 245, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'value', - 6, - 245, - const prefix0.ContainedReflectable(), - -1, - -1, - -1, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'value', - 6, - 246, - const prefix0.ContainedReflectable(), - -1, - -1, - -1, - const [], - const [], - null, - null), r.ParameterMirrorImpl( r'iterable', 151126022, - 247, + 244, const prefix0.ContainedReflectable(), 26, - 136, - 26, - null, - const [], - null, - null), - r.ParameterMirrorImpl( - r'compare', - 67112966, - 248, - const prefix0.ContainedReflectable(), - -1, - 211, - 211, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'random', - 67244038, - 249, - const prefix0.ContainedReflectable(), - -1, - 212, - 212, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'element', - 6, - 250, - const prefix0.ContainedReflectable(), - -1, - -1, - -1, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'start', - 134354950, - 250, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'test', - 134217734, - 251, - const prefix0.ContainedReflectable(), - -1, - 213, - 213, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'start', - 134354950, - 251, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'test', - 134217734, - 252, - const prefix0.ContainedReflectable(), - -1, - 213, - 213, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'start', - 67244038, - 252, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'element', - 6, - 253, - const prefix0.ContainedReflectable(), - -1, - -1, - -1, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'start', - 67244038, - 253, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'index', - 134348806, - 255, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'element', - 6, - 255, - const prefix0.ContainedReflectable(), - -1, - -1, - -1, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'index', - 134348806, - 256, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'iterable', - 151126022, - 256, - const prefix0.ContainedReflectable(), - 26, - 136, - 26, - null, - const [], - null, - null), - r.ParameterMirrorImpl( - r'index', - 134348806, - 257, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'iterable', - 151126022, - 257, - const prefix0.ContainedReflectable(), - 26, - 136, + 135, 26, null, const [], @@ -7728,7 +7585,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 67239942, - 258, + 245, const prefix0.ContainedReflectable(), 4, 4, @@ -7740,7 +7597,7 @@ final _data = { r.ParameterMirrorImpl( r'index', 134348806, - 259, + 246, const prefix0.ContainedReflectable(), 17, 17, @@ -7752,7 +7609,7 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 261, + 248, const prefix0.ContainedReflectable(), -1, 213, @@ -7764,7 +7621,7 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 262, + 249, const prefix0.ContainedReflectable(), -1, 213, @@ -7776,10 +7633,10 @@ final _data = { r.ParameterMirrorImpl( r'other', 151126022, - 263, + 250, const prefix0.ContainedReflectable(), 14, - 135, + 134, 14, null, const [], @@ -7788,7 +7645,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 264, + 251, const prefix0.ContainedReflectable(), 17, 17, @@ -7800,7 +7657,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 67244038, - 264, + 251, const prefix0.ContainedReflectable(), 17, 17, @@ -7812,7 +7669,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 265, + 252, const prefix0.ContainedReflectable(), 17, 17, @@ -7824,7 +7681,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 134348806, - 265, + 252, const prefix0.ContainedReflectable(), 17, 17, @@ -7836,7 +7693,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 266, + 253, const prefix0.ContainedReflectable(), 17, 17, @@ -7848,7 +7705,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 134348806, - 266, + 253, const prefix0.ContainedReflectable(), 17, 17, @@ -7860,10 +7717,10 @@ final _data = { r.ParameterMirrorImpl( r'iterable', 151126022, - 266, + 253, const prefix0.ContainedReflectable(), 26, - 136, + 135, 26, null, const [], @@ -7872,7 +7729,7 @@ final _data = { r.ParameterMirrorImpl( r'skipCount', 134354950, - 266, + 253, const prefix0.ContainedReflectable(), 17, 17, @@ -7884,7 +7741,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 267, + 254, const prefix0.ContainedReflectable(), 17, 17, @@ -7896,7 +7753,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 134348806, - 267, + 254, const prefix0.ContainedReflectable(), 17, 17, @@ -7908,7 +7765,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 268, + 255, const prefix0.ContainedReflectable(), 17, 17, @@ -7920,7 +7777,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 134348806, - 268, + 255, const prefix0.ContainedReflectable(), 17, 17, @@ -7932,7 +7789,7 @@ final _data = { r.ParameterMirrorImpl( r'fillValue', 67112966, - 268, + 255, const prefix0.ContainedReflectable(), -1, -1, @@ -7944,7 +7801,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 269, + 256, const prefix0.ContainedReflectable(), 17, 17, @@ -7956,7 +7813,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 134348806, - 269, + 256, const prefix0.ContainedReflectable(), 17, 17, @@ -7968,10 +7825,10 @@ final _data = { r.ParameterMirrorImpl( r'replacements', 151126022, - 269, + 256, const prefix0.ContainedReflectable(), 26, - 136, + 135, 26, null, const [], @@ -7980,7 +7837,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 271, + 258, const prefix0.ContainedReflectable(), 4, 4, @@ -7992,7 +7849,7 @@ final _data = { r.ParameterMirrorImpl( r'length', 67244038, - 277, + 264, const prefix0.ContainedReflectable(), 17, 17, @@ -8004,7 +7861,7 @@ final _data = { r.ParameterMirrorImpl( r'length', 134348806, - 278, + 265, const prefix0.ContainedReflectable(), 17, 17, @@ -8016,7 +7873,7 @@ final _data = { r.ParameterMirrorImpl( r'fill', 6, - 278, + 265, const prefix0.ContainedReflectable(), -1, -1, @@ -8028,7 +7885,7 @@ final _data = { r.ParameterMirrorImpl( r'growable', 134363142, - 278, + 265, const prefix0.ContainedReflectable(), 13, 13, @@ -8040,7 +7897,7 @@ final _data = { r.ParameterMirrorImpl( r'growable', 134363142, - 279, + 266, const prefix0.ContainedReflectable(), 13, 13, @@ -8052,7 +7909,7 @@ final _data = { r.ParameterMirrorImpl( r'elements', 151126022, - 280, + 267, const prefix0.ContainedReflectable(), 26, 205, @@ -8064,7 +7921,7 @@ final _data = { r.ParameterMirrorImpl( r'growable', 134363142, - 280, + 267, const prefix0.ContainedReflectable(), 13, 13, @@ -8076,10 +7933,10 @@ final _data = { r.ParameterMirrorImpl( r'elements', 151126022, - 281, + 268, const prefix0.ContainedReflectable(), 26, - 136, + 135, 26, null, const [], @@ -8088,7 +7945,7 @@ final _data = { r.ParameterMirrorImpl( r'growable', 134363142, - 281, + 268, const prefix0.ContainedReflectable(), 13, 13, @@ -8100,7 +7957,7 @@ final _data = { r.ParameterMirrorImpl( r'length', 134348806, - 282, + 269, const prefix0.ContainedReflectable(), 17, 17, @@ -8112,7 +7969,7 @@ final _data = { r.ParameterMirrorImpl( r'generator', 134217734, - 282, + 269, const prefix0.ContainedReflectable(), -1, 214, @@ -8124,7 +7981,7 @@ final _data = { r.ParameterMirrorImpl( r'growable', 134363142, - 282, + 269, const prefix0.ContainedReflectable(), 13, 13, @@ -8136,7 +7993,7 @@ final _data = { r.ParameterMirrorImpl( r'elements', 151126022, - 283, + 270, const prefix0.ContainedReflectable(), 26, 205, @@ -8148,7 +8005,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 6, - 272, + 259, const prefix0.ContainedReflectable(), -1, -1, @@ -8160,7 +8017,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 6, - 273, + 260, const prefix0.ContainedReflectable(), -1, -1, @@ -8172,7 +8029,7 @@ final _data = { r.ParameterMirrorImpl( r'newLength', 134348806, - 275, + 262, const prefix0.ContainedReflectable(), 17, 17, @@ -8184,7 +8041,7 @@ final _data = { r.ParameterMirrorImpl( r'source', 151126022, - 284, + 271, const prefix0.ContainedReflectable(), 15, 215, @@ -8196,7 +8053,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 67239942, - 286, + 273, const prefix0.ContainedReflectable(), 4, 4, @@ -8208,7 +8065,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 67239942, - 287, + 274, const prefix0.ContainedReflectable(), 4, 4, @@ -8220,7 +8077,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 67239942, - 288, + 275, const prefix0.ContainedReflectable(), 4, 4, @@ -8232,7 +8089,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 6, - 289, + 276, const prefix0.ContainedReflectable(), -1, -1, @@ -8244,7 +8101,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 6, - 289, + 276, const prefix0.ContainedReflectable(), -1, -1, @@ -8256,7 +8113,7 @@ final _data = { r.ParameterMirrorImpl( r'convert', 134217734, - 290, + 277, const prefix0.ContainedReflectable(), -1, 216, @@ -8268,10 +8125,10 @@ final _data = { r.ParameterMirrorImpl( r'newEntries', 151126022, - 291, + 278, const prefix0.ContainedReflectable(), 26, - 141, + 140, 26, null, const [], @@ -8280,7 +8137,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 6, - 292, + 279, const prefix0.ContainedReflectable(), -1, -1, @@ -8292,7 +8149,7 @@ final _data = { r.ParameterMirrorImpl( r'update', 134217734, - 292, + 279, const prefix0.ContainedReflectable(), -1, 217, @@ -8304,7 +8161,7 @@ final _data = { r.ParameterMirrorImpl( r'ifAbsent', 67121158, - 292, + 279, const prefix0.ContainedReflectable(), -1, 218, @@ -8316,7 +8173,7 @@ final _data = { r.ParameterMirrorImpl( r'update', 134217734, - 293, + 280, const prefix0.ContainedReflectable(), -1, 219, @@ -8328,7 +8185,7 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 294, + 281, const prefix0.ContainedReflectable(), -1, 220, @@ -8340,7 +8197,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 6, - 295, + 282, const prefix0.ContainedReflectable(), -1, -1, @@ -8352,7 +8209,7 @@ final _data = { r.ParameterMirrorImpl( r'ifAbsent', 134217734, - 295, + 282, const prefix0.ContainedReflectable(), -1, 221, @@ -8364,10 +8221,10 @@ final _data = { r.ParameterMirrorImpl( r'other', 151126022, - 296, + 283, const prefix0.ContainedReflectable(), 15, - 144, + 143, 15, null, const [], @@ -8376,7 +8233,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 67239942, - 297, + 284, const prefix0.ContainedReflectable(), 4, 4, @@ -8388,7 +8245,7 @@ final _data = { r.ParameterMirrorImpl( r'action', 134217734, - 299, + 286, const prefix0.ContainedReflectable(), -1, 222, @@ -8400,7 +8257,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 151126022, - 307, + 294, const prefix0.ContainedReflectable(), 15, 67, @@ -8412,10 +8269,10 @@ final _data = { r.ParameterMirrorImpl( r'other', 151126022, - 308, + 295, const prefix0.ContainedReflectable(), 15, - 144, + 143, 15, null, const [], @@ -8424,7 +8281,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 151126022, - 309, + 296, const prefix0.ContainedReflectable(), 15, 67, @@ -8436,7 +8293,7 @@ final _data = { r.ParameterMirrorImpl( r'iterable', 151126022, - 311, + 298, const prefix0.ContainedReflectable(), 26, 205, @@ -8448,7 +8305,7 @@ final _data = { r.ParameterMirrorImpl( r'key', 67121158, - 311, + 298, const prefix0.ContainedReflectable(), -1, 223, @@ -8460,7 +8317,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 67121158, - 311, + 298, const prefix0.ContainedReflectable(), -1, 224, @@ -8472,31 +8329,7 @@ final _data = { r.ParameterMirrorImpl( r'keys', 151126022, - 312, - const prefix0.ContainedReflectable(), - 26, - 142, - 26, - null, - const [], - null, - null), - r.ParameterMirrorImpl( - r'values', - 151126022, - 312, - const prefix0.ContainedReflectable(), - 26, - 143, - 26, - null, - const [], - null, - null), - r.ParameterMirrorImpl( - r'entries', - 151126022, - 313, + 299, const prefix0.ContainedReflectable(), 26, 141, @@ -8505,10 +8338,34 @@ final _data = { const [], null, null), + r.ParameterMirrorImpl( + r'values', + 151126022, + 299, + const prefix0.ContainedReflectable(), + 26, + 142, + 26, + null, + const [], + null, + null), + r.ParameterMirrorImpl( + r'entries', + 151126022, + 300, + const prefix0.ContainedReflectable(), + 26, + 140, + 26, + null, + const [], + null, + null), r.ParameterMirrorImpl( r'index', 134348806, - 314, + 301, const prefix0.ContainedReflectable(), 17, 17, @@ -8520,7 +8377,7 @@ final _data = { r.ParameterMirrorImpl( r'index', 134348806, - 315, + 302, const prefix0.ContainedReflectable(), 17, 17, @@ -8532,7 +8389,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 316, + 303, const prefix0.ContainedReflectable(), 4, 4, @@ -8544,7 +8401,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 317, + 304, const prefix0.ContainedReflectable(), 16, 16, @@ -8556,7 +8413,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 318, + 305, const prefix0.ContainedReflectable(), 16, 16, @@ -8568,11 +8425,11 @@ final _data = { r.ParameterMirrorImpl( r'pattern', 134348806, - 319, + 306, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8580,7 +8437,7 @@ final _data = { r.ParameterMirrorImpl( r'index', 134354950, - 319, + 306, const prefix0.ContainedReflectable(), 17, 17, @@ -8592,11 +8449,11 @@ final _data = { r.ParameterMirrorImpl( r'pattern', 134348806, - 320, + 307, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8604,7 +8461,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134354950, - 320, + 307, const prefix0.ContainedReflectable(), 17, 17, @@ -8616,11 +8473,11 @@ final _data = { r.ParameterMirrorImpl( r'pattern', 134348806, - 321, + 308, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8628,7 +8485,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 67244038, - 321, + 308, const prefix0.ContainedReflectable(), 17, 17, @@ -8640,7 +8497,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 322, + 309, const prefix0.ContainedReflectable(), 16, 16, @@ -8652,7 +8509,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 323, + 310, const prefix0.ContainedReflectable(), 17, 17, @@ -8664,7 +8521,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 67244038, - 323, + 310, const prefix0.ContainedReflectable(), 17, 17, @@ -8676,7 +8533,7 @@ final _data = { r.ParameterMirrorImpl( r'times', 134348806, - 327, + 314, const prefix0.ContainedReflectable(), 17, 17, @@ -8688,7 +8545,7 @@ final _data = { r.ParameterMirrorImpl( r'width', 134348806, - 328, + 315, const prefix0.ContainedReflectable(), 17, 17, @@ -8700,7 +8557,7 @@ final _data = { r.ParameterMirrorImpl( r'padding', 134354950, - 328, + 315, const prefix0.ContainedReflectable(), 16, 16, @@ -8712,7 +8569,7 @@ final _data = { r.ParameterMirrorImpl( r'width', 134348806, - 329, + 316, const prefix0.ContainedReflectable(), 17, 17, @@ -8724,7 +8581,7 @@ final _data = { r.ParameterMirrorImpl( r'padding', 134354950, - 329, + 316, const prefix0.ContainedReflectable(), 16, 16, @@ -8736,11 +8593,11 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 330, + 317, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8748,7 +8605,7 @@ final _data = { r.ParameterMirrorImpl( r'startIndex', 134354950, - 330, + 317, const prefix0.ContainedReflectable(), 17, 17, @@ -8760,11 +8617,11 @@ final _data = { r.ParameterMirrorImpl( r'from', 134348806, - 331, + 318, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8772,7 +8629,7 @@ final _data = { r.ParameterMirrorImpl( r'to', 134348806, - 331, + 318, const prefix0.ContainedReflectable(), 16, 16, @@ -8784,7 +8641,7 @@ final _data = { r.ParameterMirrorImpl( r'startIndex', 134354950, - 331, + 318, const prefix0.ContainedReflectable(), 17, 17, @@ -8796,11 +8653,11 @@ final _data = { r.ParameterMirrorImpl( r'from', 134348806, - 332, + 319, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8808,7 +8665,7 @@ final _data = { r.ParameterMirrorImpl( r'replace', 134217734, - 332, + 319, const prefix0.ContainedReflectable(), -1, 225, @@ -8820,7 +8677,7 @@ final _data = { r.ParameterMirrorImpl( r'startIndex', 134354950, - 332, + 319, const prefix0.ContainedReflectable(), 17, 17, @@ -8832,11 +8689,11 @@ final _data = { r.ParameterMirrorImpl( r'from', 134348806, - 333, + 320, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8844,7 +8701,7 @@ final _data = { r.ParameterMirrorImpl( r'replace', 134348806, - 333, + 320, const prefix0.ContainedReflectable(), 16, 16, @@ -8856,11 +8713,11 @@ final _data = { r.ParameterMirrorImpl( r'from', 134348806, - 334, + 321, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8868,7 +8725,7 @@ final _data = { r.ParameterMirrorImpl( r'replace', 134217734, - 334, + 321, const prefix0.ContainedReflectable(), -1, 225, @@ -8880,7 +8737,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134348806, - 335, + 322, const prefix0.ContainedReflectable(), 17, 17, @@ -8892,7 +8749,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 67239942, - 335, + 322, const prefix0.ContainedReflectable(), 17, 17, @@ -8904,7 +8761,7 @@ final _data = { r.ParameterMirrorImpl( r'replacement', 134348806, - 335, + 322, const prefix0.ContainedReflectable(), 16, 16, @@ -8916,11 +8773,11 @@ final _data = { r.ParameterMirrorImpl( r'pattern', 134348806, - 336, + 323, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8928,11 +8785,11 @@ final _data = { r.ParameterMirrorImpl( r'pattern', 134348806, - 337, + 324, const prefix0.ContainedReflectable(), -1, - 102, - 102, + 101, + 101, const [], const [], null, @@ -8940,7 +8797,7 @@ final _data = { r.ParameterMirrorImpl( r'onMatch', 67121158, - 337, + 324, const prefix0.ContainedReflectable(), -1, 226, @@ -8952,7 +8809,7 @@ final _data = { r.ParameterMirrorImpl( r'onNonMatch', 67121158, - 337, + 324, const prefix0.ContainedReflectable(), -1, 227, @@ -8964,7 +8821,7 @@ final _data = { r.ParameterMirrorImpl( r'charCodes', 151126022, - 346, + 333, const prefix0.ContainedReflectable(), 26, 228, @@ -8976,7 +8833,7 @@ final _data = { r.ParameterMirrorImpl( r'start', 134354950, - 346, + 333, const prefix0.ContainedReflectable(), 17, 17, @@ -8988,7 +8845,7 @@ final _data = { r.ParameterMirrorImpl( r'end', 67244038, - 346, + 333, const prefix0.ContainedReflectable(), 17, 17, @@ -9000,7 +8857,7 @@ final _data = { r.ParameterMirrorImpl( r'charCode', 134348806, - 347, + 334, const prefix0.ContainedReflectable(), 17, 17, @@ -9012,7 +8869,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134348806, - 348, + 335, const prefix0.ContainedReflectable(), 16, 16, @@ -9024,7 +8881,7 @@ final _data = { r.ParameterMirrorImpl( r'defaultValue', 134363142, - 348, + 335, const prefix0.ContainedReflectable(), 16, 16, @@ -9036,7 +8893,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 349, + 336, const prefix0.ContainedReflectable(), 17, 17, @@ -9048,7 +8905,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 350, + 337, const prefix0.ContainedReflectable(), 17, 17, @@ -9060,7 +8917,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 351, + 338, const prefix0.ContainedReflectable(), 17, 17, @@ -9072,7 +8929,7 @@ final _data = { r.ParameterMirrorImpl( r'shiftAmount', 134348806, - 353, + 340, const prefix0.ContainedReflectable(), 17, 17, @@ -9084,7 +8941,7 @@ final _data = { r.ParameterMirrorImpl( r'shiftAmount', 134348806, - 354, + 341, const prefix0.ContainedReflectable(), 17, 17, @@ -9096,7 +8953,7 @@ final _data = { r.ParameterMirrorImpl( r'shiftAmount', 134348806, - 355, + 342, const prefix0.ContainedReflectable(), 17, 17, @@ -9108,7 +8965,7 @@ final _data = { r.ParameterMirrorImpl( r'exponent', 134348806, - 356, + 343, const prefix0.ContainedReflectable(), 17, 17, @@ -9120,7 +8977,7 @@ final _data = { r.ParameterMirrorImpl( r'modulus', 134348806, - 356, + 343, const prefix0.ContainedReflectable(), 17, 17, @@ -9132,7 +8989,7 @@ final _data = { r.ParameterMirrorImpl( r'modulus', 134348806, - 357, + 344, const prefix0.ContainedReflectable(), 17, 17, @@ -9144,7 +9001,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 358, + 345, const prefix0.ContainedReflectable(), 17, 17, @@ -9156,6 +9013,30 @@ final _data = { r.ParameterMirrorImpl( r'width', 134348806, + 346, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'width', + 134348806, + 347, + const prefix0.ContainedReflectable(), + 17, + 17, + 17, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'radix', + 134348806, 359, const prefix0.ContainedReflectable(), 17, @@ -9165,34 +9046,10 @@ final _data = { const [], null, null), - r.ParameterMirrorImpl( - r'width', - 134348806, - 360, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'radix', - 134348806, - 372, - const prefix0.ContainedReflectable(), - 17, - 17, - 17, - const [], - const [], - null, - null), r.ParameterMirrorImpl( r'source', 134348806, - 373, + 360, const prefix0.ContainedReflectable(), 16, 16, @@ -9204,7 +9061,7 @@ final _data = { r.ParameterMirrorImpl( r'radix', 67252230, - 373, + 360, const prefix0.ContainedReflectable(), 17, 17, @@ -9216,7 +9073,7 @@ final _data = { r.ParameterMirrorImpl( r'onError', 67121158, - 373, + 360, const prefix0.ContainedReflectable(), -1, 229, @@ -9228,7 +9085,7 @@ final _data = { r.ParameterMirrorImpl( r'source', 134348806, - 374, + 361, const prefix0.ContainedReflectable(), 16, 16, @@ -9240,7 +9097,7 @@ final _data = { r.ParameterMirrorImpl( r'radix', 67252230, - 374, + 361, const prefix0.ContainedReflectable(), 17, 17, @@ -9252,7 +9109,7 @@ final _data = { r.ParameterMirrorImpl( r'name', 134348806, - 379, + 366, const prefix0.ContainedReflectable(), 16, 16, @@ -9264,7 +9121,7 @@ final _data = { r.ParameterMirrorImpl( r'defaultValue', 134363142, - 379, + 366, const prefix0.ContainedReflectable(), 17, 17, @@ -9276,7 +9133,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 380, + 367, const prefix0.ContainedReflectable(), 4, 4, @@ -9288,7 +9145,7 @@ final _data = { r.ParameterMirrorImpl( r'futures', 151126022, - 384, + 371, const prefix0.ContainedReflectable(), 26, 230, @@ -9300,7 +9157,7 @@ final _data = { r.ParameterMirrorImpl( r'eagerError', 134363142, - 384, + 371, const prefix0.ContainedReflectable(), 13, 13, @@ -9312,7 +9169,7 @@ final _data = { r.ParameterMirrorImpl( r'cleanUp', 67121158, - 384, + 371, const prefix0.ContainedReflectable(), -1, 231, @@ -9324,7 +9181,7 @@ final _data = { r.ParameterMirrorImpl( r'futures', 151126022, - 385, + 372, const prefix0.ContainedReflectable(), 26, 232, @@ -9336,7 +9193,7 @@ final _data = { r.ParameterMirrorImpl( r'elements', 151126022, - 386, + 373, const prefix0.ContainedReflectable(), 26, 233, @@ -9348,7 +9205,7 @@ final _data = { r.ParameterMirrorImpl( r'action', 134217734, - 386, + 373, const prefix0.ContainedReflectable(), -1, 234, @@ -9360,7 +9217,7 @@ final _data = { r.ParameterMirrorImpl( r'action', 134217734, - 387, + 374, const prefix0.ContainedReflectable(), -1, 235, @@ -9372,7 +9229,7 @@ final _data = { r.ParameterMirrorImpl( r'onValue', 134217734, - 388, + 375, const prefix0.ContainedReflectable(), -1, 236, @@ -9384,7 +9241,7 @@ final _data = { r.ParameterMirrorImpl( r'onError', 67252230, - 388, + 375, const prefix0.ContainedReflectable(), -1, 183, @@ -9396,7 +9253,7 @@ final _data = { r.ParameterMirrorImpl( r'onError', 134348806, - 389, + 376, const prefix0.ContainedReflectable(), -1, 198, @@ -9408,7 +9265,7 @@ final _data = { r.ParameterMirrorImpl( r'test', 67121158, - 389, + 376, const prefix0.ContainedReflectable(), -1, 237, @@ -9420,7 +9277,7 @@ final _data = { r.ParameterMirrorImpl( r'action', 134217734, - 390, + 377, const prefix0.ContainedReflectable(), -1, 238, @@ -9432,7 +9289,7 @@ final _data = { r.ParameterMirrorImpl( r'timeLimit', 134348806, - 392, + 379, const prefix0.ContainedReflectable(), -1, 239, @@ -9444,7 +9301,7 @@ final _data = { r.ParameterMirrorImpl( r'onTimeout', 67121158, - 392, + 379, const prefix0.ContainedReflectable(), -1, 240, @@ -9456,7 +9313,7 @@ final _data = { r.ParameterMirrorImpl( r'computation', 134217734, - 393, + 380, const prefix0.ContainedReflectable(), -1, 241, @@ -9468,7 +9325,7 @@ final _data = { r.ParameterMirrorImpl( r'computation', 134217734, - 394, + 381, const prefix0.ContainedReflectable(), -1, 241, @@ -9480,7 +9337,7 @@ final _data = { r.ParameterMirrorImpl( r'computation', 134217734, - 395, + 382, const prefix0.ContainedReflectable(), -1, 241, @@ -9492,7 +9349,7 @@ final _data = { r.ParameterMirrorImpl( r'value', 84021254, - 396, + 383, const prefix0.ContainedReflectable(), 20, 242, @@ -9504,7 +9361,7 @@ final _data = { r.ParameterMirrorImpl( r'error', 134348806, - 397, + 384, const prefix0.ContainedReflectable(), 4, 4, @@ -9516,7 +9373,7 @@ final _data = { r.ParameterMirrorImpl( r'stackTrace', 67244038, - 397, + 384, const prefix0.ContainedReflectable(), -1, 243, @@ -9528,7 +9385,7 @@ final _data = { r.ParameterMirrorImpl( r'duration', 134348806, - 398, + 385, const prefix0.ContainedReflectable(), -1, 239, @@ -9540,7 +9397,7 @@ final _data = { r.ParameterMirrorImpl( r'computation', 67112966, - 398, + 385, const prefix0.ContainedReflectable(), -1, 240, @@ -9551,8 +9408,8 @@ final _data = { null), r.ParameterMirrorImpl( r'path', - 134349830, - 410, + 67240966, + 397, const prefix0.ContainedReflectable(), 16, 16, @@ -9564,7 +9421,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134364166, - 410, + 397, const prefix0.ContainedReflectable(), 16, 16, @@ -9575,8 +9432,8 @@ final _data = { #method), r.ParameterMirrorImpl( r'middleware', - 151141382, - 410, + 84032518, + 397, const prefix0.ContainedReflectable(), 26, 68, @@ -9588,7 +9445,7 @@ final _data = { r.ParameterMirrorImpl( r'as', 67253254, - 410, + 397, const prefix0.ContainedReflectable(), 16, 16, @@ -9600,7 +9457,7 @@ final _data = { r.ParameterMirrorImpl( r'allowNull', 151141382, - 410, + 397, const prefix0.ContainedReflectable(), 14, 69, @@ -9612,7 +9469,7 @@ final _data = { r.ParameterMirrorImpl( r'method', 134349830, - 411, + 398, const prefix0.ContainedReflectable(), 16, 16, @@ -9623,20 +9480,20 @@ final _data = { null), r.ParameterMirrorImpl( r'middleware', - 151141382, - 411, + 84030470, + 398, const prefix0.ContainedReflectable(), 26, 68, 26, null, const [], - const [], + null, #middleware), r.ParameterMirrorImpl( r'as', 67253254, - 411, + 398, const prefix0.ContainedReflectable(), 16, 16, @@ -9648,7 +9505,7 @@ final _data = { r.ParameterMirrorImpl( r'allowNull', 151141382, - 411, + 398, const prefix0.ContainedReflectable(), 14, 69, @@ -9660,7 +9517,7 @@ final _data = { r.ParameterMirrorImpl( r'path', 134348806, - 413, + 400, const prefix0.ContainedReflectable(), 16, 16, @@ -9672,7 +9529,7 @@ final _data = { r.ParameterMirrorImpl( r'router', 151127046, - 413, + 400, const prefix0.ContainedReflectable(), 10, 70, @@ -9684,10 +9541,10 @@ final _data = { r.ParameterMirrorImpl( r'params', 151126022, - 416, + 403, const prefix0.ContainedReflectable(), 15, - 85, + 244, 15, null, const [], @@ -9696,7 +9553,7 @@ final _data = { r.ParameterMirrorImpl( r'_name', 67240038, - 421, + 408, const prefix0.ContainedReflectable(), 16, 16, @@ -9708,7 +9565,7 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 423, + 410, const prefix0.ContainedReflectable(), 4, 4, @@ -9720,7 +9577,7 @@ final _data = { r.ParameterMirrorImpl( r'invocation', 134348806, - 424, + 411, const prefix0.ContainedReflectable(), 8, 8, @@ -9732,7 +9589,19 @@ final _data = { r.ParameterMirrorImpl( r'other', 134348806, - 430, + 417, + const prefix0.ContainedReflectable(), + 24, + 24, + 24, + const [], + const [], + null, + null), + r.ParameterMirrorImpl( + r'other', + 134348806, + 418, const prefix0.ContainedReflectable(), 24, 24, @@ -9746,18 +9615,6 @@ final _data = { 134348806, 431, const prefix0.ContainedReflectable(), - 24, - 24, - 24, - const [], - const [], - null, - null), - r.ParameterMirrorImpl( - r'other', - 134348806, - 444, - const prefix0.ContainedReflectable(), 4, 4, 4, @@ -9768,10 +9625,10 @@ final _data = { r.ParameterMirrorImpl( r'source', 151126022, - 451, + 438, const prefix0.ContainedReflectable(), 26, - 244, + 245, 26, null, const [], @@ -9780,10 +9637,10 @@ final _data = { r.ParameterMirrorImpl( r'other', 151126022, - 453, + 440, const prefix0.ContainedReflectable(), 26, - 169, + 168, 26, null, const [], @@ -9792,11 +9649,11 @@ final _data = { r.ParameterMirrorImpl( r'toElement', 134217734, - 454, + 441, const prefix0.ContainedReflectable(), -1, - 245, - 245, + 246, + 246, const [], const [], null, @@ -9804,11 +9661,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 455, + 442, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -9816,11 +9673,11 @@ final _data = { r.ParameterMirrorImpl( r'toElements', 134217734, - 457, + 444, const prefix0.ContainedReflectable(), -1, - 247, - 247, + 248, + 248, const [], const [], null, @@ -9828,7 +9685,7 @@ final _data = { r.ParameterMirrorImpl( r'element', 67239942, - 458, + 445, const prefix0.ContainedReflectable(), 4, 4, @@ -9840,11 +9697,11 @@ final _data = { r.ParameterMirrorImpl( r'action', 134217734, - 459, + 446, const prefix0.ContainedReflectable(), -1, - 248, - 248, + 249, + 249, const [], const [], null, @@ -9852,11 +9709,11 @@ final _data = { r.ParameterMirrorImpl( r'combine', 134217734, - 460, + 447, const prefix0.ContainedReflectable(), -1, - 249, - 249, + 250, + 250, const [], const [], null, @@ -9864,7 +9721,7 @@ final _data = { r.ParameterMirrorImpl( r'initialValue', 6, - 461, + 448, const prefix0.ContainedReflectable(), -1, -1, @@ -9876,11 +9733,11 @@ final _data = { r.ParameterMirrorImpl( r'combine', 134217734, - 461, + 448, const prefix0.ContainedReflectable(), -1, - 250, - 250, + 251, + 251, const [], const [], null, @@ -9888,11 +9745,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 462, + 449, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -9900,7 +9757,7 @@ final _data = { r.ParameterMirrorImpl( r'separator', 134354950, - 463, + 450, const prefix0.ContainedReflectable(), 16, 16, @@ -9912,11 +9769,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 464, + 451, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -9924,7 +9781,7 @@ final _data = { r.ParameterMirrorImpl( r'growable', 134363142, - 465, + 452, const prefix0.ContainedReflectable(), 13, 13, @@ -9936,7 +9793,7 @@ final _data = { r.ParameterMirrorImpl( r'count', 134348806, - 467, + 454, const prefix0.ContainedReflectable(), 17, 17, @@ -9948,11 +9805,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 468, + 455, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -9960,7 +9817,7 @@ final _data = { r.ParameterMirrorImpl( r'count', 134348806, - 469, + 456, const prefix0.ContainedReflectable(), 17, 17, @@ -9972,11 +9829,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 470, + 457, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -9984,11 +9841,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 471, + 458, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -9996,11 +9853,11 @@ final _data = { r.ParameterMirrorImpl( r'orElse', 67121158, - 471, + 458, const prefix0.ContainedReflectable(), -1, - 251, - 251, + 252, + 252, const [], const [], null, @@ -10008,11 +9865,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 472, + 459, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -10020,11 +9877,11 @@ final _data = { r.ParameterMirrorImpl( r'orElse', 67121158, - 472, + 459, const prefix0.ContainedReflectable(), -1, - 251, - 251, + 252, + 252, const [], const [], null, @@ -10032,11 +9889,11 @@ final _data = { r.ParameterMirrorImpl( r'test', 134217734, - 473, + 460, const prefix0.ContainedReflectable(), -1, - 246, - 246, + 247, + 247, const [], const [], null, @@ -10044,11 +9901,11 @@ final _data = { r.ParameterMirrorImpl( r'orElse', 67121158, - 473, + 460, const prefix0.ContainedReflectable(), -1, - 251, - 251, + 252, + 252, const [], const [], null, @@ -10056,7 +9913,7 @@ final _data = { r.ParameterMirrorImpl( r'index', 134348806, - 474, + 461, const prefix0.ContainedReflectable(), 17, 17, @@ -10068,7 +9925,7 @@ final _data = { r.ParameterMirrorImpl( r'count', 134348806, - 484, + 471, const prefix0.ContainedReflectable(), 17, 17, @@ -10080,11 +9937,11 @@ final _data = { r.ParameterMirrorImpl( r'generator', 67112966, - 484, + 471, const prefix0.ContainedReflectable(), -1, - 252, - 252, + 253, + 253, const [], const [], null, @@ -10098,7 +9955,7 @@ final _data = { Object, prefix4.ReflectableImpl, prefix5.ReflectableBase, - prefix1.Todo, + prefix1.Order, Invocation, prefix6.Angel, prefix7.Router, @@ -10150,7 +10007,7 @@ final _data = { const r.FakeType(r'reflectable.capability._AdmitSubtypeCapability'), const m.TypeValue>().type, const m.TypeValue>>().type, - DateTime, + prefix1.FoodItem, const m.TypeValue< Map< String, @@ -10188,7 +10045,6 @@ final _data = { const m.TypeValue>().type, prefix12.ClassMirror, const m.TypeValue>().type, - const m.TypeValue>().type, const m.TypeValue>().type, const m.TypeValue>().type, const m.TypeValue>().type, @@ -10286,6 +10142,7 @@ final _data = { Set, const r.FakeType(r'dart.core.Iterator'), Iterator, + const m.TypeValue>().type, const m.TypeValue>().type, const m.TypeValue().type, const m.TypeValue().type, @@ -10352,6 +10209,7 @@ final _data = { const m.TypeValue().type, const r.FakeType(r'dart.async.FutureOr'), StackTrace, + const m.TypeValue>().type, const r.FakeType(r'dart.core.Iterable'), const m.TypeValue().type, const m.TypeValue().type, @@ -10378,7 +10236,7 @@ final _data = { r'routeMappings': (dynamic instance) => instance.routeMappings, r'app': (dynamic instance) => instance.app, r'mountPoint': (dynamic instance) => instance.mountPoint, - r'todo': (dynamic instance) => instance.todo, + r'order': (dynamic instance) => instance.order, r'capabilities': (dynamic instance) => instance.capabilities, r'canReflect': (dynamic instance) => instance.canReflect, r'reflect': (dynamic instance) => instance.reflect, @@ -10387,13 +10245,8 @@ final _data = { r'findLibrary': (dynamic instance) => instance.findLibrary, r'libraries': (dynamic instance) => instance.libraries, r'annotatedClasses': (dynamic instance) => instance.annotatedClasses, - r'id': (dynamic instance) => instance.id, - r'createdAt': (dynamic instance) => instance.createdAt, - r'updatedAt': (dynamic instance) => instance.updatedAt, - r'idAsInt': (dynamic instance) => instance.idAsInt, - r'toJson': (dynamic instance) => instance.toJson, - r'text': (dynamic instance) => instance.text, - r'over': (dynamic instance) => instance.over, + r'item': (dynamic instance) => instance.item, + r'name': (dynamic instance) => instance.name, r'typeArguments': (dynamic instance) => instance.typeArguments, r'isAccessor': (dynamic instance) => instance.isAccessor, r'enableCache': (dynamic instance) => instance.enableCache, @@ -10468,7 +10321,6 @@ final _data = { r'allowNull': (dynamic instance) => instance.allowNull, r'makeUri': (dynamic instance) => instance.makeUri, r'handlers': (dynamic instance) => instance.handlers, - r'name': (dynamic instance) => instance.name, r'parser': (dynamic instance) => instance.parser, r'router': (dynamic instance) => instance.router, r'cast': (dynamic instance) => instance.cast, @@ -10506,11 +10358,7 @@ final _data = { instance.middleware = value, r'routeMappings=': (dynamic instance, value) => instance.routeMappings = value, - r'id=': (dynamic instance, value) => instance.id = value, - r'createdAt=': (dynamic instance, value) => instance.createdAt = value, - r'updatedAt=': (dynamic instance, value) => instance.updatedAt = value, - r'text=': (dynamic instance, value) => instance.text = value, - r'over=': (dynamic instance, value) => instance.over = value, + r'item=': (dynamic instance, value) => instance.item = value, r'serializer=': (dynamic instance, value) => instance.serializer = value, r'allowMethodOverrides=': (dynamic instance, value) => @@ -10527,7 +10375,7 @@ final _data = { r'', Uri.parse('asset:example2/bin/example3_controller.dart'), const prefix0.ContainedReflectable(), - const [68], + const [64], {r'main': () => prefix1.main}, {}, const [], @@ -10564,7 +10412,7 @@ final _data = { r'dart.core', Uri.parse(r'reflectable://4/dart.core'), const prefix0.ContainedReflectable(), - const [1, 2, 3, 4, 70, 71, 72], + const [1, 2, 3, 4, 66, 67, 68], { r'deprecated': () => deprecated, r'override': () => override, @@ -10581,7 +10429,7 @@ final _data = { r'reflectable.src.reflectable_builder_based', Uri.parse('package:reflectable/src/reflectable_builder_based.dart'), const prefix0.ContainedReflectable(), - const [5, 6, 7, 82], + const [5, 6, 7, 78], { r'pleaseInitializeMessage': () => prefix4.pleaseInitializeMessage, r'data': () => prefix4.data, @@ -10617,7 +10465,7 @@ final _data = { r'angel3_route.src.router', Uri.parse('package:angel3_route/src/router.dart'), const prefix0.ContainedReflectable(), - const [83], + const [79], {r'flatten': () => prefix7.flatten}, {}, const [], @@ -10635,7 +10483,7 @@ final _data = { r'angel_framework.http.routable', Uri.parse('package:angel3_framework/src/core/routable.dart'), const prefix0.ContainedReflectable(), - const [84], + const [80], {r'chain': () => prefix9.chain}, {}, const [], @@ -10644,7 +10492,7 @@ final _data = { r'dart.async', Uri.parse(r'reflectable://11/dart.async'), const prefix0.ContainedReflectable(), - const [85, 86, 87, 88], + const [81, 82, 83, 84], { r'unawaited': () => prefix10.unawaited, r'scheduleMicrotask': () => prefix10.scheduleMicrotask, @@ -10698,11 +10546,11 @@ final _data = { 27, 28, 29, - 90, - 91, - 92, - 93, - 94 + 86, + 87, + 88, + 89, + 90 ], { r'instanceInvokeCapability': () => diff --git a/experiment/container/example2/pubspec.yaml b/experiment/container/example2/pubspec.yaml index 2e0f9ddf..fb79e1de 100644 --- a/experiment/container/example2/pubspec.yaml +++ b/experiment/container/example2/pubspec.yaml @@ -2,10 +2,10 @@ name: example2 version: 0.0.1 description: Example 2. environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: - angel3_container: ^7.0.0 - angel3_container_generator: ^7.0.0 + angel3_container: ^7.1.0-beta.1 + angel3_container_generator: ^7.1.0-beta.1 angel3_http_exception: ^7.0.0 angel3_framework: ^7.0.0 angel3_model: ^7.0.0 @@ -37,13 +37,13 @@ dev_dependencies: io: ^1.0.0 test: ^1.21.0 lints: ^2.0.0 -dependency_overrides: - angel3_container: - path: ../../../packages/container/angel_container - angel3_container_generator: - path: ../../../packages/container/angel_container_generator - angel3_framework: - path: ../../../packages/framework +# dependency_overrides: +# angel3_container: +# path: ../../../packages/container/angel_container +# angel3_container_generator: +# path: ../../../packages/container/angel_container_generator +# angel3_framework: +# path: ../../../packages/framework # angel3_model: # path: ../model # angel3_route: diff --git a/packages/serialize/angel_serialize_generator/CHANGELOG.md b/packages/serialize/angel_serialize_generator/CHANGELOG.md index 1bbaa7c0..726c243a 100644 --- a/packages/serialize/angel_serialize_generator/CHANGELOG.md +++ b/packages/serialize/angel_serialize_generator/CHANGELOG.md @@ -1,8 +1,13 @@ # Change Log +## 7.2.0-beta.1 + +* Require Dart >= 2.19 +* Fixed `topMap` incorrect return + ## 7.1.0 -* [Breaking] Require Dart >= 2.18 +* Require Dart >= 2.18 * Upgraded to `analyzer` 5.x.x * Replaced deprecated `element2` with `element` diff --git a/packages/serialize/angel_serialize_generator/example/main.g.dart b/packages/serialize/angel_serialize_generator/example/main.g.dart index 4a8905ed..8df50c05 100644 --- a/packages/serialize/angel_serialize_generator/example/main.g.dart +++ b/packages/serialize/angel_serialize_generator/example/main.g.dart @@ -8,7 +8,10 @@ part of 'main.dart'; @generatedSerializable class Todo extends _Todo { - Todo({this.text, this.completed}); + Todo({ + this.text, + this.completed, + }); @override String? text; @@ -16,7 +19,10 @@ class Todo extends _Todo { @override bool? completed; - Todo copyWith({String? text, bool? completed}) { + Todo copyWith({ + String? text, + bool? completed, + }) { return Todo( text: text ?? this.text, completed: completed ?? this.completed); } @@ -28,7 +34,10 @@ class Todo extends _Todo { @override int get hashCode { - return hashObjects([text, completed]); + return hashObjects([ + text, + completed, + ]); } @override @@ -82,7 +91,10 @@ class TodoSerializer extends Codec { } abstract class TodoFields { - static const List allFields = [text, completed]; + static const List allFields = [ + text, + completed, + ]; static const String text = 'text'; diff --git a/packages/serialize/angel_serialize_generator/lib/serialize.dart b/packages/serialize/angel_serialize_generator/lib/serialize.dart index 7254a1e6..9bec3a97 100644 --- a/packages/serialize/angel_serialize_generator/lib/serialize.dart +++ b/packages/serialize/angel_serialize_generator/lib/serialize.dart @@ -211,7 +211,7 @@ class ${pascal}Decoder extends Converter { type.typeArguments[1].getDisplayString(withNullability: true)); serializedRepresentation = '''model.${field.name}.keys.fold({}, (map, key) { - return (map as Map?)?..[key] = + return map..[key] = ${serializerToMap(rc, 'model.${field.name}[key]')}; })'''; } else if (type.element is Enum) { diff --git a/packages/serialize/angel_serialize_generator/pubspec.yaml b/packages/serialize/angel_serialize_generator/pubspec.yaml index a1305c6e..085e47a3 100644 --- a/packages/serialize/angel_serialize_generator/pubspec.yaml +++ b/packages/serialize/angel_serialize_generator/pubspec.yaml @@ -1,10 +1,10 @@ name: angel3_serialize_generator -version: 7.1.0 +version: 7.2.0-beta.1 description: Angel3 model serialization generators, designed for use with Angel. Combine with angel_serialize for flexible modeling. homepage: https://angel3-framework.web.app/ repository: https://github.com/dukefirehawk/angel/tree/master/packages/serialize/angel_serialize_generator environment: - sdk: '>=2.18.0 <3.0.0' + sdk: '>=2.19.0 <3.0.0' dependencies: analyzer: ^5.0.0 angel3_model: ^7.0.0 @@ -27,5 +27,5 @@ dev_dependencies: # dependency_overrides: # angel3_model: # path: ../../model -# angel3_serialize: +# angel3_serialize: # path: ../angel_serialize diff --git a/packages/serialize/angel_serialize_generator/test/models/book.g.dart b/packages/serialize/angel_serialize_generator/test/models/book.g.dart index 92623179..0fec33c8 100644 --- a/packages/serialize/angel_serialize_generator/test/models/book.g.dart +++ b/packages/serialize/angel_serialize_generator/test/models/book.g.dart @@ -10,17 +10,17 @@ part of angel_serialize.test.models.book; @pragma('hello') @SerializableField(alias: 'omg') class Book extends _Book { - Book( - {this.id, - this.createdAt, - this.updatedAt, - this.author, - this.title, - this.description, - this.pageCount, - List? notModels = const [], - this.camelCaseString}) - : notModels = List.unmodifiable(notModels ?? []); + Book({ + this.id, + this.createdAt, + this.updatedAt, + this.author, + this.title, + this.description, + this.pageCount, + List? notModels = const [], + this.camelCaseString, + }) : notModels = List.unmodifiable(notModels ?? []); /// A unique identifier corresponding to this item. @override @@ -53,16 +53,17 @@ class Book extends _Book { @override String? camelCaseString; - Book copyWith( - {String? id, - DateTime? createdAt, - DateTime? updatedAt, - String? author, - String? title, - String? description, - int? pageCount, - List? notModels, - String? camelCaseString}) { + Book copyWith({ + String? id, + DateTime? createdAt, + DateTime? updatedAt, + String? author, + String? title, + String? description, + int? pageCount, + List? notModels, + String? camelCaseString, + }) { return Book( id: id ?? this.id, createdAt: createdAt ?? this.createdAt, @@ -101,7 +102,7 @@ class Book extends _Book { description, pageCount, notModels, - camelCaseString + camelCaseString, ]); } @@ -117,17 +118,17 @@ class Book extends _Book { @generatedSerializable class Author extends _Author { - Author( - {this.id, - this.createdAt, - this.updatedAt, - required this.name, - required this.age, - List<_Book> books = const [], - this.newestBook, - this.secret, - this.obscured}) - : books = List.unmodifiable(books); + Author({ + this.id, + this.createdAt, + this.updatedAt, + required this.name, + required this.age, + List<_Book> books = const [], + this.newestBook, + this.secret, + this.obscured, + }) : books = List.unmodifiable(books); /// A unique identifier corresponding to this item. @override @@ -160,16 +161,17 @@ class Author extends _Author { @override String? obscured; - Author copyWith( - {String? id, - DateTime? createdAt, - DateTime? updatedAt, - String? name, - int? age, - List<_Book>? books, - _Book? newestBook, - String? secret, - String? obscured}) { + Author copyWith({ + String? id, + DateTime? createdAt, + DateTime? updatedAt, + String? name, + int? age, + List<_Book>? books, + _Book? newestBook, + String? secret, + String? obscured, + }) { return Author( id: id ?? this.id, createdAt: createdAt ?? this.createdAt, @@ -208,7 +210,7 @@ class Author extends _Author { books, newestBook, secret, - obscured + obscured, ]); } @@ -224,12 +226,12 @@ class Author extends _Author { @generatedSerializable class Library extends _Library { - Library( - {this.id, - this.createdAt, - this.updatedAt, - required Map collection}) - : collection = Map.unmodifiable(collection); + Library({ + this.id, + this.createdAt, + this.updatedAt, + required Map collection, + }) : collection = Map.unmodifiable(collection); /// A unique identifier corresponding to this item. @override @@ -246,11 +248,12 @@ class Library extends _Library { @override Map collection; - Library copyWith( - {String? id, - DateTime? createdAt, - DateTime? updatedAt, - Map? collection}) { + Library copyWith({ + String? id, + DateTime? createdAt, + DateTime? updatedAt, + Map? collection, + }) { return Library( id: id ?? this.id, createdAt: createdAt ?? this.createdAt, @@ -272,7 +275,12 @@ class Library extends _Library { @override int get hashCode { - return hashObjects([id, createdAt, updatedAt, collection]); + return hashObjects([ + id, + createdAt, + updatedAt, + collection, + ]); } @override @@ -287,14 +295,15 @@ class Library extends _Library { @generatedSerializable class Bookmark extends _Bookmark { - Bookmark(_Book book, - {this.id, - this.createdAt, - this.updatedAt, - List history = const [], - required this.page, - this.comment}) - : history = List.unmodifiable(history), + Bookmark( + _Book book, { + this.id, + this.createdAt, + this.updatedAt, + List history = const [], + required this.page, + this.comment, + }) : history = List.unmodifiable(history), super(book); /// A unique identifier corresponding to this item. @@ -318,13 +327,15 @@ class Bookmark extends _Bookmark { @override String? comment; - Bookmark copyWith(_Book book, - {String? id, - DateTime? createdAt, - DateTime? updatedAt, - List? history, - int? page, - String? comment}) { + Bookmark copyWith( + _Book book, { + String? id, + DateTime? createdAt, + DateTime? updatedAt, + List? history, + int? page, + String? comment, + }) { return Bookmark(book, id: id ?? this.id, createdAt: createdAt ?? this.createdAt, @@ -348,7 +359,14 @@ class Bookmark extends _Bookmark { @override int get hashCode { - return hashObjects([id, createdAt, updatedAt, history, page, comment]); + return hashObjects([ + id, + createdAt, + updatedAt, + history, + page, + comment, + ]); } @override @@ -439,7 +457,7 @@ abstract class BookFields { description, pageCount, notModels, - camelCaseString + camelCaseString, ]; static const String id = 'id'; @@ -543,7 +561,7 @@ abstract class AuthorFields { books, newestBook, secret, - obscured + obscured, ]; static const String id = 'id'; @@ -620,8 +638,7 @@ class LibrarySerializer extends Codec { 'created_at': model.createdAt?.toIso8601String(), 'updated_at': model.updatedAt?.toIso8601String(), 'collection': model.collection.keys.fold({}, (map, key) { - return (map as Map) - ..[key] = BookSerializer.toMap(model.collection[key]); + return map..[key] = BookSerializer.toMap(model.collection[key]); }) }; } @@ -632,7 +649,7 @@ abstract class LibraryFields { id, createdAt, updatedAt, - collection + collection, ]; static const String id = 'id'; @@ -645,7 +662,10 @@ abstract class LibraryFields { } abstract class BookmarkSerializer { - static Bookmark fromMap(Map map, _Book book) { + static Bookmark fromMap( + Map map, + _Book book, + ) { if (map['page'] == null) { throw FormatException("Missing required field 'page' on Bookmark."); } @@ -691,7 +711,7 @@ abstract class BookmarkFields { updatedAt, history, page, - comment + comment, ]; static const String id = 'id'; diff --git a/packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart b/packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart index c0daeb2e..5206a1dc 100644 --- a/packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart +++ b/packages/serialize/angel_serialize_generator/test/models/game_pad_button.g.dart @@ -8,7 +8,10 @@ part of 'game_pad_button.dart'; @generatedSerializable class GamepadButton implements _GamepadButton { - GamepadButton({this.name, this.radius}); + GamepadButton({ + this.name, + this.radius, + }); @override String? name; @@ -16,7 +19,10 @@ class GamepadButton implements _GamepadButton { @override int? radius; - GamepadButton copyWith({String? name, int? radius}) { + GamepadButton copyWith({ + String? name, + int? radius, + }) { return GamepadButton( name: name ?? this.name, radius: radius ?? this.radius); } @@ -30,7 +36,10 @@ class GamepadButton implements _GamepadButton { @override int get hashCode { - return hashObjects([name, radius]); + return hashObjects([ + name, + radius, + ]); } @override @@ -45,10 +54,10 @@ class GamepadButton implements _GamepadButton { @generatedSerializable class Gamepad extends _Gamepad { - Gamepad( - {List<_GamepadButton>? buttons = const [], - Map? dynamicMap}) - : buttons = List.unmodifiable(buttons ?? []), + Gamepad({ + List<_GamepadButton>? buttons = const [], + Map? dynamicMap, + }) : buttons = List.unmodifiable(buttons ?? []), dynamicMap = Map.unmodifiable(dynamicMap ?? {}); @override @@ -57,8 +66,10 @@ class Gamepad extends _Gamepad { @override Map? dynamicMap; - Gamepad copyWith( - {List<_GamepadButton>? buttons, Map? dynamicMap}) { + Gamepad copyWith({ + List<_GamepadButton>? buttons, + Map? dynamicMap, + }) { return Gamepad( buttons: buttons ?? this.buttons, dynamicMap: dynamicMap ?? this.dynamicMap); @@ -76,7 +87,10 @@ class Gamepad extends _Gamepad { @override int get hashCode { - return hashObjects([buttons, dynamicMap]); + return hashObjects([ + buttons, + dynamicMap, + ]); } @override @@ -131,7 +145,10 @@ class GamepadButtonSerializer extends Codec { } abstract class GamepadButtonFields { - static const List allFields = [name, radius]; + static const List allFields = [ + name, + radius, + ]; static const String name = 'name'; @@ -185,7 +202,10 @@ class GamepadSerializer extends Codec { } abstract class GamepadFields { - static const List allFields = [buttons, dynamicMap]; + static const List allFields = [ + buttons, + dynamicMap, + ]; static const String buttons = 'buttons'; diff --git a/packages/serialize/angel_serialize_generator/test/models/goat.g.dart b/packages/serialize/angel_serialize_generator/test/models/goat.g.dart index 4c8c5fb7..91fe0c5e 100644 --- a/packages/serialize/angel_serialize_generator/test/models/goat.g.dart +++ b/packages/serialize/angel_serialize_generator/test/models/goat.g.dart @@ -8,7 +8,10 @@ part of 'goat.dart'; @generatedSerializable class Goat implements _Goat { - Goat({this.integer = 34, this.list = const [34, 35]}); + Goat({ + this.integer = 34, + this.list = const [34, 35], + }); @override int integer; @@ -16,7 +19,10 @@ class Goat implements _Goat { @override List list; - Goat copyWith({int? integer, List? list}) { + Goat copyWith({ + int? integer, + List? list, + }) { return Goat(integer: integer ?? this.integer, list: list ?? this.list); } @@ -29,7 +35,10 @@ class Goat implements _Goat { @override int get hashCode { - return hashObjects([integer, list]); + return hashObjects([ + integer, + list, + ]); } @override @@ -86,7 +95,10 @@ class GoatSerializer extends Codec { } abstract class GoatFields { - static const List allFields = [integer, list]; + static const List allFields = [ + integer, + list, + ]; static const String integer = 'integer'; diff --git a/packages/serialize/angel_serialize_generator/test/models/subclass.g.dart b/packages/serialize/angel_serialize_generator/test/models/subclass.g.dart index d6612fb5..a721a9e6 100644 --- a/packages/serialize/angel_serialize_generator/test/models/subclass.g.dart +++ b/packages/serialize/angel_serialize_generator/test/models/subclass.g.dart @@ -8,7 +8,10 @@ part of 'subclass.dart'; @generatedSerializable class Animal extends _Animal { - Animal({required this.genus, required this.species}); + Animal({ + required this.genus, + required this.species, + }); @override String? genus; @@ -16,7 +19,10 @@ class Animal extends _Animal { @override String? species; - Animal copyWith({String? genus, String? species}) { + Animal copyWith({ + String? genus, + String? species, + }) { return Animal(genus: genus ?? this.genus, species: species ?? this.species); } @@ -27,7 +33,10 @@ class Animal extends _Animal { @override int get hashCode { - return hashObjects([genus, species]); + return hashObjects([ + genus, + species, + ]); } @override @@ -42,7 +51,11 @@ class Animal extends _Animal { @generatedSerializable class Bird extends _Bird { - Bird({required this.genus, required this.species, this.isSparrow = false}); + Bird({ + required this.genus, + required this.species, + this.isSparrow = false, + }); @override String? genus; @@ -53,7 +66,11 @@ class Bird extends _Bird { @override bool? isSparrow; - Bird copyWith({String? genus, String? species, bool? isSparrow}) { + Bird copyWith({ + String? genus, + String? species, + bool? isSparrow, + }) { return Bird( genus: genus ?? this.genus, species: species ?? this.species, @@ -70,7 +87,11 @@ class Bird extends _Bird { @override int get hashCode { - return hashObjects([genus, species, isSparrow]); + return hashObjects([ + genus, + species, + isSparrow, + ]); } @override @@ -132,7 +153,10 @@ class AnimalSerializer extends Codec { } abstract class AnimalFields { - static const List allFields = [genus, species]; + static const List allFields = [ + genus, + species, + ]; static const String genus = 'genus'; @@ -190,7 +214,11 @@ class BirdSerializer extends Codec { } abstract class BirdFields { - static const List allFields = [genus, species, isSparrow]; + static const List allFields = [ + genus, + species, + isSparrow, + ]; static const String genus = 'genus'; diff --git a/packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart b/packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart index df927561..a13d13b6 100644 --- a/packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart +++ b/packages/serialize/angel_serialize_generator/test/models/with_enum.g.dart @@ -8,8 +8,11 @@ part of 'with_enum.dart'; @generatedSerializable class WithEnum implements _WithEnum { - WithEnum( - {this.type = WithEnumType.b, this.finalList = const [], this.imageBytes}); + WithEnum({ + this.type = WithEnumType.b, + this.finalList = const [], + this.imageBytes, + }); @override WithEnumType? type; @@ -20,8 +23,11 @@ class WithEnum implements _WithEnum { @override Uint8List? imageBytes; - WithEnum copyWith( - {WithEnumType? type, List? finalList, Uint8List? imageBytes}) { + WithEnum copyWith({ + WithEnumType? type, + List? finalList, + Uint8List? imageBytes, + }) { return WithEnum( type: type ?? this.type, finalList: finalList ?? this.finalList, @@ -39,7 +45,11 @@ class WithEnum implements _WithEnum { @override int get hashCode { - return hashObjects([type, finalList, imageBytes]); + return hashObjects([ + type, + finalList, + imageBytes, + ]); } @override @@ -110,7 +120,11 @@ class WithEnumSerializer extends Codec { } abstract class WithEnumFields { - static const List allFields = [type, finalList, imageBytes]; + static const List allFields = [ + type, + finalList, + imageBytes, + ]; static const String type = 'type';