@ptc-org/nestjs-query-mongoose 4.0.0 → 4.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/package.json +6 -5
- package/src/query/aggregate.builder.js +1 -1
- package/src/query/aggregate.builder.js.map +1 -1
- package/src/query/filter-query.builder.d.ts +2 -2
- package/src/query/filter-query.builder.js.map +1 -1
- package/src/query/where.builder.d.ts +12 -0
- package/src/query/where.builder.js +34 -2
- package/src/query/where.builder.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-mongoose",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"description": "Mongoose adapter for @ptc-org/nestjs-query-core",
|
|
5
5
|
"author": "doug-martin <doug@dougamartin.com>",
|
|
6
6
|
"homepage": "https://github.com/tripss/nestjs-query#readme",
|
|
7
7
|
"license": "MIT",
|
|
8
|
-
"main": "src/index.js",
|
|
8
|
+
"main": "./src/index.js",
|
|
9
9
|
"types": "src/index.d.ts",
|
|
10
10
|
"directories": {
|
|
11
11
|
"lib": "src",
|
|
@@ -21,13 +21,13 @@
|
|
|
21
21
|
"camel-case": "^4.1.2",
|
|
22
22
|
"lodash.escaperegexp": "^4.1.2",
|
|
23
23
|
"lodash.merge": "^4.6.2",
|
|
24
|
-
"tslib": "^2.6.
|
|
24
|
+
"tslib": "^2.6.2"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
27
|
"@nestjs/common": "^9.0.0 || ^10.0.0",
|
|
28
28
|
"@nestjs/mongoose": "^9.0.0 || ^10.0.0",
|
|
29
29
|
"mongoose": "^6.5.0",
|
|
30
|
-
"@ptc-org/nestjs-query-core": "4.
|
|
30
|
+
"@ptc-org/nestjs-query-core": "4.1.0",
|
|
31
31
|
"reflect-metadata": "0.1.13"
|
|
32
32
|
},
|
|
33
33
|
"repository": {
|
|
@@ -37,5 +37,6 @@
|
|
|
37
37
|
},
|
|
38
38
|
"bugs": {
|
|
39
39
|
"url": "https://github.com/tripss/nestjs-query/issues"
|
|
40
|
-
}
|
|
40
|
+
},
|
|
41
|
+
"type": "commonjs"
|
|
41
42
|
}
|
|
@@ -72,7 +72,7 @@ class AggregateBuilder {
|
|
|
72
72
|
return fields.reduce((agg, { field }) => {
|
|
73
73
|
const aggAlias = `${func}_${field}`;
|
|
74
74
|
const fieldAlias = `$${(0, helpers_1.getSchemaKey)(String(field))}`;
|
|
75
|
-
if (func ===
|
|
75
|
+
if (func === AggregateFuncs.COUNT) {
|
|
76
76
|
return {
|
|
77
77
|
...agg,
|
|
78
78
|
[aggAlias]: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.builder.js","sourceRoot":"","sources":["../../../../../packages/query-mongoose/src/query/aggregate.builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"aggregate.builder.js","sourceRoot":"","sources":["../../../../../packages/query-mongoose/src/query/aggregate.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,8 +26,8 @@ export declare class FilterQueryBuilder<Entity extends Document> {
|
|
|
26
26
|
constructor(Model: MongooseModel<Entity>, whereBuilder?: WhereBuilder<Entity>, aggregateBuilder?: AggregateBuilder<Entity>);
|
|
27
27
|
buildQuery({ filter, paging, sorting }: Query<Entity>): MongooseQuery<Entity>;
|
|
28
28
|
buildAggregateQuery(aggregate: AggregateQuery<Entity>, filter?: Filter<Entity>): MongooseAggregateQuery<Entity>;
|
|
29
|
-
buildIdAggregateQuery(id: unknown
|
|
30
|
-
buildIdFilterQuery(id: unknown
|
|
29
|
+
buildIdAggregateQuery(id: unknown, filter: Filter<Entity>, aggregate: AggregateQuery<Entity>): MongooseAggregateQuery<Entity>;
|
|
30
|
+
buildIdFilterQuery(id: unknown, filter?: Filter<Entity>): FilterQuery<Entity>;
|
|
31
31
|
/**
|
|
32
32
|
* Applies the filter from a Query to a `typeorm` QueryBuilder.
|
|
33
33
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-mongoose/src/query/filter-query.builder.ts"],"names":[],"mappings":";;;AAAA,kEAAoG;AAGpG,2DAAiF;AACjF,uCAAwC;AACxC,mDAA8C;AAE9C,MAAM,uBAAuB,GAAkC;IAC7D,CAAC,iCAAa,CAAC,GAAG,CAAC,EAAE,CAAC;IACtB,CAAC,iCAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;CACzB,CAAA;AAYD;;;;GAIG;AACH,MAAa,kBAAkB;IAC7B,YACW,KAA4B,EAC5B,eAAqC,IAAI,4BAAY,CAAS,KAAK,CAAC,EACpE,mBAA6C,IAAI,oCAAgB,EAAU;QAF3E,UAAK,GAAL,KAAK,CAAuB;QAC5B,iBAAY,GAAZ,YAAY,CAAwD;QACpE,qBAAgB,GAAhB,gBAAgB,CAA2D;IACnF,CAAC;IAEG,UAAU,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAiB;QAC1D,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAC1C,OAAO,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE;SAC1F,CAAA;IACH,CAAC;IAEM,mBAAmB,CAAC,SAAiC,EAAE,MAAuB;QACnF,OAAO;YACL,WAAW,EAAE,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;YAC1C,SAAS,EAAE,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAC;YACjD,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,SAAS,CAAC,EAAE;SACzD,CAAA;IACH,CAAC;IAEM,qBAAqB,CAC1B,
|
|
1
|
+
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-mongoose/src/query/filter-query.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,18 @@ export declare class WhereBuilder<Entity extends Document> {
|
|
|
14
14
|
* @param filter - the filter to build the WHERE clause from.
|
|
15
15
|
*/
|
|
16
16
|
build(filter: Filter<Entity>): FilterQuery<Entity>;
|
|
17
|
+
/**
|
|
18
|
+
* Normalizes a filter to a dot notation filter for objects with sub objects.
|
|
19
|
+
* @param filter - the filter to normalize.
|
|
20
|
+
* @private
|
|
21
|
+
*/
|
|
22
|
+
private getNormalizedFilter;
|
|
23
|
+
/**
|
|
24
|
+
* Checks if a filter is a GraphQLFilter.
|
|
25
|
+
* @param filter - the filter to check.
|
|
26
|
+
* @private
|
|
27
|
+
*/
|
|
28
|
+
private isGraphQLFilter;
|
|
17
29
|
/**
|
|
18
30
|
* Creates field comparisons from a filter. This method will ignore and/or properties.
|
|
19
31
|
* @param filter - the filter with fields to create comparisons for.
|
|
@@ -10,13 +10,20 @@ class WhereBuilder {
|
|
|
10
10
|
constructor(Model, comparisonBuilder = new comparison_builder_1.ComparisonBuilder(Model)) {
|
|
11
11
|
this.Model = Model;
|
|
12
12
|
this.comparisonBuilder = comparisonBuilder;
|
|
13
|
+
/**
|
|
14
|
+
* Checks if a filter is a GraphQLFilter.
|
|
15
|
+
* @param filter - the filter to check.
|
|
16
|
+
* @private
|
|
17
|
+
*/
|
|
18
|
+
this.isGraphQLFilter = (filter) => typeof filter === `object` && !Array.isArray(filter) && filter?.constructor?.name === 'GraphQLFilter';
|
|
13
19
|
}
|
|
14
20
|
/**
|
|
15
21
|
* Builds a WHERE clause from a Filter.
|
|
16
22
|
* @param filter - the filter to build the WHERE clause from.
|
|
17
23
|
*/
|
|
18
24
|
build(filter) {
|
|
19
|
-
const
|
|
25
|
+
const normalizedFilter = this.getNormalizedFilter(filter);
|
|
26
|
+
const { and, or } = normalizedFilter;
|
|
20
27
|
let ands = [];
|
|
21
28
|
let ors = [];
|
|
22
29
|
let filterQuery = {};
|
|
@@ -26,7 +33,7 @@ class WhereBuilder {
|
|
|
26
33
|
if (or && or.length) {
|
|
27
34
|
ors = or.map((f) => this.build(f));
|
|
28
35
|
}
|
|
29
|
-
const filterAnds = this.filterFields(
|
|
36
|
+
const filterAnds = this.filterFields(normalizedFilter);
|
|
30
37
|
if (filterAnds) {
|
|
31
38
|
ands = [...ands, filterAnds];
|
|
32
39
|
}
|
|
@@ -38,6 +45,31 @@ class WhereBuilder {
|
|
|
38
45
|
}
|
|
39
46
|
return filterQuery;
|
|
40
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* Normalizes a filter to a dot notation filter for objects with sub objects.
|
|
50
|
+
* @param filter - the filter to normalize.
|
|
51
|
+
* @private
|
|
52
|
+
*/
|
|
53
|
+
getNormalizedFilter(filter) {
|
|
54
|
+
if (!this.isGraphQLFilter(filter))
|
|
55
|
+
return filter;
|
|
56
|
+
const newFilter = {};
|
|
57
|
+
const keys = Object.keys(filter);
|
|
58
|
+
// Converting to dot notation
|
|
59
|
+
for (const key of keys) {
|
|
60
|
+
const value = filter[key];
|
|
61
|
+
if (!['and', 'or'].includes(key) && this.isGraphQLFilter(value)) {
|
|
62
|
+
const subFilter = this.getNormalizedFilter(value);
|
|
63
|
+
for (const subKey of Object.keys(subFilter)) {
|
|
64
|
+
newFilter[`${key}.${subKey}`] = subFilter[subKey];
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
newFilter[key] = value;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
return newFilter;
|
|
72
|
+
}
|
|
41
73
|
/**
|
|
42
74
|
* Creates field comparisons from a filter. This method will ignore and/or properties.
|
|
43
75
|
* @param filter - the filter with fields to create comparisons for.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-mongoose/src/query/where.builder.ts"],"names":[],"mappings":";;;AAGA,6DAA+E;AAE/E;;;GAGG;AACH,MAAa,YAAY;IACvB,YACW,KAA4B,EAC5B,oBAA+C,IAAI,sCAAiB,CAAC,KAAK,CAAC;QAD3E,UAAK,GAAL,KAAK,CAAuB;QAC5B,sBAAiB,GAAjB,iBAAiB,CAA0D;
|
|
1
|
+
{"version":3,"file":"where.builder.js","sourceRoot":"","sources":["../../../../../packages/query-mongoose/src/query/where.builder.ts"],"names":[],"mappings":"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"}
|