From a446eaa869810acc0ae330a873874b2e0e83c2f9 Mon Sep 17 00:00:00 2001 From: Thomas Hii Date: Fri, 14 Mar 2025 22:01:59 +0800 Subject: [PATCH 1/2] Publish angel3_graphql --- packages/angel_graphql/pubspec.lock | 12 ++++++------ packages/angel_graphql/pubspec.yaml | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/angel_graphql/pubspec.lock b/packages/angel_graphql/pubspec.lock index b32e7a6..ee35930 100644 --- a/packages/angel_graphql/pubspec.lock +++ b/packages/angel_graphql/pubspec.lock @@ -197,26 +197,26 @@ packages: dependency: "direct main" description: name: graphql_parser2 - sha256: "08e693c8a103f046c1b65c1b16e96bbc3220e906fc86f7c6590a12b3eaf97130" + sha256: "13fa2f8adeac639b98a57cf06da11a238886b0ed01925a9fb3a9c34079043fd4" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.3.0" graphql_schema2: dependency: "direct main" description: name: graphql_schema2 - sha256: a8f17e9e54659cec870ce350af9d8ffc6fc1722b6b14db62b6415a9db9d5add6 + sha256: "5937c58731eeb6cfae06a0329659b5f1e167268f47e76bcc116aafc05944b0a7" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.3.0" graphql_server2: dependency: "direct main" description: name: graphql_server2 - sha256: ff189305fb404ab63b8b6ce583f6073ff405b29e3b1cb54018b629f8c4011b5c + sha256: "948d6c1e779742da4e1a10ee83ca55c132669652941eefc36897ed0b352dbcec" url: "https://pub.dev" source: hosted - version: "6.2.0" + version: "6.3.0" http: dependency: transitive description: diff --git a/packages/angel_graphql/pubspec.yaml b/packages/angel_graphql/pubspec.yaml index 5b1f6b8..04e4540 100644 --- a/packages/angel_graphql/pubspec.yaml +++ b/packages/angel_graphql/pubspec.yaml @@ -1,5 +1,5 @@ name: angel3_graphql -version: 8.2.0 +version: 8.3.0 description: The fastest and easiest way to get a GraphQL backend in Dart, using Angel3. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/angel_graphql @@ -11,9 +11,9 @@ dependencies: angel3_container: ^8.0.0 angel3_websocket: ^8.1.0 angel3_validate: ^8.0.0 - graphql_parser2: ^6.0.0 - graphql_schema2: ^6.0.0 - graphql_server2: ^6.0.0 + graphql_parser2: ^6.3.0 + graphql_schema2: ^6.3.0 + graphql_server2: ^6.3.0 http_parser: ^4.0.0 web_socket_channel: ^3.0.0 collection: ^1.17.0 From 2b2c4b892ce440ca953d8fa60beadbc86f8aeae7 Mon Sep 17 00:00:00 2001 From: Thomas Date: Sun, 14 Sep 2025 00:45:29 +0800 Subject: [PATCH 2/2] Upgrade to support dart 3.8 --- packages/angel_graphql/CHANGELOG.md | 6 + packages/angel_graphql/pubspec.lock | 121 ++++--- packages/angel_graphql/pubspec.yaml | 13 +- packages/angel_graphql/pubspec_overrides.yaml | 8 + packages/graphql_data_loader/CHANGELOG.md | 6 + packages/graphql_data_loader/pubspec.lock | 71 +++-- packages/graphql_data_loader/pubspec.yaml | 9 +- .../pubspec_overrides.yaml | 4 + packages/graphql_generator/CHANGELOG.md | 11 + .../graphql_generator/example/main.g.dart | 11 +- .../lib/graphql_generator2.dart | 274 +--------------- .../lib/src/graphql_generator.dart | 298 ++++++++++++++++++ .../lib/src/graphql_literal.dart | 9 + packages/graphql_generator/pubspec.lock | 115 +++---- packages/graphql_generator/pubspec.yaml | 21 +- .../graphql_generator/pubspec_overrides.yaml | 4 + packages/graphql_parser/CHANGELOG.md | 6 + packages/graphql_parser/pubspec.lock | 62 ++-- packages/graphql_parser/pubspec.yaml | 6 +- .../graphql_parser/pubspec_overrides.yaml | 1 + packages/graphql_schema/CHANGELOG.md | 6 + packages/graphql_schema/pubspec.lock | 62 ++-- packages/graphql_schema/pubspec.yaml | 6 +- .../graphql_schema/pubspec_overrides.yaml | 1 + packages/graphql_server/CHANGELOG.md | 6 + packages/graphql_server/pubspec.lock | 88 +++--- packages/graphql_server/pubspec.yaml | 12 +- .../graphql_server/pubspec_overrides.yaml | 6 + pubspec.lock | 150 ++++----- pubspec.yaml | 4 +- 30 files changed, 719 insertions(+), 678 deletions(-) create mode 100644 packages/angel_graphql/pubspec_overrides.yaml create mode 100644 packages/graphql_data_loader/pubspec_overrides.yaml create mode 100644 packages/graphql_generator/lib/src/graphql_generator.dart create mode 100644 packages/graphql_generator/lib/src/graphql_literal.dart create mode 100644 packages/graphql_generator/pubspec_overrides.yaml create mode 100644 packages/graphql_parser/pubspec_overrides.yaml create mode 100644 packages/graphql_schema/pubspec_overrides.yaml create mode 100644 packages/graphql_server/pubspec_overrides.yaml diff --git a/packages/angel_graphql/CHANGELOG.md b/packages/angel_graphql/CHANGELOG.md index 4bad9ff..3c9ac79 100644 --- a/packages/angel_graphql/CHANGELOG.md +++ b/packages/angel_graphql/CHANGELOG.md @@ -1,5 +1,11 @@ # Change log +## 8.4.0 + +* Require Dart >= 3.8 +* Updated `lints` to 6.0.0 +* Updated dependencies to the latest release + ## 8.3.0 * Require Dart >= 3.6 diff --git a/packages/angel_graphql/pubspec.lock b/packages/angel_graphql/pubspec.lock index ee35930..7436919 100644 --- a/packages/angel_graphql/pubspec.lock +++ b/packages/angel_graphql/pubspec.lock @@ -5,98 +5,98 @@ packages: dependency: transitive description: name: angel3_auth - sha256: "3996219fca7a49174c3745732a1e438ec94d55936697f2504196be4f3dbf191a" + sha256: "9ad6580737e075795c1b4306286ec7a15b43c9d743264c68da2ccb26a04972e7" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_client: dependency: transitive description: name: angel3_client - sha256: e2886fdb41f243d85003f94127850bdd70f79fa5f7cf1f2b79b4f7029198e9dd + sha256: c0c5aad6060d573aaddcc537c4a83ac4ce32e14dfd019d4aeda0b673fc4e725b url: "https://pub.dev" source: hosted - version: "8.4.0" + version: "8.5.0" angel3_container: dependency: "direct main" description: name: angel3_container - sha256: c08ea6b426242861d11109b748792503652a7eb0db4005409c0a031e80820c7f + sha256: "1a09a0d6333e3e504fca5d32ff7a2739918ead315b4f2bf92d75f1524146ec6b" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_file_service: dependency: "direct main" description: name: angel3_file_service - sha256: "70149780b7a259257ae55d77d8abbec5474be1c946b599b4e356eacb6ecaff09" + sha256: d970c8b0f65df8e1cafe6fc5ec83b16b05aedb01ef8d36bbdf9afee72bd30fbe url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_framework: dependency: "direct main" description: name: angel3_framework - sha256: "91d56825b78846d9294e8aae789362644d4e24df4870d52d6c2cc6d8adf8d2c9" + sha256: f6a0e640f3391b3f4fdd5abc7f6293d2834f2ff203593cc3e4b1bdfefe525c4f url: "https://pub.dev" source: hosted - version: "8.5.0" + version: "8.6.0" angel3_http_exception: dependency: transitive description: name: angel3_http_exception - sha256: "9484b425a1aece1af3f2f0521fba429cd48f0a952521d40281333694c750e4ab" + sha256: "339e5a723c963d7ff74210554ce570b45d5559b272c24250393347dbc8929252" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_mock_request: dependency: transitive description: name: angel3_mock_request - sha256: "8c8513a649d33c0c0531a120183da558000b4f044a4f30fd3ae22dfe11355a04" + sha256: "1fb1d53e7eb5e66345884c34591b8d60e208e924c970e09ca0db10f54046b69e" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_model: dependency: transitive description: name: angel3_model - sha256: "9a3f50b02bf119bb160d5f94580940b93973589d9b5949d284d2427b8fb65e16" + sha256: f0629b5a552450a9a242e3d0838b2b1521e1c38aa59620ec7e3789acb858a71b url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_route: dependency: transitive description: name: angel3_route - sha256: f2ebf4b134e13f804271d4e164a92de5dd25ad0bb651303df2c9e6fb397f32a8 + sha256: d4dab35609c597a8a88b5591bf0c2953b01e9c7cfa314d6b6d08fafd1e177e24 url: "https://pub.dev" source: hosted - version: "8.4.0" + version: "8.5.0" angel3_serialize: dependency: "direct dev" description: name: angel3_serialize - sha256: "4a4658b8af0d0eec6b8816699f137367c6af7c6f6a1f83a84e43fee55f892f5e" + sha256: "83fe50a347c130618b560f0c907ec71fd47c9f65990eaedcdbc57b846fdc21d8" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_validate: dependency: "direct main" description: name: angel3_validate - sha256: "661ef636583b0e60b35756d3d296d2ef7b257277fa703a494278ace9fcbe4f0c" + sha256: "07eac303cf3959a646782cb683a06a4c25227b79357d66eb2e1c46e42f0e0c5e" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_websocket: dependency: "direct main" description: name: angel3_websocket - sha256: "160399b1898d5fd9c8294b4321691567687d9d86d8940aea83cc528b85427229" + sha256: "0c8a89982b6c34b757b03ff6e53f3af608d134c24c0b52ad492925df341e4c9d" url: "https://pub.dev" source: hosted - version: "8.4.0" + version: "8.5.0" async: dependency: transitive description: @@ -109,42 +109,42 @@ packages: dependency: transitive description: name: belatuk_code_buffer - sha256: "06c4329570e2cb72cb808c5f19d2004865b7c1f18447d4af16d465776416ccfc" + sha256: "0071d74c83fc8715dffb0fa5b9e13a6e72cbf3c520d325504839571522ecc545" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.0" belatuk_combinator: dependency: transitive description: name: belatuk_combinator - sha256: "0c54ddf1a6a7c94585c55a5852ccc13ad1a871e3e0709d3322d0286eb7afb7d7" + sha256: "73cb20d2561c5c9fd1568eec9ed68c5e716eef91923cd97ab670138c646702e4" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.0" belatuk_http_server: dependency: transitive description: name: belatuk_http_server - sha256: "2a4ae9409f3586a95a3393b924c86fd38c30d955aa2437070c3198a1ec0a1686" + sha256: b4d0f3cb6c5bb2890f1f5851e22a6d606691e475fe7ade0a9a09eafdbb2cfd10 url: "https://pub.dev" source: hosted - version: "4.5.0" + version: "4.6.0" belatuk_json_serializer: dependency: transitive description: name: belatuk_json_serializer - sha256: b0b6ee6b4aa0552d84b487c5d1a97f72c9d5c4cbc4e2828f57e24635d5d75be8 + sha256: f6eed26310a745adadf4e351e120cb39f43388bd23543536c4fd2990dfb5b08c url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.4.0" belatuk_merge_map: dependency: transitive description: name: belatuk_merge_map - sha256: "1eb3c77417598e1d40c11d8d93b3c7bb5f10ca0977b2f942c623698bf3745f43" + sha256: "054a9259bca1ec6818643325c50fbf53bf15c5989eb4c504f4909013659e824c" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.0" boolean_selector: dependency: transitive description: @@ -196,35 +196,32 @@ packages: graphql_parser2: dependency: "direct main" description: - name: graphql_parser2 - sha256: "13fa2f8adeac639b98a57cf06da11a238886b0ed01925a9fb3a9c34079043fd4" - url: "https://pub.dev" - source: hosted - version: "6.3.0" + path: "../graphql_parser" + relative: true + source: path + version: "6.4.0" graphql_schema2: dependency: "direct main" description: - name: graphql_schema2 - sha256: "5937c58731eeb6cfae06a0329659b5f1e167268f47e76bcc116aafc05944b0a7" - url: "https://pub.dev" - source: hosted - version: "6.3.0" + path: "../graphql_schema" + relative: true + source: path + version: "6.4.0" graphql_server2: dependency: "direct main" description: - name: graphql_server2 - sha256: "948d6c1e779742da4e1a10ee83ca55c132669652941eefc36897ed0b352dbcec" - url: "https://pub.dev" - source: hosted - version: "6.3.0" + path: "../graphql_server" + relative: true + source: path + version: "6.4.0" http: dependency: transitive description: name: http - sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f + sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007 url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.5.0" http2: dependency: transitive description: @@ -245,10 +242,10 @@ packages: dependency: "direct dev" description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: "direct dev" description: @@ -269,10 +266,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -365,10 +362,10 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" tuple: dependency: transitive description: @@ -405,17 +402,17 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.1" web_socket_channel: dependency: "direct main" description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/packages/angel_graphql/pubspec.yaml b/packages/angel_graphql/pubspec.yaml index 04e4540..fd84edc 100644 --- a/packages/angel_graphql/pubspec.yaml +++ b/packages/angel_graphql/pubspec.yaml @@ -1,10 +1,10 @@ name: angel3_graphql -version: 8.3.0 +version: 8.4.0 description: The fastest and easiest way to get a GraphQL backend in Dart, using Angel3. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/angel_graphql environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dependencies: angel3_file_service: ^8.0.0 angel3_framework: ^8.4.0 @@ -21,11 +21,4 @@ dev_dependencies: angel3_serialize: ^8.0.0 file: ^7.0.0 logging: ^1.2.0 - lints: ^5.0.0 -# dependency_overrides: -# graphql_server2: -# path: ../graphql_server -# graphql_parser2: -# path: ../graphql_parser -# graphql_schema2: -# path: ../graphql_schema + lints: ^6.0.0 diff --git a/packages/angel_graphql/pubspec_overrides.yaml b/packages/angel_graphql/pubspec_overrides.yaml new file mode 100644 index 0000000..d3f73c3 --- /dev/null +++ b/packages/angel_graphql/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# melos_managed_dependency_overrides +dependency_overrides: + graphql_server2: + path: ../graphql_server + graphql_parser2: + path: ../graphql_parser + graphql_schema2: + path: ../graphql_schema diff --git a/packages/graphql_data_loader/CHANGELOG.md b/packages/graphql_data_loader/CHANGELOG.md index d3a8c72..8da6b01 100644 --- a/packages/graphql_data_loader/CHANGELOG.md +++ b/packages/graphql_data_loader/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.4.0 + +* Require Dart >= 3.8 +* Updated `lints` to 6.0.0 +* Updated dependencies to the latest release + ## 6.3.0 * Require Dart >= 3.6 diff --git a/packages/graphql_data_loader/pubspec.lock b/packages/graphql_data_loader/pubspec.lock index e5451a0..b56514c 100644 --- a/packages/graphql_data_loader/pubspec.lock +++ b/packages/graphql_data_loader/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 + sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a url: "https://pub.dev" source: hosted - version: "80.0.0" + version: "88.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" + sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "8.1.1" args: dependency: transitive description: @@ -41,6 +41,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + cli_config: + dependency: transitive + description: + name: cli_config + sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec + url: "https://pub.dev" + source: hosted + version: "0.2.0" collection: dependency: transitive description: @@ -61,10 +69,10 @@ packages: dependency: transitive description: name: coverage - sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.15.0" crypto: dependency: transitive description: @@ -100,11 +108,10 @@ packages: graphql_schema2: dependency: "direct dev" description: - name: graphql_schema2 - sha256: a8f17e9e54659cec870ce350af9d8ffc6fc1722b6b14db62b6415a9db9d5add6 - url: "https://pub.dev" - source: hosted - version: "6.2.0" + path: "../graphql_schema" + relative: true + source: path + version: "6.4.0" http_multi_server: dependency: transitive description: @@ -133,18 +140,18 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" lints: dependency: "direct dev" description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: transitive description: @@ -165,10 +172,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -317,26 +324,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" url: "https://pub.dev" source: hosted - version: "1.25.15" + version: "1.26.3" test_api: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" test_core: dependency: transitive description: name: test_core - sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" url: "https://pub.dev" source: hosted - version: "0.6.8" + version: "0.6.12" typed_data: dependency: transitive description: @@ -349,18 +356,18 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "15.0.2" watcher: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.3" web: dependency: transitive description: @@ -373,18 +380,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webkit_inspection_protocol: dependency: transitive description: @@ -402,4 +409,4 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/packages/graphql_data_loader/pubspec.yaml b/packages/graphql_data_loader/pubspec.yaml index 73a87b3..45cb03f 100644 --- a/packages/graphql_data_loader/pubspec.yaml +++ b/packages/graphql_data_loader/pubspec.yaml @@ -1,14 +1,11 @@ name: graphql_data_loader2 -version: 6.3.0 +version: 6.4.0 description: Batch and cache database lookups. Works well with GraphQL. Ported from JS. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/graphql_data_loader environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dev_dependencies: graphql_schema2: ^6.0.0 - lints: ^5.0.0 + lints: ^6.0.0 test: ^1.24.0 -# dependency_overrides: -# graphql_schema2: -# path: ../graphql_schema diff --git a/packages/graphql_data_loader/pubspec_overrides.yaml b/packages/graphql_data_loader/pubspec_overrides.yaml new file mode 100644 index 0000000..4efae40 --- /dev/null +++ b/packages/graphql_data_loader/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides +dependency_overrides: + graphql_schema2: + path: ../graphql_schema diff --git a/packages/graphql_generator/CHANGELOG.md b/packages/graphql_generator/CHANGELOG.md index 1dc3db4..3611718 100644 --- a/packages/graphql_generator/CHANGELOG.md +++ b/packages/graphql_generator/CHANGELOG.md @@ -1,5 +1,16 @@ # Change Log +## 6.4.0 + +* Require Dart >= 3.8 +* Updated `lints` to 6.0.0 +* Updated dependencies to the latest release +* Updated `analyzer` to 7.7.x + +## 6.3.1 + +* Fixed `angel3_serialize_generator` import issue + ## 6.3.0 * Require Dart >= 3.6 diff --git a/packages/graphql_generator/example/main.g.dart b/packages/graphql_generator/example/main.g.dart index 334e530..0fbb812 100644 --- a/packages/graphql_generator/example/main.g.dart +++ b/packages/graphql_generator/example/main.g.dart @@ -11,14 +11,5 @@ final GraphQLObjectType todoItemGraphQLType = objectType( 'TodoItem', isInterface: false, interfaces: [], - fields: [ - field( - 'text', - graphQLString, - ), - field( - 'isComplete', - graphQLBoolean, - ), - ], + fields: [field('text', graphQLString), field('isComplete', graphQLBoolean)], ); diff --git a/packages/graphql_generator/lib/graphql_generator2.dart b/packages/graphql_generator/lib/graphql_generator2.dart index 36c8b22..1cc6d4e 100644 --- a/packages/graphql_generator/lib/graphql_generator2.dart +++ b/packages/graphql_generator/lib/graphql_generator2.dart @@ -1,273 +1 @@ -import 'dart:async'; -import 'dart:mirrors'; -import 'package:analyzer/dart/element/element.dart'; -import 'package:analyzer/dart/element/type.dart'; -import 'package:angel3_model/angel3_model.dart'; -import 'package:angel3_serialize_generator/build_context.dart'; -import 'package:angel3_serialize_generator/context.dart'; -import 'package:build/build.dart'; -import 'package:code_builder/code_builder.dart'; -import 'package:collection/collection.dart' show IterableExtension; -import 'package:graphql_schema2/graphql_schema2.dart'; -import 'package:recase/recase.dart'; -import 'package:source_gen/source_gen.dart'; - -/// Generates GraphQL schemas, statically. -Builder graphQLBuilder(_) { - return SharedPartBuilder([_GraphQLGenerator()], 'graphql_generator2'); -} - -var _docComment = RegExp(r'^/// ', multiLine: true); -var _graphQLDoc = TypeChecker.fromRuntime(GraphQLDocumentation); -var _graphQLClassTypeChecker = TypeChecker.fromRuntime(GraphQLClass); - -class _GraphQLGenerator extends GeneratorForAnnotation { - @override - Future generateForAnnotatedElement( - Element element, - ConstantReader annotation, - BuildStep buildStep, - ) async { - if (element is ClassElement) { - var ctx = await buildContext( - element, - annotation, - buildStep, - buildStep.resolver, - serializableTypeChecker.hasAnnotationOf(element), - ); - - var lib = _buildClassSchemaLibrary(element, ctx, annotation); - - return lib.accept(DartEmitter()).toString(); - } - - if (element is EnumElement) { - var lib = _buildEnumSchemaLibrary(element, annotation); - - return lib.accept(DartEmitter()).toString(); - } - - throw UnsupportedError( - '@GraphQLClass() is only supported on classes or enums.'); - } - - bool isInterface(ClassElement clazz) { - return clazz.isAbstract && !serializableTypeChecker.hasAnnotationOf(clazz); - } - - bool _isGraphQLClass(InterfaceType clazz) { - InterfaceType? search = clazz; - - while (search != null) { - if (_graphQLClassTypeChecker.hasAnnotationOf(search.element)) { - return true; - } - - search = search.superclass; - } - - return false; - } - - Expression _inferType(String className, String name, DartType type) { - // Firstly, check if it's a GraphQL class. - if (type is InterfaceType && _isGraphQLClass(type)) { - var c = type; - var name = serializableTypeChecker.hasAnnotationOf(c.element) && - c.getDisplayString().startsWith('_') - ? c.getDisplayString().substring(1) - : c.getDisplayString(); - var rc = ReCase(name); - - return refer('${rc.camelCase}GraphQLType'); - } - - // Next, check if this is the "id" field of a `Model`. - if (TypeChecker.fromRuntime(Model).isAssignableFromType(type) && - name == 'id') { - return refer('graphQLId'); - } - - var primitive = { - String: 'graphQLString', - int: 'graphQLInt', - double: 'graphQLFloat', - bool: 'graphQLBoolean', - DateTime: 'graphQLDate' - }; - - // Check to see if it's a primitive type. - for (var entry in primitive.entries) { - if (TypeChecker.fromRuntime(entry.key).isAssignableFromType(type)) { - return refer(entry.value); - } - } - - // Next, check to see if it's a List. - if (type is InterfaceType && - type.typeArguments.isNotEmpty && - TypeChecker.fromRuntime(Iterable).isAssignableFromType(type)) { - var arg = type.typeArguments[0]; - var inner = _inferType(className, name, arg); - - return refer('listOf').call([inner]); - } - - // Nothing else is allowed. - throw 'Cannot infer the GraphQL type for field $className.$name (type=$type).'; - } - - void _applyDescription( - Map named, Element element, String? docComment) { - var docString = docComment; - - if (docString == null && _graphQLDoc.hasAnnotationOf(element)) { - var ann = _graphQLDoc.firstAnnotationOf(element); - var cr = ConstantReader(ann); - - docString = cr.peek('description')?.stringValue; - } - - if (docString != null) { - named['description'] = literalString( - docString.replaceAll(_docComment, '').replaceAll('\n', '\\n'), - ); - } - } - - Library _buildEnumSchemaLibrary(EnumElement clazz, ConstantReader ann) { - return Library((b) { - // Generate a top-level xGraphQLType object - b.body.add(Field((b) { - // enumTypeFromStrings(String name, List values, {String description} - var args = [literalString(clazz.name)]; - var values = - clazz.fields.where((f) => f.isEnumConstant).map((f) => f.name); - var named = {}; - - _applyDescription(named, clazz, clazz.documentationComment); - - args.add(literalConstList(values.map(literalString).toList())); - - b - ..name = '${ReCase(clazz.name).camelCase}GraphQLType' - ..docs.add('/// Auto-generated from [${clazz.name}].') - ..type = TypeReference((b) => b - ..symbol = 'GraphQLEnumType' - ..types.add(refer('String'))) - ..modifier = FieldModifier.final$ - ..assignment = refer('enumTypeFromStrings').call(args, named).code; - })); - }); - } - - Library _buildClassSchemaLibrary( - ClassElement clazz, - BuildContext? ctx, - ConstantReader ann, - ) { - return Library((b) { - // Generate a top-level xGraphQLType object - - b.body.add(Field((b) { - var args = [literalString(ctx!.modelClassName!)]; - var named = { - 'isInterface': literalBool(isInterface(clazz)) - }; - - // Add documentation - _applyDescription(named, clazz, clazz.documentationComment); - - // Add interfaces - var interfaces = clazz.interfaces.where(_isGraphQLClass).map((c) { - var name = serializableTypeChecker.hasAnnotationOf(c.element) && - c.getDisplayString().startsWith('_') - ? c.getDisplayString().substring(1) - : c.getDisplayString(); - var rc = ReCase(name); - - return refer('${rc.camelCase}GraphQLType'); - }); - - named['interfaces'] = literalList(interfaces); - - // Add fields - var ctxFields = ctx.fields.toList(); - - // Also incorporate parent fields. - //TODO: To be reviewed later - InterfaceType? search = clazz.thisType; //.type; - - while (search != null && - !TypeChecker.fromRuntime(Object).isExactlyType(search)) { - for (var field in search.element.fields) { - if (!ctxFields.any((f) => f.name == field.name)) { - ctxFields.add(field); - } - } - - search = search.superclass; - } - - var fields = []; - - for (var field in ctxFields) { - var named = {}; - var originalField = - clazz.fields.firstWhereOrNull((f) => f.name == field.name); - - // Check if it is deprecated. - var depEl = originalField?.getter ?? originalField ?? field; - var depAnn = - TypeChecker.fromRuntime(Deprecated).firstAnnotationOf(depEl); - - if (depAnn != null) { - var dep = ConstantReader(depAnn); - var reason = dep.peek('messages')?.stringValue ?? - dep.peek('expires')?.stringValue ?? - 'Expires: ${deprecated.message}.'; - - named['deprecationReason'] = literalString(reason); - } - - // Description finder... - _applyDescription( - named, - originalField?.getter ?? originalField ?? field, - originalField?.getter?.documentationComment ?? - originalField?.documentationComment); - - // Pick the type. - var doc = _graphQLDoc.firstAnnotationOf(depEl); - - Expression? type; - - if (doc != null) { - var cr = ConstantReader(doc); - var typeName = cr.peek('typeName')?.symbolValue; - - if (typeName != null) { - type = refer(MirrorSystem.getName(typeName)); - } - } - - fields.add(refer('field').call([ - literalString(ctx.resolveFieldName(field.name)!), - type ??= _inferType(clazz.name, field.name, field.type) - ], named)); - } - - named['fields'] = literalList(fields); - - b - ..name = '${ctx.modelClassNameRecase.camelCase}GraphQLType' - ..docs.add('/// Auto-generated from [${ctx.modelClassName}].') - //..style = refer('GraphQLObjectType') - ..type = refer('GraphQLObjectType') - ..modifier = FieldModifier.final$ - ..assignment = refer('objectType').call(args, named).code; - })); - }); - } -} +export 'src/graphql_generator.dart'; diff --git a/packages/graphql_generator/lib/src/graphql_generator.dart b/packages/graphql_generator/lib/src/graphql_generator.dart new file mode 100644 index 0000000..688c07e --- /dev/null +++ b/packages/graphql_generator/lib/src/graphql_generator.dart @@ -0,0 +1,298 @@ +import 'dart:async'; +import 'dart:mirrors'; +import 'package:analyzer/dart/element/element2.dart'; +import 'package:analyzer/dart/element/type.dart'; +import 'package:angel3_model/angel3_model.dart'; +import 'package:angel3_serialize_generator/angel3_serialize_generator.dart'; +import 'package:build/build.dart'; +import 'package:code_builder/code_builder.dart'; +import 'package:collection/collection.dart' show IterableExtension; +import 'package:graphql_generator2/src/graphql_literal.dart'; +import 'package:graphql_schema2/graphql_schema2.dart'; +import 'package:recase/recase.dart'; +import 'package:source_gen/source_gen.dart'; + +/// Generates GraphQL schemas, statically. +Builder graphQLBuilder(_) { + return SharedPartBuilder([_GraphQLGenerator()], 'graphql_generator2'); +} + +var _docComment = RegExp(r'^/// ', multiLine: true); +var _graphQLDoc = TypeChecker.fromRuntime(GraphQLDocumentation); +var _graphQLClassTypeChecker = TypeChecker.fromRuntime(GraphQLClass); + +class _GraphQLGenerator extends GeneratorForAnnotation { + @override + Future generateForAnnotatedElement( + Element2 element, + ConstantReader annotation, + BuildStep buildStep, + ) async { + if (element is ClassElement2) { + var ctx = await buildContext( + element, + annotation, + buildStep, + buildStep.resolver, + serializableTypeChecker.hasAnnotationOf(element), + ); + + var lib = _buildClassSchemaLibrary(element, ctx, annotation); + + return lib.accept(DartEmitter()).toString(); + } + + if (element is EnumElement2) { + var lib = _buildEnumSchemaLibrary(element, annotation); + + return lib.accept(DartEmitter()).toString(); + } + + throw UnsupportedError( + '@GraphQLClass() is only supported on classes or enums.', + ); + } + + bool isInterface(ClassElement2 clazz) { + return clazz.isAbstract && !serializableTypeChecker.hasAnnotationOf(clazz); + } + + bool _isGraphQLClass(InterfaceType clazz) { + InterfaceType? search = clazz; + + while (search != null) { + if (_graphQLClassTypeChecker.hasAnnotationOf(search.element3)) { + return true; + } + + search = search.superclass; + } + + return false; + } + + Expression _inferType(String className, String name, DartType type) { + // Firstly, check if it's a GraphQL class. + if (type is InterfaceType && _isGraphQLClass(type)) { + var c = type; + var name = + serializableTypeChecker.hasAnnotationOf(c.element3) && + c.getDisplayString().startsWith('_') + ? c.getDisplayString().substring(1) + : c.getDisplayString(); + var rc = ReCase(name); + + return refer('${rc.camelCase}GraphQLType'); + } + + // Next, check if this is the "id" field of a `Model`. + if (TypeChecker.fromRuntime(Model).isAssignableFromType(type) && + name == 'id') { + return refer('graphQLId'); + } + + var primitive = { + String: 'graphQLString', + int: 'graphQLInt', + double: 'graphQLFloat', + bool: 'graphQLBoolean', + DateTime: 'graphQLDate', + }; + + // Check to see if it's a primitive type. + for (var entry in primitive.entries) { + if (TypeChecker.fromRuntime(entry.key).isAssignableFromType(type)) { + return refer(entry.value); + } + } + + // Next, check to see if it's a List. + if (type is InterfaceType && + type.typeArguments.isNotEmpty && + TypeChecker.fromRuntime(Iterable).isAssignableFromType(type)) { + var arg = type.typeArguments[0]; + var inner = _inferType(className, name, arg); + + return refer('listOf').call([inner]); + } + + // Nothing else is allowed. + throw 'Cannot infer the GraphQL type for field $className.$name (type=$type).'; + } + + void _applyDescription( + Map named, + Element2 element, + String? docComment, + ) { + var docString = docComment; + + if (docString == null && _graphQLDoc.hasAnnotationOf(element)) { + var ann = _graphQLDoc.firstAnnotationOf(element); + var cr = ConstantReader(ann); + + docString = cr.peek('description')?.stringValue; + } + + if (docString != null) { + named['description'] = literalString( + docString.replaceAll(_docComment, '').replaceAll('\n', '\\n'), + ); + } + } + + Library _buildEnumSchemaLibrary(EnumElement2 clazz, ConstantReader ann) { + return Library((b) { + // Generate a top-level xGraphQLType object + b.body.add( + Field((b) { + // enumTypeFromStrings(String name, List values, {String description} + var args = [literalString(clazz.displayName)]; + var values = clazz.firstFragment.fields2 + .where((f) => f.element.isEnumConstant) + .map((f) => f.name2); + var named = {}; + + _applyDescription(named, clazz, clazz.documentationComment); + + args.add( + literalConstList(values.map(literalString2).toList()), + ); + + b + ..name = '${ReCase(clazz.displayName).camelCase}GraphQLType' + ..docs.add('/// Auto-generated from [${clazz.displayName}].') + ..type = TypeReference( + (b) => b + ..symbol = 'GraphQLEnumType' + ..types.add(refer('String')), + ) + ..modifier = FieldModifier.final$ + ..assignment = refer('enumTypeFromStrings').call(args, named).code; + }), + ); + }); + } + + Library _buildClassSchemaLibrary( + ClassElement2 clazz, + BuildContext? ctx, + ConstantReader ann, + ) { + return Library((b) { + // Generate a top-level xGraphQLType object + + b.body.add( + Field((b) { + var args = [literalString(ctx!.modelClassName!)]; + var named = { + 'isInterface': literalBool(isInterface(clazz)), + }; + + // Add documentation + _applyDescription(named, clazz, clazz.documentationComment); + + // Add interfaces + var interfaces = clazz.interfaces.where(_isGraphQLClass).map((c) { + var name = + serializableTypeChecker.hasAnnotationOf(c.element3) && + c.getDisplayString().startsWith('_') + ? c.getDisplayString().substring(1) + : c.getDisplayString(); + var rc = ReCase(name); + + return refer('${rc.camelCase}GraphQLType'); + }); + + named['interfaces'] = literalList(interfaces); + + // Add fields + var ctxFields = ctx.fields.toList(); + + // Also incorporate parent fields. + //TODO: To be reviewed later + InterfaceType? search = clazz.thisType; //.type; + + while (search != null && + !TypeChecker.fromRuntime(Object).isExactlyType(search)) { + for (var field in search.element3.fields2) { + if (!ctxFields.any((f) => f.name3 == field.name3)) { + ctxFields.add(field); + } + } + + search = search.superclass; + } + + var fields = []; + + for (var field in ctxFields) { + var named = {}; + var originalField = clazz.fields2.firstWhereOrNull( + (f) => f.name3 == field.name3, + ); + + // Check if it is deprecated. + var depEl = originalField?.getter2 ?? originalField ?? field; + var depAnn = TypeChecker.fromRuntime( + Deprecated, + ).firstAnnotationOf(depEl); + + if (depAnn != null) { + var dep = ConstantReader(depAnn); + var reason = + dep.peek('messages')?.stringValue ?? + dep.peek('expires')?.stringValue ?? + 'Expires: ${deprecated.message}.'; + + named['deprecationReason'] = literalString(reason); + } + + // Description finder... + _applyDescription( + named, + originalField?.getter2 ?? originalField ?? field, + originalField?.getter2?.documentationComment ?? + originalField?.documentationComment, + ); + + // Pick the type. + var doc = _graphQLDoc.firstAnnotationOf(depEl); + + Expression? type; + + if (doc != null) { + var cr = ConstantReader(doc); + var typeName = cr.peek('typeName')?.symbolValue; + + if (typeName != null) { + type = refer(MirrorSystem.getName(typeName)); + } + } + + fields.add( + refer('field').call([ + literalString(ctx.resolveFieldName(field.displayName)!), + type ??= _inferType( + clazz.displayName, + field.displayName, + field.type, + ), + ], named), + ); + } + + named['fields'] = literalList(fields); + + b + ..name = '${ctx.modelClassNameRecase.camelCase}GraphQLType' + ..docs.add('/// Auto-generated from [${ctx.modelClassName}].') + //..style = refer('GraphQLObjectType') + ..type = refer('GraphQLObjectType') + ..modifier = FieldModifier.final$ + ..assignment = refer('objectType').call(args, named).code; + }), + ); + }); + } +} diff --git a/packages/graphql_generator/lib/src/graphql_literal.dart b/packages/graphql_generator/lib/src/graphql_literal.dart new file mode 100644 index 0000000..b60241b --- /dev/null +++ b/packages/graphql_generator/lib/src/graphql_literal.dart @@ -0,0 +1,9 @@ +import 'package:code_builder/code_builder.dart'; + +/// Create a custom literal expression from a string [value]. +/// +/// **NOTE**: The string is always formatted `''`. +/// +Expression literalString2(String? value) { + return literalString(value ?? ''); +} diff --git a/packages/graphql_generator/pubspec.lock b/packages/graphql_generator/pubspec.lock index 334abd9..72ed5b1 100644 --- a/packages/graphql_generator/pubspec.lock +++ b/packages/graphql_generator/pubspec.lock @@ -5,42 +5,42 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 + sha256: da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f url: "https://pub.dev" source: hosted - version: "80.0.0" + version: "85.0.0" analyzer: dependency: "direct main" description: name: analyzer - sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" + sha256: "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "7.7.1" angel3_model: dependency: "direct main" description: name: angel3_model - sha256: "9a3f50b02bf119bb160d5f94580940b93973589d9b5949d284d2427b8fb65e16" + sha256: f0629b5a552450a9a242e3d0838b2b1521e1c38aa59620ec7e3789acb858a71b url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_serialize: dependency: transitive description: name: angel3_serialize - sha256: "4a4658b8af0d0eec6b8816699f137367c6af7c6f6a1f83a84e43fee55f892f5e" + sha256: "83fe50a347c130618b560f0c907ec71fd47c9f65990eaedcdbc57b846fdc21d8" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_serialize_generator: dependency: "direct main" description: name: angel3_serialize_generator - sha256: "0fd91dd1162f5c0d1b3c0f2734f48787202693926e6d6c97bca18658c8b812f4" + sha256: "3f3819b8212924c5c97dc2d18708212469ec1622c2ba054d413c8619f747707e" url: "https://pub.dev" source: hosted - version: "8.4.1" + version: "8.6.0" args: dependency: transitive description: @@ -61,10 +61,10 @@ packages: dependency: transitive description: name: belatuk_code_buffer - sha256: "06c4329570e2cb72cb808c5f19d2004865b7c1f18447d4af16d465776416ccfc" + sha256: "0071d74c83fc8715dffb0fa5b9e13a6e72cbf3c520d325504839571522ecc545" url: "https://pub.dev" source: hosted - version: "5.3.0" + version: "5.4.0" boolean_selector: dependency: transitive description: @@ -77,18 +77,18 @@ packages: dependency: "direct main" description: name: build - sha256: cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0 + sha256: ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "3.1.0" build_config: dependency: "direct main" description: name: build_config - sha256: "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33" + sha256: "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.2.0" build_daemon: dependency: transitive description: @@ -101,26 +101,26 @@ packages: dependency: transitive description: name: build_resolvers - sha256: b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0 + sha256: d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46 url: "https://pub.dev" source: hosted - version: "2.4.4" + version: "3.0.3" build_runner: dependency: "direct dev" description: name: build_runner - sha256: "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99" + sha256: b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30 url: "https://pub.dev" source: hosted - version: "2.4.15" + version: "2.7.1" build_runner_core: dependency: transitive description: name: build_runner_core - sha256: "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021" + sha256: "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b" url: "https://pub.dev" source: hosted - version: "8.0.0" + version: "9.3.1" built_collection: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: built_value - sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4 + sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d url: "https://pub.dev" source: hosted - version: "8.9.5" + version: "8.12.0" charcode: dependency: transitive description: @@ -149,18 +149,18 @@ packages: dependency: transitive description: name: checked_yaml - sha256: feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff + sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.4" code_builder: dependency: "direct main" description: name: code_builder - sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243" url: "https://pub.dev" source: hosted - version: "4.10.1" + version: "4.11.0" collection: dependency: "direct main" description: @@ -189,10 +189,10 @@ packages: dependency: transitive description: name: dart_style - sha256: "27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac" + sha256: "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb" url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.1.1" file: dependency: transitive description: @@ -228,11 +228,10 @@ packages: graphql_schema2: dependency: "direct main" description: - name: graphql_schema2 - sha256: a8f17e9e54659cec870ce350af9d8ffc6fc1722b6b14db62b6415a9db9d5add6 - url: "https://pub.dev" - source: hosted - version: "6.2.0" + path: "../graphql_schema" + relative: true + source: path + version: "6.4.0" graphs: dependency: transitive description: @@ -241,14 +240,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.2" - http: - dependency: transitive - description: - name: http - sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f - url: "https://pub.dev" - source: hosted - version: "1.3.0" http_multi_server: dependency: transitive description: @@ -273,14 +264,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.5" - js: - dependency: transitive - description: - name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf - url: "https://pub.dev" - source: hosted - version: "0.7.1" json_annotation: dependency: transitive description: @@ -293,10 +276,10 @@ packages: dependency: "direct dev" description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: transitive description: @@ -317,10 +300,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -405,10 +388,10 @@ packages: dependency: "direct main" description: name: source_gen - sha256: "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b" + sha256: "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3" url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "3.1.0" source_span: dependency: transitive description: @@ -461,10 +444,10 @@ packages: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" timing: dependency: transitive description: @@ -485,10 +468,10 @@ packages: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.3" web: dependency: transitive description: @@ -501,18 +484,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" yaml: dependency: transitive description: @@ -522,4 +505,4 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/packages/graphql_generator/pubspec.yaml b/packages/graphql_generator/pubspec.yaml index 715f4eb..f51a954 100644 --- a/packages/graphql_generator/pubspec.yaml +++ b/packages/graphql_generator/pubspec.yaml @@ -1,26 +1,23 @@ name: graphql_generator2 -version: 6.3.0 +version: 6.4.0 description: Generates GraphQL schemas from Dart classes, for use with pkg:graphql_server2. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/graphql_generator environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dependencies: - analyzer: ^7.0.0 + analyzer: ^7.7.0 angel3_model: ^8.0.0 angel3_serialize_generator: ^8.2.0 graphql_schema2: ^6.2.0 - build: ^2.4.0 - build_config: ^1.1.0 - code_builder: ^4.5.0 + build: ^3.0.0 + build_config: ^1.2.0 + code_builder: ^4.11.0 recase: ^4.1.0 - source_gen: ^2.0.0 + source_gen: ^3.1.0 collection: ^1.17.0 dev_dependencies: - build_runner: ^2.4.0 - lints: ^5.0.0 -# dependency_overrides: -# graphql_schema2: -# path: ../graphql_schema + build_runner: ^2.7.0 + lints: ^6.0.0 diff --git a/packages/graphql_generator/pubspec_overrides.yaml b/packages/graphql_generator/pubspec_overrides.yaml new file mode 100644 index 0000000..4efae40 --- /dev/null +++ b/packages/graphql_generator/pubspec_overrides.yaml @@ -0,0 +1,4 @@ +# melos_managed_dependency_overrides +dependency_overrides: + graphql_schema2: + path: ../graphql_schema diff --git a/packages/graphql_parser/CHANGELOG.md b/packages/graphql_parser/CHANGELOG.md index 85d0b3c..7e3b46e 100644 --- a/packages/graphql_parser/CHANGELOG.md +++ b/packages/graphql_parser/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.4.0 + +* Require Dart >= 3.8 +* Updated `lints` to 6.0.0 +* Updated dependencies to the latest release + ## 6.3.0 * Require Dart >= 3.6 diff --git a/packages/graphql_parser/pubspec.lock b/packages/graphql_parser/pubspec.lock index 9a809f5..060c532 100644 --- a/packages/graphql_parser/pubspec.lock +++ b/packages/graphql_parser/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 + sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a url: "https://pub.dev" source: hosted - version: "80.0.0" + version: "88.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" + sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "8.1.1" args: dependency: transitive description: @@ -49,6 +49,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + cli_config: + dependency: transitive + description: + name: cli_config + sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec + url: "https://pub.dev" + source: hosted + version: "0.2.0" collection: dependency: transitive description: @@ -69,10 +77,10 @@ packages: dependency: transitive description: name: coverage - sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.15.0" crypto: dependency: transitive description: @@ -133,18 +141,18 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" lints: dependency: "direct dev" description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: transitive description: @@ -165,10 +173,10 @@ packages: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -309,26 +317,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" url: "https://pub.dev" source: hosted - version: "1.25.15" + version: "1.26.3" test_api: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" test_core: dependency: transitive description: name: test_core - sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" url: "https://pub.dev" source: hosted - version: "0.6.8" + version: "0.6.12" typed_data: dependency: transitive description: @@ -341,18 +349,18 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "15.0.2" watcher: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.3" web: dependency: transitive description: @@ -365,18 +373,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webkit_inspection_protocol: dependency: transitive description: @@ -394,4 +402,4 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/packages/graphql_parser/pubspec.yaml b/packages/graphql_parser/pubspec.yaml index 9a29993..0b715f5 100644 --- a/packages/graphql_parser/pubspec.yaml +++ b/packages/graphql_parser/pubspec.yaml @@ -1,15 +1,15 @@ name: graphql_parser2 -version: 6.3.0 +version: 6.4.0 description: Parses GraphQL queries and schemas. Also includes classes for the GraphQL AST. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/graphql_parser environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dependencies: charcode: ^1.3.1 source_span: ^1.10.0 string_scanner: ^1.2.0 dev_dependencies: matcher: ^0.12.10 - lints: ^5.0.0 + lints: ^6.0.0 test: ^1.24.0 diff --git a/packages/graphql_parser/pubspec_overrides.yaml b/packages/graphql_parser/pubspec_overrides.yaml new file mode 100644 index 0000000..40a5fd2 --- /dev/null +++ b/packages/graphql_parser/pubspec_overrides.yaml @@ -0,0 +1 @@ +# melos_managed_dependency_overrides diff --git a/packages/graphql_schema/CHANGELOG.md b/packages/graphql_schema/CHANGELOG.md index 0e4f3e4..0514758 100644 --- a/packages/graphql_schema/CHANGELOG.md +++ b/packages/graphql_schema/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.4.0 + +* Require Dart >= 3.8 +* Updated `lints` to 6.0.0 +* Updated dependencies to the latest release + ## 6.3.0 * Require Dart >= 3.6 diff --git a/packages/graphql_schema/pubspec.lock b/packages/graphql_schema/pubspec.lock index c027764..3fd58c1 100644 --- a/packages/graphql_schema/pubspec.lock +++ b/packages/graphql_schema/pubspec.lock @@ -5,18 +5,18 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 + sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a url: "https://pub.dev" source: hosted - version: "80.0.0" + version: "88.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" + sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "8.1.1" args: dependency: transitive description: @@ -41,6 +41,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + cli_config: + dependency: transitive + description: + name: cli_config + sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec + url: "https://pub.dev" + source: hosted + version: "0.2.0" collection: dependency: "direct main" description: @@ -61,10 +69,10 @@ packages: dependency: transitive description: name: coverage - sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.15.0" crypto: dependency: transitive description: @@ -125,18 +133,18 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" lints: dependency: "direct dev" description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: transitive description: @@ -157,10 +165,10 @@ packages: dependency: "direct main" description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -309,26 +317,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" url: "https://pub.dev" source: hosted - version: "1.25.15" + version: "1.26.3" test_api: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" test_core: dependency: transitive description: name: test_core - sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" url: "https://pub.dev" source: hosted - version: "0.6.8" + version: "0.6.12" typed_data: dependency: transitive description: @@ -341,18 +349,18 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "15.0.2" watcher: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.3" web: dependency: transitive description: @@ -365,18 +373,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webkit_inspection_protocol: dependency: transitive description: @@ -394,4 +402,4 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/packages/graphql_schema/pubspec.yaml b/packages/graphql_schema/pubspec.yaml index a399eac..7c953bd 100644 --- a/packages/graphql_schema/pubspec.yaml +++ b/packages/graphql_schema/pubspec.yaml @@ -1,10 +1,10 @@ name: graphql_schema2 -version: 6.3.0 +version: 6.4.0 description: An implementation of GraphQL's type system in Dart. Basis of graphql_server2. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/graphql_schema environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dependencies: collection: ^1.17.0 meta: ^1.9.0 @@ -12,4 +12,4 @@ dependencies: quiver: ^3.2.0 dev_dependencies: test: ^1.24.0 - lints: ^5.0.0 + lints: ^6.0.0 diff --git a/packages/graphql_schema/pubspec_overrides.yaml b/packages/graphql_schema/pubspec_overrides.yaml new file mode 100644 index 0000000..40a5fd2 --- /dev/null +++ b/packages/graphql_schema/pubspec_overrides.yaml @@ -0,0 +1 @@ +# melos_managed_dependency_overrides diff --git a/packages/graphql_server/CHANGELOG.md b/packages/graphql_server/CHANGELOG.md index 445c198..60c972f 100644 --- a/packages/graphql_server/CHANGELOG.md +++ b/packages/graphql_server/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 6.4.0 + +* Require Dart >= 3.8 +* Updated `lints` to 6.0.0 +* Updated dependencies to the latest release + ## 6.3.0 * Require Dart >= 3.6 diff --git a/packages/graphql_server/pubspec.lock b/packages/graphql_server/pubspec.lock index 267d6df..3870c45 100644 --- a/packages/graphql_server/pubspec.lock +++ b/packages/graphql_server/pubspec.lock @@ -5,34 +5,34 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57 + sha256: f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a url: "https://pub.dev" source: hosted - version: "80.0.0" + version: "88.0.0" analyzer: dependency: transitive description: name: analyzer - sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e" + sha256: "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f" url: "https://pub.dev" source: hosted - version: "7.3.0" + version: "8.1.1" angel3_model: dependency: transitive description: name: angel3_model - sha256: "9a3f50b02bf119bb160d5f94580940b93973589d9b5949d284d2427b8fb65e16" + sha256: f0629b5a552450a9a242e3d0838b2b1521e1c38aa59620ec7e3789acb858a71b url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" angel3_serialize: dependency: "direct main" description: name: angel3_serialize - sha256: "4a4658b8af0d0eec6b8816699f137367c6af7c6f6a1f83a84e43fee55f892f5e" + sha256: "83fe50a347c130618b560f0c907ec71fd47c9f65990eaedcdbc57b846fdc21d8" url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "8.4.0" args: dependency: transitive description: @@ -65,6 +65,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" + cli_config: + dependency: transitive + description: + name: cli_config + sha256: ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec + url: "https://pub.dev" + source: hosted + version: "0.2.0" collection: dependency: "direct main" description: @@ -85,10 +93,10 @@ packages: dependency: transitive description: name: coverage - sha256: e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43 + sha256: "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d" url: "https://pub.dev" source: hosted - version: "1.11.1" + version: "1.15.0" crypto: dependency: transitive description: @@ -124,19 +132,17 @@ packages: graphql_parser2: dependency: "direct main" description: - name: graphql_parser2 - sha256: "08e693c8a103f046c1b65c1b16e96bbc3220e906fc86f7c6590a12b3eaf97130" - url: "https://pub.dev" - source: hosted - version: "6.2.0" + path: "../graphql_parser" + relative: true + source: path + version: "6.4.0" graphql_schema2: dependency: "direct main" description: - name: graphql_schema2 - sha256: a8f17e9e54659cec870ce350af9d8ffc6fc1722b6b14db62b6415a9db9d5add6 - url: "https://pub.dev" - source: hosted - version: "6.2.0" + path: "../graphql_schema" + relative: true + source: path + version: "6.4.0" http_multi_server: dependency: transitive description: @@ -165,18 +171,18 @@ packages: dependency: transitive description: name: js - sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf + sha256: "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc" url: "https://pub.dev" source: hosted - version: "0.7.1" + version: "0.7.2" lints: dependency: "direct dev" description: name: lints - sha256: c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7 + sha256: a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0 url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" logging: dependency: transitive description: @@ -197,10 +203,10 @@ packages: dependency: "direct main" description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mime: dependency: transitive description: @@ -357,26 +363,26 @@ packages: dependency: "direct dev" description: name: test - sha256: "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e" + sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" url: "https://pub.dev" source: hosted - version: "1.25.15" + version: "1.26.3" test_api: dependency: transitive description: name: test_api - sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd + sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 url: "https://pub.dev" source: hosted - version: "0.7.4" + version: "0.7.7" test_core: dependency: transitive description: name: test_core - sha256: "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa" + sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" url: "https://pub.dev" source: hosted - version: "0.6.8" + version: "0.6.12" tuple: dependency: "direct main" description: @@ -397,18 +403,18 @@ packages: dependency: transitive description: name: vm_service - sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02 + sha256: "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60" url: "https://pub.dev" source: hosted - version: "15.0.0" + version: "15.0.2" watcher: dependency: transitive description: name: watcher - sha256: "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104" + sha256: "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c" url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.1.3" web: dependency: transitive description: @@ -421,18 +427,18 @@ packages: dependency: transitive description: name: web_socket - sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83" + sha256: "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c" url: "https://pub.dev" source: hosted - version: "0.1.6" + version: "1.0.1" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5" + sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8 url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" webkit_inspection_protocol: dependency: transitive description: @@ -450,4 +456,4 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/packages/graphql_server/pubspec.yaml b/packages/graphql_server/pubspec.yaml index cece89c..302c9c7 100644 --- a/packages/graphql_server/pubspec.yaml +++ b/packages/graphql_server/pubspec.yaml @@ -1,11 +1,11 @@ name: graphql_server2 -version: 6.3.0 +version: 6.4.0 description: Base package for implementing GraphQL servers. You might prefer `package:angel3_graphql`, the fastest way to implement GraphQL backends in Dart. homepage: https://angel3-framework.web.app/ repository: https://github.com/dart-backend/graphql_dart/tree/master/packages/graphql_server environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dependencies: angel3_serialize: ^8.0.0 @@ -18,11 +18,5 @@ dependencies: tuple: ^2.0.0 dev_dependencies: - lints: ^5.0.0 + lints: ^6.0.0 test: ^1.24.0 - -# dependency_overrides: -# graphql_parser2: -# path: ../graphql_parser -# graphql_schema2: -# path: ../graphql_schema diff --git a/packages/graphql_server/pubspec_overrides.yaml b/packages/graphql_server/pubspec_overrides.yaml new file mode 100644 index 0000000..3bb6c2a --- /dev/null +++ b/packages/graphql_server/pubspec_overrides.yaml @@ -0,0 +1,6 @@ +# melos_managed_dependency_overrides +dependency_overrides: + graphql_parser2: + path: ../graphql_parser + graphql_schema2: + path: ../graphql_schema diff --git a/pubspec.lock b/pubspec.lock index 3467128..290b720 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,42 +13,42 @@ packages: dependency: transitive description: name: args - sha256: bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6 + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 url: "https://pub.dev" source: hosted - version: "2.6.0" + version: "2.7.0" async: dependency: transitive description: name: async - sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 + sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb" url: "https://pub.dev" source: hosted - version: "2.12.0" - boolean_selector: + version: "2.13.0" + charcode: dependency: transitive description: - name: boolean_selector - sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + name: charcode + sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a url: "https://pub.dev" source: hosted - version: "2.1.2" - charcode: + version: "1.4.0" + checked_yaml: dependency: transitive description: - name: charcode - sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + name: checked_yaml + sha256: "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f" url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "2.0.4" cli_launcher: dependency: transitive description: name: cli_launcher - sha256: "5e7e0282b79e8642edd6510ee468ae2976d847a0a29b3916e85f5fa1bfe24005" + sha256: "17d2744fb9a254c49ec8eda582536abe714ea0131533e24389843a4256f82eac" url: "https://pub.dev" source: hosted - version: "0.3.1" + version: "0.3.2+1" cli_util: dependency: transitive description: @@ -69,26 +69,26 @@ packages: dependency: transitive description: name: conventional_commit - sha256: dec15ad1118f029c618651a4359eb9135d8b88f761aa24e4016d061cd45948f2 + sha256: c40b1b449ce2a63fa2ce852f35e3890b1e182f5951819934c0e4a66254bc0dc3 url: "https://pub.dev" source: hosted - version: "0.6.0+1" + version: "0.6.1+1" file: dependency: transitive description: name: file - sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 url: "https://pub.dev" source: hosted - version: "6.1.4" + version: "7.0.1" glob: dependency: transitive description: name: glob - sha256: "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63" + sha256: c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" graphs: dependency: transitive description: @@ -101,26 +101,26 @@ packages: dependency: transitive description: name: http - sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010 + sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007 url: "https://pub.dev" source: hosted - version: "1.2.2" + version: "1.5.0" http_parser: dependency: transitive description: name: http_parser - sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "4.1.2" io: dependency: transitive description: name: io - sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + sha256: dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b url: "https://pub.dev" source: hosted - version: "1.0.4" + version: "1.0.5" json_annotation: dependency: transitive description: @@ -129,30 +129,22 @@ packages: url: "https://pub.dev" source: hosted version: "4.9.0" - matcher: - dependency: transitive - description: - name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 - url: "https://pub.dev" - source: hosted - version: "0.12.17" melos: dependency: "direct main" description: name: melos - sha256: "96e64bbade5712c3f010137e195bca9f1b351fac34ab1f322af492ae34032067" + sha256: "4280dc46bd5b741887cce1e67e5c1a6aaf3c22310035cf5bd33dceeeda62ed22" url: "https://pub.dev" source: hosted - version: "3.4.0" + version: "6.3.3" meta: dependency: transitive description: name: meta - sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c + sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" mustache_template: dependency: transitive description: @@ -189,10 +181,10 @@ packages: dependency: transitive description: name: process - sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + sha256: c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744 url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "5.0.5" prompts: dependency: transitive description: @@ -205,82 +197,58 @@ packages: dependency: transitive description: name: pub_semver - sha256: "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c" + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" url: "https://pub.dev" source: hosted - version: "2.1.4" + version: "2.2.0" pub_updater: dependency: transitive description: name: pub_updater - sha256: b06600619c8c219065a548f8f7c192b3e080beff95488ed692780f48f69c0625 - url: "https://pub.dev" - source: hosted - version: "0.3.1" - pubspec: - dependency: transitive - description: - name: pubspec - sha256: f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e + sha256: "739a0161d73a6974c0675b864fb0cf5147305f7b077b7f03a58fa7a9ab3e7e7d" url: "https://pub.dev" source: hosted - version: "2.3.0" - quiver: + version: "0.5.0" + pubspec_parse: dependency: transitive description: - name: quiver - sha256: ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2 + name: pubspec_parse + sha256: "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082" url: "https://pub.dev" source: hosted - version: "3.2.2" + version: "1.5.0" source_span: dependency: transitive description: name: source_span - sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c" url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.10.1" stack_trace: dependency: transitive description: name: stack_trace - sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" url: "https://pub.dev" source: hosted - version: "1.12.0" - stream_channel: - dependency: transitive - description: - name: stream_channel - sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 - url: "https://pub.dev" - source: hosted - version: "2.1.2" + version: "1.12.1" string_scanner: dependency: transitive description: name: string_scanner - sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.4.1" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.dev" - source: hosted - version: "1.2.1" - test_api: - dependency: transitive - description: - name: test_api - sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" url: "https://pub.dev" source: hosted - version: "0.7.3" + version: "1.2.2" typed_data: dependency: transitive description: @@ -289,37 +257,29 @@ packages: url: "https://pub.dev" source: hosted version: "1.4.0" - uri: - dependency: transitive - description: - name: uri - sha256: "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a" - url: "https://pub.dev" - source: hosted - version: "1.0.0" web: dependency: transitive description: name: web - sha256: cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.1" yaml: dependency: transitive description: name: yaml - sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" yaml_edit: dependency: transitive description: name: yaml_edit - sha256: e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f + sha256: fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5 url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" sdks: - dart: ">=3.6.0 <4.0.0" + dart: ">=3.8.0 <4.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 916922e..39cc78b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: graphql_dart environment: - sdk: '>=3.6.0 <4.0.0' + sdk: '>=3.8.0 <5.0.0' dependencies: - melos: ^3.4.0 + melos: ^6.3.0