Skip to content

Commit 65ce1a5

Browse files
committed
Merge branch 'master' into develop
2 parents afdf427 + 89f8bd8 commit 65ce1a5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/read.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ function validate_options(params) {
6666
}
6767

6868
exports = module.exports.parseAll = function (_query, _default, _options) {
69-
const options = validate_options({'default': _default, ..._options})
69+
const params = validate_options(Object.assign({'default': _default} || {}, _options || {}))
7070
return {
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),
71+
fields: fields.fields(stringToJson(_query), params),
72+
sort: ordination.sort(stringToJson(_query), params),
73+
filters: filters.filters(stringToJson(_query), params),
74+
pagination: pagination.pagination(stringToJson(_query), params),
7575
original: _query
7676
}
7777
}

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
],
2525
"keywords": [
2626
"middleware",
27+
"query",
2728
"query-string",
29+
"querystring",
30+
"querystrings",
31+
"qs",
2832
"parser",
2933
"stringfy",
3034
"encode",
3135
"decode",
3236
"searchparams",
3337
"url",
34-
"querystring",
35-
"querystrings",
36-
"qs",
37-
"query",
3838
"string"
3939
],
4040
"engines": {
@@ -48,4 +48,4 @@
4848
"nyc": "^14.1.1",
4949
"supertest": "^4.0.2"
5050
}
51-
}
51+
}

0 commit comments

Comments
 (0)