@ptc-org/nestjs-query-typeorm 1.0.0-alpha.2 → 1.0.0-alpha.3

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +527 -0
  2. package/package.json +1 -1
  3. package/src/query/relation-query.builder.d.ts +10 -5
  4. package/src/query/relation-query.builder.js +66 -83
  5. package/src/query/relation-query.builder.js.map +1 -1
  6. package/src/services/relation-query.service.d.ts +0 -1
  7. package/src/services/relation-query.service.js +1 -9
  8. package/src/services/relation-query.service.js.map +1 -1
package/CHANGELOG.md ADDED
@@ -0,0 +1,527 @@
1
+ # Change Log
2
+
3
+ All notable changes to this project will be documented in this file.
4
+ See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
+
6
+ # [0.30.0](https://github.com/tripss/nestjs-query/compare/v0.29.0...v0.30.0) (2021-09-30)
7
+
8
+
9
+ ### Bug Fixes
10
+
11
+ * **query-typeorm:** import jest-extended into typeorm query service ([f539b29](https://github.com/tripss/nestjs-query/commit/f539b29fad60c070e8736f872d547fd498eb3c4f))
12
+ * **tests:** fix jest-extended typings and eslint problems ([6af8af1](https://github.com/tripss/nestjs-query/commit/6af8af13a33faaa1585561e7b426b125a6368b6b))
13
+ * **typeorm:** revert uneeded change to test entity ([86f7fd9](https://github.com/tripss/nestjs-query/commit/86f7fd9abb101eb40af2cf66009d50cb8c173eea))
14
+
15
+
16
+ ### Features
17
+
18
+ * **query-typeorm:** allow deeply nested filters ([0bd6b76](https://github.com/tripss/nestjs-query/commit/0bd6b76c4dbd876df7f9a991803843405d24fdb9))
19
+
20
+
21
+
22
+
23
+
24
+ # [0.29.0](https://github.com/tripss/nestjs-query/compare/v0.28.1...v0.29.0) (2021-09-09)
25
+
26
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
27
+
28
+
29
+
30
+
31
+
32
+ ## [0.28.1](https://github.com/tripss/nestjs-query/compare/v0.28.0...v0.28.1) (2021-07-27)
33
+
34
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
35
+
36
+
37
+
38
+
39
+
40
+ # [0.28.0](https://github.com/tripss/nestjs-query/compare/v0.27.0...v0.28.0) (2021-07-19)
41
+
42
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
43
+
44
+
45
+
46
+
47
+
48
+ # [0.27.0](https://github.com/tripss/nestjs-query/compare/v0.26.0...v0.27.0) (2021-05-12)
49
+
50
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
51
+
52
+
53
+
54
+
55
+
56
+ # [0.26.0](https://github.com/tripss/nestjs-query/compare/v0.25.1...v0.26.0) (2021-04-13)
57
+
58
+
59
+ ### Features
60
+
61
+ * **typeorm:** Implement `setRelations` to set many relations ([d1109b7](https://github.com/tripss/nestjs-query/commit/d1109b70f961cf59d7cbc8b8a85c401980a2b6c4))
62
+
63
+
64
+
65
+
66
+
67
+ ## [0.25.1](https://github.com/tripss/nestjs-query/compare/v0.25.0...v0.25.1) (2021-04-07)
68
+
69
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
70
+
71
+
72
+
73
+
74
+
75
+ # [0.25.0](https://github.com/tripss/nestjs-query/compare/v0.24.5...v0.25.0) (2021-03-31)
76
+
77
+
78
+ ### Bug Fixes
79
+
80
+ * Add consistent sorting for aggregate queries ([4ac7a14](https://github.com/tripss/nestjs-query/commit/4ac7a1485c7dcd83569951298606f487608806b1))
81
+
82
+
83
+ ### Features
84
+
85
+ * **typeorm:** Update to support new aggregate with groupBy ([e2a4f30](https://github.com/tripss/nestjs-query/commit/e2a4f3066834ae7fddf0239ab647a0a9de667149))
86
+
87
+
88
+
89
+
90
+
91
+ ## [0.24.4](https://github.com/tripss/nestjs-query/compare/v0.24.3...v0.24.4) (2021-03-18)
92
+
93
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
94
+
95
+
96
+
97
+
98
+
99
+ ## [0.24.1](https://github.com/tripss/nestjs-query/compare/v0.24.0...v0.24.1) (2021-03-16)
100
+
101
+
102
+ ### Bug Fixes
103
+
104
+ * **typeorm, #954:** Filtering on relations with pagination ([#977](https://github.com/tripss/nestjs-query/issues/977)) ([f5a6374](https://github.com/tripss/nestjs-query/commit/f5a6374f6e22470f63ef6257f7271c818ed09321)), closes [#954](https://github.com/tripss/nestjs-query/issues/954) [#954](https://github.com/tripss/nestjs-query/issues/954) [#954](https://github.com/tripss/nestjs-query/issues/954) [#954](https://github.com/tripss/nestjs-query/issues/954)
105
+
106
+
107
+
108
+
109
+
110
+ # [0.24.0](https://github.com/tripss/nestjs-query/compare/v0.23.1...v0.24.0) (2021-03-15)
111
+
112
+
113
+ ### Features
114
+
115
+ * **typegoose:** Add typegoose package ([#846](https://github.com/tripss/nestjs-query/issues/846)) ([73cf5cd](https://github.com/tripss/nestjs-query/commit/73cf5cdbf11496ad3a3ce3f6bb69975510de26e2))
116
+
117
+
118
+
119
+
120
+
121
+ ## [0.23.1](https://github.com/tripss/nestjs-query/compare/v0.23.0...v0.23.1) (2021-02-26)
122
+
123
+
124
+ ### Bug Fixes
125
+
126
+ * **typeorm,#895:** Wrap all OR and AND expressions in brackets ([838ab16](https://github.com/tripss/nestjs-query/commit/838ab16befe7a53f5fb11e84624c3b30811f61c6)), closes [#895](https://github.com/tripss/nestjs-query/issues/895)
127
+
128
+
129
+
130
+
131
+
132
+ # [0.23.0](https://github.com/tripss/nestjs-query/compare/v0.22.0...v0.23.0) (2021-02-26)
133
+
134
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
135
+
136
+
137
+
138
+
139
+
140
+ # [0.22.0](https://github.com/tripss/nestjs-query/compare/v0.21.2...v0.22.0) (2021-02-08)
141
+
142
+
143
+ ### Bug Fixes
144
+
145
+ * **deps:** update dependency uuid to v8.3.2 ([289f1ed](https://github.com/tripss/nestjs-query/commit/289f1ed5610781792d3c1efa5492376095084ac0))
146
+
147
+
148
+
149
+
150
+
151
+ ## [0.21.2](https://github.com/tripss/nestjs-query/compare/v0.21.1...v0.21.2) (2020-10-23)
152
+
153
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
154
+
155
+
156
+
157
+
158
+
159
+ ## [0.21.1](https://github.com/tripss/nestjs-query/compare/v0.21.0...v0.21.1) (2020-10-18)
160
+
161
+
162
+ ### Bug Fixes
163
+
164
+ * **deps:** update dependency uuid to v8.3.1 ([a2b7555](https://github.com/tripss/nestjs-query/commit/a2b7555c1186e48999d44aa8af9b792f32b18b7e))
165
+
166
+
167
+
168
+
169
+
170
+ # [0.21.0](https://github.com/tripss/nestjs-query/compare/v0.20.2...v0.21.0) (2020-10-16)
171
+
172
+
173
+ ### Bug Fixes
174
+
175
+ * **eslint:** Fix eslint to recognize sub packages ([13fdd2b](https://github.com/tripss/nestjs-query/commit/13fdd2b31289dbc80316cbdb5aa32edbe596bad4))
176
+
177
+
178
+
179
+
180
+
181
+ ## [0.20.2](https://github.com/tripss/nestjs-query/compare/v0.20.1...v0.20.2) (2020-10-01)
182
+
183
+
184
+ ### Bug Fixes
185
+
186
+ * **filters:** Fix bug with incorect parameters in filter ([6ada4f4](https://github.com/tripss/nestjs-query/commit/6ada4f4a12633d41c60de9540dfc28ed0985ca62))
187
+ * **filters:** Fix bug with incorect parameters in filters ([9f4e93b](https://github.com/tripss/nestjs-query/commit/9f4e93b7726d85cb4febe86d2caf941dc957463a))
188
+ * **typeorm:** fix unit tests after fix filters bug ([5f50419](https://github.com/tripss/nestjs-query/commit/5f5041906694ae7c4aa799f52049d0981b97ccfc))
189
+
190
+
191
+
192
+
193
+
194
+ ## [0.20.1](https://github.com/tripss/nestjs-query/compare/v0.20.0...v0.20.1) (2020-09-28)
195
+
196
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
197
+
198
+
199
+
200
+
201
+
202
+ # [0.20.0](https://github.com/tripss/nestjs-query/compare/v0.19.4...v0.20.0) (2020-09-17)
203
+
204
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
205
+
206
+
207
+
208
+
209
+
210
+ ## [0.19.4](https://github.com/tripss/nestjs-query/compare/v0.19.3...v0.19.4) (2020-09-15)
211
+
212
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
213
+
214
+
215
+
216
+
217
+
218
+ ## [0.19.3](https://github.com/tripss/nestjs-query/compare/v0.19.2...v0.19.3) (2020-09-09)
219
+
220
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
221
+
222
+
223
+
224
+
225
+
226
+ ## [0.19.2](https://github.com/tripss/nestjs-query/compare/v0.19.1...v0.19.2) (2020-09-03)
227
+
228
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
229
+
230
+
231
+
232
+
233
+
234
+ ## [0.19.1](https://github.com/tripss/nestjs-query/compare/v0.19.0...v0.19.1) (2020-09-02)
235
+
236
+
237
+ ### Bug Fixes
238
+
239
+ * **typeorm,#493:** Fix uni-directional relation SQL ([7887b8c](https://github.com/tripss/nestjs-query/commit/7887b8c94516194840df03139fecd0d5a0f38f65))
240
+
241
+
242
+
243
+
244
+
245
+ # [0.19.0](https://github.com/tripss/nestjs-query/compare/v0.18.1...v0.19.0) (2020-09-01)
246
+
247
+
248
+ ### Features
249
+
250
+ * **typeorm:** Add additional filter options to QueryService ([64241dc](https://github.com/tripss/nestjs-query/commit/64241dc9c4565c3bb2d4f168c837578bd706c48c))
251
+
252
+
253
+
254
+
255
+
256
+ ## [0.18.1](https://github.com/tripss/nestjs-query/compare/v0.18.0...v0.18.1) (2020-08-14)
257
+
258
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
259
+
260
+
261
+
262
+
263
+
264
+ # [0.18.0](https://github.com/tripss/nestjs-query/compare/v0.17.10...v0.18.0) (2020-08-11)
265
+
266
+
267
+ ### Bug Fixes
268
+
269
+ * **type:** Pin dev dependencies ([442db4c](https://github.com/tripss/nestjs-query/commit/442db4cd9b9d48d0c6a20209f0b44c4a314660ac))
270
+
271
+
272
+ ### Features
273
+
274
+ * **typeorm:** Switch to use unioned queries for relations ([327c676](https://github.com/tripss/nestjs-query/commit/327c6760e3e1a7db6bb0f872928d0502345c925f))
275
+
276
+
277
+
278
+
279
+
280
+ ## [0.17.10](https://github.com/tripss/nestjs-query/compare/v0.17.9...v0.17.10) (2020-08-01)
281
+
282
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
283
+
284
+
285
+
286
+
287
+
288
+ ## [0.17.8](https://github.com/tripss/nestjs-query/compare/v0.17.7...v0.17.8) (2020-07-28)
289
+
290
+
291
+ ### Features
292
+
293
+ * **graphql:** Allow specifying allowed comparisons on filterable fields ([ced2792](https://github.com/tripss/nestjs-query/commit/ced27920e5c2278c2a04c027a692e25b3306f6cb))
294
+
295
+
296
+
297
+
298
+
299
+ ## [0.17.7](https://github.com/tripss/nestjs-query/compare/v0.17.6...v0.17.7) (2020-07-27)
300
+
301
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
302
+
303
+
304
+
305
+
306
+
307
+ ## [0.17.2](https://github.com/tripss/nestjs-query/compare/v0.17.1...v0.17.2) (2020-07-17)
308
+
309
+
310
+ ### Bug Fixes
311
+
312
+ * **typeorm:** Ensure record is entity instance when saving ([3cdbbaf](https://github.com/tripss/nestjs-query/commit/3cdbbaff11b18bcc5e6fd29fd182e2bd66b14f17)), closes [#380](https://github.com/tripss/nestjs-query/issues/380)
313
+
314
+
315
+
316
+
317
+
318
+ # [0.17.0](https://github.com/tripss/nestjs-query/compare/v0.16.2...v0.17.0) (2020-07-16)
319
+
320
+
321
+ ### Features
322
+
323
+ * **aggregations:** Add aggregations to graphql ([af075d2](https://github.com/tripss/nestjs-query/commit/af075d2e93b6abbbfbe32afcc917350f803fadaa))
324
+ * **aggregations,typeorm:** Add relation aggregation to typeorm ([2bf35a9](https://github.com/tripss/nestjs-query/commit/2bf35a92ce80b1f3026fd87cb62cad17eb6eff03))
325
+ * **aggretations:** Add aggregations support to typeorm ([7233c23](https://github.com/tripss/nestjs-query/commit/7233c2397d0ac332e5209ab87ae62f5f555609d6))
326
+
327
+
328
+
329
+
330
+
331
+ ## [0.16.2](https://github.com/tripss/nestjs-query/compare/v0.16.1...v0.16.2) (2020-07-09)
332
+
333
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
334
+
335
+
336
+
337
+
338
+
339
+ ## [0.16.1](https://github.com/tripss/nestjs-query/compare/v0.16.0...v0.16.1) (2020-07-07)
340
+
341
+
342
+ ### Bug Fixes
343
+
344
+ * **typeorm:** Fix import path in relation service [#363](https://github.com/tripss/nestjs-query/issues/363) ([0e6d484](https://github.com/tripss/nestjs-query/commit/0e6d484920960ed1966360a89af979230667b5f7))
345
+
346
+
347
+
348
+
349
+
350
+ # [0.16.0](https://github.com/tripss/nestjs-query/compare/v0.15.1...v0.16.0) (2020-07-05)
351
+
352
+
353
+ ### Features
354
+
355
+ * **typeorm:** Add support for filtering on relations ([aa8788c](https://github.com/tripss/nestjs-query/commit/aa8788cbbc0c95465e1633b57ca48c91b160038a))
356
+
357
+
358
+
359
+
360
+
361
+ ## [0.15.1](https://github.com/tripss/nestjs-query/compare/v0.15.0...v0.15.1) (2020-06-27)
362
+
363
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
364
+
365
+
366
+
367
+
368
+
369
+ # [0.15.0](https://github.com/tripss/nestjs-query/compare/v0.14.3...v0.15.0) (2020-06-23)
370
+
371
+
372
+ ### Features
373
+
374
+ * **graphql,connection:** Add totalCount to connections ([ed1e84a](https://github.com/tripss/nestjs-query/commit/ed1e84a2feb6f89c3b270fcbc1d0eaf6aec5e575))
375
+
376
+
377
+
378
+
379
+
380
+ ## [0.14.2](https://github.com/tripss/nestjs-query/compare/v0.14.1...v0.14.2) (2020-06-19)
381
+
382
+
383
+ ### Bug Fixes
384
+
385
+ * **typeorm:** Allow using string based typeorm relations ([55c157d](https://github.com/tripss/nestjs-query/commit/55c157dbea9ce8c1186a2c2ea17f847857fd2226))
386
+
387
+
388
+
389
+
390
+
391
+ # [0.14.0](https://github.com/tripss/nestjs-query/compare/v0.13.2...v0.14.0) (2020-06-18)
392
+
393
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
394
+
395
+
396
+
397
+
398
+
399
+ # [0.13.0](https://github.com/tripss/nestjs-query/compare/v0.12.0...v0.13.0) (2020-06-12)
400
+
401
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
402
+
403
+
404
+
405
+
406
+
407
+ # [0.12.0](https://github.com/tripss/nestjs-query/compare/v0.11.8...v0.12.0) (2020-06-07)
408
+
409
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
410
+
411
+
412
+
413
+
414
+
415
+ ## [0.11.8](https://github.com/tripss/nestjs-query/compare/v0.11.7...v0.11.8) (2020-05-30)
416
+
417
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
418
+
419
+
420
+
421
+
422
+
423
+ ## [0.11.7](https://github.com/tripss/nestjs-query/compare/v0.11.6...v0.11.7) (2020-05-29)
424
+
425
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
426
+
427
+
428
+
429
+
430
+
431
+ ## [0.11.6](https://github.com/tripss/nestjs-query/compare/v0.11.5...v0.11.6) (2020-05-26)
432
+
433
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
434
+
435
+
436
+
437
+
438
+
439
+ ## [0.11.5](https://github.com/tripss/nestjs-query/compare/v0.11.4...v0.11.5) (2020-05-21)
440
+
441
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
442
+
443
+
444
+
445
+
446
+
447
+ ## [0.11.4](https://github.com/tripss/nestjs-query/compare/v0.11.3...v0.11.4) (2020-05-19)
448
+
449
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
450
+
451
+
452
+
453
+
454
+
455
+ ## [0.11.3](https://github.com/tripss/nestjs-query/compare/v0.11.2...v0.11.3) (2020-05-16)
456
+
457
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
458
+
459
+
460
+
461
+
462
+
463
+ ## [0.11.2](https://github.com/tripss/nestjs-query/compare/v0.11.1...v0.11.2) (2020-05-14)
464
+
465
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
466
+
467
+
468
+
469
+
470
+
471
+ ## [0.11.1](https://github.com/tripss/nestjs-query/compare/v0.11.0...v0.11.1) (2020-05-11)
472
+
473
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
474
+
475
+
476
+
477
+
478
+
479
+ # [0.11.0](https://github.com/tripss/nestjs-query/compare/v0.10.2...v0.11.0) (2020-05-09)
480
+
481
+
482
+ ### Features
483
+
484
+ * **graphql:** Add graphql module ([282c421](https://github.com/tripss/nestjs-query/commit/282c421d0e6f67fe750fa6005f6cb7d960c8fbd0))
485
+
486
+
487
+
488
+
489
+
490
+ ## [0.10.2](https://github.com/tripss/nestjs-query/compare/v0.10.1...v0.10.2) (2020-05-04)
491
+
492
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
493
+
494
+
495
+
496
+
497
+
498
+ # [0.10.0](https://github.com/tripss/nestjs-query/compare/v0.9.0...v0.10.0) (2020-04-29)
499
+
500
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
501
+
502
+
503
+
504
+
505
+
506
+ # [0.9.0](https://github.com/tripss/nestjs-query/compare/v0.8.9...v0.9.0) (2020-04-26)
507
+
508
+
509
+ ### Features
510
+
511
+ * **typeorm:** Add support for soft deletes ([2ab42fa](https://github.com/tripss/nestjs-query/commit/2ab42faee2802abae4d8496e2529b8eb23860ed4))
512
+
513
+
514
+
515
+
516
+
517
+ ## [0.8.9](https://github.com/tripss/nestjs-query/compare/v0.8.8...v0.8.9) (2020-04-24)
518
+
519
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
520
+
521
+
522
+
523
+
524
+
525
+ ## [0.8.7](https://github.com/tripss/nestjs-query/compare/v0.8.6...v0.8.7) (2020-04-23)
526
+
527
+ **Note:** Version bump only for package @ptc-org/nestjs-query-typeorm
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ptc-org/nestjs-query-typeorm",
3
- "version": "1.0.0-alpha.2",
3
+ "version": "1.0.0-alpha.3",
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",
package/src/query/relation-query.builder.d.ts CHANGED
@@ -41,10 +41,16 @@ export declare type EntityIndexRelation<Relation> = Relation & {
41
41
  export declare class RelationQueryBuilder<Entity, Relation> {
42
42
  readonly repo: Repository<Entity>;
43
43
  readonly relation: string;
44
- private relationMetadata;
45
44
  readonly filterQueryBuilder: FilterQueryBuilder<Relation>;
46
45
  readonly relationRepo: Repository<Relation>;
46
+ private relationMetadata;
47
47
  private paramCount;
48
+ /**
49
+ * Will be filled if the query builder already contains the join
50
+ *
51
+ * TODO:: Do this different? Maybe cleanup the batchSelect / whereCondition as its almost the same
52
+ */
53
+ private existingAlias;
48
54
  constructor(repo: Repository<Entity>, relation: string);
49
55
  select(entity: Entity, query: Query<Relation>): SelectQueryBuilder<Relation>;
50
56
  batchSelect(entities: Entity[], query: Query<Relation>): SelectQueryBuilder<Relation>;
@@ -57,14 +63,13 @@ export declare class RelationQueryBuilder<Entity, Relation> {
57
63
  private getOneToManyOrOneToOneNotOwnerMeta;
58
64
  private getManyToManyOwnerMeta;
59
65
  private getManyToManyNotOwnerMetadata;
66
+ private batchSelectManyToMany;
67
+ private batchMapRelationsManyToMany;
60
68
  private getParamName;
61
69
  get entityIndexColName(): string;
62
70
  private get escapedEntityIndexColName();
63
71
  private get unionAlias();
64
72
  private escapeName;
65
- getRelationPrimaryKeysPropertyNameAndColumnsName(): {
66
- columnName: string;
67
- propertyName: string;
68
- }[];
73
+ private getRelationPrimaryKeysPropertyNameAndColumnsName;
69
74
  }
70
75
  export {};
package/src/query/relation-query.builder.js CHANGED
@@ -98,31 +98,26 @@ class RelationQueryBuilder {
98
98
  return { sql: unionSql, params: unionSqls.parameters };
99
99
  }
100
100
  createRelationQueryBuilder(entity) {
101
- const meta = this.relationMeta;
102
- const queryBuilder = this.relationRepo.createQueryBuilder(meta.fromAlias);
103
- const joinedBuilder = meta.joins.reduce((qb, join) => {
101
+ const queryBuilder = this.relationRepo.createQueryBuilder(this.relationMeta.fromAlias);
102
+ const joinedBuilder = this.relationMeta.joins.reduce((qb, join) => {
104
103
  const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
105
104
  return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
106
105
  }, queryBuilder);
107
106
  return joinedBuilder.where(new typeorm_1.Brackets((bqb) => {
108
- const where = meta.whereCondition(entity);
107
+ const where = this.relationMeta.whereCondition(entity);
109
108
  bqb.andWhere(where.sql, where.params);
110
109
  }));
111
110
  }
112
111
  getManyToOneOrOneToOneOwnerMeta(relation) {
113
- const aliasName = relation.entityMetadata.name;
114
- const { primaryColumns } = relation.entityMetadata;
115
- const { joinColumns } = relation;
116
- const joins = [
117
- {
112
+ const aliasName = relation.entityMetadata.tableName;
113
+ const joins = [{
118
114
  target: relation.entityMetadata.target,
119
115
  alias: aliasName,
120
- conditions: joinColumns.map((joinColumn) => ({
116
+ conditions: relation.joinColumns.map((joinColumn) => ({
121
117
  leftHand: `${aliasName}.${joinColumn.propertyName}`,
122
118
  rightHand: `${relation.propertyName}.${joinColumn.referencedColumn.propertyName}`
123
119
  }))
124
- }
125
- ];
120
+ }];
126
121
  const fromPrimaryKeys = relation.inverseEntityMetadata.primaryColumns.map((pk) => ({
127
122
  selectPath: `${relation.propertyName}.${pk.propertyName}`,
128
123
  databasePath: pk.databasePath,
@@ -135,9 +130,11 @@ class RelationQueryBuilder {
135
130
  fromPrimaryKeys,
136
131
  joins,
137
132
  mapRelations: (entity, relations, rawRelations) => {
138
- const rawFilter = primaryColumns.reduce((columns, column) => ({
133
+ // Set the alias to use for the join
134
+ const joinAlias = this.existingAlias?.name || aliasName;
135
+ const rawFilter = relation.entityMetadata.primaryColumns.reduce((columns, column) => ({
139
136
  ...columns,
140
- [DriverUtils_1.DriverUtils.buildAlias(this.relationRepo.manager.connection.driver, aliasName, column.databasePath)]: column.getEntityValue(entity)
137
+ [`${joinAlias}_${column.propertyPath}`]: column.getEntityValue(entity)
141
138
  }), {});
142
139
  // First filter the raw relations with the PK of the entity, then filter the relations
143
140
  // with the PK of the raw relation
@@ -150,29 +147,35 @@ class RelationQueryBuilder {
150
147
  }, []);
151
148
  },
152
149
  batchSelect: (qb, entities) => {
153
- const joinCondition = joinColumns.map((column) => {
154
- return `${aliasName}.${column.propertyName} = ${relation.propertyName}.${column.referencedColumn.propertyName}`;
155
- }).join(' AND ');
150
+ this.existingAlias = qb.expressionMap.aliases.find((alias) => {
151
+ return alias.type === 'join' && alias.target === relation.entityMetadata.target;
152
+ });
153
+ // Set the alias to use for the join
154
+ const joinAlias = this.existingAlias?.name || aliasName;
156
155
  const whereParams = {};
157
- const whereCondition = primaryColumns.map((column) => {
158
- const paramName = this.getParamName(aliasName);
156
+ const whereCondition = relation.entityMetadata.primaryColumns.map((column) => {
157
+ const paramName = this.getParamName(joinAlias);
159
158
  whereParams[paramName] = entities.map((entity) => column.getEntityValue(entity));
160
159
  // Also select the columns, so we can use them to map later
161
- qb.addSelect(`${aliasName}.${column.propertyPath}`);
162
- return `${aliasName}.${column.propertyPath} IN (:...${paramName})`;
160
+ qb.addSelect(`${joinAlias}.${column.propertyPath}`, `${joinAlias}_${column.propertyPath}`);
161
+ return `${joinAlias}.${column.propertyPath} IN (:...${paramName})`;
163
162
  }).join(' AND ');
164
- return qb.leftJoin(relation.entityMetadata.target, aliasName, joinCondition)
165
- .andWhere(whereCondition, whereParams);
163
+ // Only add the joins if there was not an existing one yet for this relation
164
+ if (!this.existingAlias) {
165
+ qb = joins.reduce((qb, join) => {
166
+ const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
167
+ return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
168
+ }, qb);
169
+ }
170
+ return qb.andWhere(whereCondition, whereParams);
166
171
  },
167
172
  whereCondition: (entity) => {
168
173
  const params = {};
169
- const sql = primaryColumns
170
- .map((column) => {
174
+ const sql = relation.entityMetadata.primaryColumns.map((column) => {
171
175
  const paramName = this.getParamName(aliasName);
172
176
  params[paramName] = column.getEntityValue(entity);
173
177
  return `${aliasName}.${column.propertyPath} = :${paramName}`;
174
- })
175
- .join(' AND ');
178
+ }).join(' AND ');
176
179
  return { sql, params };
177
180
  }
178
181
  };
@@ -200,12 +203,12 @@ class RelationQueryBuilder {
200
203
  },
201
204
  batchSelect: (qb, entities) => {
202
205
  const params = {};
203
- const sql = columns.map((column) => {
206
+ const where = columns.map((column) => {
204
207
  const paramName = this.getParamName(aliasName);
205
208
  params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
206
209
  return `${aliasName}.${column.propertyPath} IN (:...${paramName})`;
207
210
  }).join(' AND ');
208
- return qb.andWhere(sql, params);
211
+ return qb.andWhere(where, params);
209
212
  },
210
213
  whereCondition: (entity) => {
211
214
  const params = {};
@@ -243,35 +246,10 @@ class RelationQueryBuilder {
243
246
  fromPrimaryKeys,
244
247
  joins,
245
248
  mapRelations: (entity, relations, rawRelations) => {
246
- const rawFilter = relation.joinColumns.reduce((columns, column) => ({
247
- ...columns,
248
- [`${joinAlias}_${column.propertyName}`]: column.referencedColumn.getEntityValue(entity)
249
- }), {});
250
- // First filter the raw relations with the PK of the entity, then filter the relations
251
- // with the PK of the raw relation
252
- return (0, lodash_filter_1.default)(rawRelations, rawFilter).reduce((entityRelations, rawRelation) => {
253
- const filter = this.getRelationPrimaryKeysPropertyNameAndColumnsName().reduce((columns, column) => ({
254
- ...columns,
255
- [column.propertyName]: rawRelation[column.columnName]
256
- }), {});
257
- return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
258
- }, []);
249
+ return this.batchMapRelationsManyToMany(joinAlias, relation.joinColumns, entity, relations, rawRelations);
259
250
  },
260
251
  batchSelect: (qb, entities) => {
261
- const params = {};
262
- const sql = relation.joinColumns.map((column) => {
263
- const paramName = this.getParamName(column.propertyName);
264
- params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
265
- // We also want to select the field, so we can map them back in the mapper
266
- qb.addSelect(`${joinAlias}.${column.propertyName}`, `${joinAlias}_${column.propertyName}`);
267
- return `${joinAlias}.${column.propertyName} IN (:...${paramName})`;
268
- }).join(' AND ');
269
- // Add the needed joins
270
- return joins.reduce((qb, join) => {
271
- const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
272
- return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
273
- }, qb)
274
- .andWhere(sql, params);
252
+ return this.batchSelectManyToMany(qb, entities, joinAlias, relation.joinColumns);
275
253
  },
276
254
  whereCondition: (entity) => {
277
255
  const params = {};
@@ -311,35 +289,10 @@ class RelationQueryBuilder {
311
289
  fromPrimaryKeys,
312
290
  joins,
313
291
  mapRelations: (entity, relations, rawRelations) => {
314
- const rawFilter = relation.inverseRelation.inverseJoinColumns.reduce((columns, column) => ({
315
- ...columns,
316
- [`${joinAlias}_${column.propertyName}`]: column.referencedColumn.getEntityValue(entity)
317
- }), {});
318
- // First filter the raw relations with the PK of the entity, then filter the relations
319
- // with the PK of the raw relation
320
- return (0, lodash_filter_1.default)(rawRelations, rawFilter).reduce((entityRelations, rawRelation) => {
321
- const filter = this.getRelationPrimaryKeysPropertyNameAndColumnsName().reduce((columns, column) => ({
322
- ...columns,
323
- [column.propertyName]: rawRelation[column.columnName]
324
- }), {});
325
- return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
326
- }, []);
292
+ return this.batchMapRelationsManyToMany(joinAlias, relation.inverseRelation.inverseJoinColumns, entity, relations, rawRelations);
327
293
  },
328
294
  batchSelect: (qb, entities) => {
329
- const params = {};
330
- const sql = relation.inverseRelation.inverseJoinColumns.map((column) => {
331
- const paramName = this.getParamName(column.propertyName);
332
- params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
333
- // We also want to select the field, so we can map them back in the mapper
334
- qb.addSelect(`${joinAlias}.${column.propertyName}`, `${joinAlias}_${column.propertyName}`);
335
- return `${joinAlias}.${column.propertyName} IN (:...${paramName})`;
336
- }).join(' AND ');
337
- // Add the needed joins
338
- return joins.reduce((qb, join) => {
339
- const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
340
- return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
341
- }, qb)
342
- .andWhere(sql, params);
295
+ return this.batchSelectManyToMany(qb, entities, joinAlias, relation.inverseRelation.inverseJoinColumns);
343
296
  },
344
297
  whereCondition: (entity) => {
345
298
  const params = {};
@@ -352,6 +305,36 @@ class RelationQueryBuilder {
352
305
  }
353
306
  };
354
307
  }
308
+ batchSelectManyToMany(qb, entities, joinAlias, columns) {
309
+ const params = {};
310
+ const sql = columns.map((column) => {
311
+ const paramName = this.getParamName(column.propertyName);
312
+ params[paramName] = entities.map((entity) => column.referencedColumn.getEntityValue(entity));
313
+ // We also want to select the field, so we can map them back in the mapper
314
+ qb.addSelect(`${joinAlias}.${column.propertyName}`, `${joinAlias}_${column.propertyName}`);
315
+ return `${joinAlias}.${column.propertyName} IN (:...${paramName})`;
316
+ }).join(' AND ');
317
+ // Add the needed joins
318
+ return this.relationMeta.joins.reduce((qb, join) => {
319
+ const conditions = join.conditions.map(({ leftHand, rightHand }) => `${leftHand} = ${rightHand}`);
320
+ return qb.innerJoin(join.target, join.alias, conditions.join(' AND '));
321
+ }, qb).andWhere(sql, params);
322
+ }
323
+ batchMapRelationsManyToMany(joinAlias, columns, entity, relations, rawRelations) {
324
+ const rawFilter = columns.reduce((columns, column) => ({
325
+ ...columns,
326
+ [`${joinAlias}_${column.propertyName}`]: column.referencedColumn.getEntityValue(entity)
327
+ }), {});
328
+ // First filter the raw relations with the PK of the entity, then filter the relations
329
+ // with the PK of the raw relation
330
+ return (0, lodash_filter_1.default)(rawRelations, rawFilter).reduce((entityRelations, rawRelation) => {
331
+ const filter = this.getRelationPrimaryKeysPropertyNameAndColumnsName().reduce((columns, column) => ({
332
+ ...columns,
333
+ [column.propertyName]: rawRelation[column.columnName]
334
+ }), {});
335
+ return entityRelations.concat((0, lodash_filter_1.default)(relations, filter));
336
+ }, []);
337
+ }
355
338
  getParamName(prefix) {
356
339
  this.paramCount += 1;
357
340
  return `${prefix}_${this.paramCount}`;
package/src/query/relation-query.builder.js.map CHANGED
@@ -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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"}
package/src/services/relation-query.service.d.ts CHANGED
@@ -127,7 +127,6 @@ export declare abstract class RelationQueryService<Entity> {
127
127
  private createTypeormRelationQueryBuilder;
128
128
  private getRelationMeta;
129
129
  private getRelationEntity;
130
- private getRelationsFromPrimaryKeys;
131
130
  private getRelations;
132
131
  private foundAllRelations;
133
132
  }
package/src/services/relation-query.service.js CHANGED
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.RelationQueryService = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const nestjs_query_core_1 = require("@ptc-org/nestjs-query-core");
6
- const lodash_filter_1 = (0, tslib_1.__importDefault)(require("lodash.filter"));
7
6
  const lodash_omit_1 = (0, tslib_1.__importDefault)(require("lodash.omit"));
8
7
  const query_1 = require("../query");
9
8
  /**
@@ -155,8 +154,8 @@ class RelationQueryService {
155
154
  */
156
155
  async batchQueryRelations(RelationClass, relationName, entities, query) {
157
156
  const assembler = nestjs_query_core_1.AssemblerFactory.getAssembler(RelationClass, this.getRelationEntity(relationName));
158
- const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
159
157
  const convertedQuery = assembler.convertQuery(query);
158
+ const relationQueryBuilder = this.getRelationQueryBuilder(relationName);
160
159
  const entityRelations = await relationQueryBuilder.batchSelect(entities, convertedQuery).getRawAndEntities();
161
160
  return entities.reduce((results, entity) => {
162
161
  const relations = relationQueryBuilder.relationMeta.mapRelations(entity, entityRelations.entities, entityRelations.raw);
@@ -246,13 +245,6 @@ class RelationQueryService {
246
245
  }
247
246
  return relationMeta.type;
248
247
  }
249
- getRelationsFromPrimaryKeys(relationBuilder, rawResult, relations) {
250
- const pks = relationBuilder.getRelationPrimaryKeysPropertyNameAndColumnsName();
251
- const filter = pks.reduce((keys, key) =>
252
- // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
253
- ({ ...keys, [key.propertyName]: rawResult[key.columnName] }), {});
254
- return (0, lodash_filter_1.default)(relations, filter);
255
- }
256
248
  getRelations(relationName, ids, filter) {
257
249
  const relationQueryBuilder = this.getRelationQueryBuilder(relationName).filterQueryBuilder;
258
250
  return relationQueryBuilder.selectById(ids, { filter }).getMany();
package/src/services/relation-query.service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"relation-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/relation-query.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"relation-query.service.js","sourceRoot":"","sources":["../../../../../packages/query-typeorm/src/services/relation-query.service.ts"],"names":[],"mappings":"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"}