Skip to content

♻️ refactor parsing logic in qs.dart for improved readability and efficiency #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
techouse merged 1 commit into from
Mar 4, 2025
Merged

♻️ refactor parsing logic in qs.dart for improved readability and efficiency #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions lib/src/qs.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,14 @@ final class QS {
// Iterate over the keys and setup the new object
if (tempObj?.isNotEmpty ?? false) {
for (final MapEntry<String, dynamic> entry in tempObj!.entries) {
final newObj = _$Decode._parseKeys(
entry.key,
entry.value,
options,
input is String,
);

obj = Utils.merge(
obj,
newObj,
_$Decode._parseKeys(
entry.key,
entry.value,
options,
input is String,
),
options,
);
}
Expand All @@ -74,14 +72,14 @@ final class QS {
return '';
}

late Map<String, dynamic> obj;
if (object is Map<String, dynamic>) {
obj = {...?object as Map<String, dynamic>?};
} else if (object is Iterable) {
obj = object.toList().asMap().map((k, v) => MapEntry(k.toString(), v));
} else {
obj = {};
}
Map<String, dynamic> obj = switch (object) {
Map<String, dynamic> map => {...map},
Iterable iterable => iterable
.toList()
.asMap()
.map((int k, dynamic v) => MapEntry(k.toString(), v)),
_ => <String, dynamic>{},
};

final List keys = [];

Expand All @@ -97,10 +95,6 @@ final class QS {
objKeys = List.of(options.filter);
}

final bool commaRoundTrip =
options.listFormat.generator == ListFormat.comma.generator &&
options.commaRoundTrip == true;

objKeys ??= obj.keys.toList();

if (options.sort is Function) {
Expand All @@ -110,10 +104,8 @@ final class QS {
final WeakMap sideChannel = WeakMap();
for (int i = 0; i < objKeys.length; i++) {
final key = objKeys[i];
if (key is! String?) {
continue;
}
if (obj[key] == null && options.skipNulls) {

if (key is! String? || (obj[key] == null && options.skipNulls)) {
continue;
}

Expand All @@ -122,7 +114,9 @@ final class QS {
undefined: !obj.containsKey(key),
prefix: key,
generateArrayPrefix: options.listFormat.generator,
commaRoundTrip: commaRoundTrip,
commaRoundTrip:
options.listFormat.generator == ListFormat.comma.generator &&
options.commaRoundTrip == true,
allowEmptyLists: options.allowEmptyLists,
strictNullHandling: options.strictNullHandling,
skipNulls: options.skipNulls,
Expand All @@ -148,20 +142,28 @@ final class QS {
}

final String joined = keys.join(options.delimiter);
String prefix = options.addQueryPrefix ? '?' : '';
final StringBuffer out = StringBuffer();

if (options.addQueryPrefix) {
out.write('?');
}

if (options.charsetSentinel) {
prefix += switch (options.charset) {
out.write(switch (options.charset) {
/// encodeURIComponent('&#10003;')
/// the "numeric entity" representation of a checkmark
latin1 => '${Sentinel.iso}&',

/// encodeURIComponent('✓')
utf8 => '${Sentinel.charset}&',
_ => '',
};
});
}

if (joined.isNotEmpty) {
out.write(joined);
}

return joined.isNotEmpty ? prefix + joined : '';
return out.toString();
}
}
Loading