@nestjs-filter-grammar/core 0.1.0 → 0.1.2
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/dist/decorators/metadata.d.ts +4 -4
- package/dist/decorators/metadata.d.ts.map +1 -1
- package/dist/decorators/metadata.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/param/filter.decorator.d.ts +2 -1
- package/dist/param/filter.decorator.d.ts.map +1 -1
- package/dist/param/filter.decorator.js +31 -28
- package/dist/param/filter.decorator.js.map +1 -1
- package/dist/swagger/swagger.util.js +2 -2
- package/dist/swagger/swagger.util.js.map +1 -1
- package/dist/types/index.d.ts +1 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/validate.js +1 -1
- package/dist/validate.js.map +1 -1
- package/dist/visitor/filter-visitor.d.ts +3 -48
- package/dist/visitor/filter-visitor.d.ts.map +1 -1
- package/package.json +10 -10
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import 'reflect-metadata';
|
|
2
|
-
import { ColumnMetadata, SortableColumnMetadata } from '../types';
|
|
3
|
-
export declare function isFilterable(target:
|
|
4
|
-
export declare function getFilterableMetadata(target:
|
|
5
|
-
export declare function getSortableMetadata(target:
|
|
2
|
+
import { AbstractConstructor, ColumnMetadata, SortableColumnMetadata } from '../types';
|
|
3
|
+
export declare function isFilterable(target: AbstractConstructor): boolean;
|
|
4
|
+
export declare function getFilterableMetadata(target: AbstractConstructor): ColumnMetadata[];
|
|
5
|
+
export declare function getSortableMetadata(target: AbstractConstructor): SortableColumnMetadata[];
|
|
6
6
|
//# sourceMappingURL=metadata.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/decorators/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/decorators/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAEvF,wBAAgB,YAAY,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAEjE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,EAAE,CAqBnF;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,sBAAsB,EAAE,CAgBzF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/decorators/metadata.ts"],"names":[],"mappings":";;AAIA,oCAEC;AAED,sDAqBC;AAED,kDAgBC;AA/CD,4BAA0B;AAC1B,2CAA2F;AAG3F,SAAgB,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/decorators/metadata.ts"],"names":[],"mappings":";;AAIA,oCAEC;AAED,sDAqBC;AAED,kDAgBC;AA/CD,4BAA0B;AAC1B,2CAA2F;AAG3F,SAAgB,YAAY,CAAC,MAA2B;IACtD,OAAO,OAAO,CAAC,cAAc,CAAC,0BAAc,EAAE,MAAM,CAAC,KAAK,IAAI,CAAC;AACjE,CAAC;AAED,SAAgB,qBAAqB,CAAC,MAA2B;IAC/D,MAAM,MAAM,GAAqB,EAAE,CAAC;IACpC,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAE/B,wDAAwD;IACxD,IAAI,OAAO,GAAoB,MAAM,CAAC;IACtC,OAAO,OAAO,IAAI,OAAO,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACjD,MAAM,OAAO,GACX,OAAO,CAAC,cAAc,CAAC,kCAAsB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAEhE,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QAED,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,mBAAmB,CAAC,MAA2B;IAC7D,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,IAAI,OAAO,GAAoB,MAAM,CAAC;IACtC,OAAO,OAAO,IAAI,OAAO,KAAK,QAAQ,CAAC,SAAS,EAAE,CAAC;QACjD,MAAM,OAAO,GACX,OAAO,CAAC,cAAc,CAAC,gCAAoB,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAC9D,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;QACD,OAAO,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { FilterOperator, EQUALITY_OPERATORS, FilterTree, FilterGroup, FilterCondition, FilterValue, FilterValueType, FilterEnum, FilterResult, FilterError, FilterAdapter, ColumnMetadata, SortDirection, SortEntry, SortableColumnMetadata, } from './types';
|
|
1
|
+
export { AbstractConstructor, FilterOperator, EQUALITY_OPERATORS, FilterTree, FilterGroup, FilterCondition, FilterValue, FilterValueType, FilterEnum, FilterResult, FilterError, FilterAdapter, ColumnMetadata, SortDirection, SortEntry, SortableColumnMetadata, } from './types';
|
|
2
2
|
export { parseFilter } from './parse';
|
|
3
3
|
export { validateFilter } from './validate';
|
|
4
4
|
export { Filterable } from './decorators/filterable.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,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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,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.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,iCAiBiB;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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
+
import { AbstractConstructor } from '../types';
|
|
1
2
|
export interface FilterOptions {
|
|
2
3
|
queryParam?: string;
|
|
3
4
|
sortParam?: string;
|
|
4
5
|
optional?: boolean;
|
|
5
6
|
}
|
|
6
|
-
export declare function Filter(queryClass:
|
|
7
|
+
export declare function Filter(queryClass: AbstractConstructor, options?: FilterOptions): ParameterDecorator;
|
|
7
8
|
//# sourceMappingURL=filter.decorator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.decorator.d.ts","sourceRoot":"","sources":["../../src/param/filter.decorator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"filter.decorator.d.ts","sourceRoot":"","sources":["../../src/param/filter.decorator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,mBAAmB,EAAoE,MAAM,UAAU,CAAC;AAMjH,MAAM,WAAW,aAAa;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAqJD,wBAAgB,MAAM,CAAC,UAAU,EAAE,mBAAmB,EAAE,OAAO,GAAE,aAAkB,GAAG,kBAAkB,CAiBvG"}
|
|
@@ -43,8 +43,10 @@ function createFilterDecorator(queryClass, options = {}) {
|
|
|
43
43
|
return (0, common_1.createParamDecorator)((_data, ctx) => {
|
|
44
44
|
const request = ctx.switchToHttp().getRequest();
|
|
45
45
|
const queryParams = request.query ?? {};
|
|
46
|
-
const
|
|
47
|
-
const
|
|
46
|
+
const filterRaw = queryParams[paramName];
|
|
47
|
+
const filterString = typeof filterRaw === 'string' ? filterRaw : undefined;
|
|
48
|
+
const sortRaw = queryParams[sortParamName];
|
|
49
|
+
const sortString = typeof sortRaw === 'string' ? sortRaw : undefined;
|
|
48
50
|
// Handle filter
|
|
49
51
|
let filter;
|
|
50
52
|
if (!filterString || filterString.trim() === '') {
|
|
@@ -94,34 +96,35 @@ function createFilterDecorator(queryClass, options = {}) {
|
|
|
94
96
|
function applySwaggerMetadata(metadata, sortableMetadata, paramName, sortParamName, isOptional, target, propertyKey) {
|
|
95
97
|
try {
|
|
96
98
|
const { ApiQuery } = require('@nestjs/swagger');
|
|
97
|
-
if (ApiQuery)
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
99
|
+
if (!ApiQuery)
|
|
100
|
+
return;
|
|
101
|
+
const descriptor = Object.getOwnPropertyDescriptor(target, propertyKey);
|
|
102
|
+
// Filter query param description
|
|
103
|
+
const filterDescription = (0, swagger_util_1.buildSwaggerDescription)(metadata);
|
|
104
|
+
const filterDecorator = ApiQuery({
|
|
105
|
+
name: paramName,
|
|
106
|
+
required: !isOptional,
|
|
107
|
+
description: filterDescription,
|
|
108
|
+
type: String,
|
|
109
|
+
});
|
|
110
|
+
filterDecorator(target, propertyKey, descriptor);
|
|
111
|
+
// Sort query param description (only if sortable columns exist)
|
|
112
|
+
if (sortableMetadata.length > 0) {
|
|
113
|
+
const sortDescription = (0, swagger_util_1.buildSortSwaggerDescription)(sortableMetadata);
|
|
114
|
+
const sortDecorator = ApiQuery({
|
|
115
|
+
name: sortParamName,
|
|
116
|
+
required: false,
|
|
117
|
+
description: sortDescription,
|
|
104
118
|
type: String,
|
|
105
119
|
});
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
type: String,
|
|
115
|
-
});
|
|
116
|
-
sortDecorator(target, propertyKey, Object.getOwnPropertyDescriptor(target, propertyKey));
|
|
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
|
-
}
|
|
120
|
+
sortDecorator(target, propertyKey, descriptor);
|
|
121
|
+
}
|
|
122
|
+
// Apply x-filter-grammar extension to the operation
|
|
123
|
+
const { ApiExtension } = require('@nestjs/swagger');
|
|
124
|
+
if (ApiExtension) {
|
|
125
|
+
const extension = (0, swagger_util_1.buildFilterGrammarExtension)(metadata, sortableMetadata, paramName, sortParamName);
|
|
126
|
+
const extensionDecorator = ApiExtension('x-filter-grammar', extension);
|
|
127
|
+
extensionDecorator(target, propertyKey, descriptor);
|
|
125
128
|
}
|
|
126
129
|
}
|
|
127
130
|
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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"}
|
|
@@ -9,7 +9,7 @@ function buildSwaggerDescription(metadata) {
|
|
|
9
9
|
}
|
|
10
10
|
const fields = metadata
|
|
11
11
|
.map((col) => {
|
|
12
|
-
const ops = col.operators.
|
|
12
|
+
const ops = col.operators.join(', ');
|
|
13
13
|
return ` ${col.propertyKey}: (${ops})`;
|
|
14
14
|
})
|
|
15
15
|
.join('\n');
|
|
@@ -41,7 +41,7 @@ function buildSortSwaggerDescription(metadata) {
|
|
|
41
41
|
].join('\n');
|
|
42
42
|
}
|
|
43
43
|
function resolveFieldDef(meta) {
|
|
44
|
-
const operators = meta.operators
|
|
44
|
+
const operators = [...meta.operators];
|
|
45
45
|
const valueType = meta.valueType;
|
|
46
46
|
if (valueType === 'string' || valueType === 'number' || valueType === 'boolean') {
|
|
47
47
|
return { operators, type: valueType };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger.util.js","sourceRoot":"","sources":["../../src/swagger/swagger.util.ts"],"names":[],"mappings":";;AAEA,0DAuBC;AAED,kEAgBC;AAuCD,kEAiBC;AAjGD,SAAgB,uBAAuB,CAAC,QAA0B;IAChE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ;SACpB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"swagger.util.js","sourceRoot":"","sources":["../../src/swagger/swagger.util.ts"],"names":[],"mappings":";;AAEA,0DAuBC;AAED,kEAgBC;AAuCD,kEAiBC;AAjGD,SAAgB,uBAAuB,CAAC,QAA0B;IAChE,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ;SACpB,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,KAAK,GAAG,CAAC,WAAW,MAAM,GAAG,GAAG,CAAC;IAC1C,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;QACL,oBAAoB;QACpB,MAAM;QACN,EAAE;QACF,SAAS;QACT,kCAAkC;QAClC,kCAAkC;QAClC,4BAA4B;QAC5B,oBAAoB;QACpB,wBAAwB;KACzB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAgB,2BAA2B,CAAC,QAAkC;IAC5E,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEjE,OAAO;QACL,kBAAkB;QAClB,KAAK,MAAM,EAAE;QACb,EAAE;QACF,SAAS;QACT,sCAAsC;QACtC,sBAAsB;QACtB,sCAAsC;KACvC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAiBD,SAAS,eAAe,CAAC,IAAoB;IAC3C,MAAM,SAAS,GAAa,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;IAEjC,IAAI,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,QAAQ,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QAChF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IACxC,CAAC;IAED,oDAAoD;IACpD,IAAI,MAA2B,CAAC;IAChC,IAAI,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QAC7B,MAAM,GAAG,SAAS,CAAC;IACrB,CAAC;SAAM,CAAC;QACN,8CAA8C;QAC9C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;aAC/B,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;aACrC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC7C,CAAC;AAED,SAAgB,2BAA2B,CACzC,QAA0B,EAC1B,gBAA0C,EAC1C,WAAmB,EACnB,SAAiB;IAEjB,MAAM,MAAM,GAA0C,EAAE,CAAC;IACzD,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;QACL,WAAW;QACX,SAAS;QACT,MAAM;QACN,QAAQ,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;KACrD,CAAC;AACJ,CAAC"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,sBAAsB,EAAE,MAAM,QAAQ,CAAC;AAC1E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;AAAA,+BAA0E;AAAjE,qGAAA,aAAa,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;AAAA,+BAA0E;AAAjE,qGAAA,aAAa,OAAA;AAMtB,IAAY,cA6BX;AA7BD,WAAY,cAAc;IACxB,iBAAiB;IACjB,0BAAQ,CAAA;IACR,sBAAsB;IACtB,4BAAU,CAAA;IACV,uBAAuB;IACvB,0BAAQ,CAAA;IACR,oBAAoB;IACpB,0BAAQ,CAAA;IACR,iCAAiC;IACjC,4BAAU,CAAA;IACV,8BAA8B;IAC9B,4BAAU,CAAA;IACV,kCAAkC;IAClC,2BAAS,CAAA;IACT,uCAAuC;IACvC,6BAAW,CAAA;IACX,uCAAuC;IACvC,mCAAiB,CAAA;IACjB,qCAAqC;IACrC,iCAAe,CAAA;IACf,oCAAoC;IACpC,iCAAe,CAAA;IACf,yCAAyC;IACzC,oCAAkB,CAAA;IAClB,uCAAuC;IACvC,kCAAgB,CAAA;IAChB,sCAAsC;IACtC,kCAAgB,CAAA;AAClB,CAAC,EA7BW,cAAc,8BAAd,cAAc,QA6BzB;AAED,wEAAwE;AAC3D,QAAA,kBAAkB,GAAgC,IAAI,GAAG,CAAC;IACrE,cAAc,CAAC,EAAE;IACjB,cAAc,CAAC,GAAG;IAClB,cAAc,CAAC,GAAG;IAClB,cAAc,CAAC,IAAI;CACpB,CAAC,CAAC"}
|
package/dist/validate.js
CHANGED
|
@@ -30,7 +30,7 @@ function validateCondition(condition, columnMap, errors) {
|
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
if (!meta.operators.includes(condition.operator)) {
|
|
33
|
-
const allowed = meta.operators.
|
|
33
|
+
const allowed = meta.operators.join(', ');
|
|
34
34
|
errors.push({
|
|
35
35
|
message: `Operator '${condition.operator}' is not allowed for field '${condition.field}'. Allowed operators: ${allowed}`,
|
|
36
36
|
offset: condition.operatorOffset,
|
package/dist/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":";;AASA,wCASC;AAlBD,mCAOiB;AAEjB,SAAgB,cAAc,CAC5B,IAAgB,EAChB,QAA0B;IAE1B,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CACpB,IAAgB,EAChB,SAAsC,EACtC,MAAqB;IAErB,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,iBAAiB,CAAC,IAAuB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,KAAK,IAAK,IAAoB,CAAC,UAAU,EAAE,CAAC;YACrD,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,SAA0B,EAC1B,SAAsC,EACtC,MAAqB;IAErB,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAE5C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,6BAA6B,SAAS,CAAC,KAAK,GAAG;YACxD,MAAM,EAAE,SAAS,CAAC,WAAW;YAC7B,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM;YAC9B,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../src/validate.ts"],"names":[],"mappings":";;AASA,wCASC;AAlBD,mCAOiB;AAEjB,SAAgB,cAAc,CAC5B,IAAgB,EAChB,QAA0B;IAE1B,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnE,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IACvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CACpB,IAAgB,EAChB,SAAsC,EACtC,MAAqB;IAErB,IAAI,OAAO,IAAI,IAAI,EAAE,CAAC;QACpB,iBAAiB,CAAC,IAAuB,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;IAChE,CAAC;SAAM,CAAC;QACN,KAAK,MAAM,KAAK,IAAK,IAAoB,CAAC,UAAU,EAAE,CAAC;YACrD,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CACxB,SAA0B,EAC1B,SAAsC,EACtC,MAAqB;IAErB,MAAM,IAAI,GAAG,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAE5C,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,6BAA6B,SAAS,CAAC,KAAK,GAAG;YACxD,MAAM,EAAE,SAAS,CAAC,WAAW;YAC7B,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,MAAM;YAC9B,KAAK,EAAE,SAAS,CAAC,KAAK;SACvB,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,aAAa,SAAS,CAAC,QAAQ,+BAA+B,SAAS,CAAC,KAAK,yBAAyB,OAAO,EAAE;YACxH,MAAM,EAAE,SAAS,CAAC,cAAc;YAChC,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM;YACjC,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,0BAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/E,MAAM,CAAC,IAAI,CAAC;YACV,OAAO,EAAE,UAAU,SAAS,CAAC,KAAK,oBAAoB,SAAS,CAAC,QAAQ,oFAAoF;YAC5J,MAAM,EAAE,SAAS,CAAC,WAAW;YAC7B,MAAM,EAAE,CAAC;YACT,KAAK,EAAE,SAAS,CAAC,KAAK;YACtB,QAAQ,EAAE,SAAS,CAAC,QAAQ;SAC7B,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -1,52 +1,7 @@
|
|
|
1
|
-
import { CstNode
|
|
1
|
+
import { CstNode } from 'chevrotain';
|
|
2
2
|
import { FilterParser } from '../parser/filter-parser';
|
|
3
|
-
import { FilterTree
|
|
4
|
-
/** CST node for `orExpression → andExpression (Pipe andExpression)*` */
|
|
5
|
-
interface OrExpressionCstChildren {
|
|
6
|
-
andExpression: CstNode[];
|
|
7
|
-
}
|
|
8
|
-
/** CST node for `andExpression → atom (Semicolon atom)*` */
|
|
9
|
-
interface AndExpressionCstChildren {
|
|
10
|
-
atom: CstNode[];
|
|
11
|
-
}
|
|
12
|
-
/** CST node for `atom → "(" orExpression ")" | condition` */
|
|
13
|
-
interface AtomCstChildren {
|
|
14
|
-
orExpression?: CstNode[];
|
|
15
|
-
condition?: CstNode[];
|
|
16
|
-
}
|
|
17
|
-
/** CST node for `condition → Token operator values` */
|
|
18
|
-
interface ConditionCstChildren {
|
|
19
|
-
field: IToken[];
|
|
20
|
-
operator: CstNode[];
|
|
21
|
-
values: CstNode[];
|
|
22
|
-
}
|
|
23
|
-
/** CST node for `operator → GreaterEqual | LessEqual | ...` */
|
|
24
|
-
interface OperatorCstChildren {
|
|
25
|
-
[tokenName: string]: IToken[] | undefined;
|
|
26
|
-
}
|
|
27
|
-
/** CST node for `values → value (Comma value)*` */
|
|
28
|
-
interface ValuesCstChildren {
|
|
29
|
-
value: CstNode[];
|
|
30
|
-
}
|
|
31
|
-
/** CST node for `value → StringLiteral | NullLiteral | Token` */
|
|
32
|
-
interface ValueCstChildren {
|
|
33
|
-
StringLiteral?: IToken[];
|
|
34
|
-
NullLiteral?: IToken[];
|
|
35
|
-
Token?: IToken[];
|
|
36
|
-
}
|
|
3
|
+
import { FilterTree } from '../types';
|
|
37
4
|
export declare function buildFilterVisitor(parser: FilterParser): {
|
|
38
|
-
|
|
39
|
-
andExpression(ctx: AndExpressionCstChildren): FilterTree;
|
|
40
|
-
atom(ctx: AtomCstChildren): FilterTree;
|
|
41
|
-
condition(ctx: ConditionCstChildren): FilterCondition;
|
|
42
|
-
operator(ctx: OperatorCstChildren): {
|
|
43
|
-
operator: FilterOperator;
|
|
44
|
-
operatorOffset: number;
|
|
45
|
-
};
|
|
46
|
-
values(ctx: ValuesCstChildren): FilterValue[];
|
|
47
|
-
value(ctx: ValueCstChildren): FilterValue;
|
|
48
|
-
visit(cstNode: CstNode | CstNode[], param?: any): any;
|
|
49
|
-
validateVisitor(): void;
|
|
5
|
+
visit(node: CstNode): FilterTree;
|
|
50
6
|
};
|
|
51
|
-
export {};
|
|
52
7
|
//# sourceMappingURL=filter-visitor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-visitor.d.ts","sourceRoot":"","sources":["../../src/visitor/filter-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"filter-visitor.d.ts","sourceRoot":"","sources":["../../src/visitor/filter-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAU,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,UAAU,EAIX,MAAM,UAAU,CAAC;AAyElB,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,CAAC,IAAI,EAAE,OAAO,GAAG,UAAU,CAAA;CAAE,CAmE7F"}
|
package/package.json
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nestjs-filter-grammar/core",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.2",
|
|
4
4
|
"description": "Chevrotain-based filter DSL parser for NestJS with decorator-based column/operator declarations",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
|
-
"scripts": {
|
|
8
|
-
"build": "tsc -p tsconfig.build.json",
|
|
9
|
-
"test": "vitest run",
|
|
10
|
-
"test:watch": "vitest",
|
|
11
|
-
"typecheck": "tsc --noEmit"
|
|
12
|
-
},
|
|
13
7
|
"dependencies": {
|
|
14
|
-
"chevrotain": "^
|
|
8
|
+
"chevrotain": "^10.5.0"
|
|
15
9
|
},
|
|
16
10
|
"peerDependencies": {
|
|
17
11
|
"@nestjs/common": ">=10.0.0",
|
|
@@ -42,5 +36,11 @@
|
|
|
42
36
|
},
|
|
43
37
|
"files": [
|
|
44
38
|
"dist"
|
|
45
|
-
]
|
|
46
|
-
|
|
39
|
+
],
|
|
40
|
+
"scripts": {
|
|
41
|
+
"build": "tsc -p tsconfig.build.json",
|
|
42
|
+
"test": "vitest run",
|
|
43
|
+
"test:watch": "vitest",
|
|
44
|
+
"typecheck": "tsc --noEmit"
|
|
45
|
+
}
|
|
46
|
+
}
|