📦 directly export qs.ListFormat instead of internal wrapper (#624)

lejard-h · Jun 26, 2024 · 7e1f0f9 · 7e1f0f9
1 parent 627ff1d
commit 7e1f0f9
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 44 deletions.
diff --git a/chopper/lib/chopper.dart b/chopper/lib/chopper.dart
@@ -3,6 +3,7 @@
 /// [Getting Started](https://hadrien-lejard.gitbook.io/chopper)
 library chopper;
 
+export 'package:qs_dart/qs_dart.dart' show ListFormat;
 export 'src/annotations.dart';
 export 'src/authenticator.dart';
 export 'src/base.dart';
@@ -14,7 +15,6 @@ export 'src/extensions.dart';
 export 'src/chain/chain.dart';
 export 'src/interceptors/interceptor.dart';
 export 'src/converters.dart';
-export 'src/list_format.dart';
 export 'src/request.dart';
 export 'src/response.dart';
 export 'src/utils.dart' hide mapToQuery;
diff --git a/chopper/lib/src/annotations.dart b/chopper/lib/src/annotations.dart
@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:chopper/src/constants.dart';
-import 'package:chopper/src/list_format.dart';
 import 'package:chopper/src/request.dart';
 import 'package:chopper/src/response.dart';
 import 'package:meta/meta.dart';
 import 'package:meta/meta_meta.dart';
+import 'package:qs_dart/qs_dart.dart' show ListFormat;
 
 /// {@template ChopperApi}
 /// Defines a Chopper API.

diff --git a/chopper/lib/src/list_format.dart b/chopper/lib/src/list_format.dart
diff --git a/chopper/lib/src/request.dart b/chopper/lib/src/request.dart
@@ -1,11 +1,11 @@
 import 'dart:async' show Stream;
 
 import 'package:chopper/src/extensions.dart';
-import 'package:chopper/src/list_format.dart';
 import 'package:chopper/src/utils.dart';
 import 'package:equatable/equatable.dart' show EquatableMixin;
 import 'package:http/http.dart' as http;
 import 'package:meta/meta.dart';
+import 'package:qs_dart/qs_dart.dart' show ListFormat;
 
 /// {@template request}
 /// This class represents an HTTP request that can be made with Chopper.

diff --git a/chopper/lib/src/utils.dart b/chopper/lib/src/utils.dart
@@ -1,8 +1,8 @@
 import 'dart:collection';
 
-import 'package:chopper/chopper.dart';
+import 'package:chopper/src/request.dart';
 import 'package:logging/logging.dart';
-import 'package:qs_dart/qs_dart.dart' as qs;
+import 'package:qs_dart/qs_dart.dart' show encode, EncodeOptions, ListFormat;
 
 /// Creates a new [Request] by copying [request] and adding a header with the
 /// provided key [name] and value [value] to the result.
@@ -69,10 +69,10 @@ String mapToQuery(
 }) {
   listFormat ??= useBrackets == true ? ListFormat.brackets : ListFormat.repeat;
 
-  return qs.encode(
+  return encode(
     map,
-    qs.EncodeOptions(
-      listFormat: listFormat.qsListFormat,
+    EncodeOptions(
+      listFormat: listFormat,
       allowDots: listFormat == ListFormat.repeat,
       encodeDotInKeys: listFormat == ListFormat.repeat,
       encodeValuesOnly: listFormat == ListFormat.repeat,

diff --git a/chopper/pubspec.yaml b/chopper/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   http: ^1.1.0
   logging: ^1.2.0
   meta: ^1.9.1
-  qs_dart: ^1.1.0
+  qs_dart: ^1.2.0
 
 dev_dependencies:
   build_runner: ^2.4.9

diff --git a/chopper/test/utils_test.dart b/chopper/test/utils_test.dart
@@ -1,8 +1,8 @@
 // ignore_for_file: deprecated_member_use_from_same_package
 
-import 'package:chopper/src/list_format.dart';
 import 'package:chopper/src/request.dart';
 import 'package:chopper/src/utils.dart';
+import 'package:qs_dart/qs_dart.dart' show ListFormat;
 import 'package:test/test.dart';
 
 import 'fixtures/example_enum.dart';

diff --git a/chopper_generator/lib/src/generator.dart b/chopper_generator/lib/src/generator.dart
@@ -14,7 +14,6 @@ import 'package:chopper_generator/src/vars.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:dart_style/dart_style.dart';
 import 'package:logging/logging.dart';
-import 'package:qs_dart/qs_dart.dart' show ListFormat;
 import 'package:source_gen/source_gen.dart';
 
 /// Code generator for [chopper.ChopperApi] annotated classes.
@@ -406,7 +405,7 @@ final class ChopperGenerator
 
       final bool hasTag = tag.isNotEmpty;
 
-      final ListFormat? listFormat = Utils.getListFormat(method);
+      final chopper.ListFormat? listFormat = Utils.getListFormat(method);
 
       final bool? useBrackets = Utils.getUseBrackets(method);
 
@@ -716,7 +715,7 @@ final class ChopperGenerator
     bool hasParts = false,
     bool useQueries = false,
     bool useHeaders = false,
-    ListFormat? listFormat,
+    chopper.ListFormat? listFormat,
     @Deprecated('Use listFormat instead') bool? useBrackets,
     bool? includeNullQueryVars,
     Reference? tagRefer,

diff --git a/chopper_generator/lib/src/utils.dart b/chopper_generator/lib/src/utils.dart
@@ -3,10 +3,10 @@
 import 'dart:math' show max;
 
 import 'package:analyzer/dart/element/element.dart';
+import 'package:chopper/chopper.dart' show ListFormat;
 import 'package:chopper_generator/src/extensions.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:collection/collection.dart';
-import 'package:qs_dart/qs_dart.dart' show ListFormat;
 import 'package:source_gen/source_gen.dart';
 
 final class Utils {

diff --git a/chopper_generator/pubspec.yaml b/chopper_generator/pubspec.yaml
@@ -18,7 +18,6 @@ dependencies:
   meta: ^1.9.1
   source_gen: ^1.5.0
   yaml: ^3.1.2
-  qs_dart: ^1.1.0
   collection: ^1.18.0
 
 dev_dependencies: