@ptc-org/nestjs-query-typeorm 1.0.0-alpha.4 → 1.0.0-alpha.5
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 +3 -3
- package/src/query/aggregate.builder.d.ts +7 -1
- package/src/query/aggregate.builder.js +20 -1
- package/src/query/aggregate.builder.js.map +1 -1
- package/src/query/filter-query.builder.d.ts +1 -1
- package/src/query/filter-query.builder.js +10 -8
- package/src/query/filter-query.builder.js.map +1 -1
- package/src/query/relation-query.builder.js +1 -1
- package/src/query/relation-query.builder.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ptc-org/nestjs-query-typeorm",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.5",
|
|
4
4
|
"description": "Typeorm 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",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"lodash.filter": "^4.6.0",
|
|
23
23
|
"lodash.merge": "^4.6.2",
|
|
24
24
|
"lodash.omit": "^4.5.0",
|
|
25
|
-
"tslib": "^2.
|
|
25
|
+
"tslib": "^2.4.0",
|
|
26
26
|
"uuid": "^8.3.2"
|
|
27
27
|
},
|
|
28
28
|
"peerDependencies": {
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"@nestjs/typeorm": "^8.0.0",
|
|
31
31
|
"class-transformer": "^0.2.3 || 0.3.1 || 0.4",
|
|
32
32
|
"typeorm": "^0.2.25",
|
|
33
|
-
"@ptc-org/nestjs-query-core": "1.0.0-alpha.
|
|
33
|
+
"@ptc-org/nestjs-query-core": "1.0.0-alpha.4",
|
|
34
34
|
"reflect-metadata": "^0.1.13"
|
|
35
35
|
},
|
|
36
36
|
"repository": {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { SelectQueryBuilder } from 'typeorm';
|
|
1
|
+
import { Repository, SelectQueryBuilder } from 'typeorm';
|
|
2
2
|
import { AggregateQuery, AggregateResponse } from '@ptc-org/nestjs-query-core';
|
|
3
3
|
declare enum AggregateFuncs {
|
|
4
4
|
AVG = "AVG",
|
|
@@ -12,6 +12,8 @@ declare enum AggregateFuncs {
|
|
|
12
12
|
* Builds a WHERE clause from a Filter.
|
|
13
13
|
*/
|
|
14
14
|
export declare class AggregateBuilder<Entity> {
|
|
15
|
+
readonly repo: Repository<Entity>;
|
|
16
|
+
constructor(repo: Repository<Entity>);
|
|
15
17
|
static asyncConvertToAggregateResponse<Entity>(responsePromise: Promise<Record<string, unknown>[]>): Promise<AggregateResponse<Entity>[]>;
|
|
16
18
|
static getAggregateSelects<Entity>(query: AggregateQuery<Entity>): string[];
|
|
17
19
|
private static getAggregateGroupBySelects;
|
|
@@ -19,6 +21,10 @@ export declare class AggregateBuilder<Entity> {
|
|
|
19
21
|
static getAggregateAlias<Entity>(func: AggregateFuncs, field: keyof Entity): string;
|
|
20
22
|
static getGroupByAlias<Entity>(field: keyof Entity): string;
|
|
21
23
|
static convertToAggregateResponse<Entity>(rawAggregates: Record<string, unknown>[]): AggregateResponse<Entity>[];
|
|
24
|
+
/**
|
|
25
|
+
* Returns the corrected fields for orderBy and groupBy
|
|
26
|
+
*/
|
|
27
|
+
getCorrectedField(alias: string, field: string): string;
|
|
22
28
|
/**
|
|
23
29
|
* Builds a aggregate SELECT clause from a aggregate.
|
|
24
30
|
* @param qb - the `typeorm` SelectQueryBuilder
|
|
@@ -17,6 +17,9 @@ const AGG_REGEXP = /(AVG|SUM|COUNT|MAX|MIN|GROUP_BY)_(.*)/;
|
|
|
17
17
|
* Builds a WHERE clause from a Filter.
|
|
18
18
|
*/
|
|
19
19
|
class AggregateBuilder {
|
|
20
|
+
constructor(repo) {
|
|
21
|
+
this.repo = repo;
|
|
22
|
+
}
|
|
20
23
|
// eslint-disable-next-line @typescript-eslint/no-shadow
|
|
21
24
|
static async asyncConvertToAggregateResponse(responsePromise) {
|
|
22
25
|
const aggResponse = await responsePromise;
|
|
@@ -72,6 +75,17 @@ class AggregateBuilder {
|
|
|
72
75
|
}, {});
|
|
73
76
|
});
|
|
74
77
|
}
|
|
78
|
+
/**
|
|
79
|
+
* Returns the corrected fields for orderBy and groupBy
|
|
80
|
+
*/
|
|
81
|
+
getCorrectedField(alias, field) {
|
|
82
|
+
const col = alias ? `${alias}.${field}` : `${field}`;
|
|
83
|
+
const meta = this.repo.metadata.findColumnWithPropertyName(`${field}`);
|
|
84
|
+
if (meta && this.repo.manager.connection.driver.normalizeType(meta) === 'datetime') {
|
|
85
|
+
return `DATE(${col})`;
|
|
86
|
+
}
|
|
87
|
+
return col;
|
|
88
|
+
}
|
|
75
89
|
/**
|
|
76
90
|
* Builds a aggregate SELECT clause from a aggregate.
|
|
77
91
|
* @param qb - the `typeorm` SelectQueryBuilder
|
|
@@ -108,7 +122,12 @@ class AggregateBuilder {
|
|
|
108
122
|
}
|
|
109
123
|
return fields.map((field) => {
|
|
110
124
|
const col = alias ? `${alias}.${field}` : field;
|
|
111
|
-
|
|
125
|
+
const groupByAlias = AggregateBuilder.getGroupByAlias(field);
|
|
126
|
+
const meta = this.repo.metadata.findColumnWithPropertyName(`${field}`);
|
|
127
|
+
if (meta && this.repo.manager.connection.driver.normalizeType(meta) === 'datetime') {
|
|
128
|
+
return [`DATE(${col})`, groupByAlias];
|
|
129
|
+
}
|
|
130
|
+
return [`${col}`, groupByAlias];
|
|
112
131
|
});
|
|
113
132
|
}
|
|
114
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aggregate.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/aggregate.builder.ts"],"names":[],"mappings":";;;AAEA,2CAAqD;AACrD,2CAAuC;AAEvC,IAAK,cAMJ;AAND,WAAK,cAAc;IACjB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,iCAAe,CAAA;IACf,6BAAW,CAAA;IACX,6BAAW,CAAA;AACb,CAAC,EANI,cAAc,KAAd,cAAc,QAMlB;AAED,MAAM,UAAU,GAAG,uCAAuC,CAAC;AAE3D;;;GAGG;AACH,MAAa,gBAAgB;IAC3B,wDAAwD;
|
|
1
|
+
{"version":3,"file":"aggregate.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/aggregate.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,7 @@ export declare class FilterQueryBuilder<Entity> {
|
|
|
99
99
|
* @param alias - optional alias to use to qualify an identifier
|
|
100
100
|
*/
|
|
101
101
|
applySorting<T extends Sortable<Entity>>(qb: T, sorts?: SortField<Entity>[], alias?: string): T;
|
|
102
|
-
|
|
102
|
+
applyAggregateGroupBy<T extends Groupable<Entity>>(qb: T, groupBy?: (keyof Entity)[], alias?: string): T;
|
|
103
103
|
applyAggregateSorting<T extends Sortable<Entity>>(qb: T, groupBy?: (keyof Entity)[], alias?: string): T;
|
|
104
104
|
/**
|
|
105
105
|
* Create a `typeorm` SelectQueryBuilder which can be used as an entry point to create update, delete or insert
|
|
@@ -12,7 +12,7 @@ const lodash_merge_1 = (0, tslib_1.__importDefault)(require("lodash.merge"));
|
|
|
12
12
|
* Class that will convert a Query into a `typeorm` Query Builder.
|
|
13
13
|
*/
|
|
14
14
|
class FilterQueryBuilder {
|
|
15
|
-
constructor(repo, whereBuilder = new where_builder_1.WhereBuilder(), aggregateBuilder = new aggregate_builder_1.AggregateBuilder()) {
|
|
15
|
+
constructor(repo, whereBuilder = new where_builder_1.WhereBuilder(), aggregateBuilder = new aggregate_builder_1.AggregateBuilder(repo)) {
|
|
16
16
|
this.repo = repo;
|
|
17
17
|
this.whereBuilder = whereBuilder;
|
|
18
18
|
this.aggregateBuilder = aggregateBuilder;
|
|
@@ -46,11 +46,15 @@ class FilterQueryBuilder {
|
|
|
46
46
|
return qb;
|
|
47
47
|
}
|
|
48
48
|
aggregate(query, aggregate) {
|
|
49
|
+
const hasRelations = this.filterHasRelations(query.filter);
|
|
49
50
|
let qb = this.createQueryBuilder();
|
|
51
|
+
qb = hasRelations
|
|
52
|
+
? this.applyRelationJoinsRecursive(qb, this.getReferencedRelationsRecursive(this.repo.metadata, query.filter))
|
|
53
|
+
: qb;
|
|
50
54
|
qb = this.applyAggregate(qb, aggregate, qb.alias);
|
|
51
55
|
qb = this.applyFilter(qb, query.filter, qb.alias);
|
|
52
56
|
qb = this.applyAggregateSorting(qb, aggregate.groupBy, qb.alias);
|
|
53
|
-
qb = this.
|
|
57
|
+
qb = this.applyAggregateGroupBy(qb, aggregate.groupBy, qb.alias);
|
|
54
58
|
return qb;
|
|
55
59
|
}
|
|
56
60
|
/**
|
|
@@ -131,13 +135,12 @@ class FilterQueryBuilder {
|
|
|
131
135
|
return prevQb.addOrderBy(col, direction, nulls);
|
|
132
136
|
}, qb);
|
|
133
137
|
}
|
|
134
|
-
|
|
138
|
+
applyAggregateGroupBy(qb, groupBy, alias) {
|
|
135
139
|
if (!groupBy) {
|
|
136
140
|
return qb;
|
|
137
141
|
}
|
|
138
|
-
return groupBy.reduce((prevQb,
|
|
139
|
-
|
|
140
|
-
return prevQb.addGroupBy(col);
|
|
142
|
+
return groupBy.reduce((prevQb, field) => {
|
|
143
|
+
return prevQb.addGroupBy(this.aggregateBuilder.getCorrectedField(alias, field));
|
|
141
144
|
}, qb);
|
|
142
145
|
}
|
|
143
146
|
applyAggregateSorting(qb, groupBy, alias) {
|
|
@@ -145,8 +148,7 @@ class FilterQueryBuilder {
|
|
|
145
148
|
return qb;
|
|
146
149
|
}
|
|
147
150
|
return groupBy.reduce((prevQb, field) => {
|
|
148
|
-
|
|
149
|
-
return prevQb.addOrderBy(col, 'ASC');
|
|
151
|
+
return prevQb.addOrderBy(this.aggregateBuilder.getCorrectedField(alias, field), 'ASC');
|
|
150
152
|
}, qb);
|
|
151
153
|
}
|
|
152
154
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/filter-query.builder.ts"],"names":[],"mappings":";;;;AAAA,kEAA+G;AAW/G,2DAAuD;AACvD,mDAA+C;AAC/C,6EAAiC;
|
|
1
|
+
{"version":3,"file":"filter-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/filter-query.builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ class RelationQueryBuilder {
|
|
|
58
58
|
relationBuilder = this.filterQueryBuilder.applyAggregate(relationBuilder, aggregateQuery, relationBuilder.alias);
|
|
59
59
|
relationBuilder = this.filterQueryBuilder.applyFilter(relationBuilder, query.filter, relationBuilder.alias);
|
|
60
60
|
relationBuilder = this.filterQueryBuilder.applyAggregateSorting(relationBuilder, aggregateQuery.groupBy, relationBuilder.alias);
|
|
61
|
-
relationBuilder = this.filterQueryBuilder.
|
|
61
|
+
relationBuilder = this.filterQueryBuilder.applyAggregateGroupBy(relationBuilder, aggregateQuery.groupBy, relationBuilder.alias);
|
|
62
62
|
return relationBuilder;
|
|
63
63
|
}
|
|
64
64
|
get relationMeta() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relation-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/relation-query.builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"relation-query.builder.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/query/relation-query.builder.ts"],"names":[],"mappings":"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"}
|