@nestjs-filter-grammar/core 0.0.1 → 0.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/README.md +48 -2
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/lexer/tokens.d.ts +2 -0
- package/dist/lexer/tokens.d.ts.map +1 -1
- package/dist/lexer/tokens.js +5 -3
- package/dist/lexer/tokens.js.map +1 -1
- package/dist/param/filter.decorator.d.ts.map +1 -1
- package/dist/param/filter.decorator.js +7 -0
- package/dist/param/filter.decorator.js.map +1 -1
- package/dist/parser/filter-parser.d.ts +1 -0
- package/dist/parser/filter-parser.d.ts.map +1 -1
- package/dist/parser/filter-parser.js +18 -2
- package/dist/parser/filter-parser.js.map +1 -1
- package/dist/swagger/swagger.util.d.ts +12 -0
- package/dist/swagger/swagger.util.d.ts.map +1 -1
- package/dist/swagger/swagger.util.js +33 -0
- package/dist/swagger/swagger.util.js.map +1 -1
- package/dist/visitor/filter-visitor.d.ts +8 -2
- package/dist/visitor/filter-visitor.d.ts.map +1 -1
- package/dist/visitor/filter-visitor.js +7 -1
- package/dist/visitor/filter-visitor.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -165,6 +165,52 @@ interface SortEntry {
|
|
|
165
165
|
}
|
|
166
166
|
```
|
|
167
167
|
|
|
168
|
-
###
|
|
168
|
+
### Coercion
|
|
169
169
|
|
|
170
|
-
|
|
170
|
+
#### `coerceFilterValues(tree, metadata): CoerceResult`
|
|
171
|
+
|
|
172
|
+
Walks a `FilterTree` and converts string values to their declared types based on `ColumnMetadata.valueType`. Called automatically by `@Filter()`, but available for manual use when calling `parseFilter()` directly.
|
|
173
|
+
|
|
174
|
+
```typescript
|
|
175
|
+
import { parseFilter, coerceFilterValues } from '@nestjs-filter-grammar/core';
|
|
176
|
+
|
|
177
|
+
const tree = parseFilter('age>=30');
|
|
178
|
+
const { tree: coerced, errors } = coerceFilterValues(tree, metadata);
|
|
179
|
+
// coerced values: { type: 'number', value: 30 } instead of { type: 'string', value: '30' }
|
|
180
|
+
```
|
|
181
|
+
|
|
182
|
+
Quoted values (`field="123"`) are never coerced — they always remain strings.
|
|
183
|
+
|
|
184
|
+
### Swagger & OpenAPI
|
|
185
|
+
|
|
186
|
+
When `@nestjs/swagger` is installed, `@Filter()` automatically:
|
|
187
|
+
|
|
188
|
+
1. Adds `@ApiQuery` decorators with generated descriptions listing available columns and operators
|
|
189
|
+
2. Emits an `x-filter-grammar` extension on the operation with structured metadata for codegen:
|
|
190
|
+
|
|
191
|
+
```json
|
|
192
|
+
{
|
|
193
|
+
"x-filter-grammar": {
|
|
194
|
+
"filterParam": "filter",
|
|
195
|
+
"sortParam": "sort",
|
|
196
|
+
"fields": {
|
|
197
|
+
"name": { "operators": ["=", "!=", "*~"], "type": "string" },
|
|
198
|
+
"status": { "operators": ["=", "!="], "type": "enum", "values": ["active", "inactive"] },
|
|
199
|
+
"age": { "operators": [">=", "<="], "type": "number" }
|
|
200
|
+
},
|
|
201
|
+
"sortable": ["name", "status", "age"]
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
```
|
|
205
|
+
|
|
206
|
+
This extension is consumed by `@nestjs-filter-grammar/client-query-builder` to generate type-safe query builders.
|
|
207
|
+
|
|
208
|
+
### Parenthesized Expressions
|
|
209
|
+
|
|
210
|
+
The grammar supports parentheses for grouping:
|
|
211
|
+
|
|
212
|
+
```
|
|
213
|
+
(status=active|status=pending);age>=18
|
|
214
|
+
name=admin|(status=active;age>=18)
|
|
215
|
+
(a=1;b=2)|(c=3;d=4)
|
|
216
|
+
```
|
package/dist/index.d.ts
CHANGED
|
@@ -7,7 +7,8 @@ export { getFilterableMetadata, getSortableMetadata, isFilterable } from './deco
|
|
|
7
7
|
export { Filter, FilterOptions } from './param/filter.decorator';
|
|
8
8
|
export { FilterParseException } from './errors/filter-parse-exception';
|
|
9
9
|
export { coerceFilterValues } from './coerce';
|
|
10
|
-
export { buildSwaggerDescription } from './swagger/swagger.util';
|
|
10
|
+
export { buildSwaggerDescription, buildFilterGrammarExtension } from './swagger/swagger.util';
|
|
11
|
+
export type { FilterGrammarExtension, FilterGrammarFieldDef } from './swagger/swagger.util';
|
|
11
12
|
export { parseSortString } from './sort/sort-parser';
|
|
12
13
|
export { validateSort } from './sort/sort-validator';
|
|
13
14
|
export { SortableColumn } from './decorators/sortable-column.decorator';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,eAAe,EACf,WAAW,EACX,eAAe,EACf,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EACb,cAAc,EACd,aAAa,EACb,SAAS,EACT,sBAAsB,GACvB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGjG,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,UAAU,EACV,WAAW,EACX,eAAe,EACf,WAAW,EACX,eAAe,EACf,UAAU,EACV,YAAY,EACZ,WAAW,EACX,aAAa,EACb,cAAc,EACd,aAAa,EACb,SAAS,EACT,sBAAsB,GACvB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAGtC,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGjG,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAGvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAG9C,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC;AAC9F,YAAY,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAG5F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,2BAA2B,EAAE,MAAM,wBAAwB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildSortSwaggerDescription = exports.SortableColumn = exports.validateSort = exports.parseSortString = exports.buildSwaggerDescription = exports.coerceFilterValues = exports.FilterParseException = exports.Filter = exports.isFilterable = exports.getSortableMetadata = exports.getFilterableMetadata = exports.FilterableColumn = exports.Filterable = exports.validateFilter = exports.parseFilter = exports.SortDirection = exports.EQUALITY_OPERATORS = exports.FilterOperator = void 0;
|
|
3
|
+
exports.buildSortSwaggerDescription = exports.SortableColumn = exports.validateSort = exports.parseSortString = exports.buildFilterGrammarExtension = exports.buildSwaggerDescription = exports.coerceFilterValues = exports.FilterParseException = exports.Filter = exports.isFilterable = exports.getSortableMetadata = exports.getFilterableMetadata = exports.FilterableColumn = exports.Filterable = exports.validateFilter = exports.parseFilter = exports.SortDirection = exports.EQUALITY_OPERATORS = exports.FilterOperator = void 0;
|
|
4
4
|
// Types
|
|
5
5
|
var types_1 = require("./types");
|
|
6
6
|
Object.defineProperty(exports, "FilterOperator", { enumerable: true, get: function () { return types_1.FilterOperator; } });
|
|
@@ -33,6 +33,7 @@ Object.defineProperty(exports, "coerceFilterValues", { enumerable: true, get: fu
|
|
|
33
33
|
// Swagger
|
|
34
34
|
var swagger_util_1 = require("./swagger/swagger.util");
|
|
35
35
|
Object.defineProperty(exports, "buildSwaggerDescription", { enumerable: true, get: function () { return swagger_util_1.buildSwaggerDescription; } });
|
|
36
|
+
Object.defineProperty(exports, "buildFilterGrammarExtension", { enumerable: true, get: function () { return swagger_util_1.buildFilterGrammarExtension; } });
|
|
36
37
|
// Sort
|
|
37
38
|
var sort_parser_1 = require("./sort/sort-parser");
|
|
38
39
|
Object.defineProperty(exports, "parseSortString", { enumerable: true, get: function () { return sort_parser_1.parseSortString; } });
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,iCAgBiB;AAff,uGAAA,cAAc,OAAA;AACd,2GAAA,kBAAkB,OAAA;AAWlB,sGAAA,aAAa,OAAA;AAKf,SAAS;AACT,iCAAsC;AAA7B,oGAAA,WAAW,OAAA;AAEpB,aAAa;AACb,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AAEvB,aAAa;AACb,0EAA+D;AAAtD,kHAAA,UAAU,OAAA;AACnB,wFAAqG;AAA5F,+HAAA,gBAAgB,OAAA;AACzB,kDAAiG;AAAxF,iHAAA,qBAAqB,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAAE,wGAAA,YAAY,OAAA;AAEjE,sBAAsB;AACtB,6DAAiE;AAAxD,0GAAA,MAAM,OAAA;AAEf,SAAS;AACT,0EAAuE;AAA9D,8HAAA,oBAAoB,OAAA;AAE7B,WAAW;AACX,mCAA8C;AAArC,4GAAA,kBAAkB,OAAA;AAE3B,UAAU;AACV,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,iCAgBiB;AAff,uGAAA,cAAc,OAAA;AACd,2GAAA,kBAAkB,OAAA;AAWlB,sGAAA,aAAa,OAAA;AAKf,SAAS;AACT,iCAAsC;AAA7B,oGAAA,WAAW,OAAA;AAEpB,aAAa;AACb,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AAEvB,aAAa;AACb,0EAA+D;AAAtD,kHAAA,UAAU,OAAA;AACnB,wFAAqG;AAA5F,+HAAA,gBAAgB,OAAA;AACzB,kDAAiG;AAAxF,iHAAA,qBAAqB,OAAA;AAAE,+GAAA,mBAAmB,OAAA;AAAE,wGAAA,YAAY,OAAA;AAEjE,sBAAsB;AACtB,6DAAiE;AAAxD,0GAAA,MAAM,OAAA;AAEf,SAAS;AACT,0EAAuE;AAA9D,8HAAA,oBAAoB,OAAA;AAE7B,WAAW;AACX,mCAA8C;AAArC,4GAAA,kBAAkB,OAAA;AAE3B,UAAU;AACV,uDAA8F;AAArF,uHAAA,uBAAuB,OAAA;AAAE,2HAAA,2BAA2B,OAAA;AAG7D,OAAO;AACP,kDAAqD;AAA5C,8GAAA,eAAe,OAAA;AACxB,wDAAqD;AAA5C,8GAAA,YAAY,OAAA;AACrB,oFAAwE;AAA/D,2HAAA,cAAc,OAAA;AACvB,uDAAqE;AAA5D,2HAAA,2BAA2B,OAAA"}
|
package/dist/lexer/tokens.d.ts
CHANGED
|
@@ -15,6 +15,8 @@ export declare const Equals: import("chevrotain").TokenType;
|
|
|
15
15
|
export declare const Semicolon: import("chevrotain").TokenType;
|
|
16
16
|
export declare const Pipe: import("chevrotain").TokenType;
|
|
17
17
|
export declare const Comma: import("chevrotain").TokenType;
|
|
18
|
+
export declare const LParen: import("chevrotain").TokenType;
|
|
19
|
+
export declare const RParen: import("chevrotain").TokenType;
|
|
18
20
|
export declare const StringLiteral: import("chevrotain").TokenType;
|
|
19
21
|
export declare const Token: import("chevrotain").TokenType;
|
|
20
22
|
export declare const NullLiteral: import("chevrotain").TokenType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/lexer/tokens.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,gCAAuD,CAAC;AACjF,eAAO,MAAM,SAAS,gCAA0D,CAAC;AACjF,eAAO,MAAM,QAAQ,gCAA2D,CAAC;AACjF,eAAO,MAAM,WAAW,gCAAyD,CAAC;AAClF,eAAO,MAAM,SAAS,gCAA2D,CAAC;AAClF,eAAO,MAAM,SAAS,gCAA2D,CAAC;AAClF,eAAO,MAAM,SAAS,gCAA0D,CAAC;AACjF,eAAO,MAAM,UAAU,gCAA0D,CAAC;AAClF,eAAO,MAAM,QAAQ,gCAA4D,CAAC;AAClF,eAAO,MAAM,QAAQ,gCAA4D,CAAC;AAElF,eAAO,MAAM,WAAW,gCAAuD,CAAC;AAChF,eAAO,MAAM,QAAQ,gCAA0D,CAAC;AAChF,eAAO,MAAM,OAAO,gCAA2D,CAAC;AAChF,eAAO,MAAM,MAAM,gCAA4D,CAAC;AAIhF,eAAO,MAAM,SAAS,gCAAmD,CAAC;AAC1E,eAAO,MAAM,IAAI,gCAAyD,CAAC;AAC3E,eAAO,MAAM,KAAK,gCAAuD,CAAC;
|
|
1
|
+
{"version":3,"file":"tokens.d.ts","sourceRoot":"","sources":["../../src/lexer/tokens.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY,gCAAuD,CAAC;AACjF,eAAO,MAAM,SAAS,gCAA0D,CAAC;AACjF,eAAO,MAAM,QAAQ,gCAA2D,CAAC;AACjF,eAAO,MAAM,WAAW,gCAAyD,CAAC;AAClF,eAAO,MAAM,SAAS,gCAA2D,CAAC;AAClF,eAAO,MAAM,SAAS,gCAA2D,CAAC;AAClF,eAAO,MAAM,SAAS,gCAA0D,CAAC;AACjF,eAAO,MAAM,UAAU,gCAA0D,CAAC;AAClF,eAAO,MAAM,QAAQ,gCAA4D,CAAC;AAClF,eAAO,MAAM,QAAQ,gCAA4D,CAAC;AAElF,eAAO,MAAM,WAAW,gCAAuD,CAAC;AAChF,eAAO,MAAM,QAAQ,gCAA0D,CAAC;AAChF,eAAO,MAAM,OAAO,gCAA2D,CAAC;AAChF,eAAO,MAAM,MAAM,gCAA4D,CAAC;AAIhF,eAAO,MAAM,SAAS,gCAAmD,CAAC;AAC1E,eAAO,MAAM,IAAI,gCAAyD,CAAC;AAC3E,eAAO,MAAM,KAAK,gCAAuD,CAAC;AAC1E,eAAO,MAAM,MAAM,gCAAuD,CAAC;AAC3E,eAAO,MAAM,MAAM,gCAAuD,CAAC;AAI3E,eAAO,MAAM,aAAa,gCAGxB,CAAC;AAKH,eAAO,MAAM,KAAK,gCAGhB,CAAC;AAKH,eAAO,MAAM,WAAW,gCAItB,CAAC;AAIH,eAAO,MAAM,UAAU,gCAIrB,CAAC;AAIH,eAAO,MAAM,SAAS,kCAarB,CAAC"}
|
package/dist/lexer/tokens.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.allTokens = exports.WhiteSpace = exports.NullLiteral = exports.Token = exports.StringLiteral = exports.Comma = exports.Pipe = exports.Semicolon = exports.Equals = exports.IEquals = exports.LessThan = exports.GreaterThan = exports.Contains = exports.EndsWith = exports.StartsWith = exports.INotEqual = exports.IContains = exports.IEndsWith = exports.IStartsWith = exports.NotEqual = exports.LessEqual = exports.GreaterEqual = void 0;
|
|
3
|
+
exports.allTokens = exports.WhiteSpace = exports.NullLiteral = exports.Token = exports.StringLiteral = exports.RParen = exports.LParen = exports.Comma = exports.Pipe = exports.Semicolon = exports.Equals = exports.IEquals = exports.LessThan = exports.GreaterThan = exports.Contains = exports.EndsWith = exports.StartsWith = exports.INotEqual = exports.IContains = exports.IEndsWith = exports.IStartsWith = exports.NotEqual = exports.LessEqual = exports.GreaterEqual = void 0;
|
|
4
4
|
const chevrotain_1 = require("chevrotain");
|
|
5
5
|
// --- Operators (longest-first for greedy matching) ---
|
|
6
6
|
exports.GreaterEqual = (0, chevrotain_1.createToken)({ name: 'GreaterEqual', pattern: />=/ });
|
|
@@ -21,6 +21,8 @@ exports.Equals = (0, chevrotain_1.createToken)({ name: 'Equals', pattern: /=/ })
|
|
|
21
21
|
exports.Semicolon = (0, chevrotain_1.createToken)({ name: 'Semicolon', pattern: /;/ });
|
|
22
22
|
exports.Pipe = (0, chevrotain_1.createToken)({ name: 'Pipe', pattern: /\|/ });
|
|
23
23
|
exports.Comma = (0, chevrotain_1.createToken)({ name: 'Comma', pattern: /,/ });
|
|
24
|
+
exports.LParen = (0, chevrotain_1.createToken)({ name: 'LParen', pattern: /\(/ });
|
|
25
|
+
exports.RParen = (0, chevrotain_1.createToken)({ name: 'RParen', pattern: /\)/ });
|
|
24
26
|
// --- Literals ---
|
|
25
27
|
exports.StringLiteral = (0, chevrotain_1.createToken)({
|
|
26
28
|
name: 'StringLiteral',
|
|
@@ -30,7 +32,7 @@ exports.StringLiteral = (0, chevrotain_1.createToken)({
|
|
|
30
32
|
// Defined before NullLiteral so it can be referenced as longer_alt
|
|
31
33
|
exports.Token = (0, chevrotain_1.createToken)({
|
|
32
34
|
name: 'Token',
|
|
33
|
-
pattern: /[^,"
|
|
35
|
+
pattern: /[^,"|;!=><^$*~()\s]+/,
|
|
34
36
|
});
|
|
35
37
|
// --- Null keyword (must come before Token in allTokens array) ---
|
|
36
38
|
// longer_alt ensures "nullable" matches Token, but "null" matches NullLiteral
|
|
@@ -54,7 +56,7 @@ exports.allTokens = [
|
|
|
54
56
|
exports.StartsWith, exports.EndsWith, exports.Contains,
|
|
55
57
|
exports.GreaterThan, exports.LessThan, exports.IEquals, exports.Equals,
|
|
56
58
|
// Structural
|
|
57
|
-
exports.Semicolon, exports.Pipe, exports.Comma,
|
|
59
|
+
exports.Semicolon, exports.Pipe, exports.Comma, exports.LParen, exports.RParen,
|
|
58
60
|
// Literals
|
|
59
61
|
exports.StringLiteral,
|
|
60
62
|
exports.NullLiteral,
|
package/dist/lexer/tokens.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/lexer/tokens.ts"],"names":[],"mappings":";;;AAAA,2CAAgD;AAEhD,wDAAwD;AAE3C,QAAA,YAAY,GAAG,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACpE,QAAA,SAAS,GAAM,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,WAAW,EAAK,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACpE,QAAA,QAAQ,GAAO,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,UAAU,EAAM,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACpE,QAAA,WAAW,GAAI,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,aAAa,EAAG,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACrE,QAAA,SAAS,GAAM,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,WAAW,EAAK,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACrE,QAAA,SAAS,GAAM,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,WAAW,EAAK,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACrE,QAAA,SAAS,GAAM,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,WAAW,EAAK,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AACpE,QAAA,UAAU,GAAK,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,YAAY,EAAI,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACrE,QAAA,QAAQ,GAAO,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,UAAU,EAAM,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AACrE,QAAA,QAAQ,GAAO,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,UAAU,EAAM,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;AAErE,QAAA,WAAW,GAAI,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,aAAa,EAAG,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AACnE,QAAA,QAAQ,GAAO,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,UAAU,EAAM,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AACnE,QAAA,OAAO,GAAQ,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,SAAS,EAAO,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AACnE,QAAA,MAAM,GAAS,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAQ,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AAEhF,4BAA4B;AAEf,QAAA,SAAS,GAAG,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;AAC7D,QAAA,IAAI,GAAQ,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,MAAM,EAAO,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,QAAA,KAAK,GAAO,IAAA,wBAAW,EAAC,EAAE,IAAI,EAAE,OAAO,EAAM,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tokens.js","sourceRoot":"","sources":["../../src/lexer/tokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.decorator.d.ts","sourceRoot":"","sources":["../../src/param/filter.decorator.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;
|
|
1
|
+
{"version":3,"file":"filter.decorator.d.ts","sourceRoot":"","sources":["../../src/param/filter.decorator.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAgJD,wBAAgB,MAAM,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,GAAE,aAAkB,GAAG,kBAAkB,CAiB5F"}
|
|
@@ -115,6 +115,13 @@ function applySwaggerMetadata(metadata, sortableMetadata, paramName, sortParamNa
|
|
|
115
115
|
});
|
|
116
116
|
sortDecorator(target, propertyKey, Object.getOwnPropertyDescriptor(target, propertyKey));
|
|
117
117
|
}
|
|
118
|
+
// Apply x-filter-grammar extension to the operation
|
|
119
|
+
const { ApiExtension } = require('@nestjs/swagger');
|
|
120
|
+
if (ApiExtension) {
|
|
121
|
+
const extension = (0, swagger_util_1.buildFilterGrammarExtension)(metadata, sortableMetadata, paramName, sortParamName);
|
|
122
|
+
const extensionDecorator = ApiExtension('x-filter-grammar', extension);
|
|
123
|
+
extensionDecorator(target, propertyKey, Object.getOwnPropertyDescriptor(target, propertyKey));
|
|
124
|
+
}
|
|
118
125
|
}
|
|
119
126
|
}
|
|
120
127
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.decorator.js","sourceRoot":"","sources":["../../src/param/filter.decorator.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"filter.decorator.js","sourceRoot":"","sources":["../../src/param/filter.decorator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-parser.d.ts","sourceRoot":"","sources":["../../src/parser/filter-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"filter-parser.d.ts","sourceRoot":"","sources":["../../src/parser/filter-parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AA2BvC,qBAAa,YAAa,SAAQ,SAAS;;IAMlC,YAAY,sEAMhB;IAEH,OAAO,CAAC,aAAa,CAMlB;IAEH,OAAO,CAAC,IAAI,CAeT;IAEH,OAAO,CAAC,SAAS,CAId;IAEH,OAAO,CAAC,QAAQ,CAiBb;IAEH,OAAO,CAAC,MAAM,CAMX;IAEH,OAAO,CAAC,KAAK,CAMV;CACJ"}
|
|
@@ -14,12 +14,28 @@ class FilterParser extends chevrotain_1.CstParser {
|
|
|
14
14
|
});
|
|
15
15
|
});
|
|
16
16
|
this.andExpression = this.RULE('andExpression', () => {
|
|
17
|
-
this.SUBRULE(this.
|
|
17
|
+
this.SUBRULE(this.atom, { LABEL: 'atom' });
|
|
18
18
|
this.MANY(() => {
|
|
19
19
|
this.CONSUME(tokens_1.Semicolon);
|
|
20
|
-
this.SUBRULE2(this.
|
|
20
|
+
this.SUBRULE2(this.atom, { LABEL: 'atom' });
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
|
+
this.atom = this.RULE('atom', () => {
|
|
24
|
+
this.OR([
|
|
25
|
+
{
|
|
26
|
+
ALT: () => {
|
|
27
|
+
this.CONSUME(tokens_1.LParen);
|
|
28
|
+
this.SUBRULE(this.orExpression, { LABEL: 'orExpression' });
|
|
29
|
+
this.CONSUME(tokens_1.RParen);
|
|
30
|
+
},
|
|
31
|
+
},
|
|
32
|
+
{
|
|
33
|
+
ALT: () => {
|
|
34
|
+
this.SUBRULE(this.condition, { LABEL: 'condition' });
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
]);
|
|
38
|
+
});
|
|
23
39
|
this.condition = this.RULE('condition', () => {
|
|
24
40
|
this.CONSUME(tokens_1.Token, { LABEL: 'field' });
|
|
25
41
|
this.SUBRULE(this.operator, { LABEL: 'operator' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-parser.js","sourceRoot":"","sources":["../../src/parser/filter-parser.ts"],"names":[],"mappings":";;;AAAA,2CAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"filter-parser.js","sourceRoot":"","sources":["../../src/parser/filter-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,16 @@
|
|
|
1
1
|
import { ColumnMetadata, SortableColumnMetadata } from '../types';
|
|
2
2
|
export declare function buildSwaggerDescription(metadata: ColumnMetadata[]): string;
|
|
3
3
|
export declare function buildSortSwaggerDescription(metadata: SortableColumnMetadata[]): string;
|
|
4
|
+
export interface FilterGrammarFieldDef {
|
|
5
|
+
operators: string[];
|
|
6
|
+
type: 'string' | 'number' | 'boolean' | 'enum';
|
|
7
|
+
values?: (string | number)[];
|
|
8
|
+
}
|
|
9
|
+
export interface FilterGrammarExtension {
|
|
10
|
+
filterParam: string;
|
|
11
|
+
sortParam: string;
|
|
12
|
+
fields: Record<string, FilterGrammarFieldDef>;
|
|
13
|
+
sortable: string[];
|
|
14
|
+
}
|
|
15
|
+
export declare function buildFilterGrammarExtension(metadata: ColumnMetadata[], sortableMetadata: SortableColumnMetadata[], filterParam: string, sortParam: string): FilterGrammarExtension;
|
|
4
16
|
//# sourceMappingURL=swagger.util.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger.util.d.ts","sourceRoot":"","sources":["../../src/swagger/swagger.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"swagger.util.d.ts","sourceRoot":"","sources":["../../src/swagger/swagger.util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAmB,MAAM,UAAU,CAAC;AAEnF,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,MAAM,CAuB1E;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,MAAM,CAgBtF;AAID,MAAM,WAAW,qBAAqB;IACpC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,IAAI,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;IAC/C,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC;IAC9C,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAwBD,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,cAAc,EAAE,EAC1B,gBAAgB,EAAE,sBAAsB,EAAE,EAC1C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,GAChB,sBAAsB,CAYxB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.buildSwaggerDescription = buildSwaggerDescription;
|
|
4
4
|
exports.buildSortSwaggerDescription = buildSortSwaggerDescription;
|
|
5
|
+
exports.buildFilterGrammarExtension = buildFilterGrammarExtension;
|
|
5
6
|
function buildSwaggerDescription(metadata) {
|
|
6
7
|
if (metadata.length === 0) {
|
|
7
8
|
return '';
|
|
@@ -21,6 +22,7 @@ function buildSwaggerDescription(metadata) {
|
|
|
21
22
|
' OR: field=value|field2=value2',
|
|
22
23
|
' IN: field=value1,value2',
|
|
23
24
|
' Null: field=null',
|
|
25
|
+
' Group: (expr);(expr)',
|
|
24
26
|
].join('\n');
|
|
25
27
|
}
|
|
26
28
|
function buildSortSwaggerDescription(metadata) {
|
|
@@ -38,4 +40,35 @@ function buildSortSwaggerDescription(metadata) {
|
|
|
38
40
|
' Multiple: +field1,-field2,field3',
|
|
39
41
|
].join('\n');
|
|
40
42
|
}
|
|
43
|
+
function resolveFieldDef(meta) {
|
|
44
|
+
const operators = meta.operators.map((o) => o);
|
|
45
|
+
const valueType = meta.valueType;
|
|
46
|
+
if (valueType === 'string' || valueType === 'number' || valueType === 'boolean') {
|
|
47
|
+
return { operators, type: valueType };
|
|
48
|
+
}
|
|
49
|
+
// Enum: string[] or Record<string, string | number>
|
|
50
|
+
let values;
|
|
51
|
+
if (Array.isArray(valueType)) {
|
|
52
|
+
values = valueType;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
// Filter out reverse-mapped numeric enum keys
|
|
56
|
+
values = Object.entries(valueType)
|
|
57
|
+
.filter(([key]) => isNaN(Number(key)))
|
|
58
|
+
.map(([, value]) => value);
|
|
59
|
+
}
|
|
60
|
+
return { operators, type: 'enum', values };
|
|
61
|
+
}
|
|
62
|
+
function buildFilterGrammarExtension(metadata, sortableMetadata, filterParam, sortParam) {
|
|
63
|
+
const fields = {};
|
|
64
|
+
for (const meta of metadata) {
|
|
65
|
+
fields[meta.propertyKey] = resolveFieldDef(meta);
|
|
66
|
+
}
|
|
67
|
+
return {
|
|
68
|
+
filterParam,
|
|
69
|
+
sortParam,
|
|
70
|
+
fields,
|
|
71
|
+
sortable: sortableMetadata.map((s) => s.propertyKey),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
41
74
|
//# sourceMappingURL=swagger.util.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger.util.js","sourceRoot":"","sources":["../../src/swagger/swagger.util.ts"],"names":[],"mappings":";;AAEA,
|
|
1
|
+
{"version":3,"file":"swagger.util.js","sourceRoot":"","sources":["../../src/swagger/swagger.util.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,14 @@ import { FilterTree, FilterCondition, FilterValue, FilterOperator } from '../typ
|
|
|
5
5
|
interface OrExpressionCstChildren {
|
|
6
6
|
andExpression: CstNode[];
|
|
7
7
|
}
|
|
8
|
-
/** CST node for `andExpression →
|
|
8
|
+
/** CST node for `andExpression → atom (Semicolon atom)*` */
|
|
9
9
|
interface AndExpressionCstChildren {
|
|
10
|
-
|
|
10
|
+
atom: CstNode[];
|
|
11
|
+
}
|
|
12
|
+
/** CST node for `atom → "(" orExpression ")" | condition` */
|
|
13
|
+
interface AtomCstChildren {
|
|
14
|
+
orExpression?: CstNode[];
|
|
15
|
+
condition?: CstNode[];
|
|
11
16
|
}
|
|
12
17
|
/** CST node for `condition → Token operator values` */
|
|
13
18
|
interface ConditionCstChildren {
|
|
@@ -32,6 +37,7 @@ interface ValueCstChildren {
|
|
|
32
37
|
export declare function buildFilterVisitor(parser: FilterParser): {
|
|
33
38
|
orExpression(ctx: OrExpressionCstChildren): FilterTree;
|
|
34
39
|
andExpression(ctx: AndExpressionCstChildren): FilterTree;
|
|
40
|
+
atom(ctx: AtomCstChildren): FilterTree;
|
|
35
41
|
condition(ctx: ConditionCstChildren): FilterCondition;
|
|
36
42
|
operator(ctx: OperatorCstChildren): {
|
|
37
43
|
operator: FilterOperator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-visitor.d.ts","sourceRoot":"","sources":["../../src/visitor/filter-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,UAAU,EACV,eAAe,EACf,WAAW,EACX,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,wEAAwE;AACxE,UAAU,uBAAuB;IAC/B,aAAa,EAAE,OAAO,EAAE,CAAC;CAC1B;AAED,
|
|
1
|
+
{"version":3,"file":"filter-visitor.d.ts","sourceRoot":"","sources":["../../src/visitor/filter-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,UAAU,EACV,eAAe,EACf,WAAW,EACX,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,wEAAwE;AACxE,UAAU,uBAAuB;IAC/B,aAAa,EAAE,OAAO,EAAE,CAAC;CAC1B;AAED,4DAA4D;AAC5D,UAAU,wBAAwB;IAChC,IAAI,EAAE,OAAO,EAAE,CAAC;CACjB;AAED,6DAA6D;AAC7D,UAAU,eAAe;IACvB,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC;CACvB;AAED,uDAAuD;AACvD,UAAU,oBAAoB;IAC5B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,OAAO,EAAE,CAAC;CACnB;AAED,+DAA+D;AAC/D,UAAU,mBAAmB;IAC3B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;CAC3C;AAED,mDAAmD;AACnD,UAAU,iBAAiB;IACzB,KAAK,EAAE,OAAO,EAAE,CAAC;CAClB;AAED,iEAAiE;AACjE,UAAU,gBAAgB;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAiCD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY;sBASjC,uBAAuB,GAAG,UAAU;uBAOnC,wBAAwB,GAAG,UAAU;cAO9C,eAAe,GAAG,UAAU;mBAOvB,oBAAoB,GAAG,eAAe;kBAUvC,mBAAmB,GAAG;QAAE,QAAQ,EAAE,cAAc,CAAC;QAAC,cAAc,EAAE,MAAM,CAAA;KAAE;gBAS5E,iBAAiB,GAAG,WAAW,EAAE;eAIlC,gBAAgB,GAAG,WAAW;;;EAc5C"}
|
|
@@ -42,9 +42,15 @@ function buildFilterVisitor(parser) {
|
|
|
42
42
|
return simplify('OR', andNodes);
|
|
43
43
|
}
|
|
44
44
|
andExpression(ctx) {
|
|
45
|
-
const conditions = ctx.
|
|
45
|
+
const conditions = ctx.atom.map((node) => this.visit(node));
|
|
46
46
|
return simplify('AND', conditions);
|
|
47
47
|
}
|
|
48
|
+
atom(ctx) {
|
|
49
|
+
if (ctx.orExpression) {
|
|
50
|
+
return this.visit(ctx.orExpression[0]);
|
|
51
|
+
}
|
|
52
|
+
return this.visit(ctx.condition[0]);
|
|
53
|
+
}
|
|
48
54
|
condition(ctx) {
|
|
49
55
|
const fieldToken = ctx.field[0];
|
|
50
56
|
const field = fieldToken.image;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-visitor.js","sourceRoot":"","sources":["../../src/visitor/filter-visitor.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"filter-visitor.js","sourceRoot":"","sources":["../../src/visitor/filter-visitor.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED