From fbf6f24bceb55438437797304e2e923dcc2e51e0 Mon Sep 17 00:00:00 2001
From: ValentinVignal <valentin.vignal.dev@outlook.fr>
Date: Tue, 28 Jan 2025 23:47:23 +0800
Subject: [PATCH 1/6] Compare iterables

---
 .../lib/src/route_config.dart                 | 20 ++++++++++++-
 .../lib/src/type_helpers.dart                 | 30 ++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/packages/go_router_builder/lib/src/route_config.dart b/packages/go_router_builder/lib/src/route_config.dart
index b773c533ac1..67901e0df73 100644
--- a/packages/go_router_builder/lib/src/route_config.dart
+++ b/packages/go_router_builder/lib/src/route_config.dart
@@ -313,7 +313,9 @@ class GoRouteConfig extends RouteBaseConfig {
         if (param.type.isNullableType) {
           throw NullableDefaultValueError(param);
         }
-        conditions.add('$parameterName != ${param.defaultValueCode!}');
+        conditions.add(
+          compareField(param, parameterName, param.defaultValueCode!),
+        );
       } else if (param.type.isNullableType) {
         conditions.add('$parameterName != null');
       }
@@ -734,6 +736,7 @@ const Map<String, String> helperNames = <String, String>{
   convertMapValueHelperName: _convertMapValueHelper,
   boolConverterHelperName: _boolConverterHelper,
   enumExtensionHelperName: _enumConverterHelper,
+  iterableEqualsHelperName: _iterableEqualsHelper,
 };
 
 const String _convertMapValueHelper = '''
@@ -765,3 +768,18 @@ extension<T extends Enum> on Map<T, String> {
   T $enumExtensionHelperName(String value) =>
       entries.singleWhere((element) => element.value == value).key;
 }''';
+
+const String _iterableEqualsHelper = '''
+bool $iterableEqualsHelperName<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+  if (identical(iterable1, iterable2)) return true;
+  if (iterable1 == null || iterable2 == null) return false;
+  final iterator1 = iterable1.iterator;
+  final iterator2 = iterable2.iterator;
+  while (true) {
+    final hasNext1 = iterator1.moveNext();
+    final hasNext2 = iterator2.moveNext();
+    if (hasNext1 != hasNext2) return false;
+    if (!hasNext1) return true;
+    if (iterator1.current != iterator2.current) return false;
+  }
+}''';
diff --git a/packages/go_router_builder/lib/src/type_helpers.dart b/packages/go_router_builder/lib/src/type_helpers.dart
index d375c013e20..6748ef28b7f 100644
--- a/packages/go_router_builder/lib/src/type_helpers.dart
+++ b/packages/go_router_builder/lib/src/type_helpers.dart
@@ -28,6 +28,9 @@ const String extraFieldName = r'$extra';
 /// Shared start of error message related to a likely code issue.
 const String likelyIssueMessage = 'Should never get here! File an issue!';
 
+/// The name of the generated, private helper for comparing iterables.
+const String iterableEqualsHelperName = r'_$iterablesEquals';
+
 const List<_TypeHelper> _helpers = <_TypeHelper>[
   _TypeHelperBigInt(),
   _TypeHelperBool(),
@@ -86,6 +89,22 @@ String encodeField(PropertyAccessorElement element) {
   );
 }
 
+/// Returns the comparison of a parameter with its default value.
+///
+/// Otherwise, throws an [InvalidGenerationSourceError].
+String compareField(ParameterElement param, String value1, String value2) {
+  for (final _TypeHelper helper in _helpers) {
+    if (helper._matchesType(param.type)) {
+      return helper._compare(param.name, param.defaultValueCode!);
+    }
+  }
+
+  throw InvalidGenerationSourceError(
+    'The type `${param.type}` is not supported.',
+    element: param,
+  );
+}
+
 /// Gets the name of the `const` map generated to help encode [Enum] types.
 String enumMapName(InterfaceType type) => '_\$${type.element.name}EnumMap';
 
@@ -119,6 +138,8 @@ abstract class _TypeHelper {
   String _encode(String fieldName, DartType type);
 
   bool _matchesType(DartType type);
+
+  String _compare(String value1, String value2) => '$value1 != $value2';
 }
 
 class _TypeHelperBigInt extends _TypeHelperWithHelper {
@@ -252,9 +273,12 @@ class _TypeHelperUri extends _TypeHelperWithHelper {
       const TypeChecker.fromRuntime(Uri).isAssignableFromType(type);
 }
 
-class _TypeHelperIterable extends _TypeHelper {
+class _TypeHelperIterable extends _TypeHelperWithHelper {
   const _TypeHelperIterable();
 
+  @override
+  String helperName(DartType paramType) => iterableEqualsHelperName;
+
   @override
   String _decode(
       ParameterElement parameterElement, Set<String> pathParameters) {
@@ -324,6 +348,10 @@ $fieldName$nullAwareAccess.map((e) => e.toString()).toList()''';
   @override
   bool _matchesType(DartType type) =>
       const TypeChecker.fromRuntime(Iterable).isAssignableFromType(type);
+
+  @override
+  String _compare(String value1, String value2) =>
+      '!$iterableEqualsHelperName($value1, $value2)';
 }
 
 abstract class _TypeHelperWithHelper extends _TypeHelper {

From dc3ba545a4bac64067f5eb1eaa679b5e91c1c8a9 Mon Sep 17 00:00:00 2001
From: ValentinVignal <valentin.vignal.dev@outlook.fr>
Date: Tue, 28 Jan 2025 23:47:34 +0800
Subject: [PATCH 2/6] Update tests and examples

---
 .../example/lib/all_types.g.dart              | 52 +++++++++++++------
 .../example/test/location_test.dart           | 49 +++++++++++++++++
 .../iterable_with_default_value.dart.expect   | 16 +++++-
 .../go_router_builder/tool/run_tests.dart     |  3 +-
 4 files changed, 101 insertions(+), 19 deletions(-)
 create mode 100644 packages/go_router_builder/example/test/location_test.dart

diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart
index cb672ab6c8b..dfadf6e9d94 100644
--- a/packages/go_router_builder/example/lib/all_types.g.dart
+++ b/packages/go_router_builder/example/lib/all_types.g.dart
@@ -598,44 +598,48 @@ extension $IterableRouteWithDefaultValuesExtension
   String get location => GoRouteData.$location(
         '/iterable-route-with-default-values',
         queryParams: {
-          if (intIterableField != const <int>[0])
+          if (!_$iterablesEquals(intIterableField, const <int>[0]))
             'int-iterable-field':
                 intIterableField.map((e) => e.toString()).toList(),
-          if (doubleIterableField != const <double>[0, 1, 2])
+          if (!_$iterablesEquals(doubleIterableField, const <double>[0, 1, 2]))
             'double-iterable-field':
                 doubleIterableField.map((e) => e.toString()).toList(),
-          if (stringIterableField != const <String>['defaultValue'])
+          if (!_$iterablesEquals(
+              stringIterableField, const <String>['defaultValue']))
             'string-iterable-field': stringIterableField.map((e) => e).toList(),
-          if (boolIterableField != const <bool>[false])
+          if (!_$iterablesEquals(boolIterableField, const <bool>[false]))
             'bool-iterable-field':
                 boolIterableField.map((e) => e.toString()).toList(),
-          if (enumIterableField !=
-              const <SportDetails>[SportDetails.tennis, SportDetails.hockey])
+          if (!_$iterablesEquals(enumIterableField,
+              const <SportDetails>[SportDetails.tennis, SportDetails.hockey]))
             'enum-iterable-field':
                 enumIterableField.map((e) => _$SportDetailsEnumMap[e]).toList(),
-          if (intListField != const <int>[0])
+          if (!_$iterablesEquals(intListField, const <int>[0]))
             'int-list-field': intListField.map((e) => e.toString()).toList(),
-          if (doubleListField != const <double>[1, 2, 3])
+          if (!_$iterablesEquals(doubleListField, const <double>[1, 2, 3]))
             'double-list-field':
                 doubleListField.map((e) => e.toString()).toList(),
-          if (stringListField !=
-              const <String>['defaultValue0', 'defaultValue1'])
+          if (!_$iterablesEquals(stringListField,
+              const <String>['defaultValue0', 'defaultValue1']))
             'string-list-field': stringListField.map((e) => e).toList(),
-          if (boolListField != const <bool>[true])
+          if (!_$iterablesEquals(boolListField, const <bool>[true]))
             'bool-list-field': boolListField.map((e) => e.toString()).toList(),
-          if (enumListField != const <SportDetails>[SportDetails.football])
+          if (!_$iterablesEquals(
+              enumListField, const <SportDetails>[SportDetails.football]))
             'enum-list-field':
                 enumListField.map((e) => _$SportDetailsEnumMap[e]).toList(),
-          if (intSetField != const <int>{0, 1})
+          if (!_$iterablesEquals(intSetField, const <int>{0, 1}))
             'int-set-field': intSetField.map((e) => e.toString()).toList(),
-          if (doubleSetField != const <double>{})
+          if (!_$iterablesEquals(doubleSetField, const <double>{}))
             'double-set-field':
                 doubleSetField.map((e) => e.toString()).toList(),
-          if (stringSetField != const <String>{'defaultValue'})
+          if (!_$iterablesEquals(
+              stringSetField, const <String>{'defaultValue'}))
             'string-set-field': stringSetField.map((e) => e).toList(),
-          if (boolSetField != const <bool>{true, false})
+          if (!_$iterablesEquals(boolSetField, const <bool>{true, false}))
             'bool-set-field': boolSetField.map((e) => e.toString()).toList(),
-          if (enumSetField != const <SportDetails>{SportDetails.hockey})
+          if (!_$iterablesEquals(
+              enumSetField, const <SportDetails>{SportDetails.hockey}))
             'enum-set-field':
                 enumSetField.map((e) => _$SportDetailsEnumMap[e]).toList(),
         },
@@ -675,3 +679,17 @@ extension<T extends Enum> on Map<T, String> {
   T _$fromName(String value) =>
       entries.singleWhere((element) => element.value == value).key;
 }
+
+bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+  if (identical(iterable1, iterable2)) return true;
+  if (iterable1 == null || iterable2 == null) return false;
+  final iterator1 = iterable1.iterator;
+  final iterator2 = iterable2.iterator;
+  while (true) {
+    final hasNext1 = iterator1.moveNext();
+    final hasNext2 = iterator2.moveNext();
+    if (hasNext1 != hasNext2) return false;
+    if (!hasNext1) return true;
+    if (iterator1.current != iterator2.current) return false;
+  }
+}
diff --git a/packages/go_router_builder/example/test/location_test.dart b/packages/go_router_builder/example/test/location_test.dart
new file mode 100644
index 00000000000..fc33e931f59
--- /dev/null
+++ b/packages/go_router_builder/example/test/location_test.dart
@@ -0,0 +1,49 @@
+// Copyright 2013 The Flutter Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_test/flutter_test.dart';
+import 'package:go_router_builder_example/all_types.dart';
+
+void main() {
+  test('IterableRouteWithDefaultValues', () {
+    expect(
+      const IterableRouteWithDefaultValues().location,
+      '/iterable-route-with-default-values',
+    );
+
+    // Needs to not be a const to test
+    // https://github.com/flutter/flutter/issues/127825.
+    final Set<double> doubleSetField = <double>{};
+    expect(
+      IterableRouteWithDefaultValues(
+        doubleSetField: doubleSetField,
+      ).location,
+      '/iterable-route-with-default-values',
+    );
+
+    expect(
+      IterableRouteWithDefaultValues(
+        doubleSetField: <double>{0.0, 1.0},
+      ).location,
+      '/iterable-route-with-default-values?double-set-field=0.0&double-set-field=1.0',
+    );
+
+    // Needs to not be a const to test
+    // https://github.com/flutter/flutter/issues/127825.
+    final Set<int> intSetField = <int>{0, 1};
+    expect(
+      IterableRouteWithDefaultValues(
+        intSetField: intSetField,
+      ).location,
+      '/iterable-route-with-default-values',
+    );
+
+    expect(
+      const IterableRouteWithDefaultValues(
+        intSetField: <int>{0, 1, 2},
+      ).location,
+      '/iterable-route-with-default-values?int-set-field=0&int-set-field=1&int-set-field=2',
+    );
+  });
+}
diff --git a/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect b/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect
index 0b53e45b02d..7f67e0ac96e 100644
--- a/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect
+++ b/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect
@@ -13,7 +13,7 @@ extension $IterableDefaultValueRouteExtension on IterableDefaultValueRoute {
   String get location => GoRouteData.$location(
         '/iterable-default-value-route',
         queryParams: {
-          if (param != const <int>[0])
+          if (!_$iterablesEquals(param, const <int>[0]))
             'param': param.map((e) => e.toString()).toList(),
         },
       );
@@ -27,3 +27,17 @@ extension $IterableDefaultValueRouteExtension on IterableDefaultValueRoute {
 
   void replace(BuildContext context) => context.replace(location);
 }
+
+bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+  if (identical(iterable1, iterable2)) return true;
+  if (iterable1 == null || iterable2 == null) return false;
+  final iterator1 = iterable1.iterator;
+  final iterator2 = iterable2.iterator;
+  while (true) {
+    final hasNext1 = iterator1.moveNext();
+    final hasNext2 = iterator2.moveNext();
+    if (hasNext1 != hasNext2) return false;
+    if (!hasNext1) return true;
+    if (iterator1.current != iterator2.current) return false;
+  }
+}
diff --git a/packages/go_router_builder/tool/run_tests.dart b/packages/go_router_builder/tool/run_tests.dart
index 6c0e55286a6..48547835189 100644
--- a/packages/go_router_builder/tool/run_tests.dart
+++ b/packages/go_router_builder/tool/run_tests.dart
@@ -59,7 +59,8 @@ Future<void> main() async {
           .format(results.join('\n\n'))
           .trim()
           .replaceAll('\r\n', '\n');
-      expect(generated, equals(expectResult.replaceAll('\r\n', '\n')));
+      expectFile.writeAsStringSync(generated);
+      // expect(generated, equals(expectResult.replaceAll('\r\n', '\n')));
     }, timeout: const Timeout(Duration(seconds: 100)));
   }
 }

From c65bc5ee9311b7e3b5617a30dbd62024e5f0ae30 Mon Sep 17 00:00:00 2001
From: ValentinVignal <valentin.vignal.dev@outlook.fr>
Date: Tue, 28 Jan 2025 23:48:50 +0800
Subject: [PATCH 3/6] Update version number

---
 packages/go_router_builder/CHANGELOG.md | 4 ++++
 packages/go_router_builder/pubspec.yaml | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/go_router_builder/CHANGELOG.md b/packages/go_router_builder/CHANGELOG.md
index 7dfd69d4499..a8a79ca41d2 100644
--- a/packages/go_router_builder/CHANGELOG.md
+++ b/packages/go_router_builder/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.5
+
+- Fixes trailing `?` in the location when a go route has an empty default value.
+
 ## 2.7.4
 
 - Fixes an issue by removing unnecessary `const` in StatefulShellRouteData generation.
diff --git a/packages/go_router_builder/pubspec.yaml b/packages/go_router_builder/pubspec.yaml
index 1f4e9da1504..6c2ab45cb38 100644
--- a/packages/go_router_builder/pubspec.yaml
+++ b/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: 2.7.4
+version: 2.7.5
 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
 

From bd80be00aa24711978b1da2acd0884feffd59bc3 Mon Sep 17 00:00:00 2001
From: ValentinVignal <valentin.vignal.dev@outlook.fr>
Date: Tue, 28 Jan 2025 23:51:59 +0800
Subject: [PATCH 4/6] revert bad commit

---
 packages/go_router_builder/tool/run_tests.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/go_router_builder/tool/run_tests.dart b/packages/go_router_builder/tool/run_tests.dart
index 48547835189..6c0e55286a6 100644
--- a/packages/go_router_builder/tool/run_tests.dart
+++ b/packages/go_router_builder/tool/run_tests.dart
@@ -59,8 +59,7 @@ Future<void> main() async {
           .format(results.join('\n\n'))
           .trim()
           .replaceAll('\r\n', '\n');
-      expectFile.writeAsStringSync(generated);
-      // expect(generated, equals(expectResult.replaceAll('\r\n', '\n')));
+      expect(generated, equals(expectResult.replaceAll('\r\n', '\n')));
     }, timeout: const Timeout(Duration(seconds: 100)));
   }
 }

From b6082008e6bfa10e0954ad3ed9c7fcb0b17cbb3c Mon Sep 17 00:00:00 2001
From: ValentinVignal <valentin.vignal.dev@outlook.fr>
Date: Wed, 29 Jan 2025 00:23:39 +0800
Subject: [PATCH 5/6] Add missing expect updates

---
 .../test_inputs/list.dart.expect                 | 16 +++++++++++++++-
 .../test_inputs/set.dart.expect                  | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/packages/go_router_builder/test_inputs/list.dart.expect b/packages/go_router_builder/test_inputs/list.dart.expect
index 2fbf6eef07b..85560088494 100644
--- a/packages/go_router_builder/test_inputs/list.dart.expect
+++ b/packages/go_router_builder/test_inputs/list.dart.expect
@@ -23,7 +23,7 @@ extension $ListRouteExtension on ListRoute {
           'ids': ids.map((e) => e.toString()).toList(),
           if (nullableIds != null)
             'nullable-ids': nullableIds?.map((e) => e.toString()).toList(),
-          if (idsWithDefaultValue != const <int>[0])
+          if (!_$iterablesEquals(idsWithDefaultValue, const <int>[0]))
             'ids-with-default-value':
                 idsWithDefaultValue.map((e) => e.toString()).toList(),
         },
@@ -38,3 +38,17 @@ extension $ListRouteExtension on ListRoute {
 
   void replace(BuildContext context) => context.replace(location);
 }
+
+bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+  if (identical(iterable1, iterable2)) return true;
+  if (iterable1 == null || iterable2 == null) return false;
+  final iterator1 = iterable1.iterator;
+  final iterator2 = iterable2.iterator;
+  while (true) {
+    final hasNext1 = iterator1.moveNext();
+    final hasNext2 = iterator2.moveNext();
+    if (hasNext1 != hasNext2) return false;
+    if (!hasNext1) return true;
+    if (iterator1.current != iterator2.current) return false;
+  }
+}
diff --git a/packages/go_router_builder/test_inputs/set.dart.expect b/packages/go_router_builder/test_inputs/set.dart.expect
index 6a8c150b54c..179ddc37c7b 100644
--- a/packages/go_router_builder/test_inputs/set.dart.expect
+++ b/packages/go_router_builder/test_inputs/set.dart.expect
@@ -23,7 +23,7 @@ extension $SetRouteExtension on SetRoute {
           'ids': ids.map((e) => e.toString()).toList(),
           if (nullableIds != null)
             'nullable-ids': nullableIds?.map((e) => e.toString()).toList(),
-          if (idsWithDefaultValue != const <int>{0})
+          if (!_$iterablesEquals(idsWithDefaultValue, const <int>{0}))
             'ids-with-default-value':
                 idsWithDefaultValue.map((e) => e.toString()).toList(),
         },
@@ -38,3 +38,17 @@ extension $SetRouteExtension on SetRoute {
 
   void replace(BuildContext context) => context.replace(location);
 }
+
+bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+  if (identical(iterable1, iterable2)) return true;
+  if (iterable1 == null || iterable2 == null) return false;
+  final iterator1 = iterable1.iterator;
+  final iterator2 = iterable2.iterator;
+  while (true) {
+    final hasNext1 = iterator1.moveNext();
+    final hasNext2 = iterator2.moveNext();
+    if (hasNext1 != hasNext2) return false;
+    if (!hasNext1) return true;
+    if (iterator1.current != iterator2.current) return false;
+  }
+}

From 37fb20f8004b01bf5fca3508d905ee26e1d7a103 Mon Sep 17 00:00:00 2001
From: ValentinVignal <valentin.vignal.dev@outlook.fr>
Date: Wed, 29 Jan 2025 00:31:54 +0800
Subject: [PATCH 6/6] Rename to _$iterablesEquals

---
 .../example/lib/all_types.g.dart              | 33 +++++++++----------
 .../lib/src/route_config.dart                 |  4 +--
 .../lib/src/type_helpers.dart                 |  6 ++--
 .../iterable_with_default_value.dart.expect   |  4 +--
 .../test_inputs/list.dart.expect              |  4 +--
 .../test_inputs/set.dart.expect               |  4 +--
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/packages/go_router_builder/example/lib/all_types.g.dart b/packages/go_router_builder/example/lib/all_types.g.dart
index dfadf6e9d94..001ff5e46b7 100644
--- a/packages/go_router_builder/example/lib/all_types.g.dart
+++ b/packages/go_router_builder/example/lib/all_types.g.dart
@@ -598,47 +598,46 @@ extension $IterableRouteWithDefaultValuesExtension
   String get location => GoRouteData.$location(
         '/iterable-route-with-default-values',
         queryParams: {
-          if (!_$iterablesEquals(intIterableField, const <int>[0]))
+          if (!_$iterablesEqual(intIterableField, const <int>[0]))
             'int-iterable-field':
                 intIterableField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(doubleIterableField, const <double>[0, 1, 2]))
+          if (!_$iterablesEqual(doubleIterableField, const <double>[0, 1, 2]))
             'double-iterable-field':
                 doubleIterableField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(
+          if (!_$iterablesEqual(
               stringIterableField, const <String>['defaultValue']))
             'string-iterable-field': stringIterableField.map((e) => e).toList(),
-          if (!_$iterablesEquals(boolIterableField, const <bool>[false]))
+          if (!_$iterablesEqual(boolIterableField, const <bool>[false]))
             'bool-iterable-field':
                 boolIterableField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(enumIterableField,
+          if (!_$iterablesEqual(enumIterableField,
               const <SportDetails>[SportDetails.tennis, SportDetails.hockey]))
             'enum-iterable-field':
                 enumIterableField.map((e) => _$SportDetailsEnumMap[e]).toList(),
-          if (!_$iterablesEquals(intListField, const <int>[0]))
+          if (!_$iterablesEqual(intListField, const <int>[0]))
             'int-list-field': intListField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(doubleListField, const <double>[1, 2, 3]))
+          if (!_$iterablesEqual(doubleListField, const <double>[1, 2, 3]))
             'double-list-field':
                 doubleListField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(stringListField,
+          if (!_$iterablesEqual(stringListField,
               const <String>['defaultValue0', 'defaultValue1']))
             'string-list-field': stringListField.map((e) => e).toList(),
-          if (!_$iterablesEquals(boolListField, const <bool>[true]))
+          if (!_$iterablesEqual(boolListField, const <bool>[true]))
             'bool-list-field': boolListField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(
+          if (!_$iterablesEqual(
               enumListField, const <SportDetails>[SportDetails.football]))
             'enum-list-field':
                 enumListField.map((e) => _$SportDetailsEnumMap[e]).toList(),
-          if (!_$iterablesEquals(intSetField, const <int>{0, 1}))
+          if (!_$iterablesEqual(intSetField, const <int>{0, 1}))
             'int-set-field': intSetField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(doubleSetField, const <double>{}))
+          if (!_$iterablesEqual(doubleSetField, const <double>{}))
             'double-set-field':
                 doubleSetField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(
-              stringSetField, const <String>{'defaultValue'}))
+          if (!_$iterablesEqual(stringSetField, const <String>{'defaultValue'}))
             'string-set-field': stringSetField.map((e) => e).toList(),
-          if (!_$iterablesEquals(boolSetField, const <bool>{true, false}))
+          if (!_$iterablesEqual(boolSetField, const <bool>{true, false}))
             'bool-set-field': boolSetField.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(
+          if (!_$iterablesEqual(
               enumSetField, const <SportDetails>{SportDetails.hockey}))
             'enum-set-field':
                 enumSetField.map((e) => _$SportDetailsEnumMap[e]).toList(),
@@ -680,7 +679,7 @@ extension<T extends Enum> on Map<T, String> {
       entries.singleWhere((element) => element.value == value).key;
 }
 
-bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+bool _$iterablesEqual<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
   if (identical(iterable1, iterable2)) return true;
   if (iterable1 == null || iterable2 == null) return false;
   final iterator1 = iterable1.iterator;
diff --git a/packages/go_router_builder/lib/src/route_config.dart b/packages/go_router_builder/lib/src/route_config.dart
index 67901e0df73..b35ce4abb4f 100644
--- a/packages/go_router_builder/lib/src/route_config.dart
+++ b/packages/go_router_builder/lib/src/route_config.dart
@@ -736,7 +736,7 @@ const Map<String, String> helperNames = <String, String>{
   convertMapValueHelperName: _convertMapValueHelper,
   boolConverterHelperName: _boolConverterHelper,
   enumExtensionHelperName: _enumConverterHelper,
-  iterableEqualsHelperName: _iterableEqualsHelper,
+  iterablesEqualHelperName: _iterableEqualsHelper,
 };
 
 const String _convertMapValueHelper = '''
@@ -770,7 +770,7 @@ extension<T extends Enum> on Map<T, String> {
 }''';
 
 const String _iterableEqualsHelper = '''
-bool $iterableEqualsHelperName<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+bool $iterablesEqualHelperName<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
   if (identical(iterable1, iterable2)) return true;
   if (iterable1 == null || iterable2 == null) return false;
   final iterator1 = iterable1.iterator;
diff --git a/packages/go_router_builder/lib/src/type_helpers.dart b/packages/go_router_builder/lib/src/type_helpers.dart
index 6748ef28b7f..a822ea86280 100644
--- a/packages/go_router_builder/lib/src/type_helpers.dart
+++ b/packages/go_router_builder/lib/src/type_helpers.dart
@@ -29,7 +29,7 @@ const String extraFieldName = r'$extra';
 const String likelyIssueMessage = 'Should never get here! File an issue!';
 
 /// The name of the generated, private helper for comparing iterables.
-const String iterableEqualsHelperName = r'_$iterablesEquals';
+const String iterablesEqualHelperName = r'_$iterablesEqual';
 
 const List<_TypeHelper> _helpers = <_TypeHelper>[
   _TypeHelperBigInt(),
@@ -277,7 +277,7 @@ class _TypeHelperIterable extends _TypeHelperWithHelper {
   const _TypeHelperIterable();
 
   @override
-  String helperName(DartType paramType) => iterableEqualsHelperName;
+  String helperName(DartType paramType) => iterablesEqualHelperName;
 
   @override
   String _decode(
@@ -351,7 +351,7 @@ $fieldName$nullAwareAccess.map((e) => e.toString()).toList()''';
 
   @override
   String _compare(String value1, String value2) =>
-      '!$iterableEqualsHelperName($value1, $value2)';
+      '!$iterablesEqualHelperName($value1, $value2)';
 }
 
 abstract class _TypeHelperWithHelper extends _TypeHelper {
diff --git a/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect b/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect
index 7f67e0ac96e..625e92c0984 100644
--- a/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect
+++ b/packages/go_router_builder/test_inputs/iterable_with_default_value.dart.expect
@@ -13,7 +13,7 @@ extension $IterableDefaultValueRouteExtension on IterableDefaultValueRoute {
   String get location => GoRouteData.$location(
         '/iterable-default-value-route',
         queryParams: {
-          if (!_$iterablesEquals(param, const <int>[0]))
+          if (!_$iterablesEqual(param, const <int>[0]))
             'param': param.map((e) => e.toString()).toList(),
         },
       );
@@ -28,7 +28,7 @@ extension $IterableDefaultValueRouteExtension on IterableDefaultValueRoute {
   void replace(BuildContext context) => context.replace(location);
 }
 
-bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+bool _$iterablesEqual<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
   if (identical(iterable1, iterable2)) return true;
   if (iterable1 == null || iterable2 == null) return false;
   final iterator1 = iterable1.iterator;
diff --git a/packages/go_router_builder/test_inputs/list.dart.expect b/packages/go_router_builder/test_inputs/list.dart.expect
index 85560088494..3c1e5a726fb 100644
--- a/packages/go_router_builder/test_inputs/list.dart.expect
+++ b/packages/go_router_builder/test_inputs/list.dart.expect
@@ -23,7 +23,7 @@ extension $ListRouteExtension on ListRoute {
           'ids': ids.map((e) => e.toString()).toList(),
           if (nullableIds != null)
             'nullable-ids': nullableIds?.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(idsWithDefaultValue, const <int>[0]))
+          if (!_$iterablesEqual(idsWithDefaultValue, const <int>[0]))
             'ids-with-default-value':
                 idsWithDefaultValue.map((e) => e.toString()).toList(),
         },
@@ -39,7 +39,7 @@ extension $ListRouteExtension on ListRoute {
   void replace(BuildContext context) => context.replace(location);
 }
 
-bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+bool _$iterablesEqual<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
   if (identical(iterable1, iterable2)) return true;
   if (iterable1 == null || iterable2 == null) return false;
   final iterator1 = iterable1.iterator;
diff --git a/packages/go_router_builder/test_inputs/set.dart.expect b/packages/go_router_builder/test_inputs/set.dart.expect
index 179ddc37c7b..d33aa7e7c67 100644
--- a/packages/go_router_builder/test_inputs/set.dart.expect
+++ b/packages/go_router_builder/test_inputs/set.dart.expect
@@ -23,7 +23,7 @@ extension $SetRouteExtension on SetRoute {
           'ids': ids.map((e) => e.toString()).toList(),
           if (nullableIds != null)
             'nullable-ids': nullableIds?.map((e) => e.toString()).toList(),
-          if (!_$iterablesEquals(idsWithDefaultValue, const <int>{0}))
+          if (!_$iterablesEqual(idsWithDefaultValue, const <int>{0}))
             'ids-with-default-value':
                 idsWithDefaultValue.map((e) => e.toString()).toList(),
         },
@@ -39,7 +39,7 @@ extension $SetRouteExtension on SetRoute {
   void replace(BuildContext context) => context.replace(location);
 }
 
-bool _$iterablesEquals<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
+bool _$iterablesEqual<T>(Iterable<T>? iterable1, Iterable<T>? iterable2) {
   if (identical(iterable1, iterable2)) return true;
   if (iterable1 == null || iterable2 == null) return false;
   final iterator1 = iterable1.iterator;