Merge branch 'main' into CaoGiaHieu-dev/main

* main: (56 commits)
  [go_router_builder] Support extension types (#9458)
  Roll Flutter from e2a347b to 34c2a3b (41 revisions) (#9803)
  [go_router_builder] Migrate to Element2 API and update dependencies (#9649)
  [in_app_purchase_storekit] Add support for quantity in consumable product purchases (#171570) (#9698)
  [pigeon] Improves documentation of `ProxyApi` and moves helper functions to a separate file (#9756)
  Roll Flutter from 1590543 to e2a347b (1 revision) (#9784)
  [camera_avfoundation] Implementation swift migration - part 11 (#9690)
  [camera_avfoundation] Fix crash when streaming while recording (#9691)
  Roll Flutter from 3821790 to 1590543 (14 revisions) (#9780)
  Roll Flutter from 92a6bfb to 3821790 (17 revisions) (#9778)
  [video_player] Improve KVO handling on iOS (#9718)
  [dependabot]: Bump the test-dependencies group across 15 directories with 7 updates (#9736)
  Roll Flutter from 9de63a0 to 92a6bfb (11 revisions) (#9769)
  [google_maps_flutter_platform_interface] Add Advanced markers support (#9737)
  [camera_android_camerax] Re-land "Force new Surface for each SurfaceRequest" (#9760)
  [google_maps_flutter] Add ability to perform Google Maps SDK warmup (#9674)
  Roll Flutter from 59fc766 to 9de63a0 (6 revisions) (#9764)
  [webview_flutter_wkwebview] Extended Web View API on iOS to add flexibility when working with local HTML content (#8787)
  [local_auth] Differentiate iOS authentication errors (#9705)
  manual roll to 59fc766 (#9758)
  ...

# Conflicts:
#	packages/go_router_builder/lib/src/type_helpers.dart
#	packages/go_router_builder/pubspec.yaml

packages/go_router_builder/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 3.2.1
+
+- Fixes warnings in generated code of iterable parameters.
+
 ## 3.2.0
 
 - Adds support for`extension type`.
@@ -10,10 +14,6 @@
 - Improves test code formatting consistency.
 - Updates minimum supported SDK version to Flutter 3.29/Dart 3.7.
 
-## 3.0.2
-
-- Fixes warnings in generated code of iterable parameters.
-
 ## 3.0.1
 
 - Updates README.md to use the mixin `with _$RouteName`.

packages/go_router_builder/lib/src/type_helpers.dart

@@ -482,15 +482,17 @@ class _TypeHelperIterable extends _TypeHelperWithHelper {
       // get correct type for iterable
       String iterableCaster = '';
       String fallBack = '';
-      if (const TypeChecker.fromRuntime(List)
-          .isAssignableFromType(parameterElement.type)) {
+      if (const TypeChecker.fromRuntime(
+        List,
+      ).isAssignableFromType(parameterElement.type)) {
         iterableCaster += '.toList()';
         if (!parameterElement.type.isNullableType &&
             !parameterElement.hasDefaultValue) {
           fallBack = '?? const []';
         }
-      } else if (const TypeChecker.fromRuntime(Set)
-          .isAssignableFromType(parameterElement.type)) {
+      } else if (const TypeChecker.fromRuntime(
+        Set,
+      ).isAssignableFromType(parameterElement.type)) {
         iterableCaster += '.toSet()';
         if (!parameterElement.type.isNullableType &&
             !parameterElement.hasDefaultValue) {
@@ -500,7 +502,7 @@ class _TypeHelperIterable extends _TypeHelperWithHelper {
 
       return '''
 state.uri.queryParametersAll[
-        ${escapeDartString(parameterElement.name.kebab)}]
+        ${escapeDartString(parameterElement.displayName.kebab)}]
         ?.map($entriesTypeDecoder)$convertToNotNull$iterableCaster$fallBack''';
     }
     return '''
@@ -559,10 +561,11 @@ abstract class _TypeHelperWithHelper extends _TypeHelper {
           '${helperName(paramType)})';
     }
 
-    final String nullableSuffix = paramType.isNullableType ||
-            (paramType.isEnum && !paramType.isNullableType)
-        ? '!'
-        : '';
+    final String nullableSuffix =
+        paramType.isNullableType ||
+                (paramType.isEnum && !paramType.isNullableType)
+            ? '!'
+            : '';
 
     return '${helperName(paramType)}'
         '(state.${_stateValueAccess(parameterElement, pathParameters)} ${!parameterElement.isRequired ? " ?? '' " : ''})$nullableSuffix';

packages/go_router_builder/pubspec.yaml

@@ -2,7 +2,7 @@ name: go_router_builder
 description: >-
   A builder that supports generated strongly-typed route helpers for
   package:go_router
-version: 3.0.2
+version: 3.2.1
 repository: https://github.com/flutter/packages/tree/main/packages/go_router_builder
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+go_router_builder%22
 
@@ -23,7 +23,7 @@ dependencies:
 
 dev_dependencies:
   build_test: ^3.3.0
-  dart_style: '>=2.3.7 <4.0.0'
+  dart_style: ">=2.3.7 <4.0.0"
   flutter:
     sdk: flutter
   go_router: ^16.0.0