strict-qs 9.0.0 → 10.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +8 -0
- package/README.md +1 -0
- package/dist/errors.d.ts +87 -0
- package/dist/errors.js +2 -0
- package/dist/errors.js.map +1 -0
- package/dist/index.d.ts +4 -0
- package/dist/index.js +30 -14
- package/dist/index.js.map +1 -1
- package/dist/index.test.js +85 -1
- package/dist/index.test.js.map +1 -1
- package/package.json +18 -29
- package/src/errors.ts +100 -0
- package/src/index.test.ts +107 -1
- package/src/index.ts +40 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
## [10.1.0](https://github.com/nfroidure/strict-qs/compare/v10.0.0...v10.1.0) (2026-11-19)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* **parser:** fix empty values with no equal sign ([a995d37](https://github.com/nfroidure/strict-qs/commit/a995d3760453ce568c3ebebb65554348e41b648e)), closes [#20](https://github.com/nfroidure/strict-qs/issues/20)
|
|
6
|
+
|
|
7
|
+
# [10.0.0](github.com/nfroidure/strict-qs/compare/v9.0.0...v10.0.0) (2026-04-07)
|
|
8
|
+
|
|
1
9
|
# [9.0.0](github.com/nfroidure/strict-qs/compare/v8.0.3...v9.0.0) (2026-03-27)
|
|
2
10
|
|
|
3
11
|
## [8.0.3](https://github.com/nfroidure/strict-qs/compare/v8.0.2...v8.0.3) (2024-07-15)
|
package/README.md
CHANGED
|
@@ -106,6 +106,7 @@ Parse a queryString according to the provided definitions
|
|
|
106
106
|
| --- | --- | --- |
|
|
107
107
|
| options | <code>Object</code> | Parser options |
|
|
108
108
|
| options.allowEmptySearch | <code>Boolean</code> | Avoid throwing when the search is empty |
|
|
109
|
+
| options.allowEmptyValue | <code>Boolean</code> | Avoid throwing when a value is empty |
|
|
109
110
|
| options.allowUnknownParams | <code>Boolean</code> | Avoid throwing when some params are unknown |
|
|
110
111
|
| options.allowDefault | <code>Boolean</code> | Avoid throwing when some params is set to its default value |
|
|
111
112
|
| options.allowUnorderedParams | <code>Boolean</code> | Avoid throwing when params are not set in the same order than declarations |
|
package/dist/errors.d.ts
ADDED
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { type QSValue } from './index.js';
|
|
2
|
+
declare module 'yerror' {
|
|
3
|
+
interface YErrorRegistry {
|
|
4
|
+
/**
|
|
5
|
+
* Thrown when the query string does not start with the search flag '?'.
|
|
6
|
+
* @param search The malformed search string.
|
|
7
|
+
*/
|
|
8
|
+
E_MALFORMED_SEARCH: [search: string];
|
|
9
|
+
/**
|
|
10
|
+
* Thrown when the query string is empty (just '?') and allowEmptySearch is false.
|
|
11
|
+
* @param search The empty search string.
|
|
12
|
+
*/
|
|
13
|
+
E_EMPTY_SEARCH: [search: string];
|
|
14
|
+
/**
|
|
15
|
+
* Thrown when a value is not set at all (no equal sign after the parameter name).
|
|
16
|
+
* @param paramName The name of the parameter.
|
|
17
|
+
*/
|
|
18
|
+
E_UNALLOWED_EMPTY_VALUE: [paramName: string];
|
|
19
|
+
/**
|
|
20
|
+
* Thrown when an unknown query parameter is encountered and allowUnknownParams is false.
|
|
21
|
+
* @param paramName The name of the unauthorized parameter.
|
|
22
|
+
*/
|
|
23
|
+
E_UNAUTHORIZED_QUERY_PARAM: [paramName: string];
|
|
24
|
+
/**
|
|
25
|
+
* Thrown when a required query parameter is missing.
|
|
26
|
+
* @param paramName The name of the missing required parameter.
|
|
27
|
+
*/
|
|
28
|
+
E_REQUIRED_QUERY_PARAM: [paramName: string];
|
|
29
|
+
/**
|
|
30
|
+
* Thrown when query parameters are not in the expected order.
|
|
31
|
+
* @param name The parameter name.
|
|
32
|
+
* @param lastIndex The last expected index.
|
|
33
|
+
* @param index The actual index where the parameter was found.
|
|
34
|
+
*/
|
|
35
|
+
E_BAD_QUERY_PARAM_POSITION: [
|
|
36
|
+
name: string,
|
|
37
|
+
lastIndex: number,
|
|
38
|
+
index: number
|
|
39
|
+
];
|
|
40
|
+
/**
|
|
41
|
+
* Thrown when an unsupported parameter type is specified.
|
|
42
|
+
* @param paramName The parameter name.
|
|
43
|
+
* @param type The unsupported type.
|
|
44
|
+
*/
|
|
45
|
+
E_UNSUPPORTED_TYPE: [paramName: string, type: string];
|
|
46
|
+
/**
|
|
47
|
+
* Thrown when a parameter is set to its default value and allowDefault is false.
|
|
48
|
+
* @param paramName The parameter name.
|
|
49
|
+
* @param value The default value that was set.
|
|
50
|
+
*/
|
|
51
|
+
E_CANNOT_SET_TO_DEFAULT: [paramName: string, value: QSValue];
|
|
52
|
+
/**
|
|
53
|
+
* Thrown when a parameter value is not in the allowed enum values.
|
|
54
|
+
* @param paramName The parameter name.
|
|
55
|
+
* @param value The invalid value.
|
|
56
|
+
*/
|
|
57
|
+
E_NOT_IN_ENUM: [paramName: string, value: QSValue];
|
|
58
|
+
/**
|
|
59
|
+
* Thrown when a parameter value does not match the required pattern.
|
|
60
|
+
* @param paramName The parameter name.
|
|
61
|
+
* @param value The value that failed the pattern match.
|
|
62
|
+
* @param pattern The pattern that was not matched.
|
|
63
|
+
*/
|
|
64
|
+
E_PATTERN_DOES_NOT_MATCH: [
|
|
65
|
+
paramName: string,
|
|
66
|
+
value: QSValue,
|
|
67
|
+
pattern: string
|
|
68
|
+
];
|
|
69
|
+
/**
|
|
70
|
+
* Thrown when array parameters are not in ascending order.
|
|
71
|
+
* @param value The current value.
|
|
72
|
+
* @param lastValue The previous value in the array.
|
|
73
|
+
*/
|
|
74
|
+
E_UNORDERED_QUERY_PARAMS: [value: QSValue, lastValue: QSValue];
|
|
75
|
+
/**
|
|
76
|
+
* Thrown when a number string cannot be parsed back to the same string (non-reentrant).
|
|
77
|
+
* @param originalString The original string.
|
|
78
|
+
* @param parsedValue The parsed and stringified version.
|
|
79
|
+
*/
|
|
80
|
+
E_NON_REENTRANT_NUMBER: [originalString: string, parsedValue: string];
|
|
81
|
+
/**
|
|
82
|
+
* Thrown when a boolean value is not 'true' or 'false'.
|
|
83
|
+
* @param invalidValue The invalid boolean string.
|
|
84
|
+
*/
|
|
85
|
+
E_BAD_BOOLEAN: [invalidValue: string];
|
|
86
|
+
}
|
|
87
|
+
}
|
package/dist/errors.js
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":""}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
import './errors.js';
|
|
1
2
|
export declare const SEARCH_FLAG = "?";
|
|
2
3
|
export declare const BASE_10 = 10;
|
|
3
4
|
export interface QSOptions {
|
|
4
5
|
allowEmptySearch?: boolean;
|
|
6
|
+
allowEmptyValue?: boolean;
|
|
5
7
|
allowUnknownParams?: boolean;
|
|
6
8
|
allowDefault?: boolean;
|
|
7
9
|
allowUnorderedParams?: boolean;
|
|
@@ -39,6 +41,8 @@ export type QSParameterValues = Record<string, QSValue | QSValue[]>;
|
|
|
39
41
|
* Parser options
|
|
40
42
|
* @param {Boolean} options.allowEmptySearch
|
|
41
43
|
* Avoid throwing when the search is empty
|
|
44
|
+
* @param {Boolean} options.allowEmptyValue
|
|
45
|
+
* Avoid throwing when a value is empty
|
|
42
46
|
* @param {Boolean} options.allowUnknownParams
|
|
43
47
|
* Avoid throwing when some params are unknown
|
|
44
48
|
* @param {Boolean} options.allowDefault
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import initDebug from 'debug';
|
|
2
2
|
import { YError } from 'yerror';
|
|
3
|
+
import './errors.js';
|
|
3
4
|
export const SEARCH_FLAG = '?';
|
|
4
5
|
export const BASE_10 = 10;
|
|
5
6
|
const debug = initDebug('strict-qs');
|
|
@@ -9,6 +10,8 @@ const debug = initDebug('strict-qs');
|
|
|
9
10
|
* Parser options
|
|
10
11
|
* @param {Boolean} options.allowEmptySearch
|
|
11
12
|
* Avoid throwing when the search is empty
|
|
13
|
+
* @param {Boolean} options.allowEmptyValue
|
|
14
|
+
* Avoid throwing when a value is empty
|
|
12
15
|
* @param {Boolean} options.allowUnknownParams
|
|
13
16
|
* Avoid throwing when some params are unknown
|
|
14
17
|
* @param {Boolean} options.allowDefault
|
|
@@ -101,7 +104,9 @@ function pickupQueryParams(options, { queryStringParams, queryStringPartsLeft, }
|
|
|
101
104
|
' values for ' +
|
|
102
105
|
queryParamDefinition.name +
|
|
103
106
|
'.', involvedQueryStringParts);
|
|
104
|
-
if (0 === involvedQueryStringParts.length
|
|
107
|
+
if ((0 === involvedQueryStringParts.length ||
|
|
108
|
+
involvedQueryStringParts.every((queryPart) => typeof queryPart.value === 'undefined')) &&
|
|
109
|
+
queryParamDefinition.required) {
|
|
105
110
|
throw new YError('E_REQUIRED_QUERY_PARAM', [queryParamDefinition.name]);
|
|
106
111
|
}
|
|
107
112
|
queryStringParams = involvedQueryStringParts.reduce((queryStringParams, queryStringPart) => assignQueryStringPart(options, queryParamDefinition, queryStringParams, queryStringPart), queryStringParams);
|
|
@@ -139,19 +144,29 @@ function assignQueryStringPart(options, queryParamDefinition, queryStringParams,
|
|
|
139
144
|
const itemDefinition = ('array' === queryParamDefinition.type
|
|
140
145
|
? queryParamDefinition.items
|
|
141
146
|
: queryParamDefinition);
|
|
142
|
-
const value =
|
|
143
|
-
?
|
|
144
|
-
: '
|
|
145
|
-
?
|
|
146
|
-
: '
|
|
147
|
-
?
|
|
148
|
-
:
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
147
|
+
const value = typeof queryStringPart.value === 'undefined'
|
|
148
|
+
? queryStringPart.value
|
|
149
|
+
: 'string' === itemDefinition.type
|
|
150
|
+
? decodeQueryComponent(queryStringPart.value)
|
|
151
|
+
: 'boolean' === itemDefinition.type
|
|
152
|
+
? parseBoolean(decodeQueryComponent(queryStringPart.value))
|
|
153
|
+
: 'number' === itemDefinition.type
|
|
154
|
+
? parseReentrantNumber(decodeQueryComponent(queryStringPart.value))
|
|
155
|
+
: (() => {
|
|
156
|
+
throw new YError('E_UNSUPPORTED_TYPE', [
|
|
157
|
+
queryParamDefinition.name,
|
|
158
|
+
itemDefinition.type,
|
|
159
|
+
]);
|
|
160
|
+
})();
|
|
161
|
+
if (typeof value === 'undefined') {
|
|
162
|
+
if (options.allowEmptyValue) {
|
|
163
|
+
return queryStringParams;
|
|
164
|
+
}
|
|
165
|
+
throw new YError('E_UNALLOWED_EMPTY_VALUE', [queryParamDefinition.name]);
|
|
166
|
+
}
|
|
167
|
+
if ('default' in itemDefinition &&
|
|
168
|
+
itemDefinition.default === value &&
|
|
169
|
+
!options.allowDefault) {
|
|
155
170
|
throw new YError('E_CANNOT_SET_TO_DEFAULT', [
|
|
156
171
|
queryParamDefinition.name,
|
|
157
172
|
value,
|
|
@@ -165,6 +180,7 @@ function assignQueryStringPart(options, queryParamDefinition, queryStringParams,
|
|
|
165
180
|
throw new YError('E_PATTERN_DOES_NOT_MATCH', [
|
|
166
181
|
queryParamDefinition.name,
|
|
167
182
|
value,
|
|
183
|
+
itemDefinition.pattern,
|
|
168
184
|
]);
|
|
169
185
|
}
|
|
170
186
|
if ('array' === queryParamDefinition.type) {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,OAAO,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.test.js
CHANGED
|
@@ -32,6 +32,90 @@ describe('strict-qs', () => {
|
|
|
32
32
|
}
|
|
33
33
|
});
|
|
34
34
|
});
|
|
35
|
+
describe('with no value', () => {
|
|
36
|
+
const qsDefinition = [
|
|
37
|
+
{
|
|
38
|
+
name: 'user',
|
|
39
|
+
in: 'query',
|
|
40
|
+
type: 'object',
|
|
41
|
+
required: false,
|
|
42
|
+
description: 'The user',
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
name: 'id',
|
|
46
|
+
in: 'query',
|
|
47
|
+
type: 'string',
|
|
48
|
+
required: false,
|
|
49
|
+
description: 'The id',
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
name: 'uuid',
|
|
53
|
+
in: 'query',
|
|
54
|
+
type: 'string',
|
|
55
|
+
required: false,
|
|
56
|
+
description: 'The uuid',
|
|
57
|
+
pattern: '^[0-9]+-[0-9]+-[0-9]+-[0-9]+-[0-9]+$',
|
|
58
|
+
},
|
|
59
|
+
];
|
|
60
|
+
describe('should fail when strict', () => {
|
|
61
|
+
test('with object value', () => {
|
|
62
|
+
try {
|
|
63
|
+
qsStrict({}, qsDefinition, '?user');
|
|
64
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
65
|
+
}
|
|
66
|
+
catch (err) {
|
|
67
|
+
expect(err).toMatchInlineSnapshot(`[YError: E_UNALLOWED_EMPTY_VALUE (["user"]): E_UNALLOWED_EMPTY_VALUE]`);
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
test('with literal value', () => {
|
|
71
|
+
try {
|
|
72
|
+
qsStrict({}, qsDefinition, '?id');
|
|
73
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
74
|
+
}
|
|
75
|
+
catch (err) {
|
|
76
|
+
expect(err).toMatchInlineSnapshot(`[YError: E_UNALLOWED_EMPTY_VALUE (["id"]): E_UNALLOWED_EMPTY_VALUE]`);
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
test('with literal value with a pattern', () => {
|
|
80
|
+
try {
|
|
81
|
+
qsStrict({}, qsDefinition, '?uuid');
|
|
82
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
83
|
+
}
|
|
84
|
+
catch (err) {
|
|
85
|
+
expect(err).toMatchInlineSnapshot(`[YError: E_UNALLOWED_EMPTY_VALUE (["uuid"]): E_UNALLOWED_EMPTY_VALUE]`);
|
|
86
|
+
}
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
describe('should fail when allowed', () => {
|
|
90
|
+
test('with literal value and required', () => {
|
|
91
|
+
try {
|
|
92
|
+
qsStrict({ allowEmptyValue: true }, [
|
|
93
|
+
{
|
|
94
|
+
name: 'lang',
|
|
95
|
+
in: 'query',
|
|
96
|
+
type: 'string',
|
|
97
|
+
required: true,
|
|
98
|
+
},
|
|
99
|
+
], '?lang');
|
|
100
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
101
|
+
}
|
|
102
|
+
catch (err) {
|
|
103
|
+
expect(err).toMatchInlineSnapshot(`[YError: E_REQUIRED_QUERY_PARAM (["lang"]): E_REQUIRED_QUERY_PARAM]`);
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
describe('should work when allowed', () => {
|
|
108
|
+
test('with object value', () => {
|
|
109
|
+
expect(qsStrict({ allowEmptyValue: true }, qsDefinition, '?user')).toEqual({});
|
|
110
|
+
});
|
|
111
|
+
test('with literal value', () => {
|
|
112
|
+
expect(qsStrict({ allowEmptyValue: true }, qsDefinition, '?id')).toEqual({});
|
|
113
|
+
});
|
|
114
|
+
test('with literal value with a pattern', () => {
|
|
115
|
+
expect(qsStrict({ allowEmptyValue: true }, qsDefinition, '?uuid')).toEqual({});
|
|
116
|
+
});
|
|
117
|
+
});
|
|
118
|
+
});
|
|
35
119
|
describe('with unsupported definition type', () => {
|
|
36
120
|
const qsDefinition = [
|
|
37
121
|
{
|
|
@@ -166,7 +250,7 @@ describe('strict-qs', () => {
|
|
|
166
250
|
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
167
251
|
}
|
|
168
252
|
catch (err) {
|
|
169
|
-
expect(err).toMatchInlineSnapshot(`[YError: E_PATTERN_DOES_NOT_MATCH (["code",3.4]): E_PATTERN_DOES_NOT_MATCH]`);
|
|
253
|
+
expect(err).toMatchInlineSnapshot(`[YError: E_PATTERN_DOES_NOT_MATCH (["code",3.4,"^[0-9]+$"]): E_PATTERN_DOES_NOT_MATCH]`);
|
|
170
254
|
}
|
|
171
255
|
});
|
|
172
256
|
test('should work with all params', () => {
|
package/dist/index.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../src/index.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,14 +25,14 @@
|
|
|
25
25
|
}
|
|
26
26
|
},
|
|
27
27
|
"name": "strict-qs",
|
|
28
|
-
"version": "
|
|
28
|
+
"version": "10.1.0",
|
|
29
29
|
"description": "A stricter Query String parser",
|
|
30
30
|
"type": "module",
|
|
31
31
|
"main": "dist/index.js",
|
|
32
32
|
"types": "dist/index.d.ts",
|
|
33
33
|
"scripts": {
|
|
34
34
|
"build": "rimraf 'dist' && tsc --outDir dist",
|
|
35
|
-
"changelog": "conventional-changelog -p
|
|
35
|
+
"changelog": "conventional-changelog -p conventionalcommits -i CHANGELOG.md -s && git add CHANGELOG.md",
|
|
36
36
|
"cli": "env NODE_ENV=${NODE_ENV:-cli}",
|
|
37
37
|
"commitlint": "commitlint",
|
|
38
38
|
"cover": "node --run jest -- --coverage",
|
|
@@ -69,35 +69,35 @@
|
|
|
69
69
|
},
|
|
70
70
|
"homepage": "https://github.com/nfroidure/strict-qs#readme",
|
|
71
71
|
"devDependencies": {
|
|
72
|
-
"@commitlint/cli": "^
|
|
73
|
-
"@commitlint/config-conventional": "^
|
|
72
|
+
"@commitlint/cli": "^21.2.2",
|
|
73
|
+
"@commitlint/config-conventional": "^21.2.2",
|
|
74
74
|
"@eslint/js": "^10.0.1",
|
|
75
|
-
"@swc/cli": "^0.8.
|
|
76
|
-
"@swc/core": "^1.
|
|
75
|
+
"@swc/cli": "^0.8.1",
|
|
76
|
+
"@swc/core": "^1.16.1",
|
|
77
77
|
"@swc/jest": "^0.2.39",
|
|
78
78
|
"@types/debug": "^4.1.13",
|
|
79
|
-
"conventional-changelog": "
|
|
80
|
-
"
|
|
79
|
+
"conventional-changelog": "8.1.3",
|
|
80
|
+
"conventional-changelog-conventionalcommits": "^10.2.1",
|
|
81
|
+
"eslint": "^10.9.1",
|
|
81
82
|
"eslint-config-prettier": "^10.1.8",
|
|
82
|
-
"eslint-plugin-jest": "^29.
|
|
83
|
-
"eslint-plugin-prettier": "^5.5.
|
|
84
|
-
"jest": "^30.
|
|
83
|
+
"eslint-plugin-jest": "^29.16.6",
|
|
84
|
+
"eslint-plugin-prettier": "^5.5.6",
|
|
85
|
+
"jest": "^30.5.1",
|
|
85
86
|
"jsdoc-to-markdown": "^9.1.3",
|
|
86
|
-
"metapak": "^7.
|
|
87
|
-
"metapak-nfroidure": "22.
|
|
88
|
-
"prettier": "^3.
|
|
87
|
+
"metapak": "^7.1.1",
|
|
88
|
+
"metapak-nfroidure": "22.2.1",
|
|
89
|
+
"prettier": "^3.9.6",
|
|
89
90
|
"rimraf": "^6.1.3",
|
|
90
|
-
"typescript": "^6.0.
|
|
91
|
-
"typescript-eslint": "^8.
|
|
91
|
+
"typescript": "^6.0.3",
|
|
92
|
+
"typescript-eslint": "^8.69.0"
|
|
92
93
|
},
|
|
93
94
|
"dependencies": {
|
|
94
95
|
"debug": "^4.4.0",
|
|
95
|
-
"yerror": "^
|
|
96
|
+
"yerror": "^11.0.0"
|
|
96
97
|
},
|
|
97
98
|
"engines": {
|
|
98
99
|
"node": ">=24.14.0"
|
|
99
100
|
},
|
|
100
|
-
"config": {},
|
|
101
101
|
"contributors": [],
|
|
102
102
|
"files": [
|
|
103
103
|
"dist",
|
|
@@ -140,16 +140,5 @@
|
|
|
140
140
|
"funding": {
|
|
141
141
|
"type": "individual",
|
|
142
142
|
"url": "https://github.com/sponsors/nfroidure"
|
|
143
|
-
},
|
|
144
|
-
"overrides": {
|
|
145
|
-
"typescript-eslint": {
|
|
146
|
-
"typescript": "^6"
|
|
147
|
-
},
|
|
148
|
-
"@typescript-eslint/eslint-plugin": {
|
|
149
|
-
"typescript": "^6"
|
|
150
|
-
},
|
|
151
|
-
"@typescript-eslint/parser": {
|
|
152
|
-
"typescript": "^6"
|
|
153
|
-
}
|
|
154
143
|
}
|
|
155
144
|
}
|
package/src/errors.ts
ADDED
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { type QSValue } from './index.js';
|
|
2
|
+
|
|
3
|
+
declare module 'yerror' {
|
|
4
|
+
interface YErrorRegistry {
|
|
5
|
+
/**
|
|
6
|
+
* Thrown when the query string does not start with the search flag '?'.
|
|
7
|
+
* @param search The malformed search string.
|
|
8
|
+
*/
|
|
9
|
+
E_MALFORMED_SEARCH: [search: string];
|
|
10
|
+
|
|
11
|
+
/**
|
|
12
|
+
* Thrown when the query string is empty (just '?') and allowEmptySearch is false.
|
|
13
|
+
* @param search The empty search string.
|
|
14
|
+
*/
|
|
15
|
+
E_EMPTY_SEARCH: [search: string];
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Thrown when a value is not set at all (no equal sign after the parameter name).
|
|
19
|
+
* @param paramName The name of the parameter.
|
|
20
|
+
*/
|
|
21
|
+
E_UNALLOWED_EMPTY_VALUE: [paramName: string];
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Thrown when an unknown query parameter is encountered and allowUnknownParams is false.
|
|
25
|
+
* @param paramName The name of the unauthorized parameter.
|
|
26
|
+
*/
|
|
27
|
+
E_UNAUTHORIZED_QUERY_PARAM: [paramName: string];
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Thrown when a required query parameter is missing.
|
|
31
|
+
* @param paramName The name of the missing required parameter.
|
|
32
|
+
*/
|
|
33
|
+
E_REQUIRED_QUERY_PARAM: [paramName: string];
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Thrown when query parameters are not in the expected order.
|
|
37
|
+
* @param name The parameter name.
|
|
38
|
+
* @param lastIndex The last expected index.
|
|
39
|
+
* @param index The actual index where the parameter was found.
|
|
40
|
+
*/
|
|
41
|
+
E_BAD_QUERY_PARAM_POSITION: [
|
|
42
|
+
name: string,
|
|
43
|
+
lastIndex: number,
|
|
44
|
+
index: number,
|
|
45
|
+
];
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* Thrown when an unsupported parameter type is specified.
|
|
49
|
+
* @param paramName The parameter name.
|
|
50
|
+
* @param type The unsupported type.
|
|
51
|
+
*/
|
|
52
|
+
E_UNSUPPORTED_TYPE: [paramName: string, type: string];
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Thrown when a parameter is set to its default value and allowDefault is false.
|
|
56
|
+
* @param paramName The parameter name.
|
|
57
|
+
* @param value The default value that was set.
|
|
58
|
+
*/
|
|
59
|
+
E_CANNOT_SET_TO_DEFAULT: [paramName: string, value: QSValue];
|
|
60
|
+
|
|
61
|
+
/**
|
|
62
|
+
* Thrown when a parameter value is not in the allowed enum values.
|
|
63
|
+
* @param paramName The parameter name.
|
|
64
|
+
* @param value The invalid value.
|
|
65
|
+
*/
|
|
66
|
+
E_NOT_IN_ENUM: [paramName: string, value: QSValue];
|
|
67
|
+
|
|
68
|
+
/**
|
|
69
|
+
* Thrown when a parameter value does not match the required pattern.
|
|
70
|
+
* @param paramName The parameter name.
|
|
71
|
+
* @param value The value that failed the pattern match.
|
|
72
|
+
* @param pattern The pattern that was not matched.
|
|
73
|
+
*/
|
|
74
|
+
E_PATTERN_DOES_NOT_MATCH: [
|
|
75
|
+
paramName: string,
|
|
76
|
+
value: QSValue,
|
|
77
|
+
pattern: string,
|
|
78
|
+
];
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* Thrown when array parameters are not in ascending order.
|
|
82
|
+
* @param value The current value.
|
|
83
|
+
* @param lastValue The previous value in the array.
|
|
84
|
+
*/
|
|
85
|
+
E_UNORDERED_QUERY_PARAMS: [value: QSValue, lastValue: QSValue];
|
|
86
|
+
|
|
87
|
+
/**
|
|
88
|
+
* Thrown when a number string cannot be parsed back to the same string (non-reentrant).
|
|
89
|
+
* @param originalString The original string.
|
|
90
|
+
* @param parsedValue The parsed and stringified version.
|
|
91
|
+
*/
|
|
92
|
+
E_NON_REENTRANT_NUMBER: [originalString: string, parsedValue: string];
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Thrown when a boolean value is not 'true' or 'false'.
|
|
96
|
+
* @param invalidValue The invalid boolean string.
|
|
97
|
+
*/
|
|
98
|
+
E_BAD_BOOLEAN: [invalidValue: string];
|
|
99
|
+
}
|
|
100
|
+
}
|
package/src/index.test.ts
CHANGED
|
@@ -43,6 +43,112 @@ describe('strict-qs', () => {
|
|
|
43
43
|
});
|
|
44
44
|
});
|
|
45
45
|
|
|
46
|
+
describe('with no value', () => {
|
|
47
|
+
const qsDefinition: QSParameter[] = [
|
|
48
|
+
{
|
|
49
|
+
name: 'user',
|
|
50
|
+
in: 'query',
|
|
51
|
+
type: 'object',
|
|
52
|
+
required: false,
|
|
53
|
+
description: 'The user',
|
|
54
|
+
} as unknown as QSParameter,
|
|
55
|
+
{
|
|
56
|
+
name: 'id',
|
|
57
|
+
in: 'query',
|
|
58
|
+
type: 'string',
|
|
59
|
+
required: false,
|
|
60
|
+
description: 'The id',
|
|
61
|
+
} as unknown as QSParameter,
|
|
62
|
+
{
|
|
63
|
+
name: 'uuid',
|
|
64
|
+
in: 'query',
|
|
65
|
+
type: 'string',
|
|
66
|
+
required: false,
|
|
67
|
+
description: 'The uuid',
|
|
68
|
+
pattern: '^[0-9]+-[0-9]+-[0-9]+-[0-9]+-[0-9]+$',
|
|
69
|
+
} as unknown as QSParameter,
|
|
70
|
+
];
|
|
71
|
+
|
|
72
|
+
describe('should fail when strict', () => {
|
|
73
|
+
test('with object value', () => {
|
|
74
|
+
try {
|
|
75
|
+
qsStrict({}, qsDefinition, '?user');
|
|
76
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
77
|
+
} catch (err) {
|
|
78
|
+
expect(err).toMatchInlineSnapshot(
|
|
79
|
+
`[YError: E_UNALLOWED_EMPTY_VALUE (["user"]): E_UNALLOWED_EMPTY_VALUE]`,
|
|
80
|
+
);
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
test('with literal value', () => {
|
|
85
|
+
try {
|
|
86
|
+
qsStrict({}, qsDefinition, '?id');
|
|
87
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
88
|
+
} catch (err) {
|
|
89
|
+
expect(err).toMatchInlineSnapshot(
|
|
90
|
+
`[YError: E_UNALLOWED_EMPTY_VALUE (["id"]): E_UNALLOWED_EMPTY_VALUE]`,
|
|
91
|
+
);
|
|
92
|
+
}
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
test('with literal value with a pattern', () => {
|
|
96
|
+
try {
|
|
97
|
+
qsStrict({}, qsDefinition, '?uuid');
|
|
98
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
99
|
+
} catch (err) {
|
|
100
|
+
expect(err).toMatchInlineSnapshot(
|
|
101
|
+
`[YError: E_UNALLOWED_EMPTY_VALUE (["uuid"]): E_UNALLOWED_EMPTY_VALUE]`,
|
|
102
|
+
);
|
|
103
|
+
}
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
describe('should fail when allowed', () => {
|
|
108
|
+
test('with literal value and required', () => {
|
|
109
|
+
try {
|
|
110
|
+
qsStrict(
|
|
111
|
+
{ allowEmptyValue: true },
|
|
112
|
+
[
|
|
113
|
+
{
|
|
114
|
+
name: 'lang',
|
|
115
|
+
in: 'query',
|
|
116
|
+
type: 'string',
|
|
117
|
+
required: true,
|
|
118
|
+
},
|
|
119
|
+
],
|
|
120
|
+
'?lang',
|
|
121
|
+
);
|
|
122
|
+
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
123
|
+
} catch (err) {
|
|
124
|
+
expect(err).toMatchInlineSnapshot(
|
|
125
|
+
`[YError: E_REQUIRED_QUERY_PARAM (["lang"]): E_REQUIRED_QUERY_PARAM]`,
|
|
126
|
+
);
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
|
|
131
|
+
describe('should work when allowed', () => {
|
|
132
|
+
test('with object value', () => {
|
|
133
|
+
expect(
|
|
134
|
+
qsStrict({ allowEmptyValue: true }, qsDefinition, '?user'),
|
|
135
|
+
).toEqual({});
|
|
136
|
+
});
|
|
137
|
+
|
|
138
|
+
test('with literal value', () => {
|
|
139
|
+
expect(
|
|
140
|
+
qsStrict({ allowEmptyValue: true }, qsDefinition, '?id'),
|
|
141
|
+
).toEqual({});
|
|
142
|
+
});
|
|
143
|
+
|
|
144
|
+
test('with literal value with a pattern', () => {
|
|
145
|
+
expect(
|
|
146
|
+
qsStrict({ allowEmptyValue: true }, qsDefinition, '?uuid'),
|
|
147
|
+
).toEqual({});
|
|
148
|
+
});
|
|
149
|
+
});
|
|
150
|
+
});
|
|
151
|
+
|
|
46
152
|
describe('with unsupported definition type', () => {
|
|
47
153
|
const qsDefinition = [
|
|
48
154
|
{
|
|
@@ -210,7 +316,7 @@ describe('strict-qs', () => {
|
|
|
210
316
|
throw new YError('E_UNEXPECTED_SUCCESS');
|
|
211
317
|
} catch (err) {
|
|
212
318
|
expect(err).toMatchInlineSnapshot(
|
|
213
|
-
`[YError: E_PATTERN_DOES_NOT_MATCH (["code",3.4]): E_PATTERN_DOES_NOT_MATCH]`,
|
|
319
|
+
`[YError: E_PATTERN_DOES_NOT_MATCH (["code",3.4,"^[0-9]+$"]): E_PATTERN_DOES_NOT_MATCH]`,
|
|
214
320
|
);
|
|
215
321
|
}
|
|
216
322
|
});
|
package/src/index.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import initDebug from 'debug';
|
|
2
2
|
import { YError } from 'yerror';
|
|
3
|
+
import './errors.js';
|
|
3
4
|
|
|
4
5
|
export const SEARCH_FLAG = '?';
|
|
5
6
|
export const BASE_10 = 10;
|
|
@@ -13,6 +14,7 @@ interface QueryPart {
|
|
|
13
14
|
|
|
14
15
|
export interface QSOptions {
|
|
15
16
|
allowEmptySearch?: boolean;
|
|
17
|
+
allowEmptyValue?: boolean;
|
|
16
18
|
allowUnknownParams?: boolean;
|
|
17
19
|
allowDefault?: boolean;
|
|
18
20
|
allowUnorderedParams?: boolean;
|
|
@@ -55,6 +57,8 @@ export type QSParameterValues = Record<string, QSValue | QSValue[]>;
|
|
|
55
57
|
* Parser options
|
|
56
58
|
* @param {Boolean} options.allowEmptySearch
|
|
57
59
|
* Avoid throwing when the search is empty
|
|
60
|
+
* @param {Boolean} options.allowEmptyValue
|
|
61
|
+
* Avoid throwing when a value is empty
|
|
58
62
|
* @param {Boolean} options.allowUnknownParams
|
|
59
63
|
* Avoid throwing when some params are unknown
|
|
60
64
|
* @param {Boolean} options.allowDefault
|
|
@@ -195,7 +199,13 @@ function pickupQueryParams(
|
|
|
195
199
|
involvedQueryStringParts,
|
|
196
200
|
);
|
|
197
201
|
|
|
198
|
-
if (
|
|
202
|
+
if (
|
|
203
|
+
(0 === involvedQueryStringParts.length ||
|
|
204
|
+
involvedQueryStringParts.every(
|
|
205
|
+
(queryPart) => typeof queryPart.value === 'undefined',
|
|
206
|
+
)) &&
|
|
207
|
+
queryParamDefinition.required
|
|
208
|
+
) {
|
|
199
209
|
throw new YError('E_REQUIRED_QUERY_PARAM', [queryParamDefinition.name]);
|
|
200
210
|
}
|
|
201
211
|
|
|
@@ -267,20 +277,33 @@ function assignQueryStringPart(
|
|
|
267
277
|
: queryParamDefinition
|
|
268
278
|
) as QSUniqueParameter;
|
|
269
279
|
const value =
|
|
270
|
-
|
|
271
|
-
?
|
|
272
|
-
: '
|
|
273
|
-
?
|
|
274
|
-
: '
|
|
275
|
-
?
|
|
276
|
-
:
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
280
|
+
typeof queryStringPart.value === 'undefined'
|
|
281
|
+
? queryStringPart.value
|
|
282
|
+
: 'string' === itemDefinition.type
|
|
283
|
+
? decodeQueryComponent(queryStringPart.value)
|
|
284
|
+
: 'boolean' === itemDefinition.type
|
|
285
|
+
? parseBoolean(decodeQueryComponent(queryStringPart.value))
|
|
286
|
+
: 'number' === itemDefinition.type
|
|
287
|
+
? parseReentrantNumber(decodeQueryComponent(queryStringPart.value))
|
|
288
|
+
: (() => {
|
|
289
|
+
throw new YError('E_UNSUPPORTED_TYPE', [
|
|
290
|
+
queryParamDefinition.name,
|
|
291
|
+
itemDefinition.type,
|
|
292
|
+
]);
|
|
293
|
+
})();
|
|
294
|
+
|
|
295
|
+
if (typeof value === 'undefined') {
|
|
296
|
+
if (options.allowEmptyValue) {
|
|
297
|
+
return queryStringParams;
|
|
298
|
+
}
|
|
299
|
+
throw new YError('E_UNALLOWED_EMPTY_VALUE', [queryParamDefinition.name]);
|
|
300
|
+
}
|
|
301
|
+
|
|
302
|
+
if (
|
|
303
|
+
'default' in itemDefinition &&
|
|
304
|
+
itemDefinition.default === value &&
|
|
305
|
+
!options.allowDefault
|
|
306
|
+
) {
|
|
284
307
|
throw new YError('E_CANNOT_SET_TO_DEFAULT', [
|
|
285
308
|
queryParamDefinition.name,
|
|
286
309
|
value,
|
|
@@ -298,11 +321,13 @@ function assignQueryStringPart(
|
|
|
298
321
|
throw new YError('E_PATTERN_DOES_NOT_MATCH', [
|
|
299
322
|
queryParamDefinition.name,
|
|
300
323
|
value,
|
|
324
|
+
itemDefinition.pattern,
|
|
301
325
|
]);
|
|
302
326
|
}
|
|
303
327
|
|
|
304
328
|
if ('array' === queryParamDefinition.type) {
|
|
305
329
|
const values = (queryStringParams[queryStringPart.name] || []) as QSValue[];
|
|
330
|
+
|
|
306
331
|
if (
|
|
307
332
|
queryParamDefinition.ordered &&
|
|
308
333
|
values.length &&
|