♻️ replace Utils.pushToArray with more explicit code

techouse · Apr 2, 2024 · 937fafd · 937fafd
1 parent f4d7c51
commit 937fafd
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 56 deletions.
diff --git a/lib/src/extensions/encode.dart b/lib/src/extensions/encode.dart
@@ -179,34 +179,38 @@ extension _$Encode on QS {
       sideChannel[object] = step;
       final WeakMap valueSideChannel = WeakMap();
       valueSideChannel.add(key: _sentinel, value: sideChannel);
-      Utils.pushToArray(
-        values,
-        _encode(
-          value,
-          undefined: valueUndefined,
-          prefix: keyPrefix,
-          generateArrayPrefix: generateArrayPrefix,
-          commaRoundTrip: commaRoundTrip,
-          allowEmptyArrays: allowEmptyArrays,
-          strictNullHandling: strictNullHandling,
-          skipNulls: skipNulls,
-          encodeDotInKeys: encodeDotInKeys,
-          encoder: generateArrayPrefix == ListFormat.comma.generator &&
-                  encodeValuesOnly &&
-                  obj is Iterable
-              ? null
-              : encoder,
-          serializeDate: serializeDate,
-          filter: filter,
-          sort: sort,
-          allowDots: allowDots,
-          format: format,
-          formatter: formatter,
-          encodeValuesOnly: encodeValuesOnly,
-          charset: charset,
-          sideChannel: valueSideChannel,
-        ),
+
+      final encoded = _encode(
+        value,
+        undefined: valueUndefined,
+        prefix: keyPrefix,
+        generateArrayPrefix: generateArrayPrefix,
+        commaRoundTrip: commaRoundTrip,
+        allowEmptyArrays: allowEmptyArrays,
+        strictNullHandling: strictNullHandling,
+        skipNulls: skipNulls,
+        encodeDotInKeys: encodeDotInKeys,
+        encoder: generateArrayPrefix == ListFormat.comma.generator &&
+                encodeValuesOnly &&
+                obj is Iterable
+            ? null
+            : encoder,
+        serializeDate: serializeDate,
+        filter: filter,
+        sort: sort,
+        allowDots: allowDots,
+        format: format,
+        formatter: formatter,
+        encodeValuesOnly: encodeValuesOnly,
+        charset: charset,
+        sideChannel: valueSideChannel,
       );
+
+      if (encoded is Iterable) {
+        values.addAll(encoded);
+      } else {
+        values.add(encoded);
+      }
     }
 
     return values;

diff --git a/lib/src/qs.dart b/lib/src/qs.dart
@@ -107,31 +107,34 @@ final class QS {
         continue;
       }
 
-      Utils.pushToArray(
-        keys,
-        _$Encode._encode(
-          obj[key],
-          undefined: !obj.containsKey(key),
-          prefix: key,
-          generateArrayPrefix: options.listFormat.generator,
-          commaRoundTrip: commaRoundTrip,
-          allowEmptyArrays: options.allowEmptyLists,
-          strictNullHandling: options.strictNullHandling,
-          skipNulls: options.skipNulls,
-          encodeDotInKeys: options.encodeDotInKeys,
-          encoder: options.encode ? options.encoder : null,
-          serializeDate: options.serializeDate,
-          filter: options.filter,
-          sort: options.sort,
-          allowDots: options.allowDots,
-          format: options.format,
-          formatter: options.formatter,
-          encodeValuesOnly: options.encodeValuesOnly,
-          charset: options.charset,
-          addQueryPrefix: options.addQueryPrefix,
-          sideChannel: sideChannel,
-        ),
+      final encoded = _$Encode._encode(
+        obj[key],
+        undefined: !obj.containsKey(key),
+        prefix: key,
+        generateArrayPrefix: options.listFormat.generator,
+        commaRoundTrip: commaRoundTrip,
+        allowEmptyArrays: options.allowEmptyLists,
+        strictNullHandling: options.strictNullHandling,
+        skipNulls: options.skipNulls,
+        encodeDotInKeys: options.encodeDotInKeys,
+        encoder: options.encode ? options.encoder : null,
+        serializeDate: options.serializeDate,
+        filter: options.filter,
+        sort: options.sort,
+        allowDots: options.allowDots,
+        format: options.format,
+        formatter: options.formatter,
+        encodeValuesOnly: options.encodeValuesOnly,
+        charset: options.charset,
+        addQueryPrefix: options.addQueryPrefix,
+        sideChannel: sideChannel,
       );
+
+      if (encoded is Iterable) {
+        keys.addAll(encoded);
+      } else {
+        keys.add(encoded);
+      }
     }
 
     final String joined = keys.join(options.delimiter);

diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -411,11 +411,6 @@ final class Utils {
   static dynamic maybeMap<T>(dynamic val, T Function(T) fn) =>
       val is Iterable ? val.map((item) => fn(item)) : fn(val);
 
-  static void pushToArray(List arr, dynamic valueOrArray) =>
-      valueOrArray is Iterable
-          ? arr.addAll(valueOrArray)
-          : arr.add(valueOrArray);
-
   static bool isNonNullishPrimitive(dynamic val, [bool skipNulls = false]) =>
       (val is String && (skipNulls ? val.isNotEmpty : true)) ||
       val is num ||