Skip to content

Commit 40e2f0f

Browse files
committed
Merge branch 'develop'
2 parents 25bdf4b + afdf427 commit 40e2f0f

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

index.d.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ declare namespace queryStringsParser {
55
export interface QueryStringsParser {
66
(options?: IOptions): any
77

8+
parser(query?: string | object, options?: IOptions): any
9+
810
parseFields(query?: string | object, options?: IOptions): any
911

1012
parseSort(query?: string | object, options?: IOptions): any
@@ -40,4 +42,4 @@ declare namespace queryStringsParser {
4042
start_at?: string
4143
end_at?: string
4244
}
43-
}
45+
}

index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ exports = module.exports = function (params) {
77
return read.parser(params)
88
}
99

10-
exports = module.exports.parser = function (query, defaults) {
11-
return read.parseAll(query, defaults)
10+
exports = module.exports.parser = function (query, _default, _options) {
11+
return read.parseAll(query, _default, _options)
1212
}
1313

1414
exports = module.exports.parseFields = function (_query, _default) {

lib/read.js

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,13 @@ function validate_options(params) {
6565
return options
6666
}
6767

68-
exports = module.exports.parseAll = function (_query, _default) {
68+
exports = module.exports.parseAll = function (_query, _default, _options) {
69+
const options = validate_options({'default': _default, ..._options})
6970
return {
70-
fields: this.parseFields(_query, _default),
71-
sort: this.parseSort(_query),
72-
filters: this.parseFilter(_query, _default),
73-
pagination: this.parsePagination(_query, _default, true),
71+
fields: fields.fields(stringToJson(_query), options),
72+
sort: ordination.sort(stringToJson(_query), options),
73+
filters: filters.filters(stringToJson(_query), options),
74+
pagination: pagination.pagination(stringToJson(_query), options),
7475
original: _query
7576
}
7677
}

0 commit comments

Comments
 (0)